X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualParser2.ml;h=f0de0b521b888593faaedf5468c12f0f9d9f715b;hb=4e209a820d68ae8883b6eb7540570c55678a4b84;hp=2b6d6c0c9f5ae10adc44a3ab786afdda83f7d982;hpb=31f877fe0b3f0c0a4d5f03ff40c5afe5eb3f326f;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
index 2b6d6c0c9..f0de0b521 100644
--- 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,13 +180,16 @@ 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])
       ]
     | "add" LEFTA     [ (* nothing here by default *) ]
     | "mult" LEFTA    [ (* nothing here by default *) ]
-    | "power" LEFTA    [ (* nothing here by default *) ]
+    | "power" LEFTA   [ (* nothing here by default *) ]
     | "inv" NONA      [ (* nothing here by default *) ]
     | "simple" NONA
       [ sort = sort -> CicAst.Sort sort