mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the parser accept 'if' as an alternative to 'when' in alt patterns.

Browse Source 
Also fix the pretty printer, making it output 'if' instead of 'when'.

Issue #1396
This commit is contained in:
Austin Seipp 2012-01-09 09:42:07 -06:00 committed by Brian Anderson
parent fbad0204e4
commit 9211348989
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/comp/syntax/parse/parser.rs
View File

@ -1389,7 +1389,11 @@ fn parse_alt_expr(p: parser) -> @ast::expr {
while p.peek() != token::RBRACE {
let pats = parse_pats(p);
let guard = none;
if eat_word(p, "when") { guard = some(parse_expr(p)); }
if eat_word(p, "when") {
guard = some(parse_expr(p));
} else if eat_word(p, "if") {
guard = some(parse_expr(p));
}
let blk = parse_block(p);
arms += [{pats: pats, guard: guard, body: blk}];
}

2
src/comp/syntax/print/pprust.rs
View File

@ -843,7 +843,7 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
}
space(s.s);
alt arm.guard {
some(e) { word_space(s, "when"); print_expr(s, e); space(s.s); }
some(e) { word_space(s, "if"); print_expr(s, e); space(s.s); }
none. { }
}
print_possibly_embedded_block(s, arm.body, block_normal,