From 18180fd5dac16582474b5ec0fd49ebb03f7f939d Mon Sep 17 00:00:00 2001 From: Paul Stansifer Date: Fri, 24 Aug 2012 18:19:39 -0700 Subject: [PATCH] "earley_parser" -> "macro_parser" Let's be less confusing. --- src/libsyntax/ast.rs | 2 +- src/libsyntax/ext/base.rs | 4 ++-- src/libsyntax/ext/tt/{earley_parser.rs => macro_parser.rs} | 0 src/libsyntax/ext/tt/macro_rules.rs | 4 ++-- src/libsyntax/ext/tt/transcribe.rs | 2 +- src/libsyntax/syntax.rc | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/libsyntax/ext/tt/{earley_parser.rs => macro_parser.rs} (100%) diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 4cc161e1b5cf..22f696d6ed8f 100644 --- a/src/libsyntax/ast.rs +++ b/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 diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index b16a8f11427a..796f0400190e 100644 --- a/src/libsyntax/ext/base.rs +++ b/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 { diff --git a/src/libsyntax/ext/tt/earley_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs similarity index 100% rename from src/libsyntax/ext/tt/earley_parser.rs rename to src/libsyntax/ext/tt/macro_parser.rs diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 77e0970d423a..5b5a631f2483 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.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; diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 981e483f13df..8755e0d7d593 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.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}; diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc index ab2a83342eb4..7ccd46a5c1d3 100644 --- a/src/libsyntax/syntax.rc +++ b/src/libsyntax/syntax.rc @@ -67,7 +67,7 @@ mod ext { mod tt { mod transcribe; - mod earley_parser; + mod macro_parser; mod macro_rules; }