languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-11-02 14:59:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consolidating expr_to_str functions.

Browse source
This commit is contained in:
Lindsey Kuper 2011-05-05 15:53:38 -07:00 committed by Graydon Hoare
parent b3b98f3046
commit 9d7fc21967
5 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/comp/middle/trans.rs
View file

@ -12,15 +12,12 @@
import front.ast;
import front.creader;
import pretty.pprust;
import driver.session;
import middle.ty;
import back.Link;
import back.x86;
import back.abi;
import pretty.pprust;
import middle.ty.pat_ty;
import util.common;
@ -5397,7 +5394,7 @@ fn trans_log(int lvl, @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);
auto expr_str = pretty.pprust.expr_to_str(e);
auto expr_str = util.common.expr_to_str(e);
auto fail_cx = new_sub_block_ctxt(cx, "fail");
auto fail_res = trans_fail(fail_cx, some[common.span](e.span), expr_str);

2
src/comp/middle/ty.rs
View file

@ -1963,7 +1963,7 @@ fn replace_expr_type(@ast.expr expr, tup(vec[t], t) new_tyt) -> @ast.expr {
}
case (_) {
log_err "unhandled expr type in replace_expr_type(): " +
pretty.pprust.expr_to_str(expr);
util.common.expr_to_str(expr);
fail;
}
}

6
src/comp/middle/typeck.rs
View file

@ -42,8 +42,6 @@
import std.option.some;
import std.option.from_maybe;
import pretty.pprust;
import util.typestate_ann.ts_ann;
type ty_table = hashmap[ast.def_id, ty.t];
@ -1476,7 +1474,7 @@ fn pushdown_expr_full(&@fn_ctxt fcx, ty.t expected, @ast.expr e,
case (_) {
fcx.ccx.sess.span_unimpl(e.span,
#fmt("type unification for expression variant: %s",
pretty.pprust.expr_to_str(e)));
util.common.expr_to_str(e)));
fail;
}
}
@ -1735,7 +1733,7 @@ fn require_pure_function(@crate_ctxt ccx, &ast.def_id d_id, &span sp) -> () {
fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
//fcx.ccx.sess.span_warn(expr.span, "typechecking expr " +
// pretty.pprust.expr_to_str(expr));
// util.common.expr_to_str(expr));
// A generic function to factor out common logic from call and bind
// expressions.

9
src/comp/pretty/pprust.rs
View file

@ -41,15 +41,6 @@ fn block_to_str(&ast.block blk) -> str {
ret writer.get_str();
}
fn expr_to_str(&@ast.expr e) -> str {
auto writer = io.string_writer();
auto s = @rec(s=pp.mkstate(writer.get_writer(), 78u),
comments=option.none[vec[lexer.cmnt]],
mutable cur_cmnt=0u);
print_expr(s, e);
ret writer.get_str();
}
fn pat_to_str(&@ast.pat p) -> str {
auto writer = io.string_writer();
auto s = @rec(s=pp.mkstate(writer.get_writer(), 78u),

8
src/comp/util/common.rs
View file

@ -122,22 +122,22 @@ fn plain_ann(middle.ty.ctxt tcx) -> ast.ann {
none[vec[middle.ty.t]], none[@ts_ann]);
}
fn expr_to_str(&ast.expr e) -> str {
fn expr_to_str(&@ast.expr e) -> str {
let str_writer s = string_writer();
auto out_ = mkstate(s.get_writer(), 80u);
auto out = @rec(s=out_,
comments=none[vec[front.lexer.cmnt]],
mutable cur_cmnt=0u);
print_expr(out, @e);
print_expr(out, e);
ret s.get_str();
}
fn log_expr(&ast.expr e) -> () {
log(expr_to_str(e));
log(expr_to_str(@e));
}
fn log_expr_err(&ast.expr e) -> () {
log_err(expr_to_str(e));
log_err(expr_to_str(@e));
}
fn block_to_str(&ast.block b) -> str {