---

yaml
---
r: 94907
b: refs/heads/try
c: 425a140
h: refs/heads/master
i:
  94905: 91eac7c
  94903: 4793d8a
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: f499d365ada01a23bd046bac9b1bef7ccdb9fa8c
+refs/heads/try: 425a140485dc3ba70c4e30e10cd8d5fd92a458c5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/ext/quote.rs

@@ -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) {

branches/try/src/libsyntax/ext/tt/macro_parser.rs

@@ -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()),

branches/try/src/libsyntax/parse/mod.rs

@@ -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)
 }

branches/try/src/libsyntax/parse/parser.rs

@@ -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;