diff options
| author | Maxime Dénès | 2017-03-30 16:39:15 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-03-30 16:39:15 +0200 |
| commit | ff89e6cd0607fe444dc9d5c13f4828dba7d8eaca (patch) | |
| tree | 95f4010ea6527397526113058a2c0e25ad68efcc | |
| parent | bedbdbc3daf27f80252ac2c7a968b1cc2730ad83 (diff) | |
| parent | 12f6a1adf78d565aff9b27d742ffd45aad3b8427 (diff) | |
Merge branch 'v8.6' into trunk
| -rw-r--r-- | stm/stm.ml | 11 | ||||
| -rw-r--r-- | test-suite/output/ErrorInModule.out | 2 | ||||
| -rw-r--r-- | test-suite/output/ErrorInModule.v | 4 | ||||
| -rw-r--r-- | test-suite/output/ErrorInSection.out | 2 | ||||
| -rw-r--r-- | test-suite/output/ErrorInSection.v | 4 |
5 files changed, 19 insertions, 4 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index b592aab0da..b0ad3f8790 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -2232,10 +2232,13 @@ let known_state ?(redefine_qed=false) ~cache id = if eff then update_global_env () ), (if eff then `Yes else cache), true | `Cmd { cast = x; ceff = eff } -> (fun () -> - resilient_command reach view.next; - stm_vernac_interp id x; - if eff then update_global_env () - ), (if eff then `Yes else cache), true + (match !Flags.async_proofs_mode with + | Flags.APon | Flags.APonLazy -> + resilient_command reach view.next + | Flags.APoff -> reach view.next); + stm_vernac_interp id x; + if eff then update_global_env () + ), (if eff then `Yes else cache), true | `Fork ((x,_,_,_), None) -> (fun () -> resilient_command reach view.next; stm_vernac_interp id x; diff --git a/test-suite/output/ErrorInModule.out b/test-suite/output/ErrorInModule.out new file mode 100644 index 0000000000..851ecd9306 --- /dev/null +++ b/test-suite/output/ErrorInModule.out @@ -0,0 +1,2 @@ +File "stdin", line 3, characters 20-31: +Error: The reference nonexistent was not found in the current environment. diff --git a/test-suite/output/ErrorInModule.v b/test-suite/output/ErrorInModule.v new file mode 100644 index 0000000000..e69e23276b --- /dev/null +++ b/test-suite/output/ErrorInModule.v @@ -0,0 +1,4 @@ +(* -*- mode: coq; coq-prog-args: ("-emacs" "-quick") -*- *) +Module M. + Definition foo := nonexistent. +End M. diff --git a/test-suite/output/ErrorInSection.out b/test-suite/output/ErrorInSection.out new file mode 100644 index 0000000000..851ecd9306 --- /dev/null +++ b/test-suite/output/ErrorInSection.out @@ -0,0 +1,2 @@ +File "stdin", line 3, characters 20-31: +Error: The reference nonexistent was not found in the current environment. diff --git a/test-suite/output/ErrorInSection.v b/test-suite/output/ErrorInSection.v new file mode 100644 index 0000000000..3036f8f05b --- /dev/null +++ b/test-suite/output/ErrorInSection.v @@ -0,0 +1,4 @@ +(* -*- mode: coq; coq-prog-args: ("-emacs" "-quick") -*- *) +Section S. + Definition foo := nonexistent. +End S. |