rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More consistent use of backticks and "expected" in error messages.

Browse Source 
Got some of the debug messages, here, too.  I figure it doesn't hurt
to get used to doing this even in places where users won't ever see
it.
This commit is contained in:
Lindsey Kuper
2012-07-13 13:20:49 -07:00
parent 07a81ad12e
commit 5a63b2100e
29 changed files with 102 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libsyntax/parse/parser.rs
View File

@@ -311,7 +311,7 @@ class parser {
vis: public})
}
_ { self.fatal("expected ';' or '}` \
_ { self.fatal("expected `;` or `}` \
but found `"
+ token_to_str(self.reader, self.token) + "`");
}
@@ -545,7 +545,7 @@ class parser {
} else if self.token == token::MOD_SEP || is_ident(self.token) {
let path = self.parse_path_with_tps(colons_before_params);
ty_path(path, self.get_id())
} else { self.fatal("expecting type"); };
} else { self.fatal("expected type"); };
let sp = mk_sp(lo, self.last_span.hi);
ret @{id: self.get_id(),
@@ -1176,7 +1176,7 @@ class parser {
self.bump();
ret (some(sep), zerok);
} else {
self.fatal("expected '*' or '+'");
self.fatal("expected `*` or `+`");
}
}
}
@@ -1709,8 +1709,9 @@ class parser {
if self.token == token::UNDERSCORE {
self.bump();
if self.token != token::RBRACE {
self.fatal("expecting }, found " +
token_to_str(self.reader, self.token));
self.fatal("expected `}`, found `" +
token_to_str(self.reader, self.token) +
"`");
}
etc = true;
break;
@@ -1855,7 +1856,7 @@ class parser {
is_mutbl = class_mutable;
}
if !is_plain_ident(self.token) {
self.fatal("expecting ident");
self.fatal("expected ident");
}
let name = self.parse_ident();
self.expect(token::COLON);
@@ -2000,9 +2001,9 @@ class parser {
}
t {
if classify::stmt_ends_with_semi(*stmt) {
self.fatal("expected ';' or '}' after expression \
but found '"
+ token_to_str(self.reader, t) + "'");
self.fatal("expected `;` or `}` after expression \
but found `"
+ token_to_str(self.reader, t) + "`");
}
vec::push(stmts, stmt);
}
@@ -2363,8 +2364,8 @@ class parser {
alt self.parse_item(attrs, vis) {
some(i) { vec::push(items, i); }
_ {
self.fatal("expected item but found '" +
token_to_str(self.reader, self.token) + "'");
self.fatal("expected item but found `" +
token_to_str(self.reader, self.token) + "`");
}
}
#debug["parse_mod_items: attrs=%?", attrs];