diff options
| author | Emilio Jesus Gallego Arias | 2019-02-17 02:54:41 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-03-30 17:20:56 +0100 |
| commit | be62d1580ed8e55fd98d429025c291e4be7bc185 (patch) | |
| tree | d4f9901623377ef434c629fb1e5d054e2ef57bce /stm | |
| parent | 1b3009ea672fd57e13e2d6912a97db51dfe8f13f (diff) | |
[vernac] Small cleanup to remove assert false.
This is a fairly small cleanup on the `vernac_interp` function, which
makes code cleaner and for example would allow to have `Load` inside
`Load`. [Not that we would ever want that]
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/stm.ml | 2 | ||||
| -rw-r--r-- | stm/vernac_classifier.ml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index cc0de0e9df..d54a5fdf43 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -2077,7 +2077,7 @@ end = struct (* {{{ *) let rec find ~time ~batch ~fail = function | VernacTime (batch,{CAst.v=e}) -> find ~time:true ~batch ~fail e | VernacRedirect (_,{CAst.v=e}) -> find ~time ~batch ~fail e - | VernacFail e -> find ~time ~batch ~fail:true e + | VernacFail {CAst.v=e} -> find ~time ~batch ~fail:true e | e -> e, time, batch, fail in find ~time:false ~batch:false ~fail:false e in let st = Vernacstate.freeze_interp_state ~marshallable:false in diff --git a/stm/vernac_classifier.ml b/stm/vernac_classifier.ml index feb8e2a67f..58fe923f9e 100644 --- a/stm/vernac_classifier.ml +++ b/stm/vernac_classifier.ml @@ -206,10 +206,10 @@ let classify_vernac e = | VernacExpr (f, e) -> let poly = Attributes.(parse_drop_extra polymorphic_nowarn f) in static_classifier ~poly e - | VernacTimeout (_,e) -> static_control_classifier e + | VernacTimeout (_,{v=e}) -> static_control_classifier e | VernacTime (_,{v=e}) | VernacRedirect (_, {v=e}) -> static_control_classifier e - | VernacFail e -> (* Fail Qed or Fail Lemma must not join/fork the DAG *) + | VernacFail {v=e} -> (* Fail Qed or Fail Lemma must not join/fork the DAG *) (match static_control_classifier e with | ( VtQuery | VtProofStep _ | VtSideff _ | VtMeta), _ as x -> x |