Skip to content

Commit cf6e21a

Browse files
erickterickt
committed
libsyntax: change attr::parse_seq_* to take &Token
1 parent 3180d22 commit cf6e21a

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎src/libsyntax/ext/pipes/parse_proto.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub impl proto_parser for parser::Parser {
2828
let proto = protocol(id, *self.span);
2929

3030
self.parse_seq_to_before_end(
31-
token::EOF,
31+
&token::EOF,
3232
SeqSep {
3333
sep: None,
3434
trailing_sep_allowed: false,
@@ -65,8 +65,8 @@ pub impl proto_parser for parser::Parser {
6565

6666
// parse the messages
6767
self.parse_unspanned_seq(
68-
token::LBRACE,
69-
token::RBRACE,
68+
&token::LBRACE,
69+
&token::RBRACE,
7070
SeqSep {
7171
sep: Some(token::COMMA),
7272
trailing_sep_allowed: true,
@@ -80,8 +80,8 @@ pub impl proto_parser for parser::Parser {
8080

8181
let args = if *self.token == token::LPAREN {
8282
self.parse_unspanned_seq(
83-
token::LPAREN,
84-
token::RPAREN,
83+
&token::LPAREN,
84+
&token::RPAREN,
8585
SeqSep {
8686
sep: Some(token::COMMA),
8787
trailing_sep_allowed: true,
@@ -98,8 +98,8 @@ pub impl proto_parser for parser::Parser {
9898
let name = *self.interner.get(self.parse_ident());
9999
let ntys = if *self.token == token::LT {
100100
self.parse_unspanned_seq(
101-
token::LT,
102-
token::GT,
101+
&token::LT,
102+
&token::GT,
103103
SeqSep {
104104
sep: Some(token::COMMA),
105105
trailing_sep_allowed: true,

‎src/libsyntax/parse/attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ impl parser_attr for Parser {
152152

153153
fn parse_meta_seq() -> ~[@ast::meta_item] {
154154
self.parse_seq(
155-
token::LPAREN,
156-
token::RPAREN,
155+
&token::LPAREN,
156+
&token::RPAREN,
157157
seq_sep_trailing_disallowed(token::COMMA),
158158
|p| p.parse_meta_item()
159159
).node

‎src/libsyntax/parse/common.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ pub impl Parser {
295295
// f must consume tokens until reaching the next separator or
296296
// closing bracket.
297297
fn parse_seq_to_end<T: Copy>(
298-
ket: token::Token,
298+
ket: &token::Token,
299299
sep: SeqSep,
300300
f: fn(Parser) -> T
301301
) -> ~[T] {
@@ -308,36 +308,36 @@ pub impl Parser {
308308
// f must consume tokens until reaching the next separator or
309309
// closing bracket.
310310
fn parse_seq_to_before_end<T: Copy>(
311-
ket: token::Token,
311+
ket: &token::Token,
312312
sep: SeqSep,
313313
f: fn(Parser) -> T
314314
) -> ~[T] {
315315
let mut first: bool = true;
316316
let mut v: ~[T] = ~[];
317-
while *self.token != ket {
317+
while *self.token != *ket {
318318
match sep.sep {
319319
Some(ref t) => {
320320
if first { first = false; }
321321
else { self.expect(t); }
322322
}
323323
_ => ()
324324
}
325-
if sep.trailing_sep_allowed && *self.token == ket { break; }
325+
if sep.trailing_sep_allowed && *self.token == *ket { break; }
326326
v.push(f(self));
327327
}
328-
v
328+
return v;
329329
}
330330

331331
// parse a sequence, including the closing delimiter. The function
332332
// f must consume tokens until reaching the next separator or
333333
// closing bracket.
334334
fn parse_unspanned_seq<T: Copy>(
335-
+bra: token::Token,
336-
+ket: token::Token,
335+
bra: &token::Token,
336+
ket: &token::Token,
337337
sep: SeqSep,
338338
f: fn(Parser) -> T
339339
) -> ~[T] {
340-
self.expect(&bra);
340+
self.expect(bra);
341341
let result = self.parse_seq_to_before_end(ket, sep, f);
342342
self.bump();
343343
result
@@ -346,13 +346,13 @@ pub impl Parser {
346346
// NB: Do not use this function unless you actually plan to place the
347347
// spanned list in the AST.
348348
fn parse_seq<T: Copy>(
349-
+bra: token::Token,
350-
+ket: token::Token,
349+
bra: &token::Token,
350+
ket: &token::Token,
351351
sep: SeqSep,
352352
f: fn(Parser) -> T
353353
) -> spanned<~[T]> {
354354
let lo = self.span.lo;
355-
self.expect(&bra);
355+
self.expect(bra);
356356
let result = self.parse_seq_to_before_end(ket, sep, f);
357357
let hi = self.span.hi;
358358
self.bump();

‎src/libsyntax/parse/parser.rs

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,8 @@ pub impl Parser {
421421
self.expect(&token::GT);
422422
}
423423
let inputs = self.parse_unspanned_seq(
424-
token::LPAREN,
425-
token::RPAREN,
424+
&token::LPAREN,
425+
&token::RPAREN,
426426
seq_sep_trailing_disallowed(token::COMMA),
427427
|p| p.parse_arg_general(false)
428428
);
@@ -432,8 +432,8 @@ pub impl Parser {
432432
433433
fn parse_trait_methods() -> ~[trait_method] {
434434
do self.parse_unspanned_seq(
435-
token::LBRACE,
436-
token::RBRACE,
435+
&token::LBRACE,
436+
&token::RBRACE,
437437
seq_sep_none()
438438
) |p| {
439439
let attrs = p.parse_outer_attributes();
@@ -628,8 +628,8 @@ pub impl Parser {
628628
ty_ptr(self.parse_mt())
629629
} else if *self.token == token::LBRACE {
630630
let elems = self.parse_unspanned_seq(
631-
token::LBRACE,
632-
token::RBRACE,
631+
&token::LBRACE,
632+
&token::RBRACE,
633633
seq_sep_trailing_allowed(token::COMMA),
634634
|p| p.parse_ty_field()
635635
);
@@ -1190,7 +1190,7 @@ pub impl Parser {
11901190
// Vector with two or more elements.
11911191
self.bump();
11921192
let remaining_exprs = self.parse_seq_to_end(
1193-
token::RBRACKET,
1193+
&token::RBRACKET,
11941194
seq_sep_trailing_allowed(token::COMMA),
11951195
|p| p.parse_expr()
11961196
);
@@ -1246,8 +1246,8 @@ pub impl Parser {
12461246

12471247
let ket = token::flip_delimiter(&*self.token);
12481248
let tts = self.parse_unspanned_seq(
1249-
*self.token,
1250-
ket,
1249+
&copy *self.token,
1250+
&ket,
12511251
seq_sep_none(),
12521252
|p| p.parse_token_tree()
12531253
);
@@ -1339,8 +1339,8 @@ pub impl Parser {
13391339
match *self.token {
13401340
token::LPAREN if self.permits_call() => {
13411341
let es = self.parse_unspanned_seq(
1342-
token::LPAREN,
1343-
token::RPAREN,
1342+
&token::LPAREN,
1343+
&token::RPAREN,
13441344
seq_sep_trailing_disallowed(token::COMMA),
13451345
|p| p.parse_expr()
13461346
);
@@ -1363,8 +1363,8 @@ pub impl Parser {
13631363
// expr(...)
13641364
token::LPAREN if self.permits_call() => {
13651365
let es = self.parse_unspanned_seq(
1366-
token::LPAREN,
1367-
token::RPAREN,
1366+
&token::LPAREN,
1367+
&token::RPAREN,
13681368
seq_sep_trailing_disallowed(token::COMMA),
13691369
|p| p.parse_expr()
13701370
);
@@ -1434,8 +1434,8 @@ pub impl Parser {
14341434

14351435
if *p.token == token::LPAREN {
14361436
let seq = p.parse_seq(
1437-
token::LPAREN,
1438-
token::RPAREN,
1437+
&token::LPAREN,
1438+
&token::RPAREN,
14391439
seq_sep_none(),
14401440
|p| p.parse_token_tree()
14411441
);
@@ -1471,7 +1471,7 @@ pub impl Parser {
14711471
~[parse_any_tt_tok(self)],
14721472
vec::append(
14731473
self.parse_seq_to_before_end(
1474-
ket,
1474+
&ket,
14751475
seq_sep_none(),
14761476
|p| p.parse_token_tree()
14771477
),
@@ -2320,8 +2320,8 @@ pub impl Parser {
23202320
}
23212321
_ => {
23222322
args = self.parse_unspanned_seq(
2323-
token::LPAREN,
2324-
token::RPAREN,
2323+
&token::LPAREN,
2324+
&token::RPAREN,
23252325
seq_sep_trailing_disallowed(
23262326
token::COMMA
23272327
),
@@ -2470,8 +2470,8 @@ pub impl Parser {
24702470
};
24712471

24722472
let tts = self.parse_unspanned_seq(
2473-
token::LPAREN,
2474-
token::RPAREN,
2473+
&token::LPAREN,
2474+
&token::RPAREN,
24752475
seq_sep_none(),
24762476
|p| p.parse_token_tree()
24772477
);
@@ -2780,8 +2780,8 @@ pub impl Parser {
27802780
{
27812781
let args_or_capture_items: ~[arg_or_capture_item] =
27822782
self.parse_unspanned_seq(
2783-
token::LPAREN,
2784-
token::RPAREN,
2783+
&token::LPAREN,
2784+
&token::RPAREN,
27852785
seq_sep_trailing_disallowed(token::COMMA),
27862786
parse_arg_fn
27872787
);
@@ -2865,7 +2865,7 @@ pub impl Parser {
28652865
self.bump();
28662866
let sep = seq_sep_trailing_disallowed(token::COMMA);
28672867
args_or_capture_items = self.parse_seq_to_before_end(
2868-
token::RPAREN,
2868+
&token::RPAREN,
28692869
sep,
28702870
parse_arg_fn
28712871
);
@@ -2882,7 +2882,7 @@ pub impl Parser {
28822882
} else {
28832883
let sep = seq_sep_trailing_disallowed(token::COMMA);
28842884
args_or_capture_items = self.parse_seq_to_before_end(
2885-
token::RPAREN,
2885+
&token::RPAREN,
28862886
sep,
28872887
parse_arg_fn
28882888
);
@@ -2910,8 +2910,8 @@ pub impl Parser {
29102910
~[]
29112911
} else {
29122912
self.parse_unspanned_seq(
2913-
token::BINOP(token::OR),
2914-
token::BINOP(token::OR),
2913+
&token::BINOP(token::OR),
2914+
&token::BINOP(token::OR),
29152915
seq_sep_trailing_disallowed(token::COMMA),
29162916
|p| p.parse_fn_block_arg()
29172917
)
@@ -3112,7 +3112,7 @@ pub impl Parser {
31123112

31133113
fn parse_trait_ref_list(ket: &token::Token) -> ~[@trait_ref] {
31143114
self.parse_seq_to_before_end(
3115-
*ket,
3115+
ket,
31163116
seq_sep_none(),
31173117
|p| p.parse_trait_ref()
31183118
)
@@ -3163,8 +3163,8 @@ pub impl Parser {
31633163
// It's a tuple-like struct.
31643164
is_tuple_like = true;
31653165
fields = do self.parse_unspanned_seq(
3166-
token::LPAREN,
3167-
token::RPAREN,
3166+
&token::LPAREN,
3167+
&token::RPAREN,
31683168
seq_sep_trailing_allowed(token::COMMA)
31693169
) |p| {
31703170
let lo = p.span.lo;
@@ -3729,8 +3729,8 @@ pub impl Parser {
37293729
} else if *self.token == token::LPAREN {
37303730
all_nullary = false;
37313731
let arg_tys = self.parse_unspanned_seq(
3732-
token::LPAREN,
3733-
token::RPAREN,
3732+
&token::LPAREN,
3733+
&token::RPAREN,
37343734
seq_sep_trailing_disallowed(token::COMMA),
37353735
|p| p.parse_ty(false)
37363736
);
@@ -3982,8 +3982,8 @@ pub impl Parser {
39823982
token::LPAREN | token::LBRACE => {
39833983
let ket = token::flip_delimiter(&*self.token);
39843984
self.parse_unspanned_seq(
3985-
*self.token,
3986-
ket,
3985+
&copy *self.token,
3986+
&ket,
39873987
seq_sep_none(),
39883988
|p| p.parse_token_tree()
39893989
)
@@ -4074,8 +4074,8 @@ pub impl Parser {
40744074
// foo::bar::{a,b,c}
40754075
token::LBRACE => {
40764076
let idents = self.parse_unspanned_seq(
4077-
token::LBRACE,
4078-
token::RBRACE,
4077+
&token::LBRACE,
4078+
&token::RBRACE,
40794079
seq_sep_trailing_allowed(token::COMMA),
40804080
|p| p.parse_path_list_ident()
40814081
);

0 commit comments

Comments
 (0)