---

yaml
---
r: 22690
b: refs/heads/master
c: e20c5e7
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f785cccf0f9a4ea90b7cb752ec12ba749621a86e
+refs/heads/master: e20c5e759687ce26a4579c00ee5edabfea9e8fd9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/ext/tt/earley_parser.rs

@@ -232,9 +232,11 @@ fn parse(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, ms: ~[matcher])
             if (bb_eis.len() > 0u && next_eis.len() > 0u)
                 || bb_eis.len() > 1u {
                 let nts = str::connect(vec::map(bb_eis, |ei| {
-                    alt ei.elts[ei.idx].node
-                        { mtc_bb(_,name,_) { *name } _ { fail; } }
-                }), ~" or ");
+                    alt ei.elts[ei.idx].node {
+                      mtc_bb(bind,name,_) {
+                        #fmt["%s ('%s')", *name, *bind]
+                      }
+                      _ { fail; } } }), ~" or ");
                 ret failure(sp, #fmt[
                     "Local ambiguity: multiple parsing options: \
                      built-in NTs %s or %u other options.",