X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Farit_notation.ml;h=53de39449b24de7af95169348594d5ae18a66c8c;hb=b38de2d3fa8bbe346c59c18bbeb889f29e493f63;hp=522021f5ffe72f716e86683a86335ec3d24c0c3c;hpb=0148419c577eab74538b8e2564a64e399d8bdd65;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/arit_notation.ml b/helm/ocaml/cic_disambiguation/arit_notation.ml
index 522021f5f..53de39449 100644
--- a/helm/ocaml/cic_disambiguation/arit_notation.ml
+++ b/helm/ocaml/cic_disambiguation/arit_notation.ml
@@ -1,27 +1,78 @@
-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"
     [
       [ t1 = term; SYMBOL "+"; t2 = term ->
-          return_term loc (Appl [Ident ("plus", []); t1; t2])
+          return_term loc (CicAst.Appl [CicAst.Symbol ("plus", 0); t1; t2])
       | t1 = term; SYMBOL "-"; t2 = term ->
-          return_term loc (Appl [Ident ("minus", []); t1; t2])
+          return_term loc (CicAst.Appl [CicAst.Symbol ("minus", 0); t1; t2])
       ]
     ];
   term: LEVEL "mult"
     [
       [ t1 = term; SYMBOL "*"; t2 = term ->
-          return_term loc (Appl [Ident ("times", []); t1; t2])
+          return_term loc (CicAst.Appl [CicAst.Symbol ("times", 0); t1; t2])
       | t1 = term; SYMBOL "/"; t2 = term ->
-          return_term loc (Appl [Ident ("div", []); t1; t2])
+          return_term loc (CicAst.Appl [CicAst.Symbol ("div", 0); t1; t2])
       ]
     ];
   term: LEVEL "inv"
     [
       [ SYMBOL "-"; t = term ->
-        return_term loc (Appl [Ident ("uminus", []); t])
+        return_term loc (CicAst.Appl [CicAst.Symbol ("uminus", 0); t])
       ]
     ];
 END
+
+let _ =
+  DisambiguateChoices.add_num_choice
+    ("natural number",
+      (fun _ num _ -> HelmLibraryObjects.build_nat (int_of_string num)));
+  DisambiguateChoices.add_num_choice
+    ("real number",
+      (fun _ num _ -> HelmLibraryObjects.build_real (int_of_string num)));
+  DisambiguateChoices.add_symbol_choice "plus"
+    ("natural plus",
+     (fun env _ args ->
+       let t1, t2 =
+         match args with
+         | [t1; t2] -> t1, t2
+         | _ -> raise DisambiguateChoices.Invalid_choice
+       in
+       Cic.Appl [ HelmLibraryObjects.Peano.plus; t1; t2 ]));
+  DisambiguateChoices.add_symbol_choice "plus"
+    ("real plus",
+     (fun env _ args ->
+       let t1, t2 =
+         match args with
+         | [t1; t2] -> t1, t2
+         | _ -> raise DisambiguateChoices.Invalid_choice
+       in
+       Cic.Appl [ HelmLibraryObjects.Reals.rplus; t1; t2 ]));
+