michael@112: Index: install.ml
michael@112: --- install.ml.orig	2006-08-02 17:59:19 +0200
michael@112: +++ install.ml	2008-05-30 17:49:27 +0200
michael@112: @@ -104,10 +104,10 @@
michael@112:  in
michael@112:  let startdir = Sys.getcwd() in
michael@112:  try
michael@112: -	download();
michael@112: +	(* download(); *)
michael@112:  	compile();
michael@112:  	Sys.chdir startdir;
michael@112:  with
michael@112:  	Failure msg -> 
michael@112:  		Sys.chdir startdir;
michael@112: -		prerr_endline msg; exit 1
michael@112: \ No newline at end of file
michael@112: +		prerr_endline msg; exit 1
michael@113: Index: ocaml/mtasc/parser.ml
michael@113: --- ocaml/mtasc/parser.ml.orig	2007-02-04 14:56:04.000000000 +0100
michael@113: +++ ocaml/mtasc/parser.ml	2009-02-25 13:52:56.848237653 +0100
michael@113: @@ -166,8 +166,8 @@
michael@113:  	| [< '(Kwd For,p); '(POpen,_); c = parse_expr_opt; e = parse_for p c >] -> e
michael@113:  	| [< '(Kwd If,p); cond = parse_eval; e = parse_expr_opt; e2 , p2 = parse_else (pos e) >] -> EIf (cond,wrap_var e,e2), punion p p2
michael@113:  	| [< '(Kwd Return,p); v , p2 = parse_eval_option p; >] -> EReturn v , punion p p2
michael@113: -	| [< '(Kwd Break,p); >] -> EBreak , p
michael@113: -	| [< '(Kwd Continue,p); >] -> EContinue , p
michael@113: +	| [< '(Kwd Break,p); placeholder1 >] -> EBreak , p
michael@113: +	| [< '(Kwd Continue,p); placeholder2 >] -> EContinue , p
michael@113:  	| [< '(Kwd While,p1); v = parse_eval; e = parse_expr_opt >] -> EWhile (v,wrap_var e,NormalWhile) , punion p1 (pos e)
michael@113:  	| [< '(Kwd Do,p1); e = parse_expr; '(Kwd While,_); v = parse_eval; >] -> EWhile (v,wrap_var e,DoWhile) , punion p1 (pos v)
michael@113:  	| [< '(Kwd Switch,p1); v = parse_eval; '(BrOpen,_); el, p2 = parse_switch false >] -> ESwitch (v,el) , punion p1 p2
michael@113: @@ -278,7 +278,7 @@
michael@113:  
michael@113:  and parse_expr_opt = parser
michael@113:  	| [< e = parse_expr >] -> e
michael@113: -	| [< '(Next,p); >] -> EBlock [] , p
michael@113: +	| [< '(Next,p); placeholder3 >] -> EBlock [] , p
michael@113:  
michael@113:  and parse_for p c = parser
michael@113:  	| [< '(Kwd In,_); v = parse_eval; '(PClose,p2); e = parse_expr_opt >] -> EForIn(c,v,wrap_var e) , punion p p2
michael@113: @@ -324,7 +324,7 @@
michael@113:  and parse_block callb sp = parser
michael@113:  	| [< e = callb; el,p = parse_block callb sp >] -> e :: el , p
michael@113:  	| [< '(Next,_); el = parse_block callb sp >] -> el
michael@113: -	| [< '(BrClose,p); >] -> [] , p
michael@113: +	| [< '(BrClose,p); placeholder4 >] -> [] , p
michael@113:  	| [< '(Eof,_) >] -> error Unclosed_parenthesis sp
michael@113:  
michael@113:  and parse_expr_list p = parser
michael@113: @@ -351,7 +351,7 @@
michael@113:  
michael@113:  and parse_import = parser
michael@113:  	| [< '(Const (Ident name),_); p = parse_import2 name >] -> p
michael@113: -	| [< '(Binop OpMult,_); >] -> [] , None
michael@113: +	| [< '(Binop OpMult,_); placeholder5 >] -> [] , None
michael@113:  
michael@113:  and parse_import2 name = parser
michael@113:  	| [< '(Dot,_); p , n = parse_import >] -> name :: p , n