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

rollup merge of #17379 : pcwalton/keywords-followed-by-double-colon

Browse Source
This commit is contained in:
Alex Crichton 2014-09-19 10:01:01 -07:00
commit ebe9ec8074
2 changed files with 63 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/libsyntax/parse/token.rs
View File

@ -431,9 +431,11 @@ macro_rules! declare_special_idents_and_keywords {(
// If the special idents get renumbered, remember to modify these two as appropriate // If the special idents get renumbered, remember to modify these two as appropriate
pub static SELF_KEYWORD_NAME: Name = Name(SELF_KEYWORD_NAME_NUM); pub static SELF_KEYWORD_NAME: Name = Name(SELF_KEYWORD_NAME_NUM);
static STATIC_KEYWORD_NAME: Name = Name(STATIC_KEYWORD_NAME_NUM); static STATIC_KEYWORD_NAME: Name = Name(STATIC_KEYWORD_NAME_NUM);
static SUPER_KEYWORD_NAME: Name = Name(SUPER_KEYWORD_NAME_NUM);
pub static SELF_KEYWORD_NAME_NUM: u32 = 1; pub static SELF_KEYWORD_NAME_NUM: u32 = 1;
static STATIC_KEYWORD_NAME_NUM: u32 = 2; static STATIC_KEYWORD_NAME_NUM: u32 = 2;
static SUPER_KEYWORD_NAME_NUM: u32 = 3;
// NB: leaving holes in the ident table is bad! a different ident will get // NB: leaving holes in the ident table is bad! a different ident will get
// interned with the id from the hole, but it will be between the min and max // interned with the id from the hole, but it will be between the min and max
@ -443,52 +445,53 @@ declare_special_idents_and_keywords! {
pub mod special_idents { pub mod special_idents {
// These ones are statics // These ones are statics
(0, invalid, ""); (0, invalid, "");
(super::SELF_KEYWORD_NAME_NUM, self_, "self"); (super::SELF_KEYWORD_NAME_NUM, self_, "self");
(super::STATIC_KEYWORD_NAME_NUM, statik, "static"); (super::STATIC_KEYWORD_NAME_NUM, statik, "static");
(3, static_lifetime, "'static"); (super::SUPER_KEYWORD_NAME_NUM, super_, "super");
(4, static_lifetime, "'static");
// for matcher NTs // for matcher NTs
(4, tt, "tt"); (5, tt, "tt");
(5, matchers, "matchers"); (6, matchers, "matchers");
// outside of libsyntax // outside of libsyntax
(6, clownshoe_abi, "__rust_abi"); (7, clownshoe_abi, "__rust_abi");
(7, opaque, "<opaque>"); (8, opaque, "<opaque>");
(8, unnamed_field, "<unnamed_field>"); (9, unnamed_field, "<unnamed_field>");
(9, type_self, "Self"); (10, type_self, "Self");
(10, prelude_import, "prelude_import"); (11, prelude_import, "prelude_import");
} }
pub mod keywords { pub mod keywords {
// These ones are variants of the Keyword enum // These ones are variants of the Keyword enum
'strict: 'strict:
(11, As, "as"); (12, As, "as");
(12, Break, "break"); (13, Break, "break");
(13, Crate, "crate"); (14, Crate, "crate");
(14, Else, "else"); (15, Else, "else");
(15, Enum, "enum"); (16, Enum, "enum");
(16, Extern, "extern"); (17, Extern, "extern");
(17, False, "false"); (18, False, "false");
(18, Fn, "fn"); (19, Fn, "fn");
(19, For, "for"); (20, For, "for");
(20, If, "if"); (21, If, "if");
(21, Impl, "impl"); (22, Impl, "impl");
(22, In, "in"); (23, In, "in");
(23, Let, "let"); (24, Let, "let");
(24, Loop, "loop"); (25, Loop, "loop");
(25, Match, "match"); (26, Match, "match");
(26, Mod, "mod"); (27, Mod, "mod");
(27, Mut, "mut"); (28, Mut, "mut");
(28, Once, "once"); (29, Once, "once");
(29, Pub, "pub"); (30, Pub, "pub");
(30, Ref, "ref"); (31, Ref, "ref");
(31, Return, "return"); (32, Return, "return");
// Static and Self are also special idents (prefill de-dupes) // Static and Self are also special idents (prefill de-dupes)
(super::STATIC_KEYWORD_NAME_NUM, Static, "static"); (super::STATIC_KEYWORD_NAME_NUM, Static, "static");
(super::SELF_KEYWORD_NAME_NUM, Self, "self"); (super::SELF_KEYWORD_NAME_NUM, Self, "self");
(32, Struct, "struct"); (33, Struct, "struct");
(33, Super, "super"); (super::SUPER_KEYWORD_NAME_NUM, Super, "super");
(34, True, "true"); (34, True, "true");
(35, Trait, "trait"); (35, Trait, "trait");
(36, Type, "type"); (36, Type, "type");
@ -713,6 +716,7 @@ pub fn is_any_keyword(tok: &Token) -> bool {
n == SELF_KEYWORD_NAME n == SELF_KEYWORD_NAME
|| n == STATIC_KEYWORD_NAME || n == STATIC_KEYWORD_NAME
|| n == SUPER_KEYWORD_NAME
|| STRICT_KEYWORD_START <= n || STRICT_KEYWORD_START <= n
&& n <= RESERVED_KEYWORD_FINAL && n <= RESERVED_KEYWORD_FINAL
}, },
@ -727,9 +731,18 @@ pub fn is_strict_keyword(tok: &Token) -> bool {
n == SELF_KEYWORD_NAME n == SELF_KEYWORD_NAME
|| n == STATIC_KEYWORD_NAME || n == STATIC_KEYWORD_NAME
|| n == SUPER_KEYWORD_NAME
|| STRICT_KEYWORD_START <= n || STRICT_KEYWORD_START <= n
&& n <= STRICT_KEYWORD_FINAL && n <= STRICT_KEYWORD_FINAL
}, },
token::IDENT(sid, true) => {
let n = sid.name;
n != SELF_KEYWORD_NAME
&& n != SUPER_KEYWORD_NAME
&& STRICT_KEYWORD_START <= n
&& n <= STRICT_KEYWORD_FINAL
}
_ => false, _ => false,
} }
} }

15
src/test/compile-fail/keywords-followed-by-double-colon.rs Normal file
View File

@ -0,0 +1,15 @@
// 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.
fn main() {
struct::foo(); //~ ERROR expected identifier
mut::baz(); //~ ERROR expected identifier
}