---

yaml
---
r: 30074
b: refs/heads/incoming
c: 18180fd
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: e54acbf8488c877eeca264948e7e94f3c3434d41
+refs/heads/incoming: 18180fd5dac16582474b5ec0fd49ebb03f7f939d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ast.rs

@@ -407,7 +407,7 @@ type capture_clause = @~[capture_item];
 // If the syntax extension is an MBE macro, it will attempt to match its
 // LHS "matchers" against the provided token tree, and if it finds a
 // match, will transcribe the RHS token tree, splicing in any captured
-// earley_parser::matched_nonterminals into the tt_nonterminals it finds.
+// macro_parser::matched_nonterminals into the tt_nonterminals it finds.
 //
 // The RHS of an MBE macro is the only place a tt_nonterminal or tt_seq
 // makes any real sense. You could write them elsewhere but nothing

branches/incoming/src/libsyntax/ext/base.rs

@@ -301,8 +301,8 @@ fn tt_args_to_original_flavor(cx: ext_ctxt, sp: span, arg: ~[ast::token_tree])
     -> ast::mac_arg {
     import ast::{matcher, matcher_, match_tok, match_seq, match_nonterminal};
     import parse::lexer::{new_tt_reader, reader};
-    import tt::earley_parser::{parse_or_else, matched_seq,
-                               matched_nonterminal};
+    import tt::macro_parser::{parse_or_else, matched_seq,
+                              matched_nonterminal};
 
     // these spans won't matter, anyways
     fn ms(m: matcher_) -> matcher {

branches/incoming/src/libsyntax/ext/tt/earley_parser.rs renamed to branches/incoming/src/libsyntax/ext/tt/macro_parser.rs

@@ -5,8 +5,8 @@ import ast::{ident, matcher_, matcher, match_tok,
 import parse::lexer::{new_tt_reader, reader};
 import parse::token::{FAT_ARROW, SEMI, LBRACE, RBRACE, nt_matchers, nt_tt};
 import parse::parser::{parser, SOURCE_FILE};
-import earley_parser::{parse, parse_or_else, success, failure, named_match,
-                       matched_seq, matched_nonterminal, error};
+import macro_parser::{parse, parse_or_else, success, failure, named_match,
+                      matched_seq, matched_nonterminal, error};
 import std::map::hashmap;
 import parse::token::special_idents;
 

branches/incoming/src/libsyntax/ext/tt/macro_rules.rs

@@ -1,6 +1,6 @@
 import diagnostic::span_handler;
 import ast::{token_tree, tt_delim, tt_tok, tt_seq, tt_nonterminal,ident};
-import earley_parser::{named_match, matched_seq, matched_nonterminal};
+import macro_parser::{named_match, matched_seq, matched_nonterminal};
 import codemap::span;
 import parse::token::{EOF, INTERPOLATED, IDENT, token, nt_ident,
                       ident_interner};

branches/incoming/src/libsyntax/ext/tt/transcribe.rs

@@ -67,7 +67,7 @@ mod ext {
 
     mod tt {
         mod transcribe;
-        mod earley_parser;
+        mod macro_parser;
         mod macro_rules;
     }