Clean up typechecker file, disable all tests that fail under typechecker.

This commit is contained in:
Graydon Hoare 2010-11-19 20:46:04 -08:00
parent 6d92ca64a7
commit 244c59ac20
2 changed files with 14 additions and 16 deletions

View file

@ -517,17 +517,8 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
TEST_XFAILS_SELF := $(filter-out \
$(addprefix test/run-pass/, \
arith-0.rs \
arith-2.rs \
bool-not.rs \
char.rs \
fact.rs \
dead-code-one-arm-if.rs \
deep.rs \
hello.rs \
int.rs \
item-name-overload.rs \
lazy-init.rs \
multiline-comment.rs \
), \
$(wildcard test/*/*.rs test/*/*.rc))

View file

@ -1,7 +1,3 @@
//
// comp/middle/typeck.rs
//
import front.ast;
import front.ast.ann;
import middle.fold;
@ -185,7 +181,8 @@ fn ty_to_str(@ty typ) -> str {
case (ty_fn(?inputs, ?output)) {
auto f = fn_input_to_str;
s = "fn(" + _str.connect(_vec.map[arg,str](f, inputs), ", ") + ")";
s = "fn(" + _str.connect(_vec.map[arg,str](f, inputs),
", ") + ")";
if (output.struct != ty_nil) {
s += " -> " + ty_to_str(output);
}
@ -604,7 +601,7 @@ fn unify(@ty expected, @ty actual) -> unify_result {
auto result = unify_step(expected_output,
actual_output, bindings);
alt (result) {
case (ures_ok(?rty)) {
case (ures_ok(?rty)) {
result_out = rty;
}
@ -722,7 +719,7 @@ fn check_expr(&@env e, &@ty_table locals, @ast.expr expr) -> @ast.expr {
ret @fold.respan[ast.expr_](expr.span,
ast.expr_lit(lit, ast.ann_type(ty)));
}
case (_) {
// TODO
ret expr;
@ -855,3 +852,13 @@ fn check_crate(session.session sess, @ast.crate crate) -> @ast.crate {
ret fold.fold_crate[@env](e, fld, result._0);
}
//
// Local Variables:
// mode: rust
// fill-column: 78;
// indent-tabs-mode: nil
// c-basic-offset: 4
// buffer-file-coding-system: utf-8-unix
// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
// End:
//