added a lot of notation: arithmetic operators, relational operators, ...

[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 2f404be83a956eccdf3c31bafff32f3f831a60a9..fdbc75bf18ddf990326a18893f27bcf3bc9d5610 100644 (file)
--- a/helm/ocaml/cic_disambiguation/logic_notation.ml
+++ b/helm/ocaml/cic_disambiguation/logic_notation.ml
@@ -23,40 +23,65 @@
  * http://helm.cs.unibo.it/
  *)
 
-open Ast
-open Parser
+open CicTextualParser2
 
 EXTEND
   term: LEVEL "add"
     [
       [ t1 = term; SYMBOL <:unicode<lor>> (* ∨ *); t2 = term ->
-          return_term loc (Appl_symbol ("or", 0, [t1; t2]))
+          return_term loc (CicAst.Appl [CicAst.Symbol ("or", 0); t1; t2])
       ]
     ];
   term: LEVEL "mult"
     [
       [ t1 = term; SYMBOL <:unicode<land>> (* ∧ *); t2 = term ->
-        return_term loc (Appl_symbol ("and", 0, [t1; t2]))
+        return_term loc (CicAst.Appl [CicAst.Symbol ("and", 0); t1; t2])
       ]
     ];
   term: LEVEL "inv"
     [
       [ SYMBOL <:unicode<lnot>> (* ¬ *); t = term ->
-        return_term loc (Appl_symbol ("not", 0, [t])) ]
+        return_term loc (CicAst.Appl [CicAst.Symbol ("not", 0); t])
+      ]
     ];
 END
 
+(* TODO a lot of hard coded URIs, move them in HelmLibraryObjects *)
+
 let _ =
-  Disambiguate.add_symbol_choice "eq"
+    (* 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
+  DisambiguateChoices.add_symbol_choice "eq"
     ("leibnitz's equality",
      (fun interp _ args ->
        let t1, t2 =
          match args with
          | [t1; t2] -> t1, t2
-         | _ -> raise Disambiguate.Invalid_choice
+         | _ -> raise DisambiguateChoices.Invalid_choice
        in
        Cic.Appl [
          Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []);
-           Cic.Implicit; t1; t2
-       ]))
+           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");
+  DisambiguateChoices.add_binary_op "or" "logical or"
+    (mutind "cic:/Coq/Init/Logic/or.ind");
+  DisambiguateChoices.add_unary_op "not" "logical not"
+    (const "cic:/Coq/Init/Logic/not.con");