aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-11-22 11:35:00 -0800
committerGraydon Hoare <[email protected]>2010-11-22 11:35:00 -0800
commitccc21fd4da49ed819d95eaea6599538071947cd4 (patch)
tree4b1e8d383bf9e355bef2b33b6f5323feb97f4a72 /src
parentMore typeck hacking, check if and call exprs, enable fact and deep tests. (diff)
downloadrust-ccc21fd4da49ed819d95eaea6599538071947cd4.tar.xz
rust-ccc21fd4da49ed819d95eaea6599538071947cd4.zip
Fix lexer bug, enable 5 more tests on rustc.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile5
-rw-r--r--src/comp/front/lexer.rs2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 0b1f95a4..a0c08f0d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -518,17 +518,22 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
TEST_XFAILS_SELF := $(filter-out \
$(addprefix test/run-pass/, \
arith-0.rs \
+ arith-1.rs \
arith-2.rs \
bool-not.rs \
char.rs \
dead-code-one-arm-if.rs \
deep.rs \
+ div-mod.rs \
fact.rs \
hello.rs \
int.rs \
item-name-overload.rs \
lazy-init.rs \
multiline-comment.rs \
+ return-nil.rs \
+ unit.rs \
+ while-and-do-while.rs \
), \
$(wildcard test/*/*.rs test/*/*.rc))
diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs
index d2f308e3..38e9367f 100644
--- a/src/comp/front/lexer.rs
+++ b/src/comp/front/lexer.rs
@@ -572,7 +572,7 @@ impure fn next_token(reader rdr) -> token.token {
}
case ('/') {
- ret binop(rdr, token.STAR);
+ ret binop(rdr, token.SLASH);
}
case ('^') {