user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better error message for macros with MOD_SEPs

Browse source
This commit is contained in:
John Clements 2013-03-04 13:58:31 -08:00
parent dd34178b4b
commit 4f3a968f91
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libsyntax/ext/expand.rs
View file

@ -38,10 +38,14 @@ pub fn expand_expr(extsbox: @mut SyntaxEnv,
// entry-point for all syntax extensions.
expr_mac(ref mac) => {
match (*mac).node {
// Token-tree macros, these will be the only case when we're
// finished transitioning.
// Token-tree macros:
mac_invoc_tt(pth, ref tts) => {
assert (vec::len(pth.idents) == 1u);
if (pth.idents.len() > 1u) {
cx.span_fatal(
pth.span,
fmt!("expected macro name without module \
separators, got: '%?'",pth));
}
/* using idents and token::special_idents would make the
the macro names be hygienic */
let extname = cx.parse_sess().interner.get(pth.idents[0]);
@ -320,8 +324,12 @@ pub fn expand_stmt(extsbox: @mut SyntaxEnv,
}
_ => return orig(s, sp, fld)
};
assert(vec::len(pth.idents) == 1u);
if (pth.idents.len() > 1u) {
cx.span_fatal(
pth.span,
fmt!("expected macro name without module \
separators, got: '%?'",pth));
}
let extname = cx.parse_sess().interner.get(pth.idents[0]);
let (fully_expanded, sp) = match (*extsbox).find(&extname) {
None =>