tacticChaser modified to avoid double "apply" and to avoid to apply uris ".var" in...

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

diff --git a/helm/ocaml/cic_disambiguation/logic_notation.ml b/helm/ocaml/cic_disambiguation/logic_notation.ml
index fdbc75bf18ddf990326a18893f27bcf3bc9d5610..c88a0ec7d282ec4ff1fd4e3d9e1ada6aa99dd01f 100644 (file)
--- a/helm/ocaml/cic_disambiguation/logic_notation.ml
+++ b/helm/ocaml/cic_disambiguation/logic_notation.ml
@@ -51,9 +51,8 @@ END
 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 +64,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: *)