---

yaml
---
r: 39158
b: refs/heads/incoming
c: 9ff8d18
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: a88f9ac732e5674404103b7c975f0dba845d79a6
+refs/heads/incoming: 9ff8d1876630e7e3d1b0eef6c0c51610a19c4b98
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ext/trace_macros.rs

@@ -15,12 +15,16 @@ fn expand_trace_macros(cx: ext_ctxt, sp: span,
     let rdr = tt_rdr as reader;
     let rust_parser = Parser(sess, cfg, rdr.dup());
 
-    let arg = cx.str_of(rust_parser.parse_ident());
-    match arg {
-      ~"true"  => cx.set_trace_macros(true),
-      ~"false" => cx.set_trace_macros(false),
-      _ => cx.span_fatal(sp, ~"trace_macros! only accepts `true` or `false`")
+    if rust_parser.is_keyword(~"true") {
+        cx.set_trace_macros(true);
+    } else if rust_parser.is_keyword(~"false") {
+        cx.set_trace_macros(false);
+    } else {
+        cx.span_fatal(sp, ~"trace_macros! only accepts `true` or `false`")
     }
+
+    rust_parser.bump();
+
     let rust_parser = Parser(sess, cfg, rdr.dup());
     let result = rust_parser.parse_expr();
     base::mr_expr(result)