diff options
| author | bors <bors@rust-lang.org> | 2013-08-18 15:02:04 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-18 15:02:04 -0700 |
| commit | b26e11db862a9f06556d2871b1b71e09f652e395 (patch) | |
| tree | f2515c8e289133c917b0dfd1d0d2f5e4ba7e3281 /src/libsyntax/parse | |
| parent | e185b049af214cc7900beaae557a12863f4b3ce3 (diff) | |
| parent | 418e1ebae6ed543b1a78c3e987d42bf0bf25f310 (diff) | |
| download | rust-b26e11db862a9f06556d2871b1b71e09f652e395.tar.gz rust-b26e11db862a9f06556d2871b1b71e09f652e395.zip | |
auto merge of #8560 : kballard/rust/reserve-yield, r=pcwalton
Rename task::yield() to task::deschedule(). Fixes #8494.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index bdfd25ae644..0d7def84003 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -477,6 +477,7 @@ fn mk_fresh_ident_interner() -> @ident_interner { "be", // 64 "pure", // 65 + "yield", // 66 ]; @ident_interner { @@ -585,7 +586,6 @@ pub mod keywords { Once, Priv, Pub, - Pure, Ref, Return, Static, @@ -601,6 +601,8 @@ pub mod keywords { // Reserved keywords Be, + Pure, + Yield, } impl Keyword { @@ -628,7 +630,6 @@ pub mod keywords { Once => ident { name: 50, ctxt: 0 }, Priv => ident { name: 51, ctxt: 0 }, Pub => ident { name: 52, ctxt: 0 }, - Pure => ident { name: 65, ctxt: 0 }, Ref => ident { name: 53, ctxt: 0 }, Return => ident { name: 54, ctxt: 0 }, Static => ident { name: 27, ctxt: 0 }, @@ -642,6 +643,8 @@ pub mod keywords { Use => ident { name: 61, ctxt: 0 }, While => ident { name: 62, ctxt: 0 }, Be => ident { name: 64, ctxt: 0 }, + Pure => ident { name: 65, ctxt: 0 }, + Yield => ident { name: 66, ctxt: 0 }, } } } @@ -657,7 +660,7 @@ pub fn is_keyword(kw: keywords::Keyword, tok: &Token) -> bool { pub fn is_any_keyword(tok: &Token) -> bool { match *tok { token::IDENT(sid, false) => match sid.name { - 8 | 27 | 32 .. 65 => true, + 8 | 27 | 32 .. 66 => true, _ => false, }, _ => false @@ -677,7 +680,7 @@ pub fn is_strict_keyword(tok: &Token) -> bool { pub fn is_reserved_keyword(tok: &Token) -> bool { match *tok { token::IDENT(sid, false) => match sid.name { - 64 .. 65 => true, + 64 .. 66 => true, _ => false, }, _ => false, |