Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Knocking out a quick fixme: pretty-printing exprs in error messages. #306

Closed
wants to merge 4 commits into from
Closed

Knocking out a quick fixme: pretty-printing exprs in error messages. #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4b1d29
Knocking out a quick fixme: pretty-printing exprs in error messages.
lkuper Apr 2, 2011
bd1370e
Knocking out a quick fixme: pretty-printing exprs in error messages.
lkuper Apr 2, 2011
8f8cb9f
Oops -- if we're going to use the pretty-printer, we need it to work.
lkuper Apr 2, 2011
9f9c4b3
Merge remote branch 'origin/quickfix' into quickfix
lkuper Apr 2, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/comp/middle/trans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import middle.ty;
import back.x86;
import back.abi;

import pretty.pprust;

import middle.ty.pat_ty;
import middle.ty.plain_ty;

Expand Down Expand Up @@ -4910,8 +4912,7 @@ fn trans_log(@block_ctxt cx, @ast.expr e) -> result {
fn trans_check_expr(@block_ctxt cx, @ast.expr e) -> result {
auto cond_res = trans_expr(cx, e);

// FIXME: need pretty-printer.
auto expr_str = "<expr>";
auto expr_str = pretty.pprust.expr_to_str(e);
auto fail_cx = new_sub_block_ctxt(cx, "fail");
auto fail_res = trans_fail(fail_cx, e.span, expr_str);

Expand Down
5 changes: 5 additions & 0 deletions src/comp/pretty/pprust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,11 @@ impure fn print_literal(ps s, @ast.lit lit) {
wrd(s.s, common.istr(val as int));
wrd(s.s, common.ty_mach_to_str(mach));
}
case (ast.lit_mach_float(?mach,?val)) {
// val is already a str
wrd(s.s, val);
wrd(s.s, common.ty_mach_to_str(mach));
}
case (ast.lit_nil) {wrd(s.s, "()");}
case (ast.lit_bool(?val)) {
if (val) {wrd(s.s, "true");} else {wrd(s.s, "false");}
Expand Down