diff options
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/front/ast.rs | 14 | ||||
| -rw-r--r-- | src/comp/middle/typeck.rs | 29 |
2 files changed, 37 insertions, 6 deletions
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 1f123f74..cc7569e1 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -563,6 +563,20 @@ fn is_call_expr(@expr e) -> bool { } } +fn is_constraint_arg(@expr e) -> bool { + alt (e.node) { + case (expr_lit(_,_)) { + ret true; + } + case (expr_path(_, option.some[def](def_local(_)), _)) { + ret true; + } + case (_) { + ret false; + } + } +} + // // Local Variables: // mode: rust diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index fd915108..e693fdf7 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -1964,12 +1964,29 @@ fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr { literals or slots */ alt (e.node) { case (ast.expr_call(?operator, ?operands, _)) { - /* operator must be a pure function */ - /* FIXME: need more checking */ - ret @fold.respan[ast.expr_] - (expr.span, ast.expr_check(expr_t, - plain_ann(fcx.ccx.tcx))); - + alt (operator.node) { + case (ast.expr_path(?oper_name, ?d_id, _)) { + + for (@ast.expr operand in operands) { + if (! ast.is_constraint_arg(operand)) { + fcx.ccx.sess.span_err(expr.span, + "Constraint args must be " + + "slot variables or literals"); + } + } + + /* operator must be a pure function */ + /* FIXME: need more checking */ + ret @fold.respan[ast.expr_] + (expr.span, ast.expr_check(expr_t, + plain_ann(fcx.ccx.tcx))); + } + case (_) { + fcx.ccx.sess.span_err(expr.span, + "In a constraint, expected the constraint name " + + "to be an explicit name"); + } + } } case (_) { fcx.ccx.sess.span_err(expr.span, |