X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Farit_notation.ml;h=53de39449b24de7af95169348594d5ae18a66c8c;hb=1337fb2d670d110d72f4c04e9d69852660e282ab;hp=b4aaf339877cb5dcaf273ec04dc4fbc4e297e9d4;hpb=358d1d55044347255aacb8daf03de0dbb18bc668;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/arit_notation.ml b/helm/ocaml/cic_disambiguation/arit_notation.ml
index b4aaf3398..53de39449 100644
--- a/helm/ocaml/cic_disambiguation/arit_notation.ml
+++ b/helm/ocaml/cic_disambiguation/arit_notation.ml
@@ -23,62 +23,56 @@
  * http://helm.cs.unibo.it/
  *)
 
-open Ast
-open Parser
-
-(*
-let i = ref max_int
-let get_i () = decr i; !i
-*)
+open CicTextualParser2
 
 EXTEND
   term: LEVEL "add"
     [
       [ t1 = term; SYMBOL "+"; t2 = term ->
-          return_term loc (Appl_symbol ("plus", 0, [t1; t2]))
+          return_term loc (CicAst.Appl [CicAst.Symbol ("plus", 0); t1; t2])
       | t1 = term; SYMBOL "-"; t2 = term ->
-          return_term loc (Appl_symbol ("minus", 0, [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_symbol ("times", 0, [t1; t2]))
+          return_term loc (CicAst.Appl [CicAst.Symbol ("times", 0); t1; t2])
       | t1 = term; SYMBOL "/"; t2 = term ->
-          return_term loc (Appl_symbol ("div", 0, [t1; t2]))
+          return_term loc (CicAst.Appl [CicAst.Symbol ("div", 0); t1; t2])
       ]
     ];
   term: LEVEL "inv"
     [
       [ SYMBOL "-"; t = term ->
-        return_term loc (Appl_symbol ("uminus", 0, [t]))
+        return_term loc (CicAst.Appl [CicAst.Symbol ("uminus", 0); t])
       ]
     ];
 END
 
 let _ =
-  Disambiguate.add_num_choice
+  DisambiguateChoices.add_num_choice
     ("natural number",
       (fun _ num _ -> HelmLibraryObjects.build_nat (int_of_string num)));
-  Disambiguate.add_num_choice
+  DisambiguateChoices.add_num_choice
     ("real number",
       (fun _ num _ -> HelmLibraryObjects.build_real (int_of_string num)));
-  Disambiguate.add_symbol_choice "plus"
+  DisambiguateChoices.add_symbol_choice "plus"
     ("natural plus",
      (fun env _ args ->
        let t1, t2 =
          match args with
          | [t1; t2] -> t1, t2
-         | _ -> raise Disambiguate.Invalid_choice
+         | _ -> raise DisambiguateChoices.Invalid_choice
        in
        Cic.Appl [ HelmLibraryObjects.Peano.plus; t1; t2 ]));
-  Disambiguate.add_symbol_choice "plus"
+  DisambiguateChoices.add_symbol_choice "plus"
     ("real plus",
      (fun env _ args ->
        let t1, t2 =
          match args with
          | [t1; t2] -> t1, t2
-         | _ -> raise Disambiguate.Invalid_choice
+         | _ -> raise DisambiguateChoices.Invalid_choice
        in
        Cic.Appl [ HelmLibraryObjects.Reals.rplus; t1; t2 ]));