diff options
| author | filliatr | 2000-03-21 18:53:42 +0000 |
|---|---|---|
| committer | filliatr | 2000-03-21 18:53:42 +0000 |
| commit | b1dab9e06d9a964b1dd0d09bca797cb4a4e4b9a1 (patch) | |
| tree | 1c67698f4b19b4e14774b19a375e40fd009d39a9 /tactics | |
| parent | 9a913a2aa1834704908ec829d5326d214fd68e88 (diff) | |
- bug make_module_marker (plus de # et de .obj maintenant)
- portage (partiel) de Zarith
- bug discrEverywhere (manquait un "fun gls ->")
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@353 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/equality.ml | 7 | ||||
| -rw-r--r-- | tactics/tauto.ml | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tactics/equality.ml b/tactics/equality.ml index bb1acfb843..b57be4b1a9 100644 --- a/tactics/equality.ml +++ b/tactics/equality.ml @@ -180,9 +180,7 @@ type leibniz_eq = { congr: marked_term; sym : marked_term } -let mmk = make_module_marker - [ "#Prelude.obj"; "#Logic_Type.obj"; "#Specif.obj"; - "#Logic.obj"; "#Core.obj"] +let mmk = make_module_marker [ "Prelude"; "Logic_Type"; "Specif"; "Logic" ] let eq_pattern = put_pat mmk "(eq ? ? ?)" let not_pattern = put_pat mmk "(not ?)" @@ -631,7 +629,8 @@ let discrClause cls gls = let discrEverywhere = tclORELSE (Tacticals.tryAllClauses discrClause) - (errorlabstrm "DiscrEverywhere" [< 'sTR" No discriminable equalities" >]) + (fun gls -> + errorlabstrm "DiscrEverywhere" [< 'sTR" No discriminable equalities" >]) let discrConcl gls = discrClause None gls let discrHyp id gls = discrClause (Some id) gls diff --git a/tactics/tauto.ml b/tactics/tauto.ml index ac505ab45d..76efe0958e 100644 --- a/tactics/tauto.ml +++ b/tactics/tauto.ml @@ -45,8 +45,8 @@ let classically cltac = function | None -> cltac None let somatch m pat = somatch None (get_pat pat) m -let module_mark = ["#Logic.obj"] -let mmk = make_module_marker ["#Prelude.obj"] +let module_mark = ["Logic"] +let mmk = make_module_marker ["Prelude"] let false_pattern = put_pat mmk "False" let true_pattern = put_pat mmk "True" let and_pattern = put_pat mmk "(and ? ?)" |