bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

libsyntax: minor cleanup

Browse source
This commit is contained in:
Erick Tryzelaar 2013-02-24 19:27:43 -08:00
parent 380597eba3
commit 194f29c20f
1 changed files with 62 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

99
src/libsyntax/parse/parser.rs
View file

@ -2111,9 +2111,12 @@ pub impl Parser {
if *self.token == token::UNDERSCORE { if *self.token == token::UNDERSCORE {
self.bump(); self.bump();
if *self.token != token::RBRACE { if *self.token != token::RBRACE {
self.fatal(~"expected `}`, found `" + self.fatal(
token_to_str(self.reader, *self.token) + fmt!(
~"`"); "expected `}`, found `%s`",
token_to_str(self.reader, copy *self.token)
)
);
} }
etc = true; etc = true;
break; break;
@ -2195,7 +2198,6 @@ pub impl Parser {
} }
_ => pat_uniq(sub) _ => pat_uniq(sub)
}; };
} }
token::BINOP(token::AND) => { token::BINOP(token::AND) => {
let lo = self.span.lo; let lo = self.span.lo;
@ -2806,8 +2808,12 @@ pub impl Parser {
fn expect_self_ident() { fn expect_self_ident() {
if !self.is_self_ident() { if !self.is_self_ident() {
self.fatal(fmt!("expected `self` but found `%s`", self.fatal(
token_to_str(self.reader, *self.token))); fmt!(
"expected `self` but found `%s`",
token_to_str(self.reader, copy *self.token)
)
);
} }
self.bump(); self.bump();
} }
@ -2874,9 +2880,12 @@ pub impl Parser {
args_or_capture_items = ~[]; args_or_capture_items = ~[];
} }
_ => { _ => {
self.fatal(~"expected `,` or `)`, found `" + self.fatal(
token_to_str(self.reader, *self.token) + fmt!(
~"`"); "expected `,` or `)`, found `%s`",
token_to_str(self.reader, copy *self.token)
)
);
} }
} }
} else { } else {
@ -3181,9 +3190,13 @@ pub impl Parser {
is_tuple_like = true; is_tuple_like = true;
fields = ~[]; fields = ~[];
} else { } else {
self.fatal(fmt!("expected `{`, `(`, or `;` after struct name \ self.fatal(
but found `%s`", fmt!(
token_to_str(self.reader, *self.token))); "expected `{`, `(`, or `;` after struct name \
but found `%s`",
token_to_str(self.reader, copy *self.token)
)
);
} }
let actual_dtor = do the_dtor.map |dtor| { let actual_dtor = do the_dtor.map |dtor| {
@ -3218,21 +3231,23 @@ pub impl Parser {
let a_var = self.parse_instance_var(vis); let a_var = self.parse_instance_var(vis);
match *self.token { match *self.token {
token::SEMI => { token::SEMI => {
self.obsolete(*self.span, ObsoleteFieldTerminator); self.obsolete(copy *self.span, ObsoleteFieldTerminator);
self.bump(); self.bump();
} }
token::COMMA => { token::COMMA => {
self.bump(); self.bump();
} }
token::RBRACE => {} token::RBRACE => {}
_ => { _ => {
self.span_fatal(*self.span, self.span_fatal(
fmt!("expected `;`, `,`, or '}' but \ copy *self.span,
found `%s`", fmt!(
token_to_str(self.reader, "expected `;`, `,`, or '}' but found `%s`",
*self.token))); token_to_str(self.reader, copy *self.token)
} )
);
}
} }
a_var a_var
} }
@ -3316,8 +3331,12 @@ pub impl Parser {
module"); module");
} }
_ => { _ => {
self.fatal(~"expected item but found `" + self.fatal(
token_to_str(self.reader, *self.token) + ~"`"); fmt!(
"expected item but found `%s`",
token_to_str(self.reader, copy *self.token)
)
);
} }
} }
debug!("parse_mod_items: attrs=%?", attrs); debug!("parse_mod_items: attrs=%?", attrs);
@ -3567,20 +3586,26 @@ pub impl Parser {
must_be_named_mod = true; must_be_named_mod = true;
self.expect_keyword(&~"mod"); self.expect_keyword(&~"mod");
} else if *self.token != token::LBRACE { } else if *self.token != token::LBRACE {
self.span_fatal(*self.span, self.span_fatal(
fmt!("expected `{` or `mod` but found %s", copy *self.span,
token_to_str(self.reader, *self.token))); fmt!(
"expected `{` or `mod` but found `%s`",
token_to_str(self.reader, copy *self.token)
)
);
} }
let (sort, ident) = match *self.token { let (sort, ident) = match *self.token {
token::IDENT(*) => (ast::named, self.parse_ident()), token::IDENT(*) => (ast::named, self.parse_ident()),
_ => { _ => {
if must_be_named_mod { if must_be_named_mod {
self.span_fatal(*self.span, self.span_fatal(
fmt!("expected foreign module name but \ copy *self.span,
found %s", fmt!(
token_to_str(self.reader, "expected foreign module name but found `%s`",
*self.token))); token_to_str(self.reader, copy *self.token)
)
);
} }
(ast::anonymous, (ast::anonymous,