syntax: Eliminate token's dependency on lexer

3 files changed, 21 insertions, 17 deletions

diff --git a/src/librustsyntax/parse/comments.rs b/src/librustsyntax/parse/comments.rs
index 5e46162ae98..a21c8183c53 100644
--- a/src/librustsyntax/parse/comments.rs
+++ b/src/librustsyntax/parse/comments.rs
@@ -187,7 +187,7 @@ fn gather_comments_and_literals(cm: codemap::codemap,
             literals += [{lit: s, pos: tok.chpos}];
             log(debug, "tok lit: " + s);
         } else {
-            log(debug, "tok: " + token::to_str(rdr, tok.tok));
+            log(debug, "tok: " + token::to_str(*rdr.interner, tok.tok));
         }
         first_read = false;
     }
diff --git a/src/librustsyntax/parse/parser.rs b/src/librustsyntax/parse/parser.rs
index dc722ce36c1..031b54af3d6 100644
--- a/src/librustsyntax/parse/parser.rs
+++ b/src/librustsyntax/parse/parser.rs
@@ -155,13 +155,17 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
     words
 }
 
+fn token_to_str(reader: reader, token: token::token) -> str {
+    token::to_str(*reader.interner, token)
+}
+
 fn unexpected_last(p: parser, t: token::token) -> ! {
     p.span_fatal(p.last_span,
-                 "unexpected token: '" + token::to_str(p.reader, t) + "'");
+                 "unexpected token: '" + token_to_str(p.reader, t) + "'");
 }
 
 fn unexpected(p: parser) -> ! {
-    p.fatal("unexpected token: '" + token::to_str(p.reader, p.token) + "'");
+    p.fatal("unexpected token: '" + token_to_str(p.reader, p.token) + "'");
 }
 
 fn expect(p: parser, t: token::token) {
@@ -169,9 +173,9 @@ fn expect(p: parser, t: token::token) {
         p.bump();
     } else {
         let mut s: str = "expecting '";
-        s += token::to_str(p.reader, t);
+        s += token_to_str(p.reader, t);
         s += "' but found '";
-        s += token::to_str(p.reader, p.token);
+        s += token_to_str(p.reader, p.token);
         p.fatal(s + "'");
     }
 }
@@ -185,9 +189,9 @@ fn expect_gt(p: parser) {
         p.swap(token::BINOP(token::LSR), p.span.lo + 1u, p.span.hi);
     } else {
         let mut s: str = "expecting ";
-        s += token::to_str(p.reader, token::GT);
+        s += token_to_str(p.reader, token::GT);
         s += ", found ";
-        s += token::to_str(p.reader, p.token);
+        s += token_to_str(p.reader, p.token);
         p.fatal(s);
     }
 }
@@ -200,7 +204,7 @@ fn parse_ident(p: parser) -> ast::ident {
     alt p.token {
       token::IDENT(i, _) { p.bump(); ret p.get_str(i); }
       _ { p.fatal("expecting ident, found "
-                  + token::to_str(p.reader, p.token)); }
+                  + token_to_str(p.reader, p.token)); }
     }
 }
 
@@ -242,7 +246,7 @@ fn eat_word(p: parser, word: str) -> bool {
 fn expect_word(p: parser, word: str) {
     if !eat_word(p, word) {
         p.fatal("expecting " + word + ", found " +
-                    token::to_str(p.reader, p.token));
+                    token_to_str(p.reader, p.token));
     }
 }
 
@@ -1626,7 +1630,7 @@ fn parse_pat(p: parser) -> @ast::pat {
                 p.bump();
                 if p.token != token::RBRACE {
                     p.fatal("expecting }, found " +
-                                token::to_str(p.reader, p.token));
+                                token_to_str(p.reader, p.token));
                 }
                 etc = true;
                 break;
@@ -1926,7 +1930,7 @@ fn parse_block_tail_(p: parser, lo: uint, s: ast::blk_check_mode,
                   t {
                     if stmt_ends_with_semi(*stmt) {
                         p.fatal("expected ';' or '}' after expression but \
-                                 found '" + token::to_str(p.reader, t) +
+                                 found '" + token_to_str(p.reader, t) +
                                 "'");
                     }
                     stmts += [stmt];
@@ -2251,7 +2255,7 @@ fn parse_mod_items(p: parser, term: token::token,
           some(i) { items += [i]; }
           _ {
             p.fatal("expected item but found '" +
-                    token::to_str(p.reader, p.token) + "'");
+                    token_to_str(p.reader, p.token) + "'");
           }
         }
         #debug["parse_mod_items: attrs=%?", attrs];
diff --git a/src/librustsyntax/parse/token.rs b/src/librustsyntax/parse/token.rs
index 94557c123d8..1c0b4721e18 100644
--- a/src/librustsyntax/parse/token.rs
+++ b/src/librustsyntax/parse/token.rs
@@ -1,6 +1,6 @@
 
 import util::interner;
-import lexer::reader;
+import util::interner::interner;
 
 type str_num = uint;
 
@@ -90,7 +90,7 @@ fn binop_to_str(o: binop) -> str {
     }
 }
 
-fn to_str(r: reader, t: token) -> str {
+fn to_str(in: interner<str>, t: token) -> str {
     alt t {
       EQ { ret "="; }
       LT { ret "<"; }
@@ -149,17 +149,17 @@ fn to_str(r: reader, t: token) -> str {
         ret uint::to_str(u as uint, 10u) + ast_util::uint_ty_to_str(t);
       }
       LIT_FLOAT(s, t) {
-        ret interner::get::<str>(*r.interner, s) +
+        ret interner::get::<str>(in, s) +
             ast_util::float_ty_to_str(t);
       }
       LIT_STR(s) { // FIXME: escape.
-        ret "\"" + interner::get::<str>(*r.interner, s) + "\"";
+        ret "\"" + interner::get::<str>(in, s) + "\"";
       }
       LIT_BOOL(b) { if b { ret "true"; } else { ret "false"; } }
 
       /* Name components */
       IDENT(s, _) {
-        ret interner::get::<str>(*r.interner, s);
+        ret interner::get::<str>(in, s);
       }
       IDX(i) { ret "_" + int::to_str(i, 10u); }
       UNDERSCORE { ret "_"; }