rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Respect semicolons always when expanding statments.

Browse Source
This commit is contained in:
Paul Stansifer
2012-11-21 18:49:42 -05:00
committed by Graydon Hoare
parent e7f07cb2a3
commit 6174a30d7c
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libsyntax/ext/expand.rs
View File

@@ -1,7 +1,7 @@
use std::map::HashMap; use std::map::HashMap;
use ast::{crate, expr_, expr_mac, mac_invoc, mac_invoc_tt, use ast::{crate, expr_, expr_mac, mac_invoc, mac_invoc_tt,
tt_delim, tt_tok, item_mac, stmt_, stmt_mac}; tt_delim, tt_tok, item_mac, stmt_, stmt_mac, stmt_expr, stmt_semi};
use fold::*; use fold::*;
use ext::base::*; use ext::base::*;
use ext::qquote::{qq_helper}; use ext::qquote::{qq_helper};
@@ -281,16 +281,14 @@ fn expand_stmt(exts: HashMap<~str, syntax_extension>, cx: ext_ctxt,
assert(vec::len(pth.idents) == 1u); assert(vec::len(pth.idents) == 1u);
let extname = cx.parse_sess().interner.get(pth.idents[0]); let extname = cx.parse_sess().interner.get(pth.idents[0]);
match exts.find(*extname) { let (fully_expanded, sp) = match exts.find(*extname) {
None => None =>
cx.span_fatal(pth.span, fmt!("macro undefined: '%s'", *extname)), cx.span_fatal(pth.span, fmt!("macro undefined: '%s'", *extname)),
Some(normal_tt({expander: exp, span: exp_sp})) => { Some(normal_tt({expander: exp, span: exp_sp})) => {
let expanded = match exp(cx, mac.span, tts) { let expanded = match exp(cx, mac.span, tts) {
mr_expr(e) if !semi => mr_expr(e) =>
@{node: ast::stmt_expr(e, cx.next_id()), span: e.span}, @{node: stmt_expr(e, cx.next_id()), span: e.span},
mr_expr(e) if semi =>
@{node: ast::stmt_semi(e, cx.next_id()), span: e.span},
mr_any(_,_,stmt_mkr) => stmt_mkr(), mr_any(_,_,stmt_mkr) => stmt_mkr(),
_ => cx.span_fatal( _ => cx.span_fatal(
pth.span, pth.span,
@@ -303,14 +301,14 @@ fn expand_stmt(exts: HashMap<~str, syntax_extension>, cx: ext_ctxt,
let fully_expanded = fld.fold_stmt(expanded).node; let fully_expanded = fld.fold_stmt(expanded).node;
cx.bt_pop(); cx.bt_pop();
return (fully_expanded, sp) (fully_expanded, sp)
} }
Some(normal({expander: exp, span: exp_sp})) => { Some(normal({expander: exp, span: exp_sp})) => {
//convert the new-style invoc for the old-style macro //convert the new-style invoc for the old-style macro
let arg = base::tt_args_to_original_flavor(cx, pth.span, tts); let arg = base::tt_args_to_original_flavor(cx, pth.span, tts);
let exp_expr = exp(cx, mac.span, arg, None); let exp_expr = exp(cx, mac.span, arg, None);
let expanded = @{node: ast::stmt_expr(exp_expr, cx.next_id()), let expanded = @{node: stmt_expr(exp_expr, cx.next_id()),
span: exp_expr.span}; span: exp_expr.span};
cx.bt_push(ExpandedFrom({call_site: sp, cx.bt_push(ExpandedFrom({call_site: sp,
@@ -325,10 +323,14 @@ fn expand_stmt(exts: HashMap<~str, syntax_extension>, cx: ext_ctxt,
_ => { _ => {
cx.span_fatal(pth.span, cx.span_fatal(pth.span,
fmt!("'%s' is not a tt-style macro", fmt!("'%s' is not a tt-style macro", *extname))
*extname))
}
} }
};
return (match fully_expanded {
stmt_expr(e, stmt_id) if semi => stmt_semi(e, stmt_id),
_ => { fully_expanded } /* might already have a semi */
}, sp)
} }