diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-12 15:22:34 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-12 15:22:34 -0700 |
| commit | 3057790f4b2b7041f187734040e856d02104ff2e (patch) | |
| tree | 0a542f1848eb000215cdafc04dc61974c7c8a6ce /src/libsyntax/parse/token.rs | |
| parent | 287114a3b9ecc2062482271fabe608d8df0f0aa1 (diff) | |
| download | rust-3057790f4b2b7041f187734040e856d02104ff2e.tar.gz rust-3057790f4b2b7041f187734040e856d02104ff2e.zip | |
Rename 'contextual' keywords to 'temporary'
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 1beabe81bb4..7ad5c98b498 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -362,15 +362,15 @@ fn mk_fake_ident_interner() -> ident_interner { /** * All the valid words that have meaning in the Rust language. * - * Rust keywords are either 'contextual', 'restricted', or 'strict'. - * Contextual keywords may be used as identifiers because their appearance in - * the grammar is unambiguous. Restricted keywords may not appear in positions - * that might otherwise contain _value identifiers_. Strict keywords may not - * appear as identifiers. + * Rust keywords are either 'temporary', 'restricted', or 'strict'. Temporary + * keywords are contextual and may be used as identifiers anywhere. They are + * expected to disappear from the grammar soon. Restricted keywords may not + * appear in positions that might otherwise contain _value identifiers_. + * Strict keywords may not appear as identifiers at all. */ fn keyword_table() -> HashMap<~str, ()> { let keywords = str_hash(); - for contextual_keyword_table().each_key |word| { + for temporary_keyword_table().each_key |word| { keywords.insert(word, ()); } for restricted_keyword_table().each_key |word| { @@ -386,7 +386,7 @@ fn keyword_table() -> HashMap<~str, ()> { } /// Keywords that may be used as identifiers -fn contextual_keyword_table() -> HashMap<~str, ()> { +fn temporary_keyword_table() -> HashMap<~str, ()> { let words = str_hash(); let keys = ~[ ~"self", ~"static", |
