added sample configuration file

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

diff --git a/helm/ocaml/cic_disambiguation/logic_notation.ml b/helm/ocaml/cic_disambiguation/logic_notation.ml
index 011462f8158fcd2f68f56b17a8d93b6cbadfc7e0..1d47711da721d2d9419169d460acf0df76ab9512 100644 (file)
--- a/helm/ocaml/cic_disambiguation/logic_notation.ml
+++ b/helm/ocaml/cic_disambiguation/logic_notation.ml
@@ -23,40 +23,40 @@
  * http://helm.cs.unibo.it/
  *)
 
-open CicTextualParser2Ast
 open CicTextualParser2
 
 EXTEND
   term: LEVEL "add"
     [
       [ t1 = term; SYMBOL <:unicode<lor>> (* ∨ *); t2 = term ->
-          return_term loc (Appl_symbol ("or", 0, [t1; t2]))
+          return_term loc (CicAst.Appl [CicAst.Symbol ("or", 0); t1; t2])
       ]
     ];
   term: LEVEL "mult"
     [
       [ t1 = term; SYMBOL <:unicode<land>> (* ∧ *); t2 = term ->
-        return_term loc (Appl_symbol ("and", 0, [t1; t2]))
+        return_term loc (CicAst.Appl [CicAst.Symbol ("and", 0); t1; t2])
       ]
     ];
   term: LEVEL "inv"
     [
       [ SYMBOL <:unicode<lnot>> (* ¬ *); t = term ->
-        return_term loc (Appl_symbol ("not", 0, [t])) ]
+        return_term loc (CicAst.Appl [CicAst.Symbol ("not", 0); t])
+      ]
     ];
 END
 
 let _ =
-  Disambiguate.add_symbol_choice "eq"
+  DisambiguateChoices.add_symbol_choice "eq"
     ("leibnitz's equality",
      (fun interp _ args ->
        let t1, t2 =
          match args with
          | [t1; t2] -> t1, t2
-         | _ -> raise Disambiguate.Invalid_choice
+         | _ -> raise DisambiguateChoices.Invalid_choice
        in
        Cic.Appl [
          Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []);
-           Cic.Implicit; t1; t2
+           Cic.Implicit (Some `Type); t1; t2
        ]))