Convert parser to istrs. Issue #855

5 files changed, 219 insertions, 211 deletions

diff --git a/src/comp/syntax/codemap.rs b/src/comp/syntax/codemap.rs
index d9aff69acfa..2ef4e3b2caa 100644
--- a/src/comp/syntax/codemap.rs
+++ b/src/comp/syntax/codemap.rs
@@ -8,7 +8,7 @@ import std::option;
 import std::option::some;
 import std::option::none;
 
-type filename = str;
+type filename = istr;
 
 type file_pos = {ch: uint, byte: uint};
 
@@ -84,7 +84,9 @@ fn span_to_str(sp: &span, cm: &codemap) -> str {
             #fmt["%s:%u:%u: %u:%u",
                  if some(lo.filename) == prev_file {
                      "-"
-                 } else { lo.filename }, lo.line, lo.col, hi.line, hi.col];
+                 } else {
+                     istr::to_estr(lo.filename)
+                 }, lo.line, lo.col, hi.line, hi.col];
         alt cur.expanded_from {
           os_none. { break; }
           os_some(new_sp) {
@@ -146,14 +148,16 @@ fn maybe_highlight_lines(sp: &option::t<span>, cm: &codemap,
         // Print the offending lines
         for line: uint in display_lines {
             io::stdout().write_str(
-                istr::from_estr(#fmt["%s:%u ", fm.name, line + 1u]));
+                istr::from_estr(#fmt["%s:%u ",
+                                     istr::to_estr(fm.name), line + 1u]));
             let s = get_line(fm, line as int, file);
             if !str::ends_with(s, "\n") { s += "\n"; }
             io::stdout().write_str(istr::from_estr(s));
         }
         if elided {
             let last_line = display_lines[vec::len(display_lines) - 1u];
-            let s = #fmt["%s:%u ", fm.name, last_line + 1u];
+            let s = #fmt["%s:%u ",
+                         istr::to_estr(fm.name), last_line + 1u];
             let indent = str::char_len(s);
             let out = ~"";
             while indent > 0u { out += ~" "; indent -= 1u; }
@@ -172,7 +176,7 @@ fn maybe_highlight_lines(sp: &option::t<span>, cm: &codemap,
             while num > 0u { num /= 10u; digits += 1u; }
 
             // indent past |name:## | and the 0-offset column location
-            let left = str::char_len(fm.name) + digits + lo.col + 3u;
+            let left = istr::char_len(fm.name) + digits + lo.col + 3u;
             let s = "";
             while left > 0u { str::push_char(s, ' '); left -= 1u; }
 
@@ -209,7 +213,7 @@ fn span_to_lines(sp: span, cm: codemap::codemap) -> @file_lines {
     for each i: uint in uint::range(lo.line - 1u, hi.line as uint) {
         lines += [i];
     }
-    ret @{name: lo.filename, lines: lines};
+    ret @{name: istr::to_estr(lo.filename), lines: lines};
 }
 
 fn get_line(fm: filemap, line: int, file: &str) -> str {
@@ -230,7 +234,9 @@ fn get_line(fm: filemap, line: int, file: &str) -> str {
 }
 
 fn get_filemap(cm: codemap, filename: str) -> filemap {
-    for fm: filemap in cm.files { if fm.name == filename { ret fm; } }
+    for fm: filemap in cm.files {
+        if fm.name == istr::from_estr(filename) { ret fm; }
+    }
     //XXjdm the following triggers a mismatched type bug
     //      (or expected function, found _|_)
     fail; // ("asking for " + filename + " which we don't know about");
diff --git a/src/comp/syntax/ext/base.rs b/src/comp/syntax/ext/base.rs
index d9cdb54ad30..15c5de6ab4c 100644
--- a/src/comp/syntax/ext/base.rs
+++ b/src/comp/syntax/ext/base.rs
@@ -93,7 +93,8 @@ fn mk_ctxt(sess: &session) -> ext_ctxt {
     // super-ugly and needs a better solution.
     let crate_file_name_hack = sess.get_codemap().files[0].name;
 
-    ret ext_ctxt(@sess, crate_file_name_hack, codemap::os_none);
+    ret ext_ctxt(@sess, istr::to_estr(crate_file_name_hack),
+                 codemap::os_none);
 }
 
 fn expr_to_str(cx: &ext_ctxt, expr: @ast::expr, error: str) -> str {
diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs
index 04fffb70c37..1a4b3c9c29f 100644
--- a/src/comp/syntax/parse/eval.rs
+++ b/src/comp/syntax/parse/eval.rs
@@ -51,7 +51,7 @@ fn eval_crate_directive(cx: ctx, cdir: @ast::crate_directive, prefix: &istr,
         let file_path = id + ~".rs";
         alt file_opt {
           some(f) {
-            file_path = istr::from_estr(f);
+            file_path = f;
           }
           none. { }
         }
@@ -63,7 +63,7 @@ fn eval_crate_directive(cx: ctx, cdir: @ast::crate_directive, prefix: &istr,
         if cx.mode == mode_depend { cx.deps += [full_path]; ret; }
         let p0 =
             new_parser_from_file(cx.sess, cx.cfg,
-                                 istr::to_estr(full_path), cx.chpos,
+                                 full_path, cx.chpos,
                                  cx.byte_pos, SOURCE_FILE);
         let inner_attrs = parse_inner_attrs_and_next(p0);
         let mod_attrs = attrs + inner_attrs.inner;
@@ -82,7 +82,7 @@ fn eval_crate_directive(cx: ctx, cdir: @ast::crate_directive, prefix: &istr,
         let path = id;
         alt dir_opt {
           some(d) {
-            path = istr::from_estr(d);
+            path = d;
           }
           none. { }
         }
diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs
index 8f0aeeeb4ec..d1cec447d9f 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/comp/syntax/parse/lexer.rs
@@ -728,7 +728,7 @@ fn gather_comments_and_literals(cm: &codemap::codemap, path: &istr,
     let itr = @interner::mk::<istr>(istr::hash, istr::eq);
     let rdr = new_reader(cm, src,
                          codemap::new_filemap(
-                             istr::to_estr(path), 0u, 0u), itr);
+                             path, 0u, 0u), itr);
     let comments: [cmnt] = [];
     let literals: [lit] = [];
     let first_read: bool = true;
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 2ae591de181..288f11ad797 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -38,8 +38,8 @@ type parser =
         fn bump();
         fn swap(token::token, uint, uint);
         fn look_ahead(uint) -> token::token;
-        fn fatal(str) -> ! ;
-        fn warn(str);
+        fn fatal(&istr) -> ! ;
+        fn warn(&istr);
         fn restrict(restriction);
         fn get_restriction() -> restriction;
         fn get_file_type() -> file_type;
@@ -50,7 +50,7 @@ type parser =
         fn get_last_lo_pos() -> uint;
         fn get_last_hi_pos() -> uint;
         fn get_prec_table() -> @[op_spec];
-        fn get_str(token::str_num) -> str;
+        fn get_str(token::str_num) -> istr;
         fn get_reader() -> lexer::reader;
         fn get_filemap() -> codemap::filemap;
         fn get_bad_expr_words() -> hashmap<istr, ()>;
@@ -60,11 +60,12 @@ type parser =
         fn get_sess() -> parse_sess;
     };
 
-fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, path: str,
+fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, path: &istr,
                         chpos: uint, byte_pos: uint, ftype: file_type) ->
    parser {
-    let src = io::read_whole_file_str(istr::from_estr(path));
-    let filemap = codemap::new_filemap(path, chpos, byte_pos);
+    let src = io::read_whole_file_str(path);
+    let filemap = codemap::new_filemap(
+        path, chpos, byte_pos);
     sess.cm.files += [filemap];
     let itr = @interner::mk(istr::hash, istr::eq);
     let rdr = lexer::new_reader(sess.cm, src, filemap, itr);
@@ -110,12 +111,14 @@ fn new_parser(sess: parse_sess, cfg: ast::crate_cfg, rdr: lexer::reader,
             }
             ret buffer[distance - 1u].tok;
         }
-        fn fatal(m: str) -> ! {
-            codemap::emit_error(some(self.get_span()), m, sess.cm);
+        fn fatal(m: &istr) -> ! {
+            codemap::emit_error(some(self.get_span()),
+                                istr::to_estr(m), sess.cm);
             fail;
         }
-        fn warn(m: str) {
-            codemap::emit_warning(some(self.get_span()), m, sess.cm);
+        fn warn(m: &istr) {
+            codemap::emit_warning(some(self.get_span()),
+                                  istr::to_estr(m), sess.cm);
         }
         fn restrict(r: restriction) { restr = r; }
         fn get_restriction() -> restriction { ret restr; }
@@ -127,8 +130,8 @@ fn new_parser(sess: parse_sess, cfg: ast::crate_cfg, rdr: lexer::reader,
         fn get_file_type() -> file_type { ret ftype; }
         fn get_cfg() -> ast::crate_cfg { ret cfg; }
         fn get_prec_table() -> @[op_spec] { ret precs; }
-        fn get_str(i: token::str_num) -> str {
-            ret istr::to_estr(interner::get(*rdr.get_interner(), i));
+        fn get_str(i: token::str_num) -> istr {
+            ret interner::get(*rdr.get_interner(), i);
         }
         fn get_reader() -> lexer::reader { ret rdr; }
         fn get_filemap() -> codemap::filemap { ret rdr.get_filemap(); }
@@ -190,8 +193,8 @@ fn bad_expr_word_table() -> hashmap<istr, ()> {
 }
 
 fn unexpected(p: &parser, t: token::token) -> ! {
-    let s: str = "unexpected token: ";
-    s += istr::to_estr(token::to_str(p.get_reader(), t));
+    let s: istr = ~"unexpected token: ";
+    s += token::to_str(p.get_reader(), t);
     p.fatal(s);
 }
 
@@ -199,10 +202,10 @@ fn expect(p: &parser, t: token::token) {
     if p.peek() == t {
         p.bump();
     } else {
-        let s: str = "expecting ";
-        s += istr::to_estr(token::to_str(p.get_reader(), t));
-        s += ", found ";
-        s += istr::to_estr(token::to_str(p.get_reader(), p.peek()));
+        let s: istr = ~"expecting ";
+        s += token::to_str(p.get_reader(), t);
+        s += ~", found ";
+        s += token::to_str(p.get_reader(), p.peek());
         p.fatal(s);
     }
 }
@@ -215,10 +218,10 @@ fn expect_gt(p: &parser) {
     } else if p.peek() == token::BINOP(token::ASR) {
         p.swap(token::BINOP(token::LSR), p.get_lo_pos() + 1u, p.get_hi_pos());
     } else {
-        let s: str = "expecting ";
-        s += istr::to_estr(token::to_str(p.get_reader(), token::GT));
-        s += ", found ";
-        s += istr::to_estr(token::to_str(p.get_reader(), p.peek()));
+        let s: istr = ~"expecting ";
+        s += token::to_str(p.get_reader(), token::GT);
+        s += ~", found ";
+        s += token::to_str(p.get_reader(), p.peek());
         p.fatal(s);
     }
 }
@@ -231,9 +234,9 @@ fn parse_ident(p: &parser) -> ast::ident {
     alt p.peek() {
       token::IDENT(i, _) {
         p.bump();
-        ret istr::from_estr(p.get_str(i));
+        ret p.get_str(i);
       }
-      _ { p.fatal("expecting ident"); }
+      _ { p.fatal(~"expecting ident"); }
     }
 }
 
@@ -246,17 +249,17 @@ fn eat(p: &parser, tok: &token::token) -> bool {
     ret if p.peek() == tok { p.bump(); true } else { false };
 }
 
-fn is_word(p: &parser, word: &str) -> bool {
+fn is_word(p: &parser, word: &istr) -> bool {
     ret alt p.peek() {
-          token::IDENT(sid, false) { str::eq(word, p.get_str(sid)) }
+          token::IDENT(sid, false) { istr::eq(word, p.get_str(sid)) }
           _ { false }
         };
 }
 
-fn eat_word(p: &parser, word: &str) -> bool {
+fn eat_word(p: &parser, word: &istr) -> bool {
     alt p.peek() {
       token::IDENT(sid, false) {
-        if str::eq(word, p.get_str(sid)) {
+        if istr::eq(word, p.get_str(sid)) {
             p.bump();
             ret true;
         } else { ret false; }
@@ -265,10 +268,10 @@ fn eat_word(p: &parser, word: &str) -> bool {
     }
 }
 
-fn expect_word(p: &parser, word: &str) {
+fn expect_word(p: &parser, word: &istr) {
     if !eat_word(p, word) {
-        p.fatal("expecting " + word + ", found " +
-                istr::to_estr(token::to_str(p.get_reader(), p.peek())));
+        p.fatal(~"expecting " + word + ~", found " +
+                token::to_str(p.get_reader(), p.peek()));
     }
 }
 
@@ -276,8 +279,8 @@ fn check_bad_word(p: &parser) {
     alt p.peek() {
       token::IDENT(sid, false) {
         let w = p.get_str(sid);
-        if p.get_bad_expr_words().contains_key(istr::from_estr(w)) {
-            p.fatal("found " + w + " in expression position");
+        if p.get_bad_expr_words().contains_key(w) {
+            p.fatal(~"found " + w + ~" in expression position");
         }
       }
       _ { }
@@ -295,7 +298,7 @@ fn parse_ty_fn(proto: ast::proto, p: &parser) -> ast::ty_ {
         let mode = ast::val;
         if p.peek() == token::BINOP(token::AND) {
             p.bump();
-            mode = ast::alias(eat_word(p, "mutable"));
+            mode = ast::alias(eat_word(p, ~"mutable"));
         }
         let t = parse_ty(p, false);
         ret spanned(lo, t.span.hi, {mode: mode, ty: t});
@@ -324,11 +327,11 @@ fn parse_ty_fn(proto: ast::proto, p: &parser) -> ast::ty_ {
 }
 
 fn parse_proto(p: &parser) -> ast::proto {
-    if eat_word(p, "iter") {
+    if eat_word(p, ~"iter") {
         ret ast::proto_iter;
-    } else if eat_word(p, "fn") {
+    } else if eat_word(p, ~"fn") {
         ret ast::proto_fn;
-    } else if eat_word(p, "block") {
+    } else if eat_word(p, ~"block") {
         ret ast::proto_block;
     } else { unexpected(p, p.peek()); }
 }
@@ -378,8 +381,8 @@ fn parse_ty_field(p: &parser) -> ast::ty_field {
 fn ident_index(p: &parser, args: &[ast::arg], i: &ast::ident) -> uint {
     let j = 0u;
     for a: ast::arg in args { if a.ident == i { ret j; } j += 1u; }
-    p.fatal("Unbound variable " +
-            istr::to_estr(i) + " in constraint arg");
+    p.fatal(~"Unbound variable " +
+            i + ~" in constraint arg");
 }
 
 fn parse_type_constr_arg(p: &parser) -> @ast::ty_constr_arg {
@@ -468,7 +471,7 @@ fn parse_ty_postfix(orig_t: ast::ty_, p: &parser, colons_before_params: bool)
                                            idents: pth.node.idents,
                                            types: seq}), ann));
       }
-      _ { p.fatal("type parameter instantiation only allowed for paths"); }
+      _ { p.fatal(~"type parameter instantiation only allowed for paths"); }
     }
 }
 
@@ -485,43 +488,43 @@ fn parse_ty(p: &parser, colons_before_params: bool) -> @ast::ty {
     let t: ast::ty_;
     // FIXME: do something with this
 
-    if eat_word(p, "bool") {
+    if eat_word(p, ~"bool") {
         t = ast::ty_bool;
-    } else if eat_word(p, "int") {
+    } else if eat_word(p, ~"int") {
         t = ast::ty_int;
-    } else if eat_word(p, "uint") {
+    } else if eat_word(p, ~"uint") {
         t = ast::ty_uint;
-    } else if eat_word(p, "float") {
+    } else if eat_word(p, ~"float") {
         t = ast::ty_float;
-    } else if eat_word(p, "str") {
+    } else if eat_word(p, ~"str") {
         t = ast::ty_str;
-    } else if eat_word(p, "istr") {
+    } else if eat_word(p, ~"istr") {
         t = ast::ty_istr;
-    } else if eat_word(p, "char") {
+    } else if eat_word(p, ~"char") {
         t = ast::ty_char;
         /*
             } else if (eat_word(p, "task")) {
                 t = ast::ty_task;
         */
-    } else if eat_word(p, "i8") {
+    } else if eat_word(p, ~"i8") {
         t = ast::ty_machine(ast::ty_i8);
-    } else if eat_word(p, "i16") {
+    } else if eat_word(p, ~"i16") {
         t = ast::ty_machine(ast::ty_i16);
-    } else if eat_word(p, "i32") {
+    } else if eat_word(p, ~"i32") {
         t = ast::ty_machine(ast::ty_i32);
-    } else if eat_word(p, "i64") {
+    } else if eat_word(p, ~"i64") {
         t = ast::ty_machine(ast::ty_i64);
-    } else if eat_word(p, "u8") {
+    } else if eat_word(p, ~"u8") {
         t = ast::ty_machine(ast::ty_u8);
-    } else if eat_word(p, "u16") {
+    } else if eat_word(p, ~"u16") {
         t = ast::ty_machine(ast::ty_u16);
-    } else if eat_word(p, "u32") {
+    } else if eat_word(p, ~"u32") {
         t = ast::ty_machine(ast::ty_u32);
-    } else if eat_word(p, "u64") {
+    } else if eat_word(p, ~"u64") {
         t = ast::ty_machine(ast::ty_u64);
-    } else if eat_word(p, "f32") {
+    } else if eat_word(p, ~"f32") {
         t = ast::ty_machine(ast::ty_f32);
-    } else if eat_word(p, "f64") {
+    } else if eat_word(p, ~"f64") {
         t = ast::ty_machine(ast::ty_f64);
     } else if p.peek() == token::LPAREN {
         p.bump();
@@ -568,19 +571,19 @@ fn parse_ty(p: &parser, colons_before_params: bool) -> @ast::ty {
         t = ast::ty_vec(parse_mt(p));
         hi = p.get_hi_pos();
         expect(p, token::RBRACKET);
-    } else if eat_word(p, "fn") {
+    } else if eat_word(p, ~"fn") {
         t = parse_ty_fn(ast::proto_fn, p);
         alt t { ast::ty_fn(_, _, out, _, _) { hi = out.span.hi; } }
-    } else if eat_word(p, "block") {
+    } else if eat_word(p, ~"block") {
         t = parse_ty_fn(ast::proto_block, p);
         alt t { ast::ty_fn(_, _, out, _, _) { hi = out.span.hi; } }
-    } else if eat_word(p, "iter") {
+    } else if eat_word(p, ~"iter") {
         t = parse_ty_fn(ast::proto_iter, p);
         alt t { ast::ty_fn(_, _, out, _, _) { hi = out.span.hi; } }
-    } else if eat_word(p, "obj") {
+    } else if eat_word(p, ~"obj") {
         t = parse_ty_obj(p, hi);
-    } else if eat_word(p, "mutable") {
-        p.warn("ignoring deprecated 'mutable' type constructor");
+    } else if eat_word(p, ~"mutable") {
+        p.warn(~"ignoring deprecated 'mutable' type constructor");
         let typ = parse_ty(p, false);
         t = typ.node;
         hi = typ.span.hi;
@@ -588,13 +591,13 @@ fn parse_ty(p: &parser, colons_before_params: bool) -> @ast::ty {
         let path = parse_path(p);
         t = ast::ty_path(path, p.get_id());
         hi = path.span.hi;
-    } else { p.fatal("expecting type"); }
+    } else { p.fatal(~"expecting type"); }
     ret parse_ty_postfix(t, p, colons_before_params);
 }
 
 fn parse_arg_mode(p: &parser) -> ast::mode {
     if eat(p, token::BINOP(token::AND)) {
-        ast::alias(eat_word(p, "mutable"))
+        ast::alias(eat_word(p, ~"mutable"))
     } else if eat(p, token::BINOP(token::MINUS)) {
         ast::move
     } else { ast::val }
@@ -686,9 +689,9 @@ fn parse_seq<T>(bra: token::token, ket: token::token,
 fn parse_lit(p: &parser) -> ast::lit {
     let sp = p.get_span();
     let lit: ast::lit_ = ast::lit_nil;
-    if eat_word(p, "true") {
+    if eat_word(p, ~"true") {
         lit = ast::lit_bool(true);
-    } else if eat_word(p, "false") {
+    } else if eat_word(p, ~"false") {
         lit = ast::lit_bool(false);
     } else {
         alt p.peek() {
@@ -696,7 +699,7 @@ fn parse_lit(p: &parser) -> ast::lit {
           token::LIT_UINT(u) { p.bump(); lit = ast::lit_uint(u); }
           token::LIT_FLOAT(s) {
             p.bump();
-            lit = ast::lit_float(istr::from_estr(p.get_str(s)));
+            lit = ast::lit_float(p.get_str(s));
           }
           token::LIT_MACH_INT(tm, i) {
             p.bump();
@@ -704,12 +707,12 @@ fn parse_lit(p: &parser) -> ast::lit {
           }
           token::LIT_MACH_FLOAT(tm, s) {
             p.bump();
-            lit = ast::lit_mach_float(tm, istr::from_estr(p.get_str(s)));
+            lit = ast::lit_mach_float(tm, p.get_str(s));
           }
           token::LIT_CHAR(c) { p.bump(); lit = ast::lit_char(c); }
           token::LIT_STR(s) {
             p.bump();
-            lit = ast::lit_str(istr::from_estr(p.get_str(s)), ast::sk_rc);
+            lit = ast::lit_str(p.get_str(s), ast::sk_rc);
           }
           token::LPAREN. {
             p.bump();
@@ -746,7 +749,7 @@ fn parse_path(p: &parser) -> ast::path {
         alt p.peek() {
           token::IDENT(i, _) {
             hi = p.get_hi_pos();
-            ids += [istr::from_estr(p.get_str(i))];
+            ids += [p.get_str(i)];
             hi = p.get_hi_pos();
             p.bump();
             if p.peek() == token::MOD_SEP && p.look_ahead(1u) != token::LT {
@@ -778,7 +781,7 @@ fn parse_path_and_ty_param_substs(p: &parser) -> ast::path {
 }
 
 fn parse_mutability(p: &parser) -> ast::mutability {
-    if eat_word(p, "mutable") {
+    if eat_word(p, ~"mutable") {
         if p.peek() == token::QUES { p.bump(); ret ast::maybe_mut; }
         ret ast::mut;
     }
@@ -826,12 +829,12 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         } else { ret mk_expr(p, lo, hi, ast::expr_tup(es)); }
     } else if p.peek() == token::LBRACE {
         p.bump();
-        if is_word(p, "mutable") ||
+        if is_word(p, ~"mutable") ||
                is_plain_ident(p) && p.look_ahead(1u) == token::COLON {
             let fields = [parse_field(p, token::COLON)];
             let base = none;
             while p.peek() != token::RBRACE {
-                if eat_word(p, "with") { base = some(parse_expr(p)); break; }
+                if eat_word(p, ~"with") { base = some(parse_expr(p)); break; }
                 expect(p, token::COMMA);
                 fields += [parse_field(p, token::COLON)];
             }
@@ -844,27 +847,27 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
             let blk = parse_block_tail(p, lo, ast::checked);
             ret mk_expr(p, blk.span.lo, blk.span.hi, ast::expr_block(blk));
         }
-    } else if eat_word(p, "if") {
+    } else if eat_word(p, ~"if") {
         ret parse_if_expr(p);
-    } else if eat_word(p, "for") {
+    } else if eat_word(p, ~"for") {
         ret parse_for_expr(p);
-    } else if eat_word(p, "while") {
+    } else if eat_word(p, ~"while") {
         ret parse_while_expr(p);
-    } else if eat_word(p, "do") {
+    } else if eat_word(p, ~"do") {
         ret parse_do_while_expr(p);
-    } else if eat_word(p, "alt") {
+    } else if eat_word(p, ~"alt") {
         ret parse_alt_expr(p);
         /*
             } else if (eat_word(p, "spawn")) {
                 ret parse_spawn_expr(p);
         */
-    } else if eat_word(p, "fn") {
+    } else if eat_word(p, ~"fn") {
         ret parse_fn_expr(p, ast::proto_fn);
-    } else if eat_word(p, "block") {
+    } else if eat_word(p, ~"block") {
         ret parse_fn_expr(p, ast::proto_block);
-    } else if eat_word(p, "lambda") {
+    } else if eat_word(p, ~"lambda") {
         ret parse_fn_expr(p, ast::proto_closure);
-    } else if eat_word(p, "unchecked") {
+    } else if eat_word(p, ~"unchecked") {
         expect(p, token::LBRACE);
         let blk = parse_block_tail(p, lo, ast::unchecked);
         ret mk_expr(p, blk.span.lo, blk.span.hi, ast::expr_block(blk));
@@ -896,14 +899,14 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
             let sp = p.get_span();
             p.bump();
             let lit =
-                @{node: ast::lit_str(istr::from_estr(p.get_str(s)),
+                @{node: ast::lit_str(p.get_str(s),
                                      ast::sk_unique),
                   span: sp};
             ex = ast::expr_lit(lit);
           }
           _ { ex = ast::expr_uniq(parse_expr(p)); }
         }
-    } else if eat_word(p, "obj") {
+    } else if eat_word(p, ~"obj") {
         // Anonymous object
 
         // Only make people type () if they're actually adding new fields
@@ -918,7 +921,7 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         let inner_obj: option::t<@ast::expr> = none;
         expect(p, token::LBRACE);
         while p.peek() != token::RBRACE {
-            if eat_word(p, "with") {
+            if eat_word(p, ~"with") {
                 inner_obj = some(parse_expr(p));
             } else { meths += [parse_method(p)]; }
         }
@@ -932,7 +935,7 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         // "spanned".
         let ob = {fields: fields, methods: meths, inner_obj: inner_obj};
         ex = ast::expr_anon_obj(ob);
-    } else if eat_word(p, "bind") {
+    } else if eat_word(p, ~"bind") {
         let e = parse_expr_res(p, RESTRICT_NO_CALL_EXPRS);
         fn parse_expr_opt(p: &parser) -> option::t<@ast::expr> {
             alt p.peek() {
@@ -949,25 +952,25 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         let ex_ext = parse_syntax_ext(p);
         hi = ex_ext.span.hi;
         ex = ex_ext.node;
-    } else if eat_word(p, "fail") {
+    } else if eat_word(p, ~"fail") {
         if can_begin_expr(p.peek()) {
             let e = parse_expr(p);
             hi = e.span.hi;
             ex = ast::expr_fail(some(e));
         } else { ex = ast::expr_fail(none); }
-    } else if eat_word(p, "log") {
+    } else if eat_word(p, ~"log") {
         let e = parse_expr(p);
         ex = ast::expr_log(1, e);
         hi = e.span.hi;
-    } else if eat_word(p, "log_err") {
+    } else if eat_word(p, ~"log_err") {
         let e = parse_expr(p);
         ex = ast::expr_log(0, e);
         hi = e.span.hi;
-    } else if eat_word(p, "assert") {
+    } else if eat_word(p, ~"assert") {
         let e = parse_expr(p);
         ex = ast::expr_assert(e);
         hi = e.span.hi;
-    } else if eat_word(p, "check") {
+    } else if eat_word(p, ~"check") {
         /* Should be a predicate (pure boolean function) applied to
            arguments that are all either slot variables or literals.
            but the typechecker enforces that. */
@@ -975,7 +978,7 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         let e = parse_expr(p);
         hi = e.span.hi;
         ex = ast::expr_check(ast::checked, e);
-    } else if eat_word(p, "claim") {
+    } else if eat_word(p, ~"claim") {
         /* Same rules as check, except that if check-claims
          is enabled (a command-line flag), then the parser turns
         claims into check */
@@ -983,19 +986,19 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         let e = parse_expr(p);
         hi = e.span.hi;
         ex = ast::expr_check(ast::unchecked, e);
-    } else if eat_word(p, "ret") {
+    } else if eat_word(p, ~"ret") {
         if can_begin_expr(p.peek()) {
             let e = parse_expr(p);
             hi = e.span.hi;
             ex = ast::expr_ret(some(e));
         } else { ex = ast::expr_ret(none); }
-    } else if eat_word(p, "break") {
+    } else if eat_word(p, ~"break") {
         ex = ast::expr_break;
         hi = p.get_hi_pos();
-    } else if eat_word(p, "cont") {
+    } else if eat_word(p, ~"cont") {
         ex = ast::expr_cont;
         hi = p.get_hi_pos();
-    } else if eat_word(p, "put") {
+    } else if eat_word(p, ~"put") {
         alt p.peek() {
           token::SEMI. { ex = ast::expr_put(none); }
           _ {
@@ -1004,19 +1007,19 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
             ex = ast::expr_put(some(e));
           }
         }
-    } else if eat_word(p, "be") {
+    } else if eat_word(p, ~"be") {
         let e = parse_expr(p);
 
         // FIXME: Is this the right place for this check?
         if /*check*/ast_util::is_call_expr(e) {
             hi = e.span.hi;
             ex = ast::expr_be(e);
-        } else { p.fatal("Non-call expression in tail call"); }
-    } else if eat_word(p, "copy") {
+        } else { p.fatal(~"Non-call expression in tail call"); }
+    } else if eat_word(p, ~"copy") {
         let e = parse_expr(p);
         ex = ast::expr_copy(e);
         hi = e.span.hi;
-    } else if eat_word(p, "self") {
+    } else if eat_word(p, ~"self") {
         expect(p, token::DOT);
         // The rest is a call expression.
         let f: @ast::expr = parse_self_method(p);
@@ -1026,8 +1029,8 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
         hi = es.span.hi;
         ex = ast::expr_call(f, es.node);
     } else if p.peek() == token::MOD_SEP ||
-                  is_ident(p.peek()) && !is_word(p, "true") &&
-                      !is_word(p, "false") {
+                  is_ident(p.peek()) && !is_word(p, ~"true") &&
+                      !is_word(p, ~"false") {
         check_bad_word(p);
         let pth = parse_path_and_ty_param_substs(p);
         hi = pth.span.hi;
@@ -1049,7 +1052,7 @@ fn parse_syntax_ext(p: &parser) -> @ast::expr {
 fn parse_syntax_ext_naked(p: &parser, lo: uint) -> @ast::expr {
     let pth = parse_path(p);
     if vec::len(pth.node.idents) == 0u {
-        p.fatal("expected a syntax expander name");
+        p.fatal(~"expected a syntax expander name");
     }
     //temporary for a backwards-compatible cycle:
     let es =
@@ -1109,7 +1112,7 @@ fn parse_dot_or_call_expr_with(p: &parser, e: @ast::expr) -> @ast::expr {
                 p.bump();
                 e = mk_expr(p, lo, hi,
                             ast::expr_field(
-                                e, istr::from_estr(p.get_str(i))));
+                                e, p.get_str(i)));
               }
               t { unexpected(p, t); }
             }
@@ -1121,8 +1124,8 @@ fn parse_dot_or_call_expr_with(p: &parser, e: @ast::expr) -> @ast::expr {
 }
 
 fn parse_prefix_expr(p: &parser) -> @ast::expr {
-    if eat_word(p, "mutable") {
-        p.warn("ignoring deprecated 'mutable' prefix operator");
+    if eat_word(p, ~"mutable") {
+        p.warn(~"ignoring deprecated 'mutable' prefix operator");
     }
     let lo = p.get_lo_pos();
     let hi = p.get_hi_pos();
@@ -1225,7 +1228,7 @@ fn parse_more_binops(p: &parser, lhs: @ast::expr, min_prec: int) ->
             ret parse_more_binops(p, bin, min_prec);
         }
     }
-    if as_prec > min_prec && eat_word(p, "as") {
+    if as_prec > min_prec && eat_word(p, ~"as") {
         let rhs = parse_ty(p, true);
         let _as =
             mk_expr(p, lhs.span.lo, rhs.span.hi, ast::expr_cast(lhs, rhs));
@@ -1288,7 +1291,7 @@ fn parse_if_expr_1(p: &parser) ->
     let thn = parse_block(p);
     let els: option::t<@ast::expr> = none;
     let hi = thn.span.hi;
-    if eat_word(p, "else") {
+    if eat_word(p, ~"else") {
         let elexpr = parse_else_expr(p);
         els = some(elexpr);
         hi = elexpr.span.hi;
@@ -1297,7 +1300,7 @@ fn parse_if_expr_1(p: &parser) ->
 }
 
 fn parse_if_expr(p: &parser) -> @ast::expr {
-    if eat_word(p, "check") {
+    if eat_word(p, ~"check") {
         let q = parse_if_expr_1(p);
         ret mk_expr(p, q.lo, q.hi, ast::expr_if_check(q.cond, q.then, q.els));
     } else {
@@ -1323,7 +1326,7 @@ fn parse_fn_block_expr(p: &parser) -> @ast::expr {
 }
 
 fn parse_else_expr(p: &parser) -> @ast::expr {
-    if eat_word(p, "if") {
+    if eat_word(p, ~"if") {
         ret parse_if_expr(p);
     } else {
         let blk = parse_block(p);
@@ -1333,9 +1336,9 @@ fn parse_else_expr(p: &parser) -> @ast::expr {
 
 fn parse_for_expr(p: &parser) -> @ast::expr {
     let lo = p.get_last_lo_pos();
-    let is_each = eat_word(p, "each");
+    let is_each = eat_word(p, ~"each");
     let decl = parse_local(p, false);
-    expect_word(p, "in");
+    expect_word(p, ~"in");
     let seq = parse_expr(p);
     let body = parse_block(p);
     let hi = body.span.hi;
@@ -1355,7 +1358,7 @@ fn parse_while_expr(p: &parser) -> @ast::expr {
 fn parse_do_while_expr(p: &parser) -> @ast::expr {
     let lo = p.get_last_lo_pos();
     let body = parse_block(p);
-    expect_word(p, "while");
+    expect_word(p, ~"while");
     let cond = parse_expr(p);
     let hi = cond.span.hi;
     ret mk_expr(p, lo, hi, ast::expr_do_while(body, cond));
@@ -1369,7 +1372,7 @@ fn parse_alt_expr(p: &parser) -> @ast::expr {
     while p.peek() != token::RBRACE {
         let pats = parse_pats(p);
         let guard = none;
-        if eat_word(p, "when") {
+        if eat_word(p, ~"when") {
             guard = some(parse_expr(p));
         }
         let blk = parse_block(p);
@@ -1449,9 +1452,8 @@ fn parse_pat(p: &parser) -> @ast::pat {
             if p.peek() == token::UNDERSCORE {
                 p.bump();
                 if p.peek() != token::RBRACE {
-                    p.fatal("expecting }, found " +
-                            istr::to_estr(
-                                token::to_str(p.get_reader(), p.peek())));
+                    p.fatal(~"expecting }, found " +
+                            token::to_str(p.get_reader(), p.peek()));
                 }
                 etc = true;
                 break;
@@ -1464,8 +1466,8 @@ fn parse_pat(p: &parser) -> @ast::pat {
                 subpat = parse_pat(p);
             } else {
                 if p.get_bad_expr_words().contains_key(fieldname) {
-                    p.fatal("found " + istr::to_estr(fieldname)
-                            + " in binding position");
+                    p.fatal(~"found " + fieldname
+                            + ~" in binding position");
                 }
                 subpat =
                     @{id: p.get_id(),
@@ -1499,7 +1501,7 @@ fn parse_pat(p: &parser) -> @ast::pat {
         }
       }
       tok {
-        if !is_ident(tok) || is_word(p, "true") || is_word(p, "false") {
+        if !is_ident(tok) || is_word(p, ~"true") || is_word(p, ~"false") {
             let lit = parse_lit(p);
             hi = lit.span.hi;
             pat = ast::pat_lit(@lit);
@@ -1568,7 +1570,7 @@ fn parse_crate_stmt(p: &parser) -> @ast::stmt {
 
 fn parse_source_stmt(p: &parser) -> @ast::stmt {
     let lo = p.get_lo_pos();
-    if eat_word(p, "let") {
+    if eat_word(p, ~"let") {
         let decl = parse_let(p);
         ret @spanned(lo, decl.span.hi, ast::stmt_decl(decl, p.get_id()));
     } else {
@@ -1588,7 +1590,7 @@ fn parse_source_stmt(p: &parser) -> @ast::stmt {
         if vec::len(item_attrs) > 0u {
             alt maybe_item {
               some(_) {/* fallthrough */ }
-              _ { ret p.fatal("expected item"); }
+              _ { ret p.fatal(~"expected item"); }
             }
         }
 
@@ -1604,7 +1606,7 @@ fn parse_source_stmt(p: &parser) -> @ast::stmt {
             let e = parse_expr(p);
             ret @spanned(lo, e.span.hi, ast::stmt_expr(e, p.get_id()));
           }
-          _ { p.fatal("expected statement"); }
+          _ { p.fatal(~"expected statement"); }
         }
     }
 }
@@ -1674,7 +1676,7 @@ fn stmt_ends_with_semi(stmt: &ast::stmt) -> bool {
 
 fn parse_block(p: &parser) -> ast::blk {
     let lo = p.get_lo_pos();
-    if eat_word(p, "unchecked") {
+    if eat_word(p, ~"unchecked") {
         be parse_block_tail(p, lo, ast::unchecked);
     }
     else {
@@ -1704,10 +1706,9 @@ fn parse_block_tail(p: &parser, lo: uint, s: ast::check_mode) -> ast::blk {
                   token::RBRACE. { expr = some(e); }
                   t {
                     if stmt_ends_with_semi(*stmt) {
-                        p.fatal("expected ';' or '}' after " +
-                                    "expression but found " +
-                                istr::to_estr(
-                                    token::to_str(p.get_reader(), t)));
+                        p.fatal(~"expected ';' or '}' after " +
+                                    ~"expression but found " +
+                                    token::to_str(p.get_reader(), t));
                     }
                     stmts += [stmt];
                   }
@@ -1924,9 +1925,8 @@ fn parse_mod_items(p: &parser, term: token::token,
         alt parse_item(p, attrs) {
           some(i) { items += [i]; }
           _ {
-            p.fatal("expected item but found " +
-                    istr::to_estr(
-                        token::to_str(p.get_reader(), p.peek())));
+            p.fatal(~"expected item but found " +
+                        token::to_str(p.get_reader(), p.peek()));
           }
         }
     }
@@ -1977,7 +1977,7 @@ fn parse_item_native_fn(p: &parser, attrs: &[ast::attribute]) ->
     let link_name = none;
     if p.peek() == token::EQ {
         p.bump();
-        link_name = some(istr::from_estr(parse_str(p)));
+        link_name = some(parse_str(p));
     }
     let hi = p.get_hi_pos();
     expect(p, token::SEMI);
@@ -1990,14 +1990,14 @@ fn parse_item_native_fn(p: &parser, attrs: &[ast::attribute]) ->
 
 fn parse_native_item(p: &parser, attrs: &[ast::attribute]) ->
    @ast::native_item {
-    if eat_word(p, "type") {
+    if eat_word(p, ~"type") {
         ret parse_item_native_type(p, attrs);
-    } else if eat_word(p, "fn") {
+    } else if eat_word(p, ~"fn") {
         ret parse_item_native_fn(p, attrs);
     } else { unexpected(p, p.peek()); }
 }
 
-fn parse_native_mod_items(p: &parser, native_name: &str,
+fn parse_native_mod_items(p: &parser, native_name: &istr,
                           abi: ast::native_abi,
                           first_item_attrs: &[ast::attribute]) ->
    ast::native_mod {
@@ -2013,7 +2013,7 @@ fn parse_native_mod_items(p: &parser, native_name: &str,
         initial_attrs = [];
         items += [parse_native_item(p, attrs)];
     }
-    ret {native_name: istr::from_estr(native_name),
+    ret {native_name: native_name,
          abi: abi,
          view_items: view_items,
          items: items};
@@ -2022,26 +2022,26 @@ fn parse_native_mod_items(p: &parser, native_name: &str,
 fn parse_item_native_mod(p: &parser, attrs: &[ast::attribute]) -> @ast::item {
     let lo = p.get_last_lo_pos();
     let abi = ast::native_abi_cdecl;
-    if !is_word(p, "mod") {
+    if !is_word(p, ~"mod") {
         let t = parse_str(p);
-        if str::eq(t, "cdecl") {
-        } else if str::eq(t, "rust") {
+        if istr::eq(t, ~"cdecl") {
+        } else if istr::eq(t, ~"rust") {
             abi = ast::native_abi_rust;
-        } else if str::eq(t, "llvm") {
+        } else if istr::eq(t, ~"llvm") {
             abi = ast::native_abi_llvm;
-        } else if str::eq(t, "rust-intrinsic") {
+        } else if istr::eq(t, ~"rust-intrinsic") {
             abi = ast::native_abi_rust_intrinsic;
-        } else if str::eq(t, "x86stdcall") {
+        } else if istr::eq(t, ~"x86stdcall") {
             abi = ast::native_abi_x86stdcall;
-        } else { p.fatal("unsupported abi: " + t); }
+        } else { p.fatal(~"unsupported abi: " + t); }
     }
-    expect_word(p, "mod");
+    expect_word(p, ~"mod");
     let id = parse_ident(p);
     let native_name;
     if p.peek() == token::EQ {
         expect(p, token::EQ);
         native_name = parse_str(p);
-    } else { native_name = istr::to_estr(id); }
+    } else { native_name = id; }
     expect(p, token::LBRACE);
     let more_attrs = parse_inner_attrs_and_next(p);
     let inner_attrs = more_attrs.inner;
@@ -2077,8 +2077,8 @@ fn parse_item_tag(p: &parser, attrs: &[ast::attribute]) -> @ast::item {
     // Newtype syntax
     if p.peek() == token::EQ {
         if p.get_bad_expr_words().contains_key(id) {
-            p.fatal("found " + istr::to_estr(id)
-                    + " in tag constructor position");
+            p.fatal(~"found " + id
+                    + ~" in tag constructor position");
         }
         p.bump();
         let ty = parse_ty(p, false);
@@ -2115,15 +2115,14 @@ fn parse_item_tag(p: &parser, attrs: &[ast::attribute]) -> @ast::item {
             }
             expect(p, token::SEMI);
             p.get_id();
-            let vr = {name: istr::from_estr(p.get_str(name)),
+            let vr = {name: p.get_str(name),
                       args: args, id: p.get_id()};
             variants += [spanned(vlo, vhi, vr)];
           }
           token::RBRACE. {/* empty */ }
           _ {
-            p.fatal("expected name of variant or '}' but found " +
-                    istr::to_estr(
-                        token::to_str(p.get_reader(), tok)));
+            p.fatal(~"expected name of variant or '}' but found " +
+                        token::to_str(p.get_reader(), tok));
           }
         }
     }
@@ -2133,42 +2132,42 @@ fn parse_item_tag(p: &parser, attrs: &[ast::attribute]) -> @ast::item {
 }
 
 fn parse_auth(p: &parser) -> ast::_auth {
-    if eat_word(p, "unsafe") {
+    if eat_word(p, ~"unsafe") {
         ret ast::auth_unsafe;
     } else { unexpected(p, p.peek()); }
 }
 
 fn parse_item(p: &parser, attrs: &[ast::attribute]) -> option::t<@ast::item> {
-    if eat_word(p, "const") {
+    if eat_word(p, ~"const") {
         ret some(parse_item_const(p, attrs));
-    } else if eat_word(p, "inline") {
-        expect_word(p, "fn");
+    } else if eat_word(p, ~"inline") {
+        expect_word(p, ~"fn");
         ret some(parse_item_fn_or_iter(p, ast::impure_fn, ast::proto_fn,
                                        attrs, ast::il_inline));
-    } else if is_word(p, "fn") && p.look_ahead(1u) != token::LPAREN {
+    } else if is_word(p, ~"fn") && p.look_ahead(1u) != token::LPAREN {
         p.bump();
         ret some(parse_item_fn_or_iter(p, ast::impure_fn, ast::proto_fn,
                                        attrs, ast::il_normal));
-    } else if eat_word(p, "pure") {
-        expect_word(p, "fn");
+    } else if eat_word(p, ~"pure") {
+        expect_word(p, ~"fn");
         ret some(parse_item_fn_or_iter(p, ast::pure_fn, ast::proto_fn, attrs,
                                        ast::il_normal));
-    } else if eat_word(p, "iter") {
+    } else if eat_word(p, ~"iter") {
         ret some(parse_item_fn_or_iter(p, ast::impure_fn, ast::proto_iter,
                                        attrs, ast::il_normal));
-    } else if eat_word(p, "mod") {
+    } else if eat_word(p, ~"mod") {
         ret some(parse_item_mod(p, attrs));
-    } else if eat_word(p, "native") {
+    } else if eat_word(p, ~"native") {
         ret some(parse_item_native_mod(p, attrs));
     }
-    if eat_word(p, "type") {
+    if eat_word(p, ~"type") {
         ret some(parse_item_type(p, attrs));
-    } else if eat_word(p, "tag") {
+    } else if eat_word(p, ~"tag") {
         ret some(parse_item_tag(p, attrs));
-    } else if is_word(p, "obj") && p.look_ahead(1u) != token::LPAREN {
+    } else if is_word(p, ~"obj") && p.look_ahead(1u) != token::LPAREN {
         p.bump();
         ret some(parse_item_obj(p, attrs));
-    } else if eat_word(p, "resource") {
+    } else if eat_word(p, ~"resource") {
         ret some(parse_item_res(p, attrs));
     } else { ret none; }
 }
@@ -2288,13 +2287,13 @@ fn parse_rest_import_name(p: &parser, first: &ast::ident,
         alt p.peek() {
           token::SEMI. { break; }
           token::MOD_SEP. {
-            if glob { p.fatal("cannot path into a glob"); }
+            if glob { p.fatal(~"cannot path into a glob"); }
             if option::is_some(from_idents) {
-                p.fatal("cannot path into import list");
+                p.fatal(~"cannot path into import list");
             }
             p.bump();
           }
-          _ { p.fatal("expecting '::' or ';'"); }
+          _ { p.fatal(~"expecting '::' or ';'"); }
         }
         alt p.peek() {
           token::IDENT(_, _) { identifiers += [parse_ident(p)]; }
@@ -2318,22 +2317,22 @@ fn parse_rest_import_name(p: &parser, first: &ast::ident,
                 parse_seq(token::LBRACE, token::RBRACE, some(token::COMMA),
                           parse_import_ident, p).node;
             if vec::is_empty(from_idents_) {
-                p.fatal("at least one import is required");
+                p.fatal(~"at least one import is required");
             }
             from_idents = some(from_idents_);
           }
 
 
           _ {
-            p.fatal("expecting an identifier, or '*'");
+            p.fatal(~"expecting an identifier, or '*'");
           }
         }
     }
     alt def_ident {
       some(i) {
-        if glob { p.fatal("globbed imports can't be renamed"); }
+        if glob { p.fatal(~"globbed imports can't be renamed"); }
         if option::is_some(from_idents) {
-            p.fatal("can't rename import list");
+            p.fatal(~"can't rename import list");
         }
         ret ast::view_item_import(i, identifiers, p.get_id());
       }
@@ -2359,9 +2358,9 @@ fn parse_full_import_name(p: &parser, def_ident: &ast::ident) ->
       token::IDENT(i, _) {
         p.bump();
         ret parse_rest_import_name(
-            p, istr::from_estr(p.get_str(i)), some(def_ident));
+            p, p.get_str(i), some(def_ident));
       }
-      _ { p.fatal("expecting an identifier"); }
+      _ { p.fatal(~"expecting an identifier"); }
     }
 }
 
@@ -2372,15 +2371,15 @@ fn parse_import(p: &parser) -> ast::view_item_ {
         alt p.peek() {
           token::EQ. {
             p.bump();
-            ret parse_full_import_name(p, istr::from_estr(p.get_str(i)));
+            ret parse_full_import_name(p, p.get_str(i));
           }
           _ {
             ret parse_rest_import_name(
-                p, istr::from_estr(p.get_str(i)), none);
+                p, p.get_str(i), none);
           }
         }
       }
-      _ { p.fatal("expecting an identifier"); }
+      _ { p.fatal(~"expecting an identifier"); }
     }
 }
 
@@ -2394,11 +2393,11 @@ fn parse_export(p: &parser) -> ast::view_item_ {
 fn parse_view_item(p: &parser) -> @ast::view_item {
     let lo = p.get_lo_pos();
     let the_item =
-        if eat_word(p, "use") {
+        if eat_word(p, ~"use") {
             parse_use(p)
-        } else if eat_word(p, "import") {
+        } else if eat_word(p, ~"import") {
             parse_import(p)
-        } else if eat_word(p, "export") { parse_export(p) } else { fail };
+        } else if eat_word(p, ~"export") { parse_export(p) } else { fail };
     let hi = p.get_lo_pos();
     expect(p, token::SEMI);
     ret @spanned(lo, hi, the_item);
@@ -2408,8 +2407,8 @@ fn is_view_item(p: &parser) -> bool {
     alt p.peek() {
       token::IDENT(sid, false) {
         let st = p.get_str(sid);
-        ret str::eq(st, "use") || str::eq(st, "import") ||
-                str::eq(st, "export");
+        ret istr::eq(st, ~"use") || istr::eq(st, ~"import") ||
+                istr::eq(st, ~"export");
       }
       _ { ret false; }
     }
@@ -2427,19 +2426,20 @@ fn parse_native_view(p: &parser) -> [@ast::view_item] {
     ret items;
 }
 
-fn parse_crate_from_source_file(input: &str, cfg: &ast::crate_cfg,
+fn parse_crate_from_source_file(input: &istr, cfg: &ast::crate_cfg,
                                 sess: &parse_sess) -> @ast::crate {
     let p = new_parser_from_file(sess, cfg, input, 0u, 0u, SOURCE_FILE);
     ret parse_crate_mod(p, cfg);
 }
 
-fn parse_crate_from_source_str(name: &str, source: &str, cfg: &ast::crate_cfg,
+fn parse_crate_from_source_str(name: &istr, source: &istr,
+                               cfg: &ast::crate_cfg,
                                sess: &parse_sess) -> @ast::crate {
     let ftype = SOURCE_FILE;
     let filemap = codemap::new_filemap(name, 0u, 0u);
     sess.cm.files += [filemap];
     let itr = @interner::mk(istr::hash, istr::eq);
-    let rdr = lexer::new_reader(sess.cm, istr::from_estr(source),
+    let rdr = lexer::new_reader(sess.cm, source,
                                 filemap, itr);
     let p = new_parser(sess, cfg, rdr, ftype);
     ret parse_crate_mod(p, cfg);
@@ -2458,7 +2458,7 @@ fn parse_crate_mod(p: &parser, _cfg: &ast::crate_cfg) -> @ast::crate {
                   config: p.get_cfg()});
 }
 
-fn parse_str(p: &parser) -> str {
+fn parse_str(p: &parser) -> istr {
     alt p.peek() {
       token::LIT_STR(s) { p.bump(); ret p.get_str(s); }
       _ { fail; }
@@ -2479,8 +2479,8 @@ fn parse_crate_directive(p: &parser, first_outer_attr: &[ast::attribute]) ->
     let expect_mod = vec::len(outer_attrs) > 0u;
 
     let lo = p.get_lo_pos();
-    if expect_mod || is_word(p, "mod") {
-        expect_word(p, "mod");
+    if expect_mod || is_word(p, ~"mod") {
+        expect_word(p, ~"mod");
         let id = parse_ident(p);
         let file_opt =
             alt p.peek() {
@@ -2513,7 +2513,7 @@ fn parse_crate_directive(p: &parser, first_outer_attr: &[ast::attribute]) ->
           }
           t { unexpected(p, t); }
         }
-    } else if eat_word(p, "auth") {
+    } else if eat_word(p, ~"auth") {
         let n = parse_path(p);
         expect(p, token::EQ);
         let a = parse_auth(p);
@@ -2523,7 +2523,7 @@ fn parse_crate_directive(p: &parser, first_outer_attr: &[ast::attribute]) ->
     } else if is_view_item(p) {
         let vi = parse_view_item(p);
         ret spanned(lo, vi.span.hi, ast::cdir_view_item(vi));
-    } else { ret p.fatal("expected crate directive"); }
+    } else { ret p.fatal(~"expected crate directive"); }
 }
 
 fn parse_crate_directives(p: &parser, term: token::token,
@@ -2534,7 +2534,7 @@ fn parse_crate_directives(p: &parser, term: token::token,
     // seeing the terminator next, so if we do see it then fail the same way
     // parse_crate_directive would
     if vec::len(first_outer_attr) > 0u && p.peek() == term {
-        expect_word(p, "mod");
+        expect_word(p, ~"mod");
     }
 
     let cdirs: [@ast::crate_directive] = [];
@@ -2545,12 +2545,12 @@ fn parse_crate_directives(p: &parser, term: token::token,
     ret cdirs;
 }
 
-fn parse_crate_from_crate_file(input: &str, cfg: &ast::crate_cfg,
+fn parse_crate_from_crate_file(input: &istr, cfg: &ast::crate_cfg,
                                sess: &parse_sess) -> @ast::crate {
     let p = new_parser_from_file(sess, cfg, input, 0u, 0u, CRATE_FILE);
     let lo = p.get_lo_pos();
     let prefix =
-        std::fs::dirname(istr::from_estr(p.get_filemap().name));
+        std::fs::dirname(p.get_filemap().name);
     let leading_attrs = parse_inner_attrs_and_next(p);
     let crate_attrs = leading_attrs.inner;
     let first_cdir_attr = leading_attrs.next;
@@ -2574,14 +2574,15 @@ fn parse_crate_from_crate_file(input: &str, cfg: &ast::crate_cfg,
                   config: p.get_cfg()});
 }
 
-fn parse_crate_from_file(input: &str, cfg: &ast::crate_cfg, sess: &parse_sess)
-   -> @ast::crate {
-    if str::ends_with(input, ".rc") {
+fn parse_crate_from_file(input: &istr, cfg: &ast::crate_cfg,
+                         sess: &parse_sess) -> @ast::crate {
+    if istr::ends_with(input, ~".rc") {
         parse_crate_from_crate_file(input, cfg, sess)
-    } else if str::ends_with(input, ".rs") {
+    } else if istr::ends_with(input, ~".rs") {
         parse_crate_from_source_file(input, cfg, sess)
     } else {
-        codemap::emit_error(none, "unknown input file type: " + input,
+        codemap::emit_error(none, "unknown input file type: "
+                            + istr::to_estr(input),
                             sess.cm);
         fail
     }