---

yaml
---
r: 13517
b: refs/heads/master
c: d6522ab
h: refs/heads/master
i:
  13515: 76ee1c2
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d906fba63621d049bdbd0fe9478fef383efb2341
+refs/heads/master: d6522ab2d3f7ab03c6d5d93ea196137823d2cfcf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libsyntax/parse/lexer.rs

@@ -45,7 +45,7 @@ fn new_tt_reader(span_diagnostic: diagnostic::span_handler,
               mut cur_tok: token::EOF, /* dummy value, never read */
               mut cur_chpos: 0u /* dummy value, never read */
              };
-    //tt_next_token(r); /* get cur_tok and cur_chpos set up */
+    tt_next_token(r); /* get cur_tok and cur_chpos set up */
     ret r;
 }
 

trunk/src/libsyntax/parse/token.rs

@@ -77,9 +77,25 @@ enum token {
     /* Name components */
     IDENT(str_num, bool),
     UNDERSCORE,
+
+    //ACTUALLY(whole_nonterminal),
+
     EOF,
 }
 
+#[auto_serialize]
+#[doc = "For interpolation during macro expansion."]
+enum whole_nonterminal {
+    w_item(@ast::item),
+    w_block(ast::blk),
+    w_stmt(@ast::stmt),
+    w_pat( @ast::pat),
+    w_expr(@ast::expr),
+    w_ty(  @ast::ty),
+    w_ident(ast::ident),
+    w_path(@ast::path),
+}
+
 fn binop_to_str(o: binop) -> str {
     alt o {
       PLUS { "+" }