Skip to content

Commit 41aa270

Browse files
brsonbrson
committed
---
yaml --- r: 5007 b: refs/heads/master c: 26516dc h: refs/heads/master i: 5005: 27e7115 5003: 6f01220 4999: f0b7498 4991: 3cc561b v: v3
1 parent a67b397 commit 41aa270

File tree

4 files changed

+80
-76
lines changed

4 files changed

+80
-76
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 58dedcd090f4dba25430e0a02060e6658634299e
2+
refs/heads/master: 26516dc8d2e530574e466195cc9375e492a21b99

‎trunk/src/comp/syntax/parse/lexer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ fn gather_comments_and_literals(cm: &codemap::codemap, path: &istr,
750750
if is_lit(tok.tok) {
751751
literals += [{lit: rdr.get_str_from(tok.bpos), pos: tok.chpos}];
752752
}
753-
log "tok: " + token::to_str(rdr, tok.tok);
753+
log ~"tok: " + token::to_str(rdr, tok.tok);
754754
first_read = false;
755755
}
756756
ret {cmnts: comments, lits: literals};

‎trunk/src/comp/syntax/parse/parser.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ fn bad_expr_word_table() -> hashmap<istr, ()> {
191191

192192
fn unexpected(p: &parser, t: token::token) -> ! {
193193
let s: str = "unexpected token: ";
194-
s += token::to_str(p.get_reader(), t);
194+
s += istr::to_estr(token::to_str(p.get_reader(), t));
195195
p.fatal(s);
196196
}
197197

@@ -200,9 +200,9 @@ fn expect(p: &parser, t: token::token) {
200200
p.bump();
201201
} else {
202202
let s: str = "expecting ";
203-
s += token::to_str(p.get_reader(), t);
203+
s += istr::to_estr(token::to_str(p.get_reader(), t));
204204
s += ", found ";
205-
s += token::to_str(p.get_reader(), p.peek());
205+
s += istr::to_estr(token::to_str(p.get_reader(), p.peek()));
206206
p.fatal(s);
207207
}
208208
}
@@ -216,9 +216,9 @@ fn expect_gt(p: &parser) {
216216
p.swap(token::BINOP(token::LSR), p.get_lo_pos() + 1u, p.get_hi_pos());
217217
} else {
218218
let s: str = "expecting ";
219-
s += token::to_str(p.get_reader(), token::GT);
219+
s += istr::to_estr(token::to_str(p.get_reader(), token::GT));
220220
s += ", found ";
221-
s += token::to_str(p.get_reader(), p.peek());
221+
s += istr::to_estr(token::to_str(p.get_reader(), p.peek()));
222222
p.fatal(s);
223223
}
224224
}
@@ -268,7 +268,7 @@ fn eat_word(p: &parser, word: &str) -> bool {
268268
fn expect_word(p: &parser, word: &str) {
269269
if !eat_word(p, word) {
270270
p.fatal("expecting " + word + ", found " +
271-
token::to_str(p.get_reader(), p.peek()));
271+
istr::to_estr(token::to_str(p.get_reader(), p.peek())));
272272
}
273273
}
274274

@@ -1450,7 +1450,8 @@ fn parse_pat(p: &parser) -> @ast::pat {
14501450
p.bump();
14511451
if p.peek() != token::RBRACE {
14521452
p.fatal("expecting }, found " +
1453-
token::to_str(p.get_reader(), p.peek()));
1453+
istr::to_estr(
1454+
token::to_str(p.get_reader(), p.peek())));
14541455
}
14551456
etc = true;
14561457
break;
@@ -1705,7 +1706,8 @@ fn parse_block_tail(p: &parser, lo: uint, s: ast::check_mode) -> ast::blk {
17051706
if stmt_ends_with_semi(*stmt) {
17061707
p.fatal("expected ';' or '}' after " +
17071708
"expression but found " +
1708-
token::to_str(p.get_reader(), t));
1709+
istr::to_estr(
1710+
token::to_str(p.get_reader(), t)));
17091711
}
17101712
stmts += [stmt];
17111713
}
@@ -1923,7 +1925,8 @@ fn parse_mod_items(p: &parser, term: token::token,
19231925
some(i) { items += [i]; }
19241926
_ {
19251927
p.fatal("expected item but found " +
1926-
token::to_str(p.get_reader(), p.peek()));
1928+
istr::to_estr(
1929+
token::to_str(p.get_reader(), p.peek())));
19271930
}
19281931
}
19291932
}
@@ -2119,7 +2122,8 @@ fn parse_item_tag(p: &parser, attrs: &[ast::attribute]) -> @ast::item {
21192122
token::RBRACE. {/* empty */ }
21202123
_ {
21212124
p.fatal("expected name of variant or '}' but found " +
2122-
token::to_str(p.get_reader(), tok));
2125+
istr::to_estr(
2126+
token::to_str(p.get_reader(), tok)));
21232127
}
21242128
}
21252129
}

‎trunk/src/comp/syntax/parse/token.rs

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -85,103 +85,103 @@ tag token {
8585
EOF;
8686
}
8787

88-
fn binop_to_str(o: binop) -> str {
88+
fn binop_to_str(o: binop) -> istr {
8989
alt o {
90-
PLUS. { ret "+"; }
91-
MINUS. { ret "-"; }
92-
STAR. { ret "*"; }
93-
SLASH. { ret "/"; }
94-
PERCENT. { ret "%"; }
95-
CARET. { ret "^"; }
96-
AND. { ret "&"; }
97-
OR. { ret "|"; }
98-
LSL. { ret "<<"; }
99-
LSR. { ret ">>"; }
100-
ASR. { ret ">>>"; }
90+
PLUS. { ret ~"+"; }
91+
MINUS. { ret ~"-"; }
92+
STAR. { ret ~"*"; }
93+
SLASH. { ret ~"/"; }
94+
PERCENT. { ret ~"%"; }
95+
CARET. { ret ~"^"; }
96+
AND. { ret ~"&"; }
97+
OR. { ret ~"|"; }
98+
LSL. { ret ~"<<"; }
99+
LSR. { ret ~">>"; }
100+
ASR. { ret ~">>>"; }
101101
}
102102
}
103103
104-
fn to_str(r: lexer::reader, t: token) -> str {
104+
fn to_str(r: lexer::reader, t: token) -> istr {
105105
alt t {
106-
EQ. { ret "="; }
107-
LT. { ret "<"; }
108-
LE. { ret "<="; }
109-
EQEQ. { ret "=="; }
110-
NE. { ret "!="; }
111-
GE. { ret ">="; }
112-
GT. { ret ">"; }
113-
NOT. { ret "!"; }
114-
TILDE. { ret "~"; }
115-
OROR. { ret "||"; }
116-
ANDAND. { ret "&&"; }
106+
EQ. { ret ~"="; }
107+
LT. { ret ~"<"; }
108+
LE. { ret ~"<="; }
109+
EQEQ. { ret ~"=="; }
110+
NE. { ret ~"!="; }
111+
GE. { ret ~">="; }
112+
GT. { ret ~">"; }
113+
NOT. { ret ~"!"; }
114+
TILDE. { ret ~"~"; }
115+
OROR. { ret ~"||"; }
116+
ANDAND. { ret ~"&&"; }
117117
BINOP(op) { ret binop_to_str(op); }
118-
BINOPEQ(op) { ret binop_to_str(op) + "="; }
118+
BINOPEQ(op) { ret binop_to_str(op) + ~"="; }
119119
120120
121121
/* Structural symbols */
122122
AT. {
123-
ret "@";
123+
ret ~"@";
124124
}
125-
DOT. { ret "."; }
126-
ELLIPSIS. { ret "..."; }
127-
COMMA. { ret ","; }
128-
SEMI. { ret ";"; }
129-
COLON. { ret ":"; }
130-
MOD_SEP. { ret "::"; }
131-
QUES. { ret "?"; }
132-
RARROW. { ret "->"; }
133-
LARROW. { ret "<-"; }
134-
DARROW. { ret "<->"; }
135-
LPAREN. { ret "("; }
136-
RPAREN. { ret ")"; }
137-
LBRACKET. { ret "["; }
138-
RBRACKET. { ret "]"; }
139-
LBRACE. { ret "{"; }
140-
RBRACE. { ret "}"; }
141-
POUND. { ret "#"; }
142-
POUND_LBRACE. { ret "#{"; }
143-
POUND_LT. { ret "#<"; }
125+
DOT. { ret ~"."; }
126+
ELLIPSIS. { ret ~"..."; }
127+
COMMA. { ret ~","; }
128+
SEMI. { ret ~";"; }
129+
COLON. { ret ~":"; }
130+
MOD_SEP. { ret ~"::"; }
131+
QUES. { ret ~"?"; }
132+
RARROW. { ret ~"->"; }
133+
LARROW. { ret ~"<-"; }
134+
DARROW. { ret ~"<->"; }
135+
LPAREN. { ret ~"("; }
136+
RPAREN. { ret ~")"; }
137+
LBRACKET. { ret ~"["; }
138+
RBRACKET. { ret ~"]"; }
139+
LBRACE. { ret ~"{"; }
140+
RBRACE. { ret ~"}"; }
141+
POUND. { ret ~"#"; }
142+
POUND_LBRACE. { ret ~"#{"; }
143+
POUND_LT. { ret ~"#<"; }
144144

145145

146146
/* Literals */
147147
LIT_INT(i) {
148-
ret istr::to_estr(int::to_str(i, 10u));
148+
ret int::to_str(i, 10u);
149149
}
150-
LIT_UINT(u) { ret istr::to_estr(uint::to_str(u, 10u)); }
150+
LIT_UINT(u) { ret uint::to_str(u, 10u); }
151151
LIT_MACH_INT(tm, i) {
152-
ret istr::to_estr(int::to_str(i, 10u)) + "_" + ty_mach_to_str(tm);
152+
ret int::to_str(i, 10u) + ~"_" + istr::from_estr(ty_mach_to_str(tm));
153153
}
154154
LIT_MACH_FLOAT(tm, s) {
155-
ret istr::to_estr(interner::get::<istr>(
156-
*r.get_interner(), s) + ~"_") +
157-
ty_mach_to_str(tm);
155+
ret interner::get::<istr>(
156+
*r.get_interner(), s) + ~"_" +
157+
istr::from_estr(ty_mach_to_str(tm));
158158
}
159159
LIT_FLOAT(s) {
160-
ret istr::to_estr(interner::get::<istr>(*r.get_interner(), s));
160+
ret interner::get::<istr>(*r.get_interner(), s);
161161
}
162162
LIT_STR(s) { // FIXME: escape.
163-
ret "\"" +
164-
istr::to_estr(interner::get::<istr>(*r.get_interner(), s))
165-
+ "\"";
163+
ret ~"\"" +
164+
interner::get::<istr>(*r.get_interner(), s)
165+
+ ~"\"";
166166
}
167167
LIT_CHAR(c) {
168168
// FIXME: escape.
169-
let tmp = "'";
170-
str::push_char(tmp, c);
171-
str::push_byte(tmp, '\'' as u8);
169+
let tmp = ~"'";
170+
istr::push_char(tmp, c);
171+
istr::push_byte(tmp, '\'' as u8);
172172
ret tmp;
173173
}
174-
LIT_BOOL(b) { if b { ret "true"; } else { ret "false"; } }
174+
LIT_BOOL(b) { if b { ret ~"true"; } else { ret ~"false"; } }
175175

176176

177177
/* Name components */
178178
IDENT(s, _) {
179-
ret istr::to_estr(interner::get::<istr>(*r.get_interner(), s));
179+
ret interner::get::<istr>(*r.get_interner(), s);
180180
}
181-
IDX(i) { ret istr::to_estr(~"_" + int::to_str(i, 10u)); }
182-
UNDERSCORE. { ret "_"; }
183-
BRACEQUOTE(_) { ret "<bracequote>"; }
184-
EOF. { ret "<eof>"; }
181+
IDX(i) { ret ~"_" + int::to_str(i, 10u); }
182+
UNDERSCORE. { ret ~"_"; }
183+
BRACEQUOTE(_) { ret ~"<bracequote>"; }
184+
EOF. { ret ~"<eof>"; }
185185
}
186186
}
187187

0 commit comments

Comments
 (0)