diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-03-08 18:32:03 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-03-11 23:19:42 -0700 |
| commit | 9c7e16e48d15b3380cc680f6194fe3516867d2db (patch) | |
| tree | bf5fdfb45faa8e8f1023ad46f53c8063245257ef /src/libsyntax/parse | |
| parent | cb37d09f50e6e1ac50eee35b0874167f0119c114 (diff) | |
| download | rust-9c7e16e48d15b3380cc680f6194fe3516867d2db.tar.gz rust-9c7e16e48d15b3380cc680f6194fe3516867d2db.zip | |
Remove the log keyword (by renaming it to __log)
We can't quite remove logging from the language, but this hides the keyword.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 99c1c2cb1fe..7d3f5c12612 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1184,7 +1184,7 @@ pub impl Parser { } } hi = self.span.hi; - } else if self.eat_keyword(&~"log") { + } else if self.eat_keyword(&~"__log") { self.expect(&token::LPAREN); let lvl = self.parse_expr(); self.expect(&token::COMMA); diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 81aacbf173d..c41b3aec09b 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -495,7 +495,7 @@ pub fn strict_keyword_table() -> HashMap<~str, ()> { ~"else", ~"enum", ~"extern", ~"false", ~"fn", ~"for", ~"if", ~"impl", - ~"let", ~"log", ~"loop", + ~"let", ~"__log", ~"loop", ~"match", ~"mod", ~"mut", ~"once", ~"priv", ~"pub", ~"pure", |