diff options
| author | Arnaud Spiwack | 2014-12-23 13:27:10 +0100 |
|---|---|---|
| committer | Arnaud Spiwack | 2014-12-23 13:40:05 +0100 |
| commit | 239fe70ae8a39f5c5619cf88f1ae264c31bda65e (patch) | |
| tree | 739ad87d4c4fb4cf1fe1c4dd7552b6fcb29bd9e9 | |
| parent | 8e1a7e3e6a4c84db18f6fd5334776489015b368d (diff) | |
Fix compilation error in some configurations.
This was due to the unqualified uses of "Lazy" being disambiguated in different manners. I just changed the constructor name to "Select".
Fixes #3877.
| -rw-r--r-- | grammar/q_coqast.ml4 | 2 | ||||
| -rw-r--r-- | intf/tacexpr.mli | 2 | ||||
| -rw-r--r-- | parsing/g_ltac.ml4 | 2 | ||||
| -rw-r--r-- | printing/pptactic.ml | 2 | ||||
| -rw-r--r-- | tactics/tacinterp.ml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/grammar/q_coqast.ml4 b/grammar/q_coqast.ml4 index e3d910f321..c7d126c37d 100644 --- a/grammar/q_coqast.ml4 +++ b/grammar/q_coqast.ml4 @@ -291,7 +291,7 @@ let mlexpr_of_entry_type = function let mlexpr_of_match_lazy_flag = function | Tacexpr.General -> <:expr<Tacexpr.General>> - | Tacexpr.Lazy -> <:expr<Tacexpr.Lazy>> + | Tacexpr.Select -> <:expr<Tacexpr.Select>> | Tacexpr.Once -> <:expr<Tacexpr.Once>> let mlexpr_of_match_pattern = function diff --git a/intf/tacexpr.mli b/intf/tacexpr.mli index 7c898b75eb..c4e91d32ee 100644 --- a/intf/tacexpr.mli +++ b/intf/tacexpr.mli @@ -22,7 +22,7 @@ open Locus type direction_flag = bool (* true = Left-to-right false = right-to-right *) type lazy_flag = | General (* returns all possible successes *) - | Lazy (* returns all successes of the first matching branch *) + | Select (* returns all successes of the first matching branch *) | Once (* returns the first success in a maching branch (not necessarily the first) *) type evars_flag = bool (* true = pose evars false = fail on evars *) diff --git a/parsing/g_ltac.ml4 b/parsing/g_ltac.ml4 index fa2c111a68..a1b99de87b 100644 --- a/parsing/g_ltac.ml4 +++ b/parsing/g_ltac.ml4 @@ -173,7 +173,7 @@ GEXTEND Gram ; match_key: [ [ "match" -> Once - | "lazymatch" -> Lazy + | "lazymatch" -> Select | "multimatch" -> General ] ] ; input_fun: diff --git a/printing/pptactic.ml b/printing/pptactic.ml index ddb85a3626..ac06bb39f3 100644 --- a/printing/pptactic.ml +++ b/printing/pptactic.ml @@ -623,7 +623,7 @@ module Make let pr_lazy = function | General -> keyword "multi" - | Lazy -> keyword "lazy" + | Select -> keyword "lazy" | Once -> mt () let pr_match_pattern pr_pat = function diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml index a8da8c81f5..a088070342 100644 --- a/tactics/tacinterp.ml +++ b/tactics/tacinterp.ml @@ -1559,7 +1559,7 @@ and interp_match_successes lz ist s = match lz with | General -> general - | Lazy -> + | Select -> begin (** Only keep the first matching result, we don't backtrack on it *) let s = Proofview.tclONCE s in |