From 528373b79b63ef9104325bb71cfcf39752352b80 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 9 Sep 2012 16:53:47 -0700
Subject: Turn most contextual keywords into restricted keywords

---
 src/libsyntax/parse/token.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/libsyntax/parse')

diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index cd7f75b15be..aa2c9ab3a5e 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -382,12 +382,7 @@ fn keyword_table() -> hashmap<~str, ()> {
 fn contextual_keyword_table() -> hashmap<~str, ()> {
     let words = str_hash();
     let keys = ~[
-        ~"as",
-        ~"else",
-        ~"move",
-        ~"priv", ~"pub",
         ~"self", ~"static",
-        ~"use"
     ];
     for keys.each |word| {
         words.insert(word, ());
@@ -412,6 +407,7 @@ fn contextual_keyword_table() -> hashmap<~str, ()> {
 fn restricted_keyword_table() -> hashmap<~str, ()> {
     let words = str_hash();
     let keys = ~[
+        ~"as",
         ~"assert",
         ~"break",
         ~"const", ~"copy",
@@ -421,11 +417,11 @@ fn restricted_keyword_table() -> hashmap<~str, ()> {
         ~"if", ~"impl", ~"import",
         ~"let", ~"log", ~"loop",
         ~"match", ~"mod", ~"move", ~"mut",
-        ~"pure",
+        ~"priv", ~"pub", ~"pure",
         ~"ref", ~"return",
         ~"struct",
         ~"true", ~"trait", ~"type",
-        ~"unchecked", ~"unsafe",
+        ~"unchecked", ~"unsafe", ~"use",
         ~"while"
     ];
     for keys.each |word| {
-- 
cgit 1.4.1-3-g733a5