about summary refs log tree commit diff
path: root/src/grammar
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-10-28 02:01:44 +1100
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-10-28 15:55:37 +1100
commitcd049591a25973cd41ca5b69e7a151ae5fa0b71f (patch)
treee2c5dc3408d805d9bb4a2cfa0b4cdb0d64080749 /src/grammar
parentfcb78d65f2a3b553b9aaca762910daf10fbb1dce (diff)
downloadrust-cd049591a25973cd41ca5b69e7a151ae5fa0b71f.tar.gz
rust-cd049591a25973cd41ca5b69e7a151ae5fa0b71f.zip
Use an enum rather than a bool in token::Ident
Diffstat (limited to 'src/grammar')
-rw-r--r--src/grammar/verify.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/grammar/verify.rs b/src/grammar/verify.rs
index 16abf5160fa..fef7d3510e7 100644
--- a/src/grammar/verify.rs
+++ b/src/grammar/verify.rs
@@ -35,7 +35,7 @@ use syntax::parse::lexer::TokenAndSpan;
 
 fn parse_token_list(file: &str) -> HashMap<String, Token> {
     fn id() -> Token {
-        token::Ident(ast::Ident { name: Name(0), ctxt: 0, }, false)
+        token::Ident(ast::Ident { name: Name(0), ctxt: 0, }, token::Plain)
     }
 
     let mut res = HashMap::new();
@@ -198,7 +198,8 @@ fn parse_antlr_token(s: &str, tokens: &HashMap<String, Token>) -> TokenAndSpan {
         token::LitFloat(..)        => token::LitFloat(nm),
         token::LitBinary(..)       => token::LitBinary(nm),
         token::LitBinaryRaw(..)    => token::LitBinaryRaw(fix(content), count(content)),
-        token::Ident(..)           => token::Ident(ast::Ident { name: nm, ctxt: 0 }, true),
+        token::Ident(..)           => token::Ident(ast::Ident { name: nm, ctxt: 0 },
+                                                   token::ModName),
         token::Lifetime(..)        => token::Lifetime(ast::Ident { name: nm, ctxt: 0 }),
         ref t => t.clone()
     };