diff options
| author | Brian Anderson <[email protected]> | 2011-04-21 20:34:04 -0400 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-04-21 20:42:26 -0400 |
| commit | 540344acb9ebaa0141e991217c9fd9e2a5ec717a (patch) | |
| tree | 04633c069092e6f36617db6a3f40e73212bc0b1c | |
| parent | test: Un-XFAIL drop-parametric-closure-with-bound-box.rs, oops. (diff) | |
| download | rust-540344acb9ebaa0141e991217c9fd9e2a5ec717a.tar.xz rust-540344acb9ebaa0141e991217c9fd9e2a5ec717a.zip | |
Fix the signature of expr_ext
The extension body is just a string, not an expression.
| -rw-r--r-- | src/comp/front/ast.rs | 2 | ||||
| -rw-r--r-- | src/comp/front/extfmt.rs | 2 | ||||
| -rw-r--r-- | src/comp/front/parser.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/fold.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/typestate_check.rs | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 882b70a4..95522c0c 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -275,7 +275,7 @@ tag expr_ { expr_field(@expr, ident, ann); expr_index(@expr, @expr, ann); expr_path(path, option.t[def], ann); - expr_ext(path, vec[@expr], option.t[@expr], @expr, ann); + expr_ext(path, vec[@expr], option.t[str], @expr, ann); expr_fail(ann); expr_break(ann); expr_cont(ann); diff --git a/src/comp/front/extfmt.rs b/src/comp/front/extfmt.rs index e8f0c252..39c074c3 100644 --- a/src/comp/front/extfmt.rs +++ b/src/comp/front/extfmt.rs @@ -46,7 +46,7 @@ export expand_syntax_ext; // FIXME: Need to thread parser through here to handle errors correctly fn expand_syntax_ext(vec[@ast.expr] args, - option.t[@ast.expr] body) -> @ast.expr { + option.t[str] body) -> @ast.expr { if (_vec.len[@ast.expr](args) == 0u) { log_err "malformed #fmt call"; diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 26d3b89d..fdd41cf0 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -794,7 +794,7 @@ fn parse_bottom_expr(parser p) -> @ast.expr { pf, p); hi = es.span.hi; ex = expand_syntax_ext(p, es.span, pth, es.node, - none[@ast.expr]); + none[str]); } case (token.FAIL) { @@ -935,7 +935,7 @@ fn parse_bottom_expr(parser p) -> @ast.expr { fn expand_syntax_ext(parser p, ast.span sp, &ast.path path, vec[@ast.expr] args, - option.t[@ast.expr] body) -> ast.expr_ { + option.t[str] body) -> ast.expr_ { check (_vec.len[ast.ident](path.node.idents) > 0u); auto extname = path.node.idents.(0); diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index 25617640..a0f3bc93 100644 --- a/src/comp/middle/fold.rs +++ b/src/comp/middle/fold.rs @@ -173,7 +173,7 @@ type ast_fold[ENV] = (fn(&ENV e, &span sp, &path p, vec[@expr] args, - option.t[@expr] body, + option.t[str] body, @expr expanded, ann a) -> @expr) fold_expr_ext, @@ -1343,7 +1343,7 @@ fn identity_fold_expr_path[ENV](&ENV env, &span sp, fn identity_fold_expr_ext[ENV](&ENV env, &span sp, &path p, vec[@expr] args, - option.t[@expr] body, + option.t[str] body, @expr expanded, ann a) -> @expr { ret @respan(sp, ast.expr_ext(p, args, body, expanded, a)); diff --git a/src/comp/middle/typestate_check.rs b/src/comp/middle/typestate_check.rs index 3e67cf2e..8a6e840a 100644 --- a/src/comp/middle/typestate_check.rs +++ b/src/comp/middle/typestate_check.rs @@ -1922,9 +1922,9 @@ fn annotate_expr(&fn_info_map fm, &@expr e) -> @expr { case (expr_path(_,_,_)) { /* no change */ } - case (expr_ext(?p, ?es, ?e_opt, ?e, ?a)) { + case (expr_ext(?p, ?es, ?s_opt, ?e, ?a)) { e1 = expr_ext(p, annotate_exprs(fm, es), - annotate_option_exp(fm, e_opt), + s_opt, annotate_expr(fm, e), a); } /* no change, next 3 cases */ |