r326 - in /packages/mtasc/trunk/debian: changelog patches/fix_mtasc_for_camlp4_3.11.0.patch patches/series

[pabs at users.alioth.debian.org]

Author: pabs
Date: Mon Mar  9 11:17:32 2009
New Revision: 326

URL: http://svn.debian.org/wsvn/?sc=1&rev=326
Log:
Add patch to allow building with camlp4o from ocaml 3.11.0
Patch fix_mtasc_for_camlp4_3.11.0.patch by Stefano Zacchiroli

Added:
    packages/mtasc/trunk/debian/patches/fix_mtasc_for_camlp4_3.11.0.patch
Modified:
    packages/mtasc/trunk/debian/changelog
    packages/mtasc/trunk/debian/patches/series

Modified: packages/mtasc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/mtasc/trunk/debian/changelog?rev=326&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/changelog (original)
+++ packages/mtasc/trunk/debian/changelog Mon Mar  9 11:17:32 2009
@@ -9,6 +9,8 @@
   * Add Vcs-* fields
   * Drop build-dep version numbers satisfied in oldstable/etch
   * Improve the patch and Makefile handling
+  * Add patch to allow building with camlp4o from ocaml 3.11.0
+    Patch fix_mtasc_for_camlp4_3.11.0.patch by Stefano Zacchiroli
 
  -- Paul Wise <pabs at debian.org>  Mon, 09 Mar 2009 16:56:39 +0900
 

Added: packages/mtasc/trunk/debian/patches/fix_mtasc_for_camlp4_3.11.0.patch
URL: http://svn.debian.org/wsvn/packages/mtasc/trunk/debian/patches/fix_mtasc_for_camlp4_3.11.0.patch?rev=326&op=file
==============================================================================
--- packages/mtasc/trunk/debian/patches/fix_mtasc_for_camlp4_3.11.0.patch (added)
+++ packages/mtasc/trunk/debian/patches/fix_mtasc_for_camlp4_3.11.0.patch Mon Mar  9 11:17:32 2009
@@ -1,0 +1,43 @@
+Patch: fix_mtasc_for_camlp4_3.11.0.patch
+Author: Stefano Zacchiroli <zack at debian.org>
+Description: allow parser.ml to compile with camlp4 from ocaml 3.11.0
+--- a/ocaml/mtasc/parser.ml
++++ b/ocaml/mtasc/parser.ml
+@@ -166,8 +166,8 @@
+ 	| [< '(Kwd For,p); '(POpen,_); c = parse_expr_opt; e = parse_for p c >] -> e
+ 	| [< '(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
+ 	| [< '(Kwd Return,p); v , p2 = parse_eval_option p; >] -> EReturn v , punion p p2
+-	| [< '(Kwd Break,p); >] -> EBreak , p
+-	| [< '(Kwd Continue,p); >] -> EContinue , p
++	| [< '(Kwd Break,p) >] -> EBreak , p
++	| [< '(Kwd Continue,p) >] -> EContinue , p
+ 	| [< '(Kwd While,p1); v = parse_eval; e = parse_expr_opt >] -> EWhile (v,wrap_var e,NormalWhile) , punion p1 (pos e)
+ 	| [< '(Kwd Do,p1); e = parse_expr; '(Kwd While,_); v = parse_eval; >] -> EWhile (v,wrap_var e,DoWhile) , punion p1 (pos v)
+ 	| [< '(Kwd Switch,p1); v = parse_eval; '(BrOpen,_); el, p2 = parse_switch false >] -> ESwitch (v,el) , punion p1 p2
+@@ -278,7 +278,7 @@
+ 
+ and parse_expr_opt = parser
+ 	| [< e = parse_expr >] -> e
+-	| [< '(Next,p); >] -> EBlock [] , p
++	| [< '(Next,p) >] -> EBlock [] , p
+ 
+ and parse_for p c = parser
+ 	| [< '(Kwd In,_); v = parse_eval; '(PClose,p2); e = parse_expr_opt >] -> EForIn(c,v,wrap_var e) , punion p p2
+@@ -324,7 +324,7 @@
+ and parse_block callb sp = parser
+ 	| [< e = callb; el,p = parse_block callb sp >] -> e :: el , p
+ 	| [< '(Next,_); el = parse_block callb sp >] -> el
+-	| [< '(BrClose,p); >] -> [] , p
++	| [< '(BrClose,p) >] -> [] , p
+ 	| [< '(Eof,_) >] -> error Unclosed_parenthesis sp
+ 
+ and parse_expr_list p = parser
+@@ -351,7 +351,7 @@
+ 
+ and parse_import = parser
+ 	| [< '(Const (Ident name),_); p = parse_import2 name >] -> p
+-	| [< '(Binop OpMult,_); >] -> [] , None
++	| [< '(Binop OpMult,_) >] -> [] , None
+ 
+ and parse_import2 name = parser
+ 	| [< '(Dot,_); p , n = parse_import >] -> name :: p , n

Modified: packages/mtasc/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/mtasc/trunk/debian/patches/series?rev=326&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/patches/series (original)
+++ packages/mtasc/trunk/debian/patches/series Mon Mar  9 11:17:32 2009
@@ -1,3 +1,4 @@
 01_exe_in_usage.patch
 02_makefile_kludges.patch
 04_include_dirs.patch
+fix_mtasc_for_camlp4_3.11.0.patch