renamed Http_client to Http_user_agent to avoid clashes with Gerd's

[helm.git] / helm / ocaml / cic / helmLibraryObjects.ml

diff --git a/helm/ocaml/cic/helmLibraryObjects.ml b/helm/ocaml/cic/helmLibraryObjects.ml
index dc621c5a9d9c192f6da98064a901533021d3b449..6ebdf8e1fac2cd0c94c5ae35b5da5060bdcec88e 100644 (file)
--- a/helm/ocaml/cic/helmLibraryObjects.ml
+++ b/helm/ocaml/cic/helmLibraryObjects.ml
@@ -24,11 +24,11 @@ let indconuri_of_uri uri =
     int_of_string
       (String.sub uri index_con (String.length uri - index_con)))
 
+(*  (* NO LONGER USED, see CicUtil.term_of_uri *)
 let term_of_uri ?(subst = []) uri =
   let s = UriManager.string_of_uri uri in
   try
   (* Constant *)
-  (* TODO explicit substitutions? *)
   let len = String.length s in
   let sub = String.sub s (len -4) 4 in
   if sub = ".con" then
@@ -47,6 +47,7 @@ let term_of_uri ?(subst = []) uri =
           mutconstruct ~subst uri typeno consno)
  with
  | Invalid_argument _ | Not_found -> raise (UriManager.IllFormedUri s)
+*)
 
 (** {2 Helm's objects shorthands} *)
 
@@ -118,8 +119,9 @@ module Reals =
     let rlt_URI = uri rlt_SURI
     let rgt_SURI = "cic:/Coq/Reals/Rdefinitions/Rgt.con"
     let rgt_URI = uri rgt_SURI
-    let rtheory_URI = uri "cic:/Coq/Reals/Rbase/RTheory.con"
-    let rinv_r1_URI = uri "cic:/Coq/Reals/Rbase/Rinv_R1.con"
+    let rtheory_URI = uri "cic:/Coq/Reals/RIneq/RTheory.con"
+    let rinv_r1_URI = uri "cic:/Coq/Reals/RIneq/Rinv_1.con"
+    let pow_URI = uri "cic:/Coq/Reals/Rfunctions/pow.con"
 
     let r = const r_URI
     let rplus = const rplus_URI
@@ -146,9 +148,8 @@ module Peano =
     let ge_URI = uri ge_SURI
     let lt_SURI = "cic:/Coq/Init/Peano/lt.con"
     let lt_URI = uri lt_SURI
-    let gt_SURI = "cic:/Coq/Init/Peano/lt.con"
+    let gt_SURI = "cic:/Coq/Init/Peano/gt.con"
     let gt_URI = uri gt_SURI
-    let lt_URI = uri "cic:/Coq/Init/Peano/lt.con"
 
     let plus = const plus_URI
     let mult = const mult_URI
@@ -175,6 +176,8 @@ module BinPos =
 
 module BinInt =
   struct
+    let zmult_URI = uri "cic:/Coq/ZArith/BinInt/Zmult.con"
+    let zmult = const zmult_URI
     let zplus_SURI = "cic:/Coq/ZArith/BinInt/Zplus.con"
     let zplus_URI = uri zplus_SURI
     let zplus = const zplus_URI
@@ -189,6 +192,7 @@ module BinInt =
     let zopp_SURI = "cic:/Coq/ZArith/BinInt/Zopp.con"
     let zopp_URI = uri zopp_SURI
     let zopp = const zopp_URI
+    let zpower_URI = uri "cic:/Coq/ZArith/Zpower/Zpower.con"
   end
 
 (** {2 Helpers for creating common terms}