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

Fix ICE in macros

Browse source
This commit is contained in:
Corey Richardson 2013-05-22 14:21:09 -04:00
parent b6a0d40c1d
commit 7ccc97e5b4
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libsyntax/ext/tt/transcribe.rs
View file

@ -118,10 +118,13 @@ fn lookup_cur_matched_by_matched(r: &mut TtReader,
}
fn lookup_cur_matched(r: &mut TtReader, name: ident) -> @named_match {
// FIXME (#3850): this looks a bit silly with an extra scope.
let start;
{ start = *r.interpolations.get(&name); }
return lookup_cur_matched_by_matched(r, start);
match r.interpolations.find_copy(&name) {
Some(s) => lookup_cur_matched_by_matched(r, s),
None => {
r.sp_diag.span_fatal(r.cur_span, fmt!("unknown macro variable `%s`",
*r.interner.get(name)));
}
}
}
enum lis {
lis_unconstrained, lis_constraint(uint, ident), lis_contradiction(~str)