Partial porting to V8 URIs.

[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 b249427755ba71065e4482cc5b5739671c3394f8..51faaa6acc06a91e6cc1d400e661b92217c203a1 100644 (file)
--- a/helm/ocaml/cic_disambiguation/arit_notation.ml
+++ b/helm/ocaml/cic_disambiguation/arit_notation.ml
@@ -65,9 +65,8 @@ EXTEND
 END
 
 let _ =
-  let uri s = UriManager.uri_of_string s in
-  let const s = Cic.Const (uri s, []) in
-  let mutind s = Cic.MutInd (uri s, 0, []) in
+  let const s = Cic.Const (s, []) in
+  let mutind s = Cic.MutInd (s, 0, []) in
 
   DisambiguateChoices.add_num_choice
     ("natural number",
@@ -81,34 +80,34 @@ let _ =
   DisambiguateChoices.add_binary_op "plus" "real plus"
     HelmLibraryObjects.Reals.rplus;
   DisambiguateChoices.add_binary_op "minus" "natural minus"
-    (const "cic:/Coq/Arith/Minus/minus.con");
+    (const HelmLibraryObjects.Peano.minus_URI);
   DisambiguateChoices.add_binary_op "minus" "real minus"
-    (const "cic:/Coq/Reals/Rdefinitions/Rminus.con");
+    (const HelmLibraryObjects.Reals.rminus_URI);
   DisambiguateChoices.add_binary_op "times" "natural times"
-    (const "cic:/Coq/Init/Peano/mult.con");
+    (const HelmLibraryObjects.Peano.mult_URI);
   DisambiguateChoices.add_binary_op "times" "real times"
-    (const "cic:/Coq/Reals/Rdefinitions/Rmult.con");
+    (const HelmLibraryObjects.Reals.rmult_URI);
   DisambiguateChoices.add_binary_op "divide" "real divide"
-    (const "cic:/Coq/Reals/Rdefinitions/Rdiv.con");
+    (const HelmLibraryObjects.Reals.rdiv_URI);
   DisambiguateChoices.add_unary_op "uminus" "real unary minus"
-    (const "cic:/Coq/Reals/Rdefinitions/Ropp.con");
+    (const HelmLibraryObjects.Reals.ropp_URI);
 
   DisambiguateChoices.add_binary_op "leq" "natural 'less or equal to'"
-    (mutind "cic:/Coq/Init/Peano/le.ind");
+    (mutind HelmLibraryObjects.Peano.le_URI);
   DisambiguateChoices.add_binary_op "leq" "real 'less or equal to'"
-    (const "cic:/Coq/Reals/Rdefinitions/Rle.con");
+    (const HelmLibraryObjects.Reals.rle_URI);
   DisambiguateChoices.add_binary_op "geq" "natural 'greater or equal to'"
-    (const "cic:/Coq/Init/Peano/ge.con");
+    (const HelmLibraryObjects.Peano.ge_URI);
   DisambiguateChoices.add_binary_op "geq" "real 'greater or equal to'"
-    (const "cic:/Coq/Reals/Rdefinitions/Rge.con");
+    (const HelmLibraryObjects.Reals.rge_URI);
   DisambiguateChoices.add_binary_op "lt" "natural 'less than'"
-    (const "cic:/Coq/Init/Peano/lt.con");
+    (const HelmLibraryObjects.Peano.lt_URI);
   DisambiguateChoices.add_binary_op "lt" "real 'less than'"
-    (const "cic:/Coq/Reals/Rdefinitions/Rlt.con");
+    (const HelmLibraryObjects.Reals.rlt_URI);
   DisambiguateChoices.add_binary_op "gt" "natural 'greater than'"
-    (const "cic:/Coq/Init/Peano/gt.con");
+    (const HelmLibraryObjects.Peano.gt_URI);
   DisambiguateChoices.add_binary_op "gt" "real 'greater than'"
-    (const "cic:/Coq/Reals/Rdefinitions/Rgt.con");
+    (const HelmLibraryObjects.Reals.rgt_URI);
   DisambiguateChoices.add_symbol_choice "neq"
     ("not equal to (leibnitz)",
       (fun env _ args ->
@@ -117,7 +116,7 @@ let _ =
           | [t1; t2] -> t1, t2
           | _ -> raise DisambiguateChoices.Invalid_choice
         in
-        Cic.Appl [ const "cic:/Coq/Init/Logic/not.con";
+        Cic.Appl [ const HelmLibraryObjects.Logic.not_URI;
           Cic.Appl [
             Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []);
               Cic.Implicit (Some `Type); t1; t2 ] ]));
@@ -129,7 +128,7 @@ let _ =
           | [t1; t2] -> t1, t2
           | _ -> raise DisambiguateChoices.Invalid_choice
         in
-        Cic.Appl [ const "cic:/Coq/Init/Logic/not.con";
+        Cic.Appl [ const HelmLibraryObjects.Logic.not_URI;
           Cic.Appl [
             Cic.MutInd (HelmLibraryObjects.Logic_Type.eqt_URI, 0, []);
               Cic.Implicit (Some `Type); t1; t2 ] ]));