OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

syntax: Parse global paths in patterns

Browse Source 
Closes #6449
This commit is contained in:
Alex Crichton 2014-05-20 20:28:00 -07:00
parent e546452727
commit fd88e2b729
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2920,7 +2920,7 @@ impl<'a> Parser<'a> {
_ => {}
}
if !is_ident_or_path(&self.token)
if (!is_ident_or_path(&self.token) && self.token != token::MOD_SEP)
|| self.is_keyword(keywords::True)
|| self.is_keyword(keywords::False) {
// Parse an expression pattern or exp .. exp.

51
src/test/run-pass/issue-6449.rs Normal file
View File

@ -0,0 +1,51 @@
// Copyright 2012-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.
enum Foo {
Bar(int),
Baz,
}
enum Other {
Other1(Foo),
Other2(Foo, Foo),
}
fn main() {
match Baz {
::Bar(3) => fail!(),
::Bar(_) if false => fail!(),
::Bar(..) if false => fail!(),
::Bar(_n) => fail!(),
::Baz => {}
}
match Bar(3) {
::Bar(3) => {}
::Bar(_) if false => fail!(),
::Bar(..) if false => fail!(),
::Bar(_n) => fail!(),
::Baz => fail!(),
}
match Bar(4) {
::Bar(3) => fail!(),
::Bar(_) if false => fail!(),
::Bar(..) if false => fail!(),
::Bar(n) => assert_eq!(n, 4),
::Baz => fail!(),
}
match Other1(Baz) {
::Other1(::Baz) => {}
::Other1(::Bar(_)) => {}
::Other2(::Baz, ::Bar(_)) => {}
::Other2(::Bar(..), ::Baz) => {}
::Other2(..) => {}
}
}