OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libsyntax: De-@mut quote_depth in the parser

Browse Source
This commit is contained in:
Patrick Walton 2013-12-30 14:40:31 -08:00
parent f499d365ad
commit 425a140485
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsyntax/ext/quote.rs
View File

@ -590,7 +590,7 @@ fn expand_tts(cx: &ExtCtxt, sp: Span, tts: &[ast::token_tree])
let mut p = parse::new_parser_from_tts(cx.parse_sess(),
cx.cfg(),
tts.to_owned());
*p.quote_depth += 1u;
p.quote_depth += 1u;
let cx_expr = p.parse_expr();
if !p.eat(&token::COMMA) {

4
src/libsyntax/ext/tt/macro_parser.rs
View File

@ -448,9 +448,9 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> nonterminal {
}
"attr" => token::nt_attr(@p.parse_attribute(false)),
"tt" => {
*p.quote_depth += 1u; //but in theory, non-quoted tts might be useful
p.quote_depth += 1u; //but in theory, non-quoted tts might be useful
let res = token::nt_tt(@p.parse_token_tree());
*p.quote_depth -= 1u;
p.quote_depth -= 1u;
res
}
"matchers" => token::nt_matchers(p.parse_matchers()),

2
src/libsyntax/parse/mod.rs
View File

@ -175,7 +175,7 @@ pub fn parse_tts_from_source_str(
name,
source
);
*p.quote_depth += 1u;
p.quote_depth += 1u;
// right now this is re-creating the token trees from ... token trees.
maybe_aborted(p.parse_all_token_trees(),p)
}

6
src/libsyntax/parse/parser.rs
View File

@ -315,7 +315,7 @@ pub fn Parser(sess: @mut ParseSess,
buffer_end: @mut 0,
tokens_consumed: @mut 0,
restriction: @mut UNRESTRICTED,
quote_depth: @mut 0,
quote_depth: 0,
obsolete_set: @mut HashSet::new(),
mod_path_stack: @mut ~[],
open_braces: @mut ~[],
@ -340,7 +340,7 @@ pub struct Parser {
buffer_end: @mut int,
tokens_consumed: @mut uint,
restriction: @mut restriction,
quote_depth: @mut uint, // not (yet) related to the quasiquoter
quote_depth: uint, // not (yet) related to the quasiquoter
reader: @mut reader,
interner: @token::ident_interner,
/// The set of seen errors about obsolete syntax. Used to suppress
@ -2097,7 +2097,7 @@ impl Parser {
token_str))
},
/* we ought to allow different depths of unquotation */
token::DOLLAR if *p.quote_depth > 0u => {
token::DOLLAR if p.quote_depth > 0u => {
p.bump();
let sp = *p.span;