diff options
| author | herbelin | 2000-10-04 13:36:51 +0000 |
|---|---|---|
| committer | herbelin | 2000-10-04 13:36:51 +0000 |
| commit | 3580c838754af24b17d0c4ad0d879cd1fdf621c6 (patch) | |
| tree | de303ae8634c4456b5533d84fbf869403a08cd95 | |
| parent | ba753cf3c13ec88cfc1210c0f297b88cc58e5e14 (diff) | |
Elimination des coupures sur le type constant
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@646 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | kernel/environ.ml | 8 | ||||
| -rw-r--r-- | kernel/environ.mli | 4 | ||||
| -rw-r--r-- | proofs/tacmach.mli | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/kernel/environ.ml b/kernel/environ.ml index 0c6167a15c..41be8a6796 100644 --- a/kernel/environ.ml +++ b/kernel/environ.ml @@ -295,13 +295,9 @@ let make_all_name_different env = env (* Constants *) -let defined_constant env c = match kind_of_term c with - | IsConst (sp, _) -> is_defined (lookup_constant sp env) - | _ -> invalid_arg "defined_constant" +let defined_constant env (sp,_) = is_defined (lookup_constant sp env) -let opaque_constant env c = match kind_of_term c with - | IsConst (sp, _) -> is_opaque (lookup_constant sp env) - | _ -> invalid_arg "opaque_constant" +let opaque_constant env (sp,_) = is_opaque (lookup_constant sp env) (* A const is evaluable if it is defined and not opaque *) let evaluable_constant env k = diff --git a/kernel/environ.mli b/kernel/environ.mli index dc733b3b44..6327c735b4 100644 --- a/kernel/environ.mli +++ b/kernel/environ.mli @@ -143,8 +143,8 @@ val it_mkNamedProd_or_LetIn : constr -> var_context -> constr val lambda_create : env -> constr * constr -> constr val prod_create : env -> constr * constr -> constr -val defined_constant : env -> constr -> bool -val evaluable_constant : env -> constr -> bool +val defined_constant : env -> constant -> bool +val evaluable_constant : env -> constant -> bool (*s Modules. *) diff --git a/proofs/tacmach.mli b/proofs/tacmach.mli index e2ae561eef..9108d48cfa 100644 --- a/proofs/tacmach.mli +++ b/proofs/tacmach.mli @@ -206,8 +206,8 @@ val w_whd_betadeltaiota : walking_constraints -> constr -> constr val w_hnf_constr : walking_constraints -> constr -> constr val w_conv_x : walking_constraints -> constr -> constr -> bool val w_const_value : walking_constraints -> constant -> constr -val w_defined_const : walking_constraints -> constr -> bool -val w_defined_evar : walking_constraints -> int -> bool +val w_defined_const : walking_constraints -> constant -> bool +val w_defined_evar : walking_constraints -> existential_key -> bool (*s Tactic Registration. *) |