Fix #128: avoid Marshal-ing exn value via closure

src/glr.ml

@@ -65,8 +65,6 @@ module type IN =
 sig
   include Parse_table.S
   val debug : bool
-  exception Reject_parse
-  exception Reject_all_parses
 end;;
 
 module Make (Pt : IN) : S with
@@ -538,7 +536,7 @@ struct
                  (rn.rule_nt.reduce_action rl, 
                   idx::injection_children,
                   NTset.add rn.rule_nt.reduce_left loop)::res
-               with Reject_parse ->
+               with Types.Reject_parse ->
                  res)
           (process_t_or_s_nodes idx rn.outgoing rn.rule_nt.reduce_transparent)
           []
@@ -602,7 +600,7 @@ struct
           try
             sn.started <- true;
             List.flatten (List.map process_rule_node sn.possibilities)
-          with Reject_all_parses ->
+          with Types.Reject_all_parses ->
             []
         in
           sn.finished <- true;

src/main.ml

@@ -697,7 +697,7 @@ let read_systemdefn read_systemdefn_filename =
   let fd = open_in_bin read_systemdefn_filename in
   let sd,lookup ,sd_unquotiented, sd_quotiented_unaux = 
     try (Marshal.from_channel fd :
-          (Types.systemdefn * (string -> bool -> string -> Types.symterm list) * Types.systemdefn * Types.systemdefn))
+          (Types.systemdefn * Types.made_parser * Types.systemdefn * Types.systemdefn))
     with Failure s -> Auxl.error None ("Cannot read dumped systemdefn\n   " ^ s ^"\n")
   in
   close_in fd;
@@ -712,7 +712,7 @@ let output_stage (sd,lookup,sd_unquotiented,sd_quotiented_unaux) =
       let fd = open_out_bin s in
       Marshal.to_channel fd (
           (sd,lookup,sd_unquotiented,sd_quotiented_unaux) :
-            (Types.systemdefn * (string -> bool -> string -> Types.symterm list) * Types.systemdefn * Types.systemdefn))
+            (Types.systemdefn * Types.made_parser * Types.systemdefn * Types.systemdefn))
         [Marshal.Closures];
       close_out fd;
       print_string ("system definition in file: " ^ s ^ "\n") );

src/new_term_parser.ml

@@ -245,9 +245,6 @@ module Nt = Nonterminal;;
 module GramTypes = Parse_table.MakeTypes (Gtp);;
 open GramTypes;;
 
-exception Reject_parse
-exception Reject_all_parses
-
 let rec split l n = 
   if n = 0 then
     ([], l)

src/term_parser.ml

@@ -1191,8 +1191,6 @@ let make_parser xd : made_parser =
   let module Pt2 = 
     struct 
       include Pt
-      exception Reject_parse = New_term_parser.Reject_parse;;
-      exception Reject_all_parses = New_term_parser.Reject_all_parses;;
       let debug = false
     end 
   in

src/types.ml

@@ -39,6 +39,10 @@ exception LemTODO;;
 
 exception DE1 of string;;
 
+exception Reject_parse;;
+
+exception Reject_all_parses;;
+
 open Location;;
 
 (** ************************ *)