Skip to content

Commit

Permalink
libsyntax: Disallow keywords followed by ::.
Browse files Browse the repository at this point in the history 
This breaks code that looked like:

    mymacro!(static::foo);

... where `mymacro!` expects a path or expression. Change such macros to
not accept keywords followed by `::`.

Closes #17298.

[breaking-change]
  • Loading branch information
@pcwalton
pcwalton committed Sep 18, 2014
1 parent 9c41064 commit 5aa264a
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 35 deletions.
83 changes: 48 additions & 35 deletions src/libsyntax/parse/token.rs
View file
Expand Up @@ -431,9 +431,11 @@ macro_rules! declare_special_idents_and_keywords {(
// If the special idents get renumbered, remember to modify these two as appropriate
pub static SELF_KEYWORD_NAME: Name = Name(SELF_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;
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
// interned with the id from the hole, but it will be between the min and max
Expand All @@ -443,52 +445,53 @@ declare_special_idents_and_keywords! {
pub mod special_idents {
// These ones are statics
(0, invalid, "");
(super::SELF_KEYWORD_NAME_NUM, self_, "self");
(super::STATIC_KEYWORD_NAME_NUM, statik, "static");
(3, static_lifetime, "'static");
(super::SELF_KEYWORD_NAME_NUM, self_, "self");
(super::STATIC_KEYWORD_NAME_NUM, statik, "static");
(super::SUPER_KEYWORD_NAME_NUM, super_, "super");
(4, static_lifetime, "'static");

// for matcher NTs
(4, tt, "tt");
(5, matchers, "matchers");
(5, tt, "tt");
(6, matchers, "matchers");

// outside of libsyntax
(6, clownshoe_abi, "__rust_abi");
(7, opaque, "<opaque>");
(8, unnamed_field, "<unnamed_field>");
(9, type_self, "Self");
(10, prelude_import, "prelude_import");
(7, clownshoe_abi, "__rust_abi");
(8, opaque, "<opaque>");
(9, unnamed_field, "<unnamed_field>");
(10, type_self, "Self");
(11, prelude_import, "prelude_import");
}

pub mod keywords {
// These ones are variants of the Keyword enum

'strict:
(11, As, "as");
(12, Break, "break");
(13, Crate, "crate");
(14, Else, "else");
(15, Enum, "enum");
(16, Extern, "extern");
(17, False, "false");
(18, Fn, "fn");
(19, For, "for");
(20, If, "if");
(21, Impl, "impl");
(22, In, "in");
(23, Let, "let");
(24, Loop, "loop");
(25, Match, "match");
(26, Mod, "mod");
(27, Mut, "mut");
(28, Once, "once");
(29, Pub, "pub");
(30, Ref, "ref");
(31, Return, "return");
(12, As, "as");
(13, Break, "break");
(14, Crate, "crate");
(15, Else, "else");
(16, Enum, "enum");
(17, Extern, "extern");
(18, False, "false");
(19, Fn, "fn");
(20, For, "for");
(21, If, "if");
(22, Impl, "impl");
(23, In, "in");
(24, Let, "let");
(25, Loop, "loop");
(26, Match, "match");
(27, Mod, "mod");
(28, Mut, "mut");
(29, Once, "once");
(30, Pub, "pub");
(31, Ref, "ref");
(32, Return, "return");
// Static and Self are also special idents (prefill de-dupes)
(super::STATIC_KEYWORD_NAME_NUM, Static, "static");
(super::SELF_KEYWORD_NAME_NUM, Self, "self");
(32, Struct, "struct");
(33, Super, "super");
(super::STATIC_KEYWORD_NAME_NUM, Static, "static");
(super::SELF_KEYWORD_NAME_NUM, Self, "self");
(33, Struct, "struct");
(super::SUPER_KEYWORD_NAME_NUM, Super, "super");
(34, True, "true");
(35, Trait, "trait");
(36, Type, "type");
Expand Down Expand Up @@ -713,6 +716,7 @@ pub fn is_any_keyword(tok: &Token) -> bool {

n == SELF_KEYWORD_NAME
|| n == STATIC_KEYWORD_NAME
|| n == SUPER_KEYWORD_NAME
|| STRICT_KEYWORD_START <= n
&& n <= RESERVED_KEYWORD_FINAL
},
Expand All @@ -727,9 +731,18 @@ pub fn is_strict_keyword(tok: &Token) -> bool {

n == SELF_KEYWORD_NAME
|| n == STATIC_KEYWORD_NAME
|| n == SUPER_KEYWORD_NAME
|| STRICT_KEYWORD_START <= n
&& 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,
}
}
Expand Down
15 changes: 15 additions & 0 deletions src/test/compile-fail/keywords-followed-by-double-colon.rs
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
}

4 comments on commit 5aa264a

@bors
Copy link
Contributor

@bors bors commented on 5aa264a Sep 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at pcwalton@5aa264a

@bors
Copy link
Contributor

@bors bors commented on 5aa264a Sep 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging pcwalton/rust/keywords-followed-by-double-colon = 5aa264a into auto

@bors
Copy link
Contributor

@bors bors commented on 5aa264a Sep 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pcwalton/rust/keywords-followed-by-double-colon = 5aa264a merged ok, testing candidate = 138f3241

@bors
Copy link
Contributor

@bors bors commented on 5aa264a Sep 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1434
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1436
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1435
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1435
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1432
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1431
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1431
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1435
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1429
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1429
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1432
exception: http://buildbot.rust-lang.org/builders/auto-win32-32-opt/builds/267
exception: http://buildbot.rust-lang.org/builders/auto-win32-32-nopt-t/builds/267
exception: http://buildbot.rust-lang.org/builders/auto-win32-32-nopt-c/builds/267
exception: http://buildbot.rust-lang.org/builders/auto-win64-64-opt/builds/267
exception: http://buildbot.rust-lang.org/builders/auto-win64-64-nopt-t/builds/267
exception: http://buildbot.rust-lang.org/builders/auto-win64-64-nopt-c/builds/267

Please sign in to comment.