aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-08-24 09:58:26 -0700
committerGraydon Hoare <[email protected]>2010-08-24 09:58:26 -0700
commit10316fbfa59b66817f447ac4a35242893bc9970a (patch)
tree5606b1b317004d9984c4be1c1f047785ed13c7e0 /src/boot
parentRename lib tests, enable lib-int.rs using _str.eq for now. (diff)
downloadrust-10316fbfa59b66817f447ac4a35242893bc9970a.tar.xz
rust-10316fbfa59b66817f447ac4a35242893bc9970a.zip
Make error reporting slightly more regular.
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/driver/session.ml2
-rw-r--r--src/boot/fe/cexp.ml5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/boot/driver/session.ml b/src/boot/driver/session.ml
index d295763a..21faed0b 100644
--- a/src/boot/driver/session.ml
+++ b/src/boot/driver/session.ml
@@ -109,7 +109,7 @@ let report_err sess ido str =
in
match spano with
None ->
- fail sess "Error: %s\n%!" str
+ fail sess "error: %s\n%!" str
| Some span ->
fail sess "%s: error: %s\n%!"
(string_of_span span) str
diff --git a/src/boot/fe/cexp.ml b/src/boot/fe/cexp.ml
index 9c1b40e1..f69d35bd 100644
--- a/src/boot/fe/cexp.ml
+++ b/src/boot/fe/cexp.ml
@@ -602,10 +602,11 @@ let with_err_handling sess thunk =
thunk ()
with
Parse_err (ps, str) ->
- Session.fail sess "Parse error: %s\n%!" str;
+ Session.fail sess "%s: error: %s\n%!"
+ (Session.string_of_pos (lexpos ps)) str;
List.iter
(fun (cx,pos) ->
- Session.fail sess "%s:E (parse context): %s\n%!"
+ Session.fail sess "%s: (parse context): %s\n%!"
(Session.string_of_pos pos) cx)
ps.pstate_ctxt;
let apos = lexpos ps in