ported to CicAst

[helm.git] / helm / ocaml / cic_disambiguation / arit_notation.ml

diff --git a/helm/ocaml/cic_disambiguation/arit_notation.ml b/helm/ocaml/cic_disambiguation/arit_notation.ml
index e4c700d0a6fede6338256ae9a6b12d51ccbeeb93..53de39449b24de7af95169348594d5ae18a66c8c 100644 (file)
--- a/helm/ocaml/cic_disambiguation/arit_notation.ml
+++ b/helm/ocaml/cic_disambiguation/arit_notation.ml
@@ -23,35 +23,29 @@
  * http://helm.cs.unibo.it/
  *)
 
-open CicTextualParser2Ast
 open CicTextualParser2
 
-(*
-let i = ref max_int
-let get_i () = decr i; !i
-*)
-
 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