Skip to content

Commit 4650da5

Browse files
erickterickt
committed
libsyntax: change eat to take a &token
1 parent 1deb858 commit 4650da5

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎src/libsyntax/ext/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ pub fn get_exprs_from_tts(cx: ext_ctxt, tts: &[ast::token_tree])
341341
let mut es = ~[];
342342
while *p.token != token::EOF {
343343
if es.len() != 0 {
344-
p.eat(token::COMMA);
344+
p.eat(&token::COMMA);
345345
}
346346
es.push(p.parse_expr());
347347
}

‎src/libsyntax/parse/common.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ pub impl Parser {
103103

104104
// consume token 'tok' if it exists. Returns true if the given
105105
// token was present, false otherwise.
106-
fn eat(tok: token::Token) -> bool {
107-
return if *self.token == tok { self.bump(); true } else { false };
106+
fn eat(tok: &token::Token) -> bool {
107+
return if *self.token == *tok { self.bump(); true } else { false };
108108
}
109109

110110
// Storing keywords as interned idents instead of strings would be nifty.

‎src/libsyntax/parse/parser.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ pub impl Parser {
417417
Lifetimes
418418
419419
*/
420-
if self.eat(token::LT) {
420+
if self.eat(&token::LT) {
421421
let _lifetimes = self.parse_lifetimes();
422422
self.expect(token::GT);
423423
}
@@ -525,9 +525,9 @@ pub impl Parser {
525525
}
526526

527527
fn parse_ret_ty() -> (ret_style, @Ty) {
528-
return if self.eat(token::RARROW) {
528+
return if self.eat(&token::RARROW) {
529529
let lo = self.span.lo;
530-
if self.eat(token::NOT) {
530+
if self.eat(&token::NOT) {
531531
(
532532
noreturn,
533533
@Ty {
@@ -719,12 +719,12 @@ pub impl Parser {
719719
}
720720

721721
fn parse_arg_mode() -> mode {
722-
if self.eat(token::BINOP(token::MINUS)) {
722+
if self.eat(&token::BINOP(token::MINUS)) {
723723
expl(by_copy) // NDM outdated syntax
724-
} else if self.eat(token::ANDAND) {
724+
} else if self.eat(&token::ANDAND) {
725725
expl(by_ref)
726-
} else if self.eat(token::BINOP(token::PLUS)) {
727-
if self.eat(token::BINOP(token::PLUS)) {
726+
} else if self.eat(&token::BINOP(token::PLUS)) {
727+
if self.eat(&token::BINOP(token::PLUS)) {
728728
expl(by_val)
729729
} else {
730730
expl(by_copy)
@@ -806,7 +806,7 @@ pub impl Parser {
806806
let m = p.parse_arg_mode();
807807
let is_mutbl = self.eat_keyword(&~"mut");
808808
let pat = p.parse_pat(false);
809-
let t = if p.eat(token::COLON) {
809+
let t = if p.eat(&token::COLON) {
810810
p.parse_ty(false)
811811
} else {
812812
@Ty {
@@ -826,7 +826,7 @@ pub impl Parser {
826826
}
827827

828828
fn maybe_parse_fixed_vstore_with_star() -> Option<uint> {
829-
if self.eat(token::BINOP(token::STAR)) {
829+
if self.eat(&token::BINOP(token::STAR)) {
830830
match *self.token {
831831
token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 => {
832832
self.bump();
@@ -884,7 +884,7 @@ pub impl Parser {
884884

885885
maybe_whole!(self, nt_path);
886886
let lo = self.span.lo;
887-
let global = self.eat(token::MOD_SEP);
887+
let global = self.eat(&token::MOD_SEP);
888888
let mut ids = ~[];
889889
loop {
890890
let is_not_last =
@@ -917,7 +917,7 @@ pub impl Parser {
917917
maybe_whole!(self, nt_path);
918918
let lo = self.span.lo;
919919
let path = self.parse_path_without_tps();
920-
if colons && !self.eat(token::MOD_SEP) {
920+
if colons && !self.eat(&token::MOD_SEP) {
921921
return path;
922922
}
923923

@@ -940,7 +940,7 @@ pub impl Parser {
940940

941941
// Parse any lifetime or type parameters which may appear:
942942
let tps = {
943-
if !self.eat(token::LT) {
943+
if !self.eat(&token::LT) {
944944
~[]
945945
} else {
946946
// First consume lifetimes.
@@ -1251,7 +1251,7 @@ pub impl Parser {
12511251

12521252
self.expect(token::COMMA);
12531253

1254-
if self.eat(token::DOTDOT) {
1254+
if self.eat(&token::DOTDOT) {
12551255
base = Some(self.parse_expr());
12561256
break;
12571257
}
@@ -1302,12 +1302,12 @@ pub impl Parser {
13021302
let mut hi;
13031303
loop {
13041304
// expr.f
1305-
if self.eat(token::DOT) {
1305+
if self.eat(&token::DOT) {
13061306
match *self.token {
13071307
token::IDENT(i, _) => {
13081308
hi = self.span.hi;
13091309
self.bump();
1310-
let tys = if self.eat(token::MOD_SEP) {
1310+
let tys = if self.eat(&token::MOD_SEP) {
13111311
self.expect(token::LT);
13121312
self.parse_seq_to_gt(Some(token::COMMA),
13131313
|p| p.parse_ty(false))
@@ -1960,7 +1960,7 @@ pub impl Parser {
19601960
if require_comma {
19611961
self.expect(token::COMMA);
19621962
} else {
1963-
self.eat(token::COMMA);
1963+
self.eat(&token::COMMA);
19641964
}
19651965
19661966
let blk = codemap::spanned {
@@ -2218,7 +2218,7 @@ pub impl Parser {
22182218
|| self.is_keyword(&~"false")
22192219
{
22202220
let val = self.parse_expr_res(RESTRICT_NO_BAR_OP);
2221-
if self.eat(token::DOTDOT) {
2221+
if self.eat(&token::DOTDOT) {
22222222
let end = self.parse_expr_res(RESTRICT_NO_BAR_OP);
22232223
pat = pat_range(val, end);
22242224
} else {
@@ -2246,7 +2246,7 @@ pub impl Parser {
22462246
if is_plain_ident(*self.token) && cannot_be_enum_or_struct {
22472247
let name = self.parse_value_path();
22482248
let sub;
2249-
if self.eat(token::AT) {
2249+
if self.eat(&token::AT) {
22502250
sub = Some(self.parse_pat(refutable));
22512251
} else {
22522252
sub = None;
@@ -2315,7 +2315,7 @@ pub impl Parser {
23152315
~"expected identifier, found path");
23162316
}
23172317
let name = self.parse_value_path();
2318-
let sub = if self.eat(token::AT) {
2318+
let sub = if self.eat(&token::AT) {
23192319
Some(self.parse_pat(refutable))
23202320
} else { None };
23212321

@@ -2343,7 +2343,7 @@ pub impl Parser {
23432343
node: ty_infer,
23442344
span: mk_sp(lo, lo),
23452345
};
2346-
if self.eat(token::COLON) { ty = self.parse_ty(false); }
2346+
if self.eat(&token::COLON) { ty = self.parse_ty(false); }
23472347
let init = if allow_init { self.parse_initializer() } else { None };
23482348
@spanned(
23492349
lo,
@@ -2362,7 +2362,7 @@ pub impl Parser {
23622362
let is_mutbl = self.eat_keyword(&~"mut");
23632363
let lo = self.span.lo;
23642364
let mut locals = ~[self.parse_local(is_mutbl, true)];
2365-
while self.eat(token::COMMA) {
2365+
while self.eat(&token::COMMA) {
23662366
locals.push(self.parse_local(is_mutbl, true));
23672367
}
23682368
return @spanned(lo, self.last_span.hi, decl_local(locals));
@@ -2648,9 +2648,9 @@ pub impl Parser {
26482648

26492649
fn parse_optional_ty_param_bounds() -> @~[ty_param_bound] {
26502650
let mut bounds = ~[];
2651-
if self.eat(token::COLON) {
2651+
if self.eat(&token::COLON) {
26522652
loop {
2653-
if self.eat(token::BINOP(token::AND)) {
2653+
if self.eat(&token::BINOP(token::AND)) {
26542654
if self.eat_keyword(&~"static") {
26552655
bounds.push(RegionTyParamBound);
26562656
} else {
@@ -2695,7 +2695,7 @@ pub impl Parser {
26952695
break;
26962696
}
26972697

2698-
if self.eat(token::BINOP(token::PLUS)) {
2698+
if self.eat(&token::BINOP(token::PLUS)) {
26992699
loop;
27002700
}
27012701

@@ -2715,7 +2715,7 @@ pub impl Parser {
27152715
}
27162716

27172717
fn parse_ty_params() -> ~[ty_param] {
2718-
if self.eat(token::LT) {
2718+
if self.eat(&token::LT) {
27192719
let _lifetimes = self.parse_lifetimes();
27202720
self.parse_seq_to_gt(
27212721
Some(token::COMMA),
@@ -2849,7 +2849,7 @@ pub impl Parser {
28492849

28502850
fn parse_fn_block_decl() -> fn_decl {
28512851
let inputs_captures = {
2852-
if self.eat(token::OROR) {
2852+
if self.eat(&token::OROR) {
28532853
~[]
28542854
} else {
28552855
self.parse_unspanned_seq(
@@ -2858,7 +2858,7 @@ pub impl Parser {
28582858
|p| p.parse_fn_block_arg())
28592859
}
28602860
};
2861-
let output = if self.eat(token::RARROW) {
2861+
let output = if self.eat(&token::RARROW) {
28622862
self.parse_ty(false)
28632863
} else {
28642864
@Ty { id: self.get_id(), node: ty_infer, span: *self.span }
@@ -2996,17 +2996,17 @@ pub impl Parser {
29962996

29972997
ty = self.parse_ty(false);
29982998
opt_trait_ref
2999-
} else if self.eat(token::COLON) {
2999+
} else if self.eat(&token::COLON) {
30003000
self.obsolete(*self.span, ObsoleteImplSyntax);
30013001
Some(self.parse_trait_ref())
30023002
} else {
30033003
None
30043004
};
30053005

30063006
let mut meths = ~[];
3007-
if !self.eat(token::SEMI) {
3007+
if !self.eat(&token::SEMI) {
30083008
self.expect(token::LBRACE);
3009-
while !self.eat(token::RBRACE) {
3009+
while !self.eat(&token::RBRACE) {
30103010
meths.push(self.parse_method());
30113011
}
30123012
}
@@ -3061,7 +3061,7 @@ pub impl Parser {
30613061
let class_name = self.parse_value_ident();
30623062
self.parse_region_param();
30633063
let ty_params = self.parse_ty_params();
3064-
if self.eat(token::COLON) {
3064+
if self.eat(&token::COLON) {
30653065
self.obsolete(*self.span, ObsoleteClassTraits);
30663066
let _ = self.parse_trait_ref_list(token::LBRACE);
30673067
}
@@ -3070,7 +3070,7 @@ pub impl Parser {
30703070
let mut the_dtor: Option<(blk, ~[attribute], codemap::span)> = None;
30713071
let is_tuple_like;
30723072

3073-
if self.eat(token::LBRACE) {
3073+
if self.eat(&token::LBRACE) {
30743074
// It's a record-like struct.
30753075
is_tuple_like = false;
30763076
fields = ~[];
@@ -3113,7 +3113,7 @@ pub impl Parser {
31133113
@spanned(lo, p.span.hi, struct_field_)
31143114
};
31153115
self.expect(token::SEMI);
3116-
} else if self.eat(token::SEMI) {
3116+
} else if self.eat(&token::SEMI) {
31173117
// It's a unit-like struct.
31183118
is_tuple_like = true;
31193119
fields = ~[];
@@ -3526,7 +3526,7 @@ pub impl Parser {
35263526
};
35273527

35283528
// extern mod { ... }
3529-
if items_allowed && self.eat(token::LBRACE) {
3529+
if items_allowed && self.eat(&token::LBRACE) {
35303530
let abi;
35313531
match abi_opt {
35323532
Some(found_abi) => abi = found_abi,
@@ -3578,7 +3578,7 @@ pub impl Parser {
35783578
}
35793579

35803580
fn parse_region_param() {
3581-
if self.eat(token::BINOP(token::SLASH)) {
3581+
if self.eat(&token::BINOP(token::SLASH)) {
35823582
self.expect(token::BINOP(token::AND));
35833583
}
35843584
}
@@ -3659,7 +3659,7 @@ pub impl Parser {
36593659
needs_comma = false;
36603660
} else {
36613661
ident = self.parse_value_ident();
3662-
if self.eat(token::LBRACE) {
3662+
if self.eat(&token::LBRACE) {
36633663
// Parse a struct variant.
36643664
all_nullary = false;
36653665
kind = struct_variant_kind(self.parse_struct_def());
@@ -3676,7 +3676,7 @@ pub impl Parser {
36763676
});
36773677
}
36783678
kind = tuple_variant_kind(args);
3679-
} else if self.eat(token::EQ) {
3679+
} else if self.eat(&token::EQ) {
36803680
have_disr = true;
36813681
disr_expr = Some(self.parse_expr());
36823682
kind = tuple_variant_kind(args);
@@ -3696,7 +3696,7 @@ pub impl Parser {
36963696
};
36973697
variants.push(spanned(vlo, self.last_span.hi, vr));
36983698

3699-
if needs_comma && !self.eat(token::COMMA) { break; }
3699+
if needs_comma && !self.eat(&token::COMMA) { break; }
37003700
}
37013701
self.expect(token::RBRACE);
37023702
if (have_disr && !all_nullary) {

0 commit comments

Comments
 (0)