X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FhelmLibraryObjects.ml;h=defc33f6cc63e6eef9b18b7c40332f0008214775;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=b2023b4487e95adedc3a53b287dc4904d9c2ed8b;hpb=0d6f26fe444a0a958eda5ac3a1efebca54de40ff;p=helm.git diff --git a/helm/ocaml/cic/helmLibraryObjects.ml b/helm/ocaml/cic/helmLibraryObjects.ml index b2023b448..defc33f6c 100644 --- a/helm/ocaml/cic/helmLibraryObjects.ml +++ b/helm/ocaml/cic/helmLibraryObjects.ml @@ -24,30 +24,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 +94,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 +123,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