about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-02-24 19:04:17 -0800
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-02-26 00:44:49 -0800
commit380597eba35be0eb12c59180e1eea97264cd3cc7 (patch)
tree7f1764eb78b4edee04744409db81ced0275f86cb /src/libsyntax/parse
parentcf6e21a17f04ddc766633f1f22144f7e6c59008c (diff)
downloadrust-380597eba35be0eb12c59180e1eea97264cd3cc7.tar.gz
rust-380597eba35be0eb12c59180e1eea97264cd3cc7.zip
libsyntax: change parse_matcher_subseq to take &Token
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 1e6473c3cb1..fc69605a927 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/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");