diff options
| author | Brian Anderson <andersrb@gmail.com> | 2011-04-21 20:34:04 -0400 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2011-04-21 20:42:26 -0400 |
| commit | 540344acb9ebaa0141e991217c9fd9e2a5ec717a (patch) | |
| tree | 04633c069092e6f36617db6a3f40e73212bc0b1c /src/comp/middle | |
| parent | c78b73b71d82e4f428c60daee892b9d30e0e1029 (diff) | |
| download | rust-540344acb9ebaa0141e991217c9fd9e2a5ec717a.tar.gz rust-540344acb9ebaa0141e991217c9fd9e2a5ec717a.zip | |
Fix the signature of expr_ext
The extension body is just a string, not an expression.
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/fold.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/typestate_check.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index 25617640734..a0f3bc93f95 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 3e67cf2e109..8a6e840a428 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 */ |