Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions src/builtins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,6 @@ fn exit(ctx: &mut Context, args: Args) -> Option<ObjectInstance> {
std::process::exit(exit_code as i32);
}

fn fmt_int(ctx: &mut Context, args: Args) -> Option<ObjectInstance> {
let value = JkInt::from_instance(&args[0].execute(ctx).unwrap()).0;

Some(JkString::from(value.to_string()).to_instance())
}

fn fmt_char(ctx: &mut Context, args: Args) -> Option<ObjectInstance> {
let value = JkChar::from_instance(&args[0].execute(ctx).unwrap()).0;

Expand Down Expand Up @@ -165,7 +159,6 @@ impl Builtins {
builtins.add("__builtin_string_is_empty", string_is_empty);
builtins.add("__builtin_string_equals", string_equals);
builtins.add("__builtin_ffi_link_with", ffi_link_with);
builtins.add("__builtin_fmt_int", fmt_int);
builtins.add("__builtin_fmt_char", fmt_char);
builtins.add("__builtin_fmt_float", fmt_float);
builtins.add("__builtin_arg_get", arg_get);
Expand Down Expand Up @@ -258,7 +251,6 @@ mod tests {
fn t_fmt_builtins_are_valid() {
jinko! {
__builtin_fmt_char('a');
__builtin_fmt_int(158);
__builtin_fmt_float(7.4);
};
}
Expand Down
56 changes: 53 additions & 3 deletions stdlib/fmt.jk
Original file line number Diff line number Diff line change
@@ -1,9 +1,59 @@
ext func __builtin_fmt_int(value: int) -> string;
incl int

ext func __builtin_fmt_char(value: char) -> string;
ext func __builtin_fmt_float(value: float) -> string;

func fmt_int(value: int) -> string {
value.__builtin_fmt_int()
// FIXME: This is a DISGUSTING implementation
func inner_i_to_s(i: int, base: string) -> string {
if i == 0 {
base
} else {
if i.modulo(10) == 0 {
inner_i_to_s(i / 10, "0".concat(base))
} else {
if i.modulo(10) == 1 {
inner_i_to_s(i / 10, "1".concat(base))
} else {
if i.modulo(10) == 2 {
inner_i_to_s(i / 10, "2".concat(base))
} else {
if i.modulo(10) == 3 {
inner_i_to_s(i / 10, "3".concat(base))
} else {
if i.modulo(10) == 4 {
inner_i_to_s(i / 10, "4".concat(base))
} else {
if i.modulo(10) == 5 {
inner_i_to_s(i / 10, "5".concat(base))
} else {
if i.modulo(10) == 6 {
inner_i_to_s(i / 10, "6".concat(base))
} else {
if i.modulo(10) == 7 {
inner_i_to_s(i / 10, "7".concat(base))
} else {
if i.modulo(10) == 8 {
inner_i_to_s(i / 10, "8".concat(base))
} else {
inner_i_to_s(i / 10, "9".concat(base))
}
}
}
}
}
}
}
}
}
}
}

func fmt_int(i: int) -> string {
if i == 0 {
"0"
} else {
inner_i_to_s(i, "")
}
}

func fmt_char(value: char) -> string {
Expand Down
3 changes: 3 additions & 0 deletions stdlib/int.jk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
func modulo(lhs: int, rhs: int) -> int {
lhs - (rhs * (lhs / rhs))
}