---

yaml
---
r: 32563
b: refs/heads/dist-snap
c: 3057790
h: refs/heads/master
i:
  32561: a83e0a7
  32559: d78c443
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 287114a3b9ecc2062482271fabe608d8df0f0aa1
+refs/heads/dist-snap: 3057790f4b2b7041f187734040e856d02104ff2e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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",