Skip to content

Commit d346b51

Browse files
erickterickt
committed
libsyntax: change token::to_str to take &Token
1 parent 194f29c commit d346b51

File tree

6 files changed

+50
-44
lines changed

6 files changed

+50
-44
lines changed

‎src/libsyntax/ext/tt/macro_parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ pub fn parse(sess: @mut ParseSess,
378378
nts, next_eis.len()));
379379
} else if (bb_eis.len() == 0u && next_eis.len() == 0u) {
380380
return failure(sp, ~"No rules expected the token: "
381-
+ to_str(rdr.interner(), tok));
381+
+ to_str(rdr.interner(), &tok));
382382
} else if (next_eis.len() > 0u) {
383383
/* Now process the next token */
384384
while(next_eis.len() > 0u) {
@@ -424,7 +424,7 @@ pub fn parse_nt(p: Parser, name: ~str) -> nonterminal {
424424
~"ident" => match *p.token {
425425
token::IDENT(sn,b) => { p.bump(); token::nt_ident(sn,b) }
426426
_ => p.fatal(~"expected ident, found "
427-
+ token::to_str(p.reader.interner(), copy *p.token))
427+
+ token::to_str(p.reader.interner(), &copy *p.token))
428428
},
429429
~"path" => token::nt_path(p.parse_path_with_tps(false)),
430430
~"tt" => {

‎src/libsyntax/parse/comments.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ pub fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
359359
literals.push(lit {lit: s, pos: sp.lo});
360360
log(debug, ~"tok lit: " + s);
361361
} else {
362-
log(debug, ~"tok: " + token::to_str(rdr.interner, tok));
362+
log(debug, ~"tok: " + token::to_str(rdr.interner, &tok));
363363
}
364364
first_read = false;
365365
}

‎src/libsyntax/parse/common.rs

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub fn seq_sep_none() -> SeqSep {
4646
}
4747
}
4848

49-
pub fn token_to_str(reader: reader, ++token: token::Token) -> ~str {
49+
pub fn token_to_str(reader: reader, token: &token::Token) -> ~str {
5050
token::to_str(reader.interner(), token)
5151
}
5252

@@ -56,7 +56,7 @@ pub impl Parser {
5656
*self.last_span,
5757
fmt!(
5858
"unexpected token: `%s`",
59-
token_to_str(self.reader, t)
59+
token_to_str(self.reader, &t)
6060
)
6161
);
6262
}
@@ -65,7 +65,7 @@ pub impl Parser {
6565
self.fatal(
6666
fmt!(
6767
"unexpected token: `%s`",
68-
token_to_str(self.reader, *self.token)
68+
token_to_str(self.reader, &copy *self.token)
6969
)
7070
);
7171
}
@@ -77,9 +77,10 @@ pub impl Parser {
7777
self.bump();
7878
} else {
7979
self.fatal(
80-
fmt!("expected `%s` but found `%s`",
81-
token_to_str(self.reader, *t),
82-
token_to_str(self.reader, *self.token)
80+
fmt!(
81+
"expected `%s` but found `%s`",
82+
token_to_str(self.reader, t),
83+
token_to_str(self.reader, &copy *self.token)
8384
)
8485
)
8586
}
@@ -102,7 +103,7 @@ pub impl Parser {
102103
self.fatal(
103104
fmt!(
104105
"expected ident, found `%s`",
105-
token_to_str(self.reader, *self.token)
106+
token_to_str(self.reader, &copy *self.token)
106107
)
107108
);
108109
}
@@ -149,7 +150,7 @@ pub impl Parser {
149150
}
150151

151152
fn is_keyword(word: &~str) -> bool {
152-
self.token_is_keyword(word, &*self.token)
153+
self.token_is_keyword(word, &copy *self.token)
153154
}
154155

155156
fn is_any_keyword(tok: &token::Token) -> bool {
@@ -178,7 +179,7 @@ pub impl Parser {
178179
fmt!(
179180
"expected `%s`, found `%s`",
180181
*word,
181-
token_to_str(self.reader, *self.token)
182+
token_to_str(self.reader, &copy *self.token)
182183
)
183184
);
184185
}
@@ -190,11 +191,11 @@ pub impl Parser {
190191

191192
fn check_strict_keywords() {
192193
match *self.token {
193-
token::IDENT(_, false) => {
194-
let w = token_to_str(self.reader, *self.token);
195-
self.check_strict_keywords_(&w);
196-
}
197-
_ => ()
194+
token::IDENT(_, false) => {
195+
let w = token_to_str(self.reader, &copy *self.token);
196+
self.check_strict_keywords_(&w);
197+
}
198+
_ => ()
198199
}
199200
}
200201

@@ -210,11 +211,11 @@ pub impl Parser {
210211

211212
fn check_reserved_keywords() {
212213
match *self.token {
213-
token::IDENT(_, false) => {
214-
let w = token_to_str(self.reader, *self.token);
215-
self.check_reserved_keywords_(&w);
216-
}
217-
_ => ()
214+
token::IDENT(_, false) => {
215+
let w = token_to_str(self.reader, &copy *self.token);
216+
self.check_reserved_keywords_(&w);
217+
}
218+
_ => ()
218219
}
219220
}
220221

@@ -237,9 +238,9 @@ pub impl Parser {
237238
);
238239
} else {
239240
let mut s: ~str = ~"expected `";
240-
s += token_to_str(self.reader, token::GT);
241+
s += token_to_str(self.reader, &token::GT);
241242
s += ~"`, found `";
242-
s += token_to_str(self.reader, *self.token);
243+
s += token_to_str(self.reader, &copy *self.token);
243244
s += ~"`";
244245
self.fatal(s);
245246
}

‎src/libsyntax/parse/parser.rs

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ pub impl Parser {
460460
let hi = p.last_span.hi;
461461
debug!("parse_trait_methods(): trait method signature ends in \
462462
`%s`",
463-
token_to_str(p.reader, copy *p.token));
463+
token_to_str(p.reader, &copy *p.token));
464464
match *p.token {
465465
token::SEMI => {
466466
p.bump();
@@ -502,7 +502,7 @@ pub impl Parser {
502502
p.fatal(
503503
fmt!(
504504
"expected `;` or `}` but found `%s`",
505-
token_to_str(p.reader, copy *p.token)
505+
token_to_str(p.reader, &copy *p.token)
506506
)
507507
);
508508
}
@@ -848,7 +848,7 @@ pub impl Parser {
848848
fmt!(
849849
"expected integral vector length \
850850
but found `%s`",
851-
token_to_str(self.reader, copy *self.token)
851+
token_to_str(self.reader, &copy *self.token)
852852
)
853853
);
854854
}
@@ -1423,7 +1423,7 @@ pub impl Parser {
14231423
p.fatal(
14241424
fmt!(
14251425
"incorrect close delimiter: `%s`",
1426-
token_to_str(p.reader, copy *p.token)
1426+
token_to_str(p.reader, &copy *p.token)
14271427
)
14281428
);
14291429
}
@@ -2114,7 +2114,7 @@ pub impl Parser {
21142114
self.fatal(
21152115
fmt!(
21162116
"expected `}`, found `%s`",
2117-
token_to_str(self.reader, copy *self.token)
2117+
token_to_str(self.reader, &copy *self.token)
21182118
)
21192119
);
21202120
}
@@ -2621,10 +2621,15 @@ pub impl Parser {
26212621
copy t => {
26222622
if classify::stmt_ends_with_semi(*stmt) {
26232623
self.fatal(
2624-
~"expected `;` or `}` after \
2625-
expression but found `"
2626-
+ token_to_str(self.reader, t)
2627-
+ ~"`");
2624+
fmt!(
2625+
"expected `;` or `}` after \
2626+
expression but found `%s`",
2627+
token_to_str(
2628+
self.reader,
2629+
&t
2630+
)
2631+
)
2632+
);
26282633
}
26292634
stmts.push(stmt);
26302635
}
@@ -2811,7 +2816,7 @@ pub impl Parser {
28112816
self.fatal(
28122817
fmt!(
28132818
"expected `self` but found `%s`",
2814-
token_to_str(self.reader, copy *self.token)
2819+
token_to_str(self.reader, &copy *self.token)
28152820
)
28162821
);
28172822
}
@@ -2883,7 +2888,7 @@ pub impl Parser {
28832888
self.fatal(
28842889
fmt!(
28852890
"expected `,` or `)`, found `%s`",
2886-
token_to_str(self.reader, copy *self.token)
2891+
token_to_str(self.reader, &copy *self.token)
28872892
)
28882893
);
28892894
}
@@ -3194,7 +3199,7 @@ pub impl Parser {
31943199
fmt!(
31953200
"expected `{`, `(`, or `;` after struct name \
31963201
but found `%s`",
3197-
token_to_str(self.reader, copy *self.token)
3202+
token_to_str(self.reader, &copy *self.token)
31983203
)
31993204
);
32003205
}
@@ -3244,7 +3249,7 @@ pub impl Parser {
32443249
copy *self.span,
32453250
fmt!(
32463251
"expected `;`, `,`, or '}' but found `%s`",
3247-
token_to_str(self.reader, copy *self.token)
3252+
token_to_str(self.reader, &copy *self.token)
32483253
)
32493254
);
32503255
}
@@ -3334,7 +3339,7 @@ pub impl Parser {
33343339
self.fatal(
33353340
fmt!(
33363341
"expected item but found `%s`",
3337-
token_to_str(self.reader, copy *self.token)
3342+
token_to_str(self.reader, &copy *self.token)
33383343
)
33393344
);
33403345
}
@@ -3590,7 +3595,7 @@ pub impl Parser {
35903595
copy *self.span,
35913596
fmt!(
35923597
"expected `{` or `mod` but found `%s`",
3593-
token_to_str(self.reader, copy *self.token)
3598+
token_to_str(self.reader, &copy *self.token)
35943599
)
35953600
);
35963601
}
@@ -3603,7 +3608,7 @@ pub impl Parser {
36033608
copy *self.span,
36043609
fmt!(
36053610
"expected foreign module name but found `%s`",
3606-
token_to_str(self.reader, copy *self.token)
3611+
token_to_str(self.reader, &copy *self.token)
36073612
)
36083613
);
36093614
}

‎src/libsyntax/parse/token.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ pub fn binop_to_str(o: binop) -> ~str {
130130
}
131131
}
132132
133-
pub fn to_str(in: @ident_interner, t: Token) -> ~str {
134-
match t {
133+
pub fn to_str(in: @ident_interner, t: &Token) -> ~str {
134+
match *t {
135135
EQ => ~"=",
136136
LT => ~"<",
137137
LE => ~"<=",

‎src/libsyntax/print/pprust.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,14 +777,14 @@ pub fn print_tt(s: @ps, tt: ast::token_tree) {
777777
match tt {
778778
ast::tt_delim(ref tts) => print_tts(s, *tts),
779779
ast::tt_tok(_, ref tk) => {
780-
word(s.s, parse::token::to_str(s.intr, (*tk)));
780+
word(s.s, parse::token::to_str(s.intr, tk));
781781
}
782782
ast::tt_seq(_, ref tts, ref sep, zerok) => {
783783
word(s.s, ~"$(");
784784
for (*tts).each() |tt_elt| { print_tt(s, *tt_elt); }
785785
word(s.s, ~")");
786786
match (*sep) {
787-
Some(ref tk) => word(s.s, parse::token::to_str(s.intr, (*tk))),
787+
Some(ref tk) => word(s.s, parse::token::to_str(s.intr, tk)),
788788
None => ()
789789
}
790790
word(s.s, if zerok { ~"*" } else { ~"+" });

0 commit comments

Comments
 (0)