OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix pretty-printing of istr literals. Issue #855

Browse Source
This commit is contained in:
Brian Anderson 2011-08-23 11:08:31 -07:00
parent c274d16b7f
commit 7b12924813
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/comp/syntax/parse/parser.rs
View File

@ -886,10 +886,11 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr {
p.bump();
alt p.peek() {
token::LIT_STR(s) {
let sp = p.get_span();
p.bump();
let lit =
@{node: ast::lit_str(p.get_str(s), ast::sk_unique),
span: p.get_span()};
span: sp};
ex = ast::expr_lit(lit);
}
_ { ex = ast::expr_uniq(parse_expr(p)); }

12
src/comp/syntax/print/pprust.rs
View File

@ -1468,7 +1468,17 @@ fn print_literal(s: &ps, lit: &@ast::lit) {
maybe_print_comment(s, lit.span.lo);
alt next_lit(s) {
some(lt) {
if lt.pos == lit.span.lo { word(s.s, lt.lit); s.cur_lit += 1u; ret; }
if lt.pos == lit.span.lo {
// FIXME: This is a hack until istrs replace strings, since
// istrs are prefixed with a token that is not part of the literal
alt lit.node {
ast::lit_str(_, ast::sk_unique.) { word(s.s, "~"); }
_ { }
}
word(s.s, lt.lit);
s.cur_lit += 1u;
ret;
}
}
_ { }
}