Skip to content

Commit 380597e

Browse files
committed
libsyntax: change parse_matcher_subseq to take &Token
1 parent cf6e21a commit 380597e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,9 +1502,9 @@ pub impl Parser {
15021502
token::LBRACE | token::LPAREN | token::LBRACKET => {
15031503
self.parse_matcher_subseq(
15041504
name_idx,
1505-
*self.token,
1505+
&*self.token,
15061506
// tjc: not sure why we need a copy
1507-
token::flip_delimiter(&*self.token)
1507+
&token::flip_delimiter(&*self.token)
15081508
)
15091509
}
15101510
_ => self.fatal(~"expected open delimiter")
@@ -1517,15 +1517,15 @@ pub impl Parser {
15171517
// invalid. It's similar to common::parse_seq.
15181518
fn parse_matcher_subseq(
15191519
name_idx: @mut uint,
1520-
bra: token::Token,
1521-
ket: token::Token
1520+
bra: &token::Token,
1521+
ket: &token::Token
15221522
) -> ~[matcher] {
15231523
let mut ret_val = ~[];
15241524
let mut lparens = 0u;
15251525

1526-
self.expect(&bra);
1526+
self.expect(bra);
15271527

1528-
while *self.token != ket || lparens > 0u {
1528+
while *self.token != *ket || lparens > 0u {
15291529
if *self.token == token::LPAREN { lparens += 1u; }
15301530
if *self.token == token::RPAREN { lparens -= 1u; }
15311531
ret_val.push(self.parse_matcher(name_idx));
@@ -1545,8 +1545,8 @@ pub impl Parser {
15451545
let name_idx_lo = *name_idx;
15461546
let ms = self.parse_matcher_subseq(
15471547
name_idx,
1548-
token::LPAREN,
1549-
token::RPAREN
1548+
&token::LPAREN,
1549+
&token::RPAREN
15501550
);
15511551
if ms.len() == 0u {
15521552
self.fatal(~"repetition body must be nonempty");

0 commit comments

Comments
 (0)