- added a configuration variable for selecting between fresh instances

[helm.git] / helm / ocaml / cic_disambiguation / cicTextualParser2.ml

diff --git a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
index 76f62b4171947473da8d3ab844f3049da5e730ec..f0de0b521b888593faaedf5468c12f0f9d9f715b 100644 (file)
--- a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
@@ -31,6 +31,10 @@ let debug_print s =
     prerr_endline "</NEW_TEXTUAL_PARSER>"
   end
 
+  (** if set to true each number will have a different insance number and can
+  * thus be interpreted differently than others *)
+let use_fresh_num_instances = false
+
 open Printf
 
 exception Parse_error of string
@@ -41,11 +45,11 @@ type command = CicAst.term CommandAst.command
 type script = CicAst.term CommandAst.Script.script
 
 let fresh_num_instance =
- let n = ref 0 in
-  function () ->
-   incr n;
-   !n
-;;
+  let n = ref 0 in
+  if use_fresh_num_instances then
+    (fun () -> incr n; !n)
+  else
+    (fun () -> 0)
 
 let choice_of_uri (uri: string) =
   let cic = HelmLibraryObjects.term_of_uri (UriManager.uri_of_string uri) in
@@ -176,6 +180,9 @@ EXTEND
             return_term loc
               (CicAst.Binder (`Pi, (Cic.Anonymous, Some t1), t2))
       ]
+    | "logic_add" LEFTA   [ (* nothing here by default *) ]
+    | "logic_mult" LEFTA  [ (* nothing here by default *) ]
+    | "logic_inv" NONA    [ (* nothing here by default *) ]
     | "relop" LEFTA
       [ t1 = term; SYMBOL "="; t2 = term ->
         return_term loc (CicAst.Appl [CicAst.Symbol ("eq", 0); t1; t2])