diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2016-11-17 10:43:44 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2016-11-17 10:43:44 +0100 |
| commit | b00e039b957b8428c21faec5c76f3a3484cde2cf (patch) | |
| tree | b83393e89cc7e057a6ebcab574153198d8a5d4d1 /toplevel | |
| parent | ca9e00ff9b2a8ee17430398a5e0bef2345c39341 (diff) | |
| parent | 26d180fa0b27edc773fd07c73906e4ed56475200 (diff) | |
Merge remote-tracking branch 'github/pr/360' into v8.6
Was PR#360: [stm] Remove STM-related vernaculars
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/vernac.ml | 3 | ||||
| -rw-r--r-- | toplevel/vernacentries.ml | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/toplevel/vernac.ml b/toplevel/vernac.ml index bfdae85d5..ba5bc5506 100644 --- a/toplevel/vernac.ml +++ b/toplevel/vernac.ml @@ -27,8 +27,7 @@ let rec is_navigation_vernac = function | VernacResetName _ | VernacBacktrack _ | VernacBackTo _ - | VernacBack _ - | VernacStm _ -> true + | VernacBack _ -> true | VernacRedirect (_, (_,c)) | VernacTime (_,c) -> is_navigation_vernac c (* Time Back* is harmless *) diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml index 230e62607..f0e63aa7c 100644 --- a/toplevel/vernacentries.ml +++ b/toplevel/vernacentries.ml @@ -1941,7 +1941,6 @@ let interp ?proof ~loc locality poly c = | VernacTime _ -> assert false | VernacRedirect _ -> assert false | VernacTimeout _ -> assert false - | VernacStm _ -> assert false | VernacError e -> raise e @@ -2209,9 +2208,6 @@ let interp ?(verbosely=true) ?proof (loc,c) = aux ?locality ~polymorphism:b isprogcmd c | VernacPolymorphic (b, c) -> CErrors.error "Polymorphism specified twice" | VernacLocal _ -> CErrors.error "Locality specified twice" - | VernacStm (Command c) -> aux ?locality ?polymorphism isprogcmd c - | VernacStm (PGLast c) -> aux ?locality ?polymorphism isprogcmd c - | VernacStm _ -> assert false (* Done by Stm *) | VernacFail v -> with_fail true (fun () -> aux ?locality ?polymorphism isprogcmd v) | VernacTimeout (n,v) -> |