}
fn unexpected(p: parser, t: token::token) -> ! {
- let s: str = "unexpected token: ";
- s += token::to_str(p.get_reader(), t);
+ let s: str = "unexpected token: '" + token::to_str(p.get_reader(), t) +
+ "'";
p.fatal(s);
}
if p.peek() == t {
p.bump();
} else {
- let s: str = "expecting ";
+ let s: str = "expecting '";
s += token::to_str(p.get_reader(), t);
- s += ", found ";
+ s += "' but found '";
s += token::to_str(p.get_reader(), p.peek());
- p.fatal(s);
+ p.fatal(s + "'");
}
}
token::RBRACE. { expr = some(e); }
t {
if stmt_ends_with_semi(*stmt) {
- p.fatal("expected ';' or '}' after " +
- "expression but found " +
- token::to_str(p.get_reader(), t));
+ p.fatal("expected ';' or '}' after expression but \
+ found '" + token::to_str(p.get_reader(), t) +
+ "'");
}
stmts += [stmt];
}
alt parse_item(p, attrs) {
some(i) { items += [i]; }
_ {
- p.fatal("expected item but found " +
- token::to_str(p.get_reader(), p.peek()));
+ p.fatal("expected item but found '" +
+ token::to_str(p.get_reader(), p.peek()) + "'");
}
}
}
}
token::RBRACE. {/* empty */ }
_ {
- p.fatal("expected name of variant or '}' but found " +
- token::to_str(p.get_reader(), tok));
+ p.fatal("expected name of variant or '}' but found '" +
+ token::to_str(p.get_reader(), tok) + "'");
}
}
}