X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FhelmLibraryObjects.ml;h=3038582ab67e6ce60f6e573bb3dd27cd83fb4ed5;hb=b1bad322d0daf6c25f95a82c4349f057a753ab7c;hp=b2023b4487e95adedc3a53b287dc4904d9c2ed8b;hpb=0d6f26fe444a0a958eda5ac3a1efebca54de40ff;p=helm.git

diff --git a/helm/ocaml/cic/helmLibraryObjects.ml b/helm/ocaml/cic/helmLibraryObjects.ml
index b2023b448..3038582ab 100644
--- a/helm/ocaml/cic/helmLibraryObjects.ml
+++ b/helm/ocaml/cic/helmLibraryObjects.ml
@@ -1,3 +1,30 @@
+(* Copyright (C) 2005, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(* $Id$ *)
+
 (** {2 Auxiliary functions} *)
 
 let uri = UriManager.uri_of_string
@@ -24,30 +51,6 @@ let indconuri_of_uri uri =
     int_of_string
       (String.sub uri index_con (String.length uri - index_con)))
 
-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
-    const ~subst uri
-  else if sub = ".var" then
-    var ~subst uri
-  else
-    (try
-      (* Inductive Type *)
-      let (uri, typeno) = indtyuri_of_uri s in
-      mutind ~subst uri typeno
-     with
-      | UriManager.IllFormedUri _ | Failure _ | Invalid_argument _ ->
-          (* Constructor of an Inductive Type *)
-          let (uri, typeno, consno) = indconuri_of_uri s in
-          mutconstruct ~subst uri typeno consno)
- with
- | Invalid_argument _ | Not_found -> raise (UriManager.IllFormedUri s)
-
 (** {2 Helm's objects shorthands} *)
 
 module Logic =
@@ -118,8 +121,8 @@ 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
@@ -147,9 +150,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