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

Add test for "malformed macro lhs" and change back span_bug to span_fatal

Browse source
This commit is contained in:
Guillaume Gomez 2016-01-04 01:11:54 +01:00
parent b62289153c
commit 6e68cdfcc2
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/ext/tt/macro_rules.rs
View file

@ -178,7 +178,7 @@ fn generic_extension<'cx>(cx: &'cx ExtCtxt,
for (i, lhs) in lhses.iter().enumerate() { // try each arm's matchers
let lhs_tt = match *lhs {
TokenTree::Delimited(_, ref delim) => &delim.tts[..],
_ => cx.span_bug(sp, "malformed macro lhs")
_ => cx.span_fatal(sp, "malformed macro lhs")
};
match TokenTree::parse(cx, lhs_tt, arg) {
@ -186,7 +186,7 @@ fn generic_extension<'cx>(cx: &'cx ExtCtxt,
let rhs = match rhses[i] {
// ignore delimiters
TokenTree::Delimited(_, ref delimed) => delimed.tts.clone(),
_ => cx.span_bug(sp, "malformed macro rhs"),
_ => cx.span_fatal(sp, "malformed macro rhs"),
};
// rhs has holes ( `$id` and `$(...)` that need filled)
let trncbr = new_tt_reader(&cx.parse_sess().span_diagnostic,