mtasc/mtasc.patch@870131689a5c (annotated)
mtasc/mtasc.patch
Sat, 21 May 2011 22:05:42 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 21 May 2011 22:05:42 +0200
- changeset 340
- 870131689a5c
- parent 112
- 6052d0605a74
- permissions
- -rw-r--r--
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
| michael@112 | 1 | Index: install.ml |
| michael@112 | 2 | --- install.ml.orig 2006-08-02 17:59:19 +0200 |
| michael@112 | 3 | +++ install.ml 2008-05-30 17:49:27 +0200 |
| michael@112 | 4 | @@ -104,10 +104,10 @@ |
| michael@112 | 5 | in |
| michael@112 | 6 | let startdir = Sys.getcwd() in |
| michael@112 | 7 | try |
| michael@112 | 8 | - download(); |
| michael@112 | 9 | + (* download(); *) |
| michael@112 | 10 | compile(); |
| michael@112 | 11 | Sys.chdir startdir; |
| michael@112 | 12 | with |
| michael@112 | 13 | Failure msg -> |
| michael@112 | 14 | Sys.chdir startdir; |
| michael@112 | 15 | - prerr_endline msg; exit 1 |
| michael@112 | 16 | \ No newline at end of file |
| michael@112 | 17 | + prerr_endline msg; exit 1 |
| michael@113 | 18 | Index: ocaml/mtasc/parser.ml |
| michael@113 | 19 | --- ocaml/mtasc/parser.ml.orig 2007-02-04 14:56:04.000000000 +0100 |
| michael@113 | 20 | +++ ocaml/mtasc/parser.ml 2009-02-25 13:52:56.848237653 +0100 |
| michael@113 | 21 | @@ -166,8 +166,8 @@ |
| michael@113 | 22 | | [< '(Kwd For,p); '(POpen,_); c = parse_expr_opt; e = parse_for p c >] -> e |
| michael@113 | 23 | | [< '(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 | 24 | | [< '(Kwd Return,p); v , p2 = parse_eval_option p; >] -> EReturn v , punion p p2 |
| michael@113 | 25 | - | [< '(Kwd Break,p); >] -> EBreak , p |
| michael@113 | 26 | - | [< '(Kwd Continue,p); >] -> EContinue , p |
| michael@113 | 27 | + | [< '(Kwd Break,p); placeholder1 >] -> EBreak , p |
| michael@113 | 28 | + | [< '(Kwd Continue,p); placeholder2 >] -> EContinue , p |
| michael@113 | 29 | | [< '(Kwd While,p1); v = parse_eval; e = parse_expr_opt >] -> EWhile (v,wrap_var e,NormalWhile) , punion p1 (pos e) |
| michael@113 | 30 | | [< '(Kwd Do,p1); e = parse_expr; '(Kwd While,_); v = parse_eval; >] -> EWhile (v,wrap_var e,DoWhile) , punion p1 (pos v) |
| michael@113 | 31 | | [< '(Kwd Switch,p1); v = parse_eval; '(BrOpen,_); el, p2 = parse_switch false >] -> ESwitch (v,el) , punion p1 p2 |
| michael@113 | 32 | @@ -278,7 +278,7 @@ |
| michael@113 | 33 | |
| michael@113 | 34 | and parse_expr_opt = parser |
| michael@113 | 35 | | [< e = parse_expr >] -> e |
| michael@113 | 36 | - | [< '(Next,p); >] -> EBlock [] , p |
| michael@113 | 37 | + | [< '(Next,p); placeholder3 >] -> EBlock [] , p |
| michael@113 | 38 | |
| michael@113 | 39 | and parse_for p c = parser |
| michael@113 | 40 | | [< '(Kwd In,_); v = parse_eval; '(PClose,p2); e = parse_expr_opt >] -> EForIn(c,v,wrap_var e) , punion p p2 |
| michael@113 | 41 | @@ -324,7 +324,7 @@ |
| michael@113 | 42 | and parse_block callb sp = parser |
| michael@113 | 43 | | [< e = callb; el,p = parse_block callb sp >] -> e :: el , p |
| michael@113 | 44 | | [< '(Next,_); el = parse_block callb sp >] -> el |
| michael@113 | 45 | - | [< '(BrClose,p); >] -> [] , p |
| michael@113 | 46 | + | [< '(BrClose,p); placeholder4 >] -> [] , p |
| michael@113 | 47 | | [< '(Eof,_) >] -> error Unclosed_parenthesis sp |
| michael@113 | 48 | |
| michael@113 | 49 | and parse_expr_list p = parser |
| michael@113 | 50 | @@ -351,7 +351,7 @@ |
| michael@113 | 51 | |
| michael@113 | 52 | and parse_import = parser |
| michael@113 | 53 | | [< '(Const (Ident name),_); p = parse_import2 name >] -> p |
| michael@113 | 54 | - | [< '(Binop OpMult,_); >] -> [] , None |
| michael@113 | 55 | + | [< '(Binop OpMult,_); placeholder5 >] -> [] , None |
| michael@113 | 56 | |
| michael@113 | 57 | and parse_import2 name = parser |
| michael@113 | 58 | | [< '(Dot,_); p , n = parse_import >] -> name :: p , n |
