diff options
| author | Maxime Dénès | 2017-11-13 11:34:27 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2017-11-13 11:34:27 +0100 |
| commit | e71b3445f1555a25daab81b8d5dd2ccf7e586e39 (patch) | |
| tree | 6835da553cf120e6d63c9ff255b0377b7f10787c | |
| parent | c232059eecefa8763ce1e381990d6d7034080d3e (diff) | |
| parent | 464ef8adf143b4c08252aa5148583aa52f65464c (diff) | |
Merge PR #6117: Fix printing anomaly in conv
| -rw-r--r-- | lib/cErrors.ml | 2 | ||||
| -rw-r--r-- | pretyping/reductionops.ml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/cErrors.ml b/lib/cErrors.ml index 94357aad35..eaffc28aca 100644 --- a/lib/cErrors.ml +++ b/lib/cErrors.ml @@ -91,7 +91,7 @@ let print_backtrace e = match Backtrace.get_backtrace e with let print_anomaly askreport e = if askreport then - hov 0 (str "Anomaly" ++ spc () ++ quote (raw_anomaly e) ++ spc ()) ++ + hov 0 (str "Anomaly" ++ spc () ++ quote (raw_anomaly e)) ++ spc () ++ hov 0 (str "Please report at " ++ str Coq_config.wwwbugtracker ++ str ".") else hov 0 (raw_anomaly e) diff --git a/pretyping/reductionops.ml b/pretyping/reductionops.ml index 308896f3ad..32c993224e 100644 --- a/pretyping/reductionops.ml +++ b/pretyping/reductionops.ml @@ -1314,7 +1314,9 @@ let pb_equal = function | Reduction.CONV -> Reduction.CONV let report_anomaly e = - let e = UserError (None, Pp.(str "Conversion test raised an anomaly" ++ print e)) in + let msg = Pp.(str "Conversion test raised an anomaly:" ++ + spc () ++ CErrors.print e) in + let e = UserError (None,msg) in let e = CErrors.push e in iraise e |