aboutsummaryrefslogtreecommitdiff
path: root/src/comp/front
diff options
context:
space:
mode:
authorMarijn Haverbeke <[email protected]>2011-04-19 12:02:06 +0200
committerMarijn Haverbeke <[email protected]>2011-04-19 16:57:13 +0200
commit6511d471bafd446026462ce0dba8ef5e2ebf462f (patch)
tree7d1be7a2ed367965ef50b1e6f12c87e74391f750 /src/comp/front
parentadd log_err to rustc (diff)
downloadrust-6511d471bafd446026462ce0dba8ef5e2ebf462f.tar.xz
rust-6511d471bafd446026462ce0dba8ef5e2ebf462f.zip
replace error logging with log_err in stdlib and rustc
Diffstat (limited to 'src/comp/front')
-rw-r--r--src/comp/front/codemap.rs2
-rw-r--r--src/comp/front/creader.rs14
-rw-r--r--src/comp/front/extfmt.rs22
-rw-r--r--src/comp/front/lexer.rs25
4 files changed, 30 insertions, 33 deletions
diff --git a/src/comp/front/codemap.rs b/src/comp/front/codemap.rs
index 8d18e51b..8088a6f0 100644
--- a/src/comp/front/codemap.rs
+++ b/src/comp/front/codemap.rs
@@ -46,7 +46,7 @@ fn lookup_pos(codemap map, uint pos) -> loc {
}
}
}
- log #fmt("Failed to find a location for character %u", pos);
+ log_err #fmt("Failed to find a location for character %u", pos);
fail;
}
diff --git a/src/comp/front/creader.rs b/src/comp/front/creader.rs
index 55b40cce..ec9c6883 100644
--- a/src/comp/front/creader.rs
+++ b/src/comp/front/creader.rs
@@ -67,7 +67,7 @@ fn parse_ty_str(str rep, str_def sd) -> @ty.t {
auto st = @rec(rep=rep, mutable pos=0u, len=len);
auto result = parse_ty(st, sd);
if (st.pos != len) {
- log "parse_ty_str: incomplete parse, stopped at byte "
+ log_err "parse_ty_str: incomplete parse, stopped at byte "
+ _uint.to_str(st.pos, 10u) + " of "
+ _uint.to_str(len, 10u) + " in str '" + rep + "'";
}
@@ -242,7 +242,7 @@ fn parse_def_id(vec[u8] buf) -> ast.def_id {
colon_idx += 1u;
}
if (colon_idx == len) {
- log "didn't find ':' when parsing def id";
+ log_err "didn't find ':' when parsing def id";
fail;
}
@@ -407,8 +407,8 @@ fn load_crate(session.session sess,
}
}
- log #fmt("can't open crate '%s' (looked for '%s' in lib search paths)",
- ident, filename);
+ log_err #fmt("can't open crate '%s' (looked for '%s' in lib search path)",
+ ident, filename);
fail;
}
@@ -459,8 +459,8 @@ fn kind_has_type_params(u8 kind_ch) -> bool {
else if (kind_ch == ('n' as u8)) { ret false; }
else if (kind_ch == ('v' as u8)) { ret true; }
else {
- log #fmt("kind_has_type_params(): unknown kind char: %d",
- kind_ch as int);
+ log_err #fmt("kind_has_type_params(): unknown kind char: %d",
+ kind_ch as int);
fail;
}
}
@@ -503,7 +503,7 @@ fn lookup_def(session.session sess, int cnum, vec[ast.ident] path)
tid = tup(cnum, tid._1);
def = ast.def_variant(tid, did);
} else {
- log #fmt("lookup_def(): unknown kind char: %d", kind_ch as int);
+ log_err #fmt("lookup_def(): unknown kind char: %d", kind_ch as int);
fail;
}
diff --git a/src/comp/front/extfmt.rs b/src/comp/front/extfmt.rs
index cfb27dcc..e8f0c252 100644
--- a/src/comp/front/extfmt.rs
+++ b/src/comp/front/extfmt.rs
@@ -49,7 +49,7 @@ fn expand_syntax_ext(vec[@ast.expr] args,
option.t[@ast.expr] body) -> @ast.expr {
if (_vec.len[@ast.expr](args) == 0u) {
- log "malformed #fmt call";
+ log_err "malformed #fmt call";
fail;
}
@@ -74,7 +74,7 @@ fn expr_to_str(@ast.expr expr) -> str {
}
}
}
- log "malformed #fmt call";
+ log_err "malformed #fmt call";
fail;
}
@@ -214,7 +214,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
ret make_call(sp, count_is_path, count_is_args);
}
case (_) {
- log "not implemented";
+ log_err "not implemented";
fail;
}
}
@@ -302,7 +302,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
case (option.none[int]) {
}
case (_) {
- log unsupported;
+ log_err unsupported;
fail;
}
}
@@ -313,13 +313,13 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
}
case (flag_sign_always) {
if (!is_signed_type(cnv)) {
- log "+ flag only valid in signed #fmt conversions";
+ log_err "+ flag only valid in signed #fmt conversion";
fail;
}
}
case (flag_space_for_sign) {
if (!is_signed_type(cnv)) {
- log "space flag only valid in "
+ log_err "space flag only valid in "
+ "signed #fmt conversions";
fail;
}
@@ -327,7 +327,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
case (flag_left_zero_pad) {
}
case (_) {
- log unsupported;
+ log_err unsupported;
fail;
}
}
@@ -339,7 +339,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
case (count_is(_)) {
}
case (_) {
- log unsupported;
+ log_err unsupported;
fail;
}
}
@@ -350,7 +350,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
case (count_is(_)) {
}
case (_) {
- log unsupported;
+ log_err unsupported;
fail;
}
}
@@ -382,7 +382,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
ret make_conv_call(arg.span, "uint", cnv, arg);
}
case (_) {
- log unsupported;
+ log_err unsupported;
fail;
}
}
@@ -492,7 +492,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
}
case (piece_conv(?conv)) {
if (n >= _vec.len[@ast.expr](args)) {
- log "too many conversions in #fmt string";
+ log_err "too many conversions in #fmt string";
fail;
}
diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs
index 8d4c464d..e34ddd4f 100644
--- a/src/comp/front/lexer.rs
+++ b/src/comp/front/lexer.rs
@@ -321,7 +321,7 @@ impure fn consume_block_comment(reader rdr) {
}
}
if (rdr.is_eof()) {
- log "unterminated block comment";
+ log_err "unterminated block comment";
fail;
}
}
@@ -359,7 +359,7 @@ impure fn scan_exponent(reader rdr) -> option.t[str] {
ret(some(res + exponent));
}
else {
- log ("scan_exponent: bad fp literal");
+ log_err ("scan_exponent: bad fp literal");
fail;
}
}
@@ -538,8 +538,7 @@ impure fn scan_numeric_escape(reader rdr) -> char {
case ('u') { n_hex_digits = 4; }
case ('U') { n_hex_digits = 8; }
case (?c) {
- log "unknown numeric character escape";
- log c;
+ log_err #fmt("unknown numeric character escape: %d", c as int);
fail;
}
}
@@ -551,8 +550,7 @@ impure fn scan_numeric_escape(reader rdr) -> char {
while (n_hex_digits != 0) {
if (!is_hex_digit(n)) {
- log "illegal numeric character escape";
- log n;
+ log_err #fmt("illegal numeric character escape: %d", n as int);
fail;
}
accum_int *= 16;
@@ -593,7 +591,7 @@ impure fn next_token(reader rdr) -> token.token {
auto rsvd = rdr.get_reserved();
if (rsvd.contains_key(accum_str)) {
- log "reserved keyword";
+ log_err #fmt("reserved keyword: %s", accum_str);
fail;
}
@@ -716,8 +714,8 @@ impure fn next_token(reader rdr) -> token.token {
case ('U') { c2 = scan_numeric_escape(rdr); }
case (?c2) {
- log "unknown character escape";
- log c2;
+ log_err #fmt("unknown character escape: %d",
+ c2 as int);
fail;
}
}
@@ -725,7 +723,7 @@ impure fn next_token(reader rdr) -> token.token {
}
if (rdr.next() != '\'') {
- log "unterminated character constant";
+ log_err "unterminated character constant";
fail;
}
rdr.bump(); // advance curr to closing '
@@ -776,8 +774,8 @@ impure fn next_token(reader rdr) -> token.token {
}
case (?c2) {
- log "unknown string escape";
- log c2;
+ log_err #fmt("unknown string escape: %d",
+ c2 as int);
fail;
}
}
@@ -843,8 +841,7 @@ impure fn next_token(reader rdr) -> token.token {
}
case (?c) {
- log "unkown start of token";
- log c;
+ log_err #fmt("unkown start of token: %d", c as int);
fail;
}
}