user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate formatting functions a bit more.

Browse source
This commit is contained in:
Graydon Hoare 2011-05-31 10:58:30 -07:00
parent 55e3cd41de
commit b6971d94df
7 changed files with 132 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/comp/front/parser.rs
View file

@ -1597,7 +1597,7 @@ fn stmt_to_expr(@ast::stmt stmt) -> option::t[@ast::expr] {
ret none[@ast::expr];
}
fn stmt_ends_with_semi(@ast::stmt stmt) -> bool {
fn stmt_ends_with_semi(&ast::stmt stmt) -> bool {
alt (stmt.node) {
case (ast::stmt_decl(?d,_)) {
alt (d.node) {
@ -1675,7 +1675,7 @@ fn parse_block(&parser p) -> ast::block {
}
case (token::RBRACE) { expr = some(e); }
case (?t) {
if (stmt_ends_with_semi(stmt)) {
if (stmt_ends_with_semi(*stmt)) {
p.err("expected ';' or '}' after " +
"expression but found " +
token::to_str(p.get_reader(), t));
@ -1692,7 +1692,7 @@ fn parse_block(&parser p) -> ast::block {
// used in branches and binary expressions in rustboot
// means we cannot use && here. I know, right?
if (p.get_file_type() == SOURCE_FILE) {
if (stmt_ends_with_semi(stmt)) {
if (stmt_ends_with_semi(*stmt)) {
expect(p, token::SEMI);
}
}