diff options
| author | Hugo Herbelin | 2017-04-06 11:15:41 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2017-04-06 11:28:08 +0200 |
| commit | 33f40197e6b7bef02c8df2dc0a0066f8144b66d6 (patch) | |
| tree | 1ed61e9efe45f04b9f03229eec2ad986dde02059 /ltac | |
| parent | c6f24b1cbfb485dbf14b3934208c113140de2eca (diff) | |
| parent | ed25677029e2cc1e34eba76aade1a00980ca11de (diff) | |
Merge branch 'origin/v8.5' into v8.6.
Was needed to be done for a while.
Diffstat (limited to 'ltac')
| -rw-r--r-- | ltac/tactic_debug.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ltac/tactic_debug.ml b/ltac/tactic_debug.ml index 5cbddc7f64..698c913e84 100644 --- a/ltac/tactic_debug.ml +++ b/ltac/tactic_debug.ml @@ -108,6 +108,8 @@ let string_get s i = try Proofview.NonLogical.return (String.get s i) with e -> Proofview.NonLogical.raise e +let run_invalid_arg () = Proofview.NonLogical.raise (Invalid_argument "run_com") + (* Gives the number of steps or next breakpoint of a run command *) let run_com inst = let open Proofview.NonLogical in @@ -118,14 +120,14 @@ let run_com inst = let s = String.sub inst i (String.length inst - i) in if inst.[0] >= '0' && inst.[0] <= '9' then int_of_string s >>= fun num -> - (if num<0 then invalid_arg "run_com" else return ()) >> + (if num<0 then run_invalid_arg () else return ()) >> (skip:=num) >> (skipped:=0) else breakpoint:=Some (possibly_unquote s) else - invalid_arg "run_com" + run_invalid_arg () else - invalid_arg "run_com" + run_invalid_arg () (* Prints the run counter *) let run ini = |