return e;
}
let extname = &pth.segments[0].identifier;
- let extnamestr = ident_to_str(extname);
+ let extnamestr = token::get_ident(extname.name);
// leaving explicit deref here to highlight unbox op:
let marked_after = match fld.extsbox.find(&extname.name) {
None => {
fld.cx.span_err(
pth.span,
- format!("macro undefined: '{}'", extnamestr));
+ format!("macro undefined: '{}'",
+ extnamestr.get()));
// let compilation continue
return e;
fld.cx.bt_push(ExpnInfo {
call_site: e.span,
callee: NameAndSpan {
- name: extnamestr,
+ name: extnamestr.get().to_str(),
format: MacroBang,
span: exp_span,
},
pth.span,
format!(
"non-expr macro in expr pos: {}",
- extnamestr
+ extnamestr.get()
)
);
return e;
_ => {
fld.cx.span_err(
pth.span,
- format!("'{}' is not a tt-style macro", extnamestr)
+ format!("'{}' is not a tt-style macro",
+ extnamestr.get())
);
return e;
}
fld.cx.bt_push(ExpnInfo {
call_site: attr.span,
callee: NameAndSpan {
- name: mname.get().to_managed(),
+ name: mname.get().to_str(),
format: MacroAttribute,
span: None
}
};
let extname = &pth.segments[0].identifier;
- let extnamestr = ident_to_str(extname);
+ let extnamestr = token::get_ident(extname.name);
let fm = fresh_mark();
let expanded = match fld.extsbox.find(&extname.name) {
None => {
fld.cx.span_err(pth.span,
- format!("macro undefined: '{}!'", extnamestr));
+ format!("macro undefined: '{}!'",
+ extnamestr.get()));
// let compilation continue
return SmallVector::zero();
}
if it.ident.name != parse::token::special_idents::invalid.name {
fld.cx.span_err(pth.span,
format!("macro {}! expects no ident argument, \
- given '{}'", extnamestr,
+ given '{}'",
+ extnamestr.get(),
ident_to_str(&it.ident)));
return SmallVector::zero();
}
fld.cx.bt_push(ExpnInfo {
call_site: it.span,
callee: NameAndSpan {
- name: extnamestr,
+ name: extnamestr.get().to_str(),
format: MacroBang,
span: span
}
Some(&IdentTT(ref expander, span)) => {
if it.ident.name == parse::token::special_idents::invalid.name {
fld.cx.span_err(pth.span,
- format!("macro {}! expects an ident argument", extnamestr));
+ format!("macro {}! expects an ident argument",
+ extnamestr.get()));
return SmallVector::zero();
}
fld.cx.bt_push(ExpnInfo {
call_site: it.span,
callee: NameAndSpan {
- name: extnamestr,
+ name: extnamestr.get().to_str(),
format: MacroBang,
span: span
}
expander.expand(fld.cx, it.span, it.ident, marked_tts)
}
_ => {
- fld.cx.span_err(it.span, format!("{}! is not legal in item position", extnamestr));
+ fld.cx.span_err(it.span,
+ format!("{}! is not legal in item position",
+ extnamestr.get()));
return SmallVector::zero();
}
};
.collect()
}
MRExpr(_) => {
- fld.cx.span_err(pth.span, format!("expr macro in item position: {}", extnamestr));
+ fld.cx.span_err(pth.span,
+ format!("expr macro in item position: {}",
+ extnamestr.get()));
return SmallVector::zero();
}
MRAny(any_macro) => {
return SmallVector::zero();
}
let extname = &pth.segments[0].identifier;
- let extnamestr = ident_to_str(extname);
+ let extnamestr = token::get_ident(extname.name);
let marked_after = match fld.extsbox.find(&extname.name) {
None => {
- fld.cx.span_err(pth.span, format!("macro undefined: '{}'", extnamestr));
+ fld.cx.span_err(pth.span, format!("macro undefined: '{}'",
+ extnamestr.get()));
return SmallVector::zero();
}
fld.cx.bt_push(ExpnInfo {
call_site: s.span,
callee: NameAndSpan {
- name: extnamestr,
+ name: extnamestr.get().to_str(),
format: MacroBang,
span: exp_span,
}
MRAny(any_macro) => any_macro.make_stmt(),
_ => {
fld.cx.span_err(pth.span,
- format!("non-stmt macro in stmt pos: {}", extnamestr));
+ format!("non-stmt macro in stmt pos: {}",
+ extnamestr.get()));
return SmallVector::zero();
}
};
}
_ => {
- fld.cx.span_err(pth.span, format!("'{}' is not a tt-style macro", extnamestr));
+ fld.cx.span_err(pth.span, format!("'{}' is not a tt-style macro",
+ extnamestr.get()));
return SmallVector::zero();
}
};