diff options
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 10 | ||||
| -rw-r--r-- | src/test/run-pass/match-range-static.rs | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6b8411a9ead..810efd39177 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2383,7 +2383,13 @@ pub impl Parser { can_be_enum_or_struct = false } - if is_plain_ident(&*self.token) && !can_be_enum_or_struct { + if self.look_ahead(1) == token::DOTDOT { + let start = self.parse_expr_res(RESTRICT_NO_BAR_OP); + self.eat(&token::DOTDOT); + let end = self.parse_expr_res(RESTRICT_NO_BAR_OP); + pat = pat_range(start, end); + } + else if is_plain_ident(&*self.token) && !can_be_enum_or_struct { let name = self.parse_path_without_tps(); let sub; if self.eat(&token::AT) { @@ -2392,7 +2398,7 @@ pub impl Parser { } else { // or just foo sub = None; - }; + } pat = pat_ident(binding_mode, name, sub); } else { // parse an enum pat diff --git a/src/test/run-pass/match-range-static.rs b/src/test/run-pass/match-range-static.rs new file mode 100644 index 00000000000..3eefc386250 --- /dev/null +++ b/src/test/run-pass/match-range-static.rs @@ -0,0 +1,10 @@ +static s: int = 1; +static e: int = 42; + +fn main() { + match 7 { + s..e => (), + _ => (), + } +} + |