---

yaml
---
r: 44739
b: refs/heads/master
c: 380597e
h: refs/heads/master
i:
  44737: 2108b9c
  44735: ae3bd0b
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cf6e21a17f04ddc766633f1f22144f7e6c59008c
+refs/heads/master: 380597eba35be0eb12c59180e1eea97264cd3cc7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/libsyntax/parse/parser.rs

@@ -1502,9 +1502,9 @@ pub impl Parser {
             token::LBRACE | token::LPAREN | token::LBRACKET => {
                 self.parse_matcher_subseq(
                     name_idx,
-                    *self.token,
+                    &*self.token,
                     // tjc: not sure why we need a copy
-                    token::flip_delimiter(&*self.token)
+                    &token::flip_delimiter(&*self.token)
                 )
             }
             _ => self.fatal(~"expected open delimiter")
@@ -1517,15 +1517,15 @@ pub impl Parser {
     // invalid. It's similar to common::parse_seq.
     fn parse_matcher_subseq(
         name_idx: @mut uint,
-        bra: token::Token,
-        ket: token::Token
+        bra: &token::Token,
+        ket: &token::Token
     ) -> ~[matcher] {
         let mut ret_val = ~[];
         let mut lparens = 0u;
 
-        self.expect(&bra);
+        self.expect(bra);
 
-        while *self.token != ket || lparens > 0u {
+        while *self.token != *ket || lparens > 0u {
             if *self.token == token::LPAREN { lparens += 1u; }
             if *self.token == token::RPAREN { lparens -= 1u; }
             ret_val.push(self.parse_matcher(name_idx));
@@ -1545,8 +1545,8 @@ pub impl Parser {
                 let name_idx_lo = *name_idx;
                 let ms = self.parse_matcher_subseq(
                     name_idx,
-                    token::LPAREN,
-                    token::RPAREN
+                    &token::LPAREN,
+                    &token::RPAREN
                 );
                 if ms.len() == 0u {
                     self.fatal(~"repetition body must be nonempty");