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=f23098f9688764a3083447f2cd91959fa56f1979;hpb=aba014724c9ad08f80944ec3021c9fa3826dca4a;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/logic_notation.ml b/helm/ocaml/cic_disambiguation/logic_notation.ml
index f23098f96..2227b2741 100644
--- a/helm/ocaml/cic_disambiguation/logic_notation.ml
+++ b/helm/ocaml/cic_disambiguation/logic_notation.ml
@@ -23,24 +23,51 @@
  * http://helm.cs.unibo.it/
  *)
 
-open Ast
-open Parser
+open CicTextualParser2
 
 EXTEND
-  term: LEVEL "add"
+  term: LEVEL "logic_add"
     [
-      [ t1 = term; SYMBOL "∨"; t2 = term ->
-          return_term loc (Appl_symbol ("or", [t1; t2]))
+      [ 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 "∧"; t2 = term ->
-        return_term loc (Appl_symbol ("and", [t1; t2]))
+      [ 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 "¬"; t = term -> return_term loc (Appl_symbol ("not", [t])) ]
+      [ SYMBOL <:unicode<lnot>> (* ¬ *); t = term ->
+        return_term loc (CicAst.Appl [CicAst.Symbol ("not", 0); t])
+      ]
     ];
 END
+
+let _ =
+    (* TODO cut-and-pasted code: here, in arit_notation.ml and
+     * disambiguateChoices.ml *)
+  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 ->
+       let t1, t2 =
+         match args with
+         | [t1; t2] -> t1, t2
+         | _ -> raise DisambiguateChoices.Invalid_choice
+       in
+       Cic.Appl [
+         Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []);
+           Cic.Implicit (Some `Type); t1; t2
+      ]));
+  DisambiguateChoices.add_binary_op "and" "logical and"
+    (mutind HelmLibraryObjects.Logic.and_URI);
+  DisambiguateChoices.add_binary_op "or" "logical or"
+    (mutind HelmLibraryObjects.Logic.or_URI);
+  DisambiguateChoices.add_unary_op "not" "logical not"
+    (const HelmLibraryObjects.Logic.not_URI);
+
+(* vim:set encoding=utf8: *)