diff options
| author | Graydon Hoare <[email protected]> | 2011-03-14 16:59:04 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-03-14 16:59:04 -0700 |
| commit | 7f5bffc3ea8545be1916dd089e4f25a360c83950 (patch) | |
| tree | 877d7e430339360c8645a1983707d04088d1cba2 /src/comp/front/eval.rs | |
| parent | Rename check_assignment_like to check_assignment since it turned out not to b... (diff) | |
| parent | Merge branch 'master' into recursive-elseif (diff) | |
| download | rust-7f5bffc3ea8545be1916dd089e4f25a360c83950.tar.xz rust-7f5bffc3ea8545be1916dd089e4f25a360c83950.zip | |
Merge remote branch 'brson/recursive-elseif'
Diffstat (limited to 'src/comp/front/eval.rs')
| -rw-r--r-- | src/comp/front/eval.rs | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs index 77f3acd1..ac249848 100644 --- a/src/comp/front/eval.rs +++ b/src/comp/front/eval.rs @@ -289,7 +289,7 @@ impure fn eval_crate_directive_expr(parser p, alt (x.node) { - case (ast.expr_if(?cond, ?thn, ?elifs, ?elopt, _)) { + case (ast.expr_if(?cond, ?thn, ?elopt, _)) { auto cv = eval_expr(sess, e, cond); if (!val_is_bool(cv)) { sess.span_err(x.span, "bad cond type in 'if'"); @@ -301,24 +301,11 @@ impure fn eval_crate_directive_expr(parser p, index); } - for (tup(@ast.expr, ast.block) elif in elifs) { - auto cv = eval_expr(sess, e, elif._0); - if (!val_is_bool(cv)) { - sess.span_err(x.span, "bad cond type in 'else if'"); - } - - if (val_as_bool(cv)) { - ret eval_crate_directive_block(p, e, elif._1, prefix, - view_items, items, - index); - } - } - alt (elopt) { - case (some[ast.block](?els)) { - ret eval_crate_directive_block(p, e, els, prefix, - view_items, items, - index); + case (some[@ast.expr](?els)) { + ret eval_crate_directive_expr(p, e, els, prefix, + view_items, items, + index); } case (_) { // Absent-else is ok. @@ -353,6 +340,12 @@ impure fn eval_crate_directive_expr(parser p, sess.span_err(x.span, "no cases matched in 'alt'"); } + case (ast.expr_block(?block, _)) { + ret eval_crate_directive_block(p, e, block, prefix, + view_items, items, + index); + } + case (_) { sess.span_err(x.span, "unsupported expr type"); } |