From 0d3400fec27187592791167d391e0ad6a0bfe7ce Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 15 Dec 2010 09:44:48 -0800
Subject: rustc: Lex '_' as an underscore, not as an identifier

---
 src/comp/front/lexer.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/comp')

diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs
index 07efe212..a45b1113 100644
--- a/src/comp/front/lexer.rs
+++ b/src/comp/front/lexer.rs
@@ -416,6 +416,10 @@ impure fn next_token(reader rdr) -> token.token {
             c = rdr.curr();
         }
 
+        if (_str.eq(accum_str, "_")) {
+            ret token.UNDERSCORE;
+        }
+
         auto kwds = rdr.get_keywords();
         if (kwds.contains_key(accum_str)) {
             ret kwds.get(accum_str);
@@ -453,7 +457,6 @@ impure fn next_token(reader rdr) -> token.token {
         case (']') { rdr.bump(); ret token.RBRACKET; }
         case ('@') { rdr.bump(); ret token.AT; }
         case ('#') { rdr.bump(); ret token.POUND; }
-        case ('_') { rdr.bump(); ret token.UNDERSCORE; }
         case ('~') { rdr.bump(); ret token.TILDE; }
 
 
-- 
cgit v1.2.3