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

libsyntax: Fix parsing of module-qualified structure patterns. rs=bugfix

Browse Source
This commit is contained in:
Patrick Walton 2012-12-07 19:09:25 -08:00
parent cb7996a565
commit 184f5102b3
2 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libsyntax/parse/parser.rs
View File

@ -2046,8 +2046,6 @@ fn parse_pat(refutable: bool) -> @pat {
pat = self.parse_pat_ident(refutable, bind_by_value);
} else if self.eat_keyword(~"move") {
pat = self.parse_pat_ident(refutable, bind_by_move);
} else if !is_plain_ident(self.token) {
pat = self.parse_enum_variant(refutable);
} else {
let binding_mode;
// XXX: Aren't these two cases deadcode? -- bblum
@ -2066,7 +2064,7 @@ fn parse_pat(refutable: bool) -> @pat {
let cannot_be_enum_or_struct;
match self.look_ahead(1) {
token::LPAREN | token::LBRACKET | token::LT |
token::LBRACE =>
token::LBRACE | token::MOD_SEP =>
cannot_be_enum_or_struct = false,
_ =>
cannot_be_enum_or_struct = true
@ -2163,32 +2161,6 @@ fn parse_pat_ident(refutable: bool,
pat_ident(binding_mode, name, sub)
}
fn parse_enum_variant(refutable: bool) -> ast::pat_ {
let enum_path = self.parse_path_with_tps(true);
match self.token {
token::LPAREN => {
match self.look_ahead(1u) {
token::BINOP(token::STAR) => { // foo(*)
self.expect(token::LPAREN);
self.expect(token::BINOP(token::STAR));
self.expect(token::RPAREN);
pat_enum(enum_path, None)
}
_ => { // foo(a, ..., z)
let args = self.parse_unspanned_seq(
token::LPAREN, token::RPAREN,
seq_sep_trailing_disallowed(token::COMMA),
|p| p.parse_pat(refutable));
pat_enum(enum_path, Some(args))
}
}
}
_ => { // option::None
pat_enum(enum_path, Some(~[]))
}
}
}
fn parse_local(is_mutbl: bool,
allow_init: bool) -> @local {
let lo = self.span.lo;

12
src/test/run-pass/module-qualified-struct-destructure.rs Normal file
View File

@ -0,0 +1,12 @@
mod m {
pub struct S {
x: int,
y: int
}
}
fn main() {
let x = m::S { x: 1, y: 2 };
let m::S { x: a, y: b } = x;
}