X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Flogic_notation.ml;h=2227b2741e14c6dd6fadac9a75ba4401ba8dc3d2;hb=a96ac1d9b14c89392c5672fb94944363ced625b8;hp=35ce4b90cdaf24680b723ea232e65a728363a7ba;hpb=0148419c577eab74538b8e2564a64e399d8bdd65;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/logic_notation.ml b/helm/ocaml/cic_disambiguation/logic_notation.ml
index 35ce4b90c..2227b2741 100644
--- a/helm/ocaml/cic_disambiguation/logic_notation.ml
+++ b/helm/ocaml/cic_disambiguation/logic_notation.ml
@@ -1,23 +1,73 @@
-open Ast
-open Parser
+(* Copyright (C) 2004, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://helm.cs.unibo.it/
+ *)
+
+open CicTextualParser2
 
 EXTEND
-  term: LEVEL "add"
+  term: LEVEL "logic_add"
     [
-      [ t1 = term; SYMBOL "∨"; t2 = term ->
-          return_term loc (Appl [Ident ("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 [Ident ("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 [Ident ("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: *)