diff options
| -rw-r--r-- | src/comp/middle/fold.rs | 2 | ||||
| -rw-r--r-- | src/comp/middle/typeck.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index 203b8fda..8ec0bd2f 100644 --- a/src/comp/middle/fold.rs +++ b/src/comp/middle/fold.rs @@ -404,7 +404,7 @@ fn fold_expr[ENV](&ENV env, ast_fold[ENV] fld, &@expr e) -> @expr { case (ast.expr_unary(?op, ?a, ?t)) { auto aa = fold_expr(env_, fld, a); - ret fld.fold_expr_unary(env_, e.span, op, a, t); + ret fld.fold_expr_unary(env_, e.span, op, aa, t); } case (ast.expr_lit(?lit, ?t)) { diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index 7f427c32..d7df7616 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -271,6 +271,7 @@ fn ast_ty_to_ty(ty_getter getter, &@ast.ty ast_ty) -> @ty { case (ast.ty_path(?path, ?def)) { auto def_id; + check (def != none[ast.def]); alt (option.get[ast.def](def)) { case (ast.def_ty(?id)) { def_id = id; } case (_) { fail; } @@ -1247,6 +1248,7 @@ fn check_expr(&fn_ctxt fcx, @ast.expr expr) -> @ast.expr { case (ast.expr_name(?name, ?defopt, _)) { auto t = plain_ty(ty_nil); + check (defopt != none[ast.def]); alt (option.get[ast.def](defopt)) { case (ast.def_arg(?id)) { check (fcx.locals.contains_key(id)); |