diff options
| author | herbelin | 2000-11-29 11:32:32 +0000 |
|---|---|---|
| committer | herbelin | 2000-11-29 11:32:32 +0000 |
| commit | b8e689a57740fc8f4c881e9ad9c63966cc39e4c7 (patch) | |
| tree | 7375be4a80a7340b37203655311f7d7ae2693096 | |
| parent | adf159a7711efae7bff6a07943b9854639cac9e2 (diff) | |
Nouveau long long avec Coq en tête
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1015 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | contrib/omega/coq_omega.ml | 15 | ||||
| -rw-r--r-- | tactics/equality.ml | 2 | ||||
| -rw-r--r-- | tactics/tactics.ml | 7 |
3 files changed, 13 insertions, 11 deletions
diff --git a/contrib/omega/coq_omega.ml b/contrib/omega/coq_omega.ml index 2574a3b30f..51d9a46ecb 100644 --- a/contrib/omega/coq_omega.ml +++ b/contrib/omega/coq_omega.ml @@ -364,13 +364,14 @@ let coq_or = lazy (constant ["Init";"Logic"] "or") let coq_ex = lazy (constant ["Init";"Logic"] "ex") (* Section paths for unfold *) -let sp_Zs = path_of_string "Zarith.zarith_aux.Zs" -let sp_Zminus = path_of_string "Zarith.zarith_aux.Zminus" -let sp_Zle = path_of_string "Zarith.zarith_aux.Zle" -let sp_Zgt = path_of_string "Zarith.zarith_aux.Zgt" -let sp_Zge = path_of_string "Zarith.zarith_aux.Zge" -let sp_Zlt = path_of_string "Zarith.zarith_aux.Zlt" -let sp_not = path_of_string "Init.Logic.not" +let make_coq_path dir s = make_path ("Coq"::dir) (id_of_string s) CCI +let sp_Zs = make_coq_path ["Zarith";"zarith_aux"] "Zs" +let sp_Zminus = make_coq_path ["Zarith";"zarith_aux"] "Zminus" +let sp_Zle = make_coq_path ["Zarith";"zarith_aux"] "Zle" +let sp_Zgt = make_coq_path ["Zarith";"zarith_aux"] "Zgt" +let sp_Zge = make_coq_path ["Zarith";"zarith_aux"] "Zge" +let sp_Zlt = make_coq_path ["Zarith";"zarith_aux"] "Zlt" +let sp_not = make_coq_path ["Init";"Logic"] "not" let mk_var v = mkVar (id_of_string v) let mk_plus t1 t2 = mkApp (Lazy.force coq_Zplus, [| t1; t2 |]) diff --git a/tactics/equality.ml b/tactics/equality.ml index 2e8ce398ee..6ba9f0076f 100644 --- a/tactics/equality.ml +++ b/tactics/equality.ml @@ -671,7 +671,7 @@ let existT_pattern = put_pat mmk "(existT ?1 ?2 ?3 ?4)" let constant dir s = Declare.global_absolute_reference - (make_path ("Init"::dir) (id_of_string s) CCI) + (make_path ("Coq"::"Init"::dir) (id_of_string s) CCI) let build_sigma_set () = { proj1 = constant ["Specif"] "projS1"; diff --git a/tactics/tactics.ml b/tactics/tactics.ml index b1eb7b6efd..9dd71b75d2 100644 --- a/tactics/tactics.ml +++ b/tactics/tactics.ml @@ -1525,10 +1525,11 @@ let contradiction_on_hyp id gl = error "Not a contradiction" let constant dir s = - Declare.global_absolute_reference (make_path dir (id_of_string s) CCI) + Declare.global_absolute_reference + (make_path ("Coq"::"Init"::dir) (id_of_string s) CCI) -let coq_False = lazy (constant ["Init";"Logic"] "False") -let coq_not = lazy (constant ["Init";"Logic"] "not") +let coq_False = lazy (constant ["Logic"] "False") +let coq_not = lazy (constant ["Logic"] "not") (* Absurd *) let absurd c gls = |