aboutsummaryrefslogtreecommitdiff
path: root/src/comp
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-12-15 09:44:48 -0800
committerPatrick Walton <[email protected]>2010-12-15 09:44:48 -0800
commit0d3400fec27187592791167d391e0ad6a0bfe7ce (patch)
treecedfeb94911944dad851c23f7ecbe22faa92820d /src/comp
parentrustc: Translate pattern matching (diff)
downloadrust-0d3400fec27187592791167d391e0ad6a0bfe7ce.tar.xz
rust-0d3400fec27187592791167d391e0ad6a0bfe7ce.zip
rustc: Lex '_' as an underscore, not as an identifier
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/front/lexer.rs5
1 files changed, 4 insertions, 1 deletions
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; }