bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rustc: Implement functional record update for structs

Browse source
This commit is contained in:
Patrick Walton 2012-08-06 13:15:40 -07:00
parent 1e3143b34e
commit bff512a90f
10 changed files with 127 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -912,18 +912,27 @@ class parser {
self.bump();
let mut fields = ~[];
vec::push(fields, self.parse_field(token::COLON));
while self.token != token::RBRACE {
while self.token != token::RBRACE &&
!self.is_keyword(~"with") {
self.expect(token::COMMA);
if self.token == token::RBRACE {
if self.token == token::RBRACE ||
self.is_keyword(~"with") {
// Accept an optional trailing comma.
break;
}
vec::push(fields, self.parse_field(token::COLON));
}
let base;
if self.eat_keyword(~"with") {
base = some(self.parse_expr());
} else {
base = none;
}
hi = pth.span.hi;
self.expect(token::RBRACE);
ex = expr_struct(pth, fields);
ex = expr_struct(pth, fields, base);
return self.mk_pexpr(lo, hi, ex);
}
}