---

yaml
---
r: 13511
b: refs/heads/master
c: d619e89
h: refs/heads/master
i:
  13509: 8a4339b
  13507: cd21572
  13503: cb66784
v: v3

Author: paulstansifer

[refs]

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

trunk/src/libsyntax/parse/lexer.rs

@@ -1,6 +1,7 @@
 import util::interner;
 import util::interner::intern;
 import diagnostic;
+import ast::{tt_delim,tt_flat};
 
 export reader, string_reader, new_string_reader, is_whitespace;
 export nextch, is_eof, bump, get_str_from;
@@ -14,6 +15,26 @@ iface reader {
     fn interner() -> @interner::interner<@str>;
 }
 
+enum tt_frame_up { /* to break a circularity */
+    tt_frame_up(option<tt_frame>)
+}
+
+type tt_frame = @{
+    /* invariant: readme[idx] is always a tt_flat */
+    readme: [ast::token_tree],
+    mut idx: uint,
+    up: tt_frame_up
+};
+
+type tt_reader = @{
+    mut cur: tt_frame,
+    interner: @interner::interner<@str>,
+    span_diagnostic: diagnostic::span_handler,
+    /* cached: */
+    mut cur_tok: token::token,
+    mut cur_chpos: uint
+};
+
 type string_reader = @{
     span_diagnostic: diagnostic::span_handler,
     src: @str,
@@ -39,13 +60,56 @@ impl string_reader_as_reader of reader for string_reader {
     }
     fn fatal(m: str) -> ! {
         self.span_diagnostic.span_fatal(
-            ast_util::mk_sp(self.chpos, self.chpos),
-            m)
+            ast_util::mk_sp(self.chpos, self.chpos), m)
     }
     fn chpos() -> uint { self.chpos }
     fn interner() -> @interner::interner<@str> { self.interner }
 }
 
+impl tt_reader_as_reader of reader for tt_reader {
+    fn is_eof() -> bool { self.cur_tok == token::EOF }
+    fn next_token() -> {tok: token::token, chpos: uint} {
+        let ret_val = { tok: self.cur_tok, chpos: self.cur_chpos };
+        self.cur.idx += 1u;
+        if self.cur.idx >= vec::len(self.cur.readme) {
+            /* done with this set; pop */
+            alt self.cur.up {
+              tt_frame_up(option::none) {
+                self.cur_tok = token::EOF;
+                ret ret_val;
+              }
+              tt_frame_up(option::some(tt_f)) {
+                self.cur = tt_f;
+                /* the above `if` would need to be a `while` if we didn't know
+                that the last thing in a `tt_delim` is always a `tt_flat` */
+                self.cur.idx += 1u;
+              }
+            }
+        }
+        /* if `tt_delim`s could be 0-length, we'd need to be able to switch
+        between popping and pushing until we got to an actual `tt_flat` */
+        loop { /* because it's easiest, this handles `tt_delim` not starting
+                  with a `tt_flat`, even though it won't happen */
+            alt self.cur.readme[self.cur.idx] {
+              tt_delim(tts) {
+                self.cur = @{readme: tts, mut idx: 0u,
+                             up: tt_frame_up(option::some(self.cur)) };
+              }
+              tt_flat(chpos, tok) {
+                self.cur_chpos = chpos; self.cur_tok = tok;
+                ret ret_val;
+              }
+          }
+        }
+    }
+    fn fatal(m: str) -> ! {
+        self.span_diagnostic.span_fatal(
+            ast_util::mk_sp(self.chpos(), self.chpos()), m);
+    }
+    fn chpos() -> uint { self.cur_chpos }
+    fn interner() -> @interner::interner<@str> { self.interner }
+}
+
 fn get_str_from(rdr: string_reader, start: uint) -> str unsafe {
     // I'm pretty skeptical about this subtraction. What if there's a
     // multi-byte character before the mark?