bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix some lexer bugs in rustc. Beginning to lex stuff now.

Browse source
This commit is contained in:
Graydon Hoare 2010-08-20 12:12:37 -07:00
parent 1db0cb208d
commit eecd1f47d7
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/comp/fe/lexer.rs
View file

@ -1,7 +1,7 @@
import std._io.stdio_reader; import std._io.stdio_reader;
fn in_range(char c, char lo, char hi) -> bool { fn in_range(char c, char lo, char hi) -> bool {
ret c <= lo && c <= hi; ret lo <= c && c <= hi;
} }
fn is_alpha(char c) -> bool { fn is_alpha(char c) -> bool {
@ -37,12 +37,14 @@ fn next_token(stdio_reader rdr) -> token.token {
} }
if (c == eof) { ret token.EOF(); } if (c == eof) { ret token.EOF(); }
if (is_alpha(c)) { if (is_alpha(c)) {
while (is_alpha(c)) { while (is_alpha(c)) {
accum += (c as u8); accum += (c as u8);
c = rdr.getc() as char; c = rdr.getc() as char;
ret token.IDENT(accum);
} }
rdr.ungetc(c as int);
ret token.IDENT(accum);
} }
if (is_dec_digit(c)) { if (is_dec_digit(c)) {
@ -50,8 +52,10 @@ fn next_token(stdio_reader rdr) -> token.token {
} else { } else {
while (is_dec_digit(c)) { while (is_dec_digit(c)) {
accum += (c as u8); accum += (c as u8);
ret token.LIT_INT(0); c = rdr.getc() as char;
} }
rdr.ungetc(c as int);
ret token.LIT_INT(0);
} }
} }