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

Factor out creation of calls into ExtFmt.RT

Browse Source
This commit is contained in:
Brian Anderson 2011-04-11 21:55:03 -04:00
parent bba245f3e6
commit 73eecbd0ca
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/comp/front/extfmt.rs
View File

@ -125,6 +125,14 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
ret sp_callexpr;
}
fn make_conv_call(common.span sp, str conv_type,
@ast.expr arg) -> @ast.expr {
auto fname = "conv_" + conv_type;
let vec[str] path = vec("std", "ExtFmt", "RT", fname);
let vec[@ast.expr] args = vec(arg);
ret make_call(arg.span, path, args);
}
fn make_new_conv(conv cnv, @ast.expr arg) -> @ast.expr {
auto unsupported = "conversion not supported in #fmt string";
@ -168,26 +176,18 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
case (ty_int(?sign)) {
alt (sign) {
case (signed) {
let vec[str] path = vec("std", "ExtFmt", "RT", "int_to_str");
let vec[@ast.expr] args = vec(arg);
ret make_call(arg.span, path, args);
ret make_conv_call(arg.span, "int", arg);
}
case (unsigned) {
let vec[str] path = vec("std", "ExtFmt", "RT", "int_to_str");
let vec[@ast.expr] args = vec(arg);
ret make_call(arg.span, path, args);
ret make_conv_call(arg.span, "uint", arg);
}
}
}
case (ty_bool) {
let vec[str] path = vec("std", "ExtFmt", "RT", "bool_to_str");
let vec[@ast.expr] args = vec(arg);
ret make_call(arg.span, path, args);
ret make_conv_call(arg.span, "bool", arg);
}
case (ty_char) {
let vec[str] path = vec("std", "ExtFmt", "RT", "char_to_str");
let vec[@ast.expr] args = vec(arg);
ret make_call(arg.span, path, args);
ret make_conv_call(arg.span, "char", arg);
}
case (_) {
log unsupported;

8
src/lib/ExtFmt.rs
View File

@ -264,15 +264,15 @@ mod CT {
// Functions used by the fmt extension at runtime
mod RT {
fn int_to_str(int i) -> str {
fn conv_int(int i) -> str {
ret _int.to_str(i, 10u);
}
fn uint_to_str(uint u) -> str {
fn conv_uint(uint u) -> str {
ret _uint.to_str(u, 10u);
}
fn bool_to_str(bool b) -> str {
fn conv_bool(bool b) -> str {
if (b) {
ret "true";
} else {
@ -280,7 +280,7 @@ mod RT {
}
}
fn char_to_str(char c) -> str {
fn conv_char(char c) -> str {
ret _str.from_char(c);
}
}