Commits

camlspotter committed 7f3530d Merge

merge

Comments (0)

Files changed (3)

 .PHONY: all install clean
 
+OCAMLPACKAGEFLAGS=
+
 # BYTE_ENABLED= true
 
 OCAMLINCLUDES += ..

ocaml/plphelper.ml

 *)
 
 let rule (name : string) (m : unit -> ('a * Position.Region.t) Token.Parser.t) : 'a Token.Parser.t = 
+<<<<<<< local
   with_rhs name (memoize name (m ()))
+||||||| base
+  fun st -> with_rhs name (memoize name (m ())) st
+=======
+  (* This eta is required to avoid inf loop and segfault by stack overflow *) 
+  fun st -> with_rhs name (memoize name (m ())) st
+>>>>>>> other
 
 let get_poses () = 
   match !rhs_tbl_stack with
       in
       fold [] (!rhs_counter - 1)
 
+<<<<<<< base
+=======
 (*
+>>>>>>> other
 let case (name : string) (t : (unit -> 'a) Token.Parser.t) : ('a * Planck.Position.Region.t) Token.Parser.t = fun st -> 
+<<<<<<< base
+=======
   Profile.incr ();
   if !do_debug then prerr_endline (String.make (!level*2) ' ' ^ "-> " ^ name);
   let st_start = if !do_debug then Some st else None in (* Make [st] GCed as early as possible *) 
 *)
 let case (name : string) (t : (unit -> 'a) Token.Parser.t) : ('a * Planck.Position.Region.t) Token.Parser.t = fun st -> 
   Profile.incr ();
+>>>>>>> other
   if !do_debug then prerr_endline (String.make (!level*2) ' ' ^ "-> " ^ name);
   let st_start = if !do_debug then Some st else None in (* Make [st] GCed as early as possible *) 
 

planck_intf.ml

File contents unchanged.