From 39590d81f01b97da574de3298f664eeabf84d255 Mon Sep 17 00:00:00 2001 From: Paul Stansifer Date: Wed, 27 Jun 2012 15:29:35 -0700 Subject: Some rearranging in perparation for MBE-style TT transcription. --- src/libsyntax/parse.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/libsyntax/parse.rs') diff --git a/src/libsyntax/parse.rs b/src/libsyntax/parse.rs index 04f533be5bf..9c143257e9e 100644 --- a/src/libsyntax/parse.rs +++ b/src/libsyntax/parse.rs @@ -13,8 +13,10 @@ export parse_expr_from_source_str, parse_item_from_source_str; export parse_from_source_str; import parser::parser; -import attr::parser_attr; -import common::parser_common; +//import attr::parser_attr; +import attr::*; //resolve bug? +//import common::parser_common; +import common::*; //resolve bug? import ast::node_id; import util::interner; // FIXME (#1935): resolve badness @@ -199,6 +201,7 @@ fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, +path: str, fn new_parser_from_tt(sess: parse_sess, cfg: ast::crate_cfg, tt: ~[ast::token_tree]) -> parser { - let trdr = lexer::new_tt_reader(sess.span_diagnostic, sess.interner, tt); + let trdr = lexer::new_tt_reader(sess.span_diagnostic, sess.interner, + none, tt); ret parser(sess, cfg, trdr as reader, parser::SOURCE_FILE) } -- cgit 1.4.1-3-g733a5