X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Flogic_notation.ml;h=2227b2741e14c6dd6fadac9a75ba4401ba8dc3d2;hb=3bb4ce11fb9d4c6375483a80344beb94c4517dd7;hp=fdbc75bf18ddf990326a18893f27bcf3bc9d5610;hpb=45586ab88c026e6a21927654387b6df266a44700;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/logic_notation.ml b/helm/ocaml/cic_disambiguation/logic_notation.ml
index fdbc75bf1..2227b2741 100644
--- a/helm/ocaml/cic_disambiguation/logic_notation.ml
+++ b/helm/ocaml/cic_disambiguation/logic_notation.ml
@@ -26,19 +26,19 @@
 open CicTextualParser2
 
 EXTEND
-  term: LEVEL "add"
+  term: LEVEL "logic_add"
     [
       [ t1 = term; SYMBOL <:unicode<lor>> (* ∨ *); t2 = term ->
           return_term loc (CicAst.Appl [CicAst.Symbol ("or", 0); t1; t2])
       ]
     ];
-  term: LEVEL "mult"
+  term: LEVEL "logic_mult"
     [
       [ t1 = term; SYMBOL <:unicode<land>> (* ∧ *); t2 = term ->
         return_term loc (CicAst.Appl [CicAst.Symbol ("and", 0); t1; t2])
       ]
     ];
-  term: LEVEL "inv"
+  term: LEVEL "logic_inv"
     [
       [ SYMBOL <:unicode<lnot>> (* ¬ *); t = term ->
         return_term loc (CicAst.Appl [CicAst.Symbol ("not", 0); t])
@@ -46,14 +46,11 @@ EXTEND
     ];
 END
 
-(* TODO a lot of hard coded URIs, move them in HelmLibraryObjects *)
-
 let _ =
     (* TODO cut-and-pasted code: here, in arit_notation.ml and
      * disambiguateChoices.ml *)
-  let uri s = UriManager.uri_of_string s in
-  let const s = Cic.Const (uri s, []) in
-  let mutind s = Cic.MutInd (uri s, 0, []) in
+  let const s = Cic.Const (s, []) in
+  let mutind s = Cic.MutInd (s, 0, []) in
   DisambiguateChoices.add_symbol_choice "eq"
     ("leibnitz's equality",
      (fun interp _ args ->
@@ -65,23 +62,12 @@ let _ =
        Cic.Appl [
          Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []);
            Cic.Implicit (Some `Type); t1; t2
-       ]));
-  DisambiguateChoices.add_symbol_choice "eq"
-    ("equality over objects with sort Type",
-     (fun interp _ args ->
-       let t1, t2 =
-         match args with
-         | [t1; t2] -> t1, t2
-         | _ -> raise DisambiguateChoices.Invalid_choice
-       in
-       Cic.Appl [
-         Cic.MutInd (HelmLibraryObjects.Logic_Type.eqt_URI, 0, []);
-           Cic.Implicit (Some `Type); t1; t2
-       ]));
+      ]));
   DisambiguateChoices.add_binary_op "and" "logical and"
-    (mutind "cic:/Coq/Init/Logic/and.ind");
+    (mutind HelmLibraryObjects.Logic.and_URI);
   DisambiguateChoices.add_binary_op "or" "logical or"
-    (mutind "cic:/Coq/Init/Logic/or.ind");
+    (mutind HelmLibraryObjects.Logic.or_URI);
   DisambiguateChoices.add_unary_op "not" "logical not"
-    (const "cic:/Coq/Init/Logic/not.con");
+    (const HelmLibraryObjects.Logic.not_URI);
 
+(* vim:set encoding=utf8: *)