diff options
| author | Maxime Dénès | 2017-09-22 11:46:33 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-09-22 11:46:33 +0200 |
| commit | 06a723190858da8ed3f30736f22398aa7822c959 (patch) | |
| tree | 805ad45a4492a880dbf6008906eeaff807388ad0 /vernac | |
| parent | 63b3b3f307053fd055355d8a669456c988d083aa (diff) | |
| parent | 569e8f7601ee1484f8373320a102fa2ab026078c (diff) | |
Merge PR #1055: Remove STM vernaculars
Diffstat (limited to 'vernac')
| -rw-r--r-- | vernac/vernacentries.ml | 5 | ||||
| -rw-r--r-- | vernac/vernacprop.ml | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/vernac/vernacentries.ml b/vernac/vernacentries.ml index b0e438a8e3..c7b8def0e0 100644 --- a/vernac/vernacentries.ml +++ b/vernac/vernacentries.ml @@ -1923,7 +1923,6 @@ let interp ?proof ?loc locality poly c = | VernacTime _ -> assert false | VernacRedirect _ -> assert false | VernacTimeout _ -> assert false - | VernacStm _ -> assert false (* The STM should handle that, but LOAD bypasses the STM... *) | VernacAbortAll -> CErrors.user_err (str "AbortAll cannot be used through the Load command") @@ -2184,10 +2183,6 @@ let interp ?(verbosely=true) ?proof (loc,c) = let orig_program_mode = Flags.is_program_mode () in let rec aux ?locality ?polymorphism isprogcmd = function - (* This assert case will be removed when fake_ide can understand - completion feedback *) - | VernacStm _ -> assert false (* Done by Stm *) - | VernacProgram c when not isprogcmd -> aux ?locality ?polymorphism true c | VernacProgram _ -> user_err Pp.(str "Program mode specified twice") | VernacLocal (b, c) when Option.is_empty locality -> diff --git a/vernac/vernacprop.ml b/vernac/vernacprop.ml index fc11bcf4a0..3cff1f14c0 100644 --- a/vernac/vernacprop.ml +++ b/vernac/vernacprop.ml @@ -17,8 +17,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 *) |