FIX #21475: Interval match patterns won't parse namespace specifiers correctly

This commit is contained in:
defuz 2015-01-22 21:56:27 +02:00
parent 48aeaba934
commit 52fa187431
2 changed files with 39 additions and 0 deletions

View File

@ -3539,6 +3539,19 @@ impl<'a> Parser<'a> {
self.bump();
pat = PatStruct(enum_path, fields, etc);
}
token::DotDotDot => {
let hi = self.last_span.hi;
let start = self.mk_expr(lo, hi, ExprPath(enum_path));
self.eat(&token::DotDotDot);
let end = if self.token.is_ident() || self.token.is_path() {
let path = self.parse_path(LifetimeAndTypesWithColons);
let hi = self.span.hi;
self.mk_expr(lo, hi, ExprPath(path))
} else {
self.parse_literal_maybe_minus()
};
pat = PatRange(start, end);
}
_ => {
let mut args: Vec<P<Pat>> = Vec::new();
match self.token {

View File

@ -0,0 +1,26 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use m::{START, END};
fn main() {
match 42u32 {
m::START...m::END => {},
// FIXME: Should also work (now: mismatched types in range [E0031])
// 0u32...m::END => {},
// m::START...59u32 => {},
_ => {},
}
}
mod m {
pub const START: u32 = 4;
pub const END: u32 = 14;
}