diff --git a/vlib/builtin/string_interpolation.v b/vlib/builtin/string_interpolation.v index 0f3b219d8b..ff2633dd13 100644 --- a/vlib/builtin/string_interpolation.v +++ b/vlib/builtin/string_interpolation.v @@ -353,62 +353,66 @@ fn (data StrIntpData) get_fmt_format(mut sb strings.Builder) { match typ { // floating point .si_f32 { - // println("HERE: f32") - if use_default_str { - mut f := data.d.d_f32.str() - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() + $if !nofloat ? { + // println("HERE: f32") + if use_default_str { + mut f := data.d.d_f32.str() + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() + } else { + // println("HERE: f32 format") + // println(data.d.d_f32) + if data.d.d_f32 < 0 { + bf.positive = false + } + mut f := strconv.format_fl(data.d.d_f32, bf) + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() } - sb.write_string(f) - f.free() - } else { - // println("HERE: f32 format") - // println(data.d.d_f32) - if data.d.d_f32 < 0 { - bf.positive = false - } - mut f := strconv.format_fl(data.d.d_f32, bf) - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() - } - sb.write_string(f) - f.free() } } .si_f64 { - // println("HERE: f64") - if use_default_str { - mut f := data.d.d_f64.str() - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() - } - sb.write_string(f) - f.free() - } else { - if data.d.d_f64 < 0 { - bf.positive = false - } - f_union := strconv.Float64u{ - f: data.d.d_f64 - } - if f_union.u == strconv.double_minus_zero { - bf.positive = false - } + $if !nofloat ? { + // println("HERE: f64") + if use_default_str { + mut f := data.d.d_f64.str() + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() + } else { + if data.d.d_f64 < 0 { + bf.positive = false + } + f_union := strconv.Float64u{ + f: data.d.d_f64 + } + if f_union.u == strconv.double_minus_zero { + bf.positive = false + } - mut f := strconv.format_fl(data.d.d_f64, bf) - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() + mut f := strconv.format_fl(data.d.d_f64, bf) + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() } - sb.write_string(f) - f.free() } } .si_g32 { @@ -552,55 +556,59 @@ fn (data StrIntpData) get_fmt_format(mut sb strings.Builder) { } } .si_e32 { - // println("HERE: e32") - bf.len1 = 6 - if use_default_str { - mut f := data.d.d_f32.str() - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() + $if !nofloat ? { + // println("HERE: e32") + bf.len1 = 6 + if use_default_str { + mut f := data.d.d_f32.str() + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() + } else { + if data.d.d_f32 < 0 { + bf.positive = false + } + mut f := strconv.format_es(data.d.d_f32, bf) + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() } - sb.write_string(f) - f.free() - } else { - if data.d.d_f32 < 0 { - bf.positive = false - } - mut f := strconv.format_es(data.d.d_f32, bf) - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() - } - sb.write_string(f) - f.free() } } .si_e64 { - // println("HERE: e64") - bf.len1 = 6 - if use_default_str { - mut f := data.d.d_f64.str() - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() + $if !nofloat ? { + // println("HERE: e64") + bf.len1 = 6 + if use_default_str { + mut f := data.d.d_f64.str() + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() + } else { + if data.d.d_f64 < 0 { + bf.positive = false + } + mut f := strconv.format_es(data.d.d_f64, bf) + if upper_case { + tmp := f + f = f.to_upper() + tmp.free() + } + sb.write_string(f) + f.free() } - sb.write_string(f) - f.free() - } else { - if data.d.d_f64 < 0 { - bf.positive = false - } - mut f := strconv.format_es(data.d.d_f64, bf) - if upper_case { - tmp := f - f = f.to_upper() - tmp.free() - } - sb.write_string(f) - f.free() } } // runes diff --git a/vlib/strconv/vprintf.c.v b/vlib/strconv/vprintf.c.v index 18e37b622f..7347d55791 100644 --- a/vlib/strconv/vprintf.c.v +++ b/vlib/strconv/vprintf.c.v @@ -386,72 +386,78 @@ pub fn v_sprintf(str string, pt ...voidptr) string { // float and double if ch in [`f`, `F`] { - v_sprintf_panic(p_index, pt.len) - x := unsafe { *(&f64(pt[p_index])) } - positive := x >= f64(0.0) - len1 = if len1 >= 0 { len1 } else { def_len1 } - s := format_fl_old(f64(x), - pad_ch: pad_ch - len0: len0 - len1: len1 - positive: positive - sign_flag: sign - allign: allign - ) - res.write_string(if ch == `F` { s.to_upper() } else { s }) + $if !nofloat ? { + v_sprintf_panic(p_index, pt.len) + x := unsafe { *(&f64(pt[p_index])) } + positive := x >= f64(0.0) + len1 = if len1 >= 0 { len1 } else { def_len1 } + s := format_fl_old(f64(x), + pad_ch: pad_ch + len0: len0 + len1: len1 + positive: positive + sign_flag: sign + allign: allign + ) + res.write_string(if ch == `F` { s.to_upper() } else { s }) + } status = .reset_params p_index++ i++ continue } else if ch in [`e`, `E`] { - v_sprintf_panic(p_index, pt.len) - x := unsafe { *(&f64(pt[p_index])) } - positive := x >= f64(0.0) - len1 = if len1 >= 0 { len1 } else { def_len1 } - s := format_es_old(f64(x), - pad_ch: pad_ch - len0: len0 - len1: len1 - positive: positive - sign_flag: sign - allign: allign - ) - res.write_string(if ch == `E` { s.to_upper() } else { s }) + $if !nofloat ? { + v_sprintf_panic(p_index, pt.len) + x := unsafe { *(&f64(pt[p_index])) } + positive := x >= f64(0.0) + len1 = if len1 >= 0 { len1 } else { def_len1 } + s := format_es_old(f64(x), + pad_ch: pad_ch + len0: len0 + len1: len1 + positive: positive + sign_flag: sign + allign: allign + ) + res.write_string(if ch == `E` { s.to_upper() } else { s }) + } status = .reset_params p_index++ i++ continue } else if ch in [`g`, `G`] { - v_sprintf_panic(p_index, pt.len) - x := unsafe { *(&f64(pt[p_index])) } - positive := x >= f64(0.0) - mut s := '' - tx := fabs(x) - if tx < 999_999.0 && tx >= 0.00001 { - // println("Here g format_fl [$tx]") - len1 = if len1 >= 0 { len1 + 1 } else { def_len1 } - s = format_fl_old(x, - pad_ch: pad_ch - len0: len0 - len1: len1 - positive: positive - sign_flag: sign - allign: allign - rm_tail_zero: true - ) - } else { - len1 = if len1 >= 0 { len1 + 1 } else { def_len1 } - s = format_es_old(x, - pad_ch: pad_ch - len0: len0 - len1: len1 - positive: positive - sign_flag: sign - allign: allign - rm_tail_zero: true - ) + $if !nofloat ? { + v_sprintf_panic(p_index, pt.len) + x := unsafe { *(&f64(pt[p_index])) } + positive := x >= f64(0.0) + mut s := '' + tx := fabs(x) + if tx < 999_999.0 && tx >= 0.00001 { + // println("Here g format_fl [$tx]") + len1 = if len1 >= 0 { len1 + 1 } else { def_len1 } + s = format_fl_old(x, + pad_ch: pad_ch + len0: len0 + len1: len1 + positive: positive + sign_flag: sign + allign: allign + rm_tail_zero: true + ) + } else { + len1 = if len1 >= 0 { len1 + 1 } else { def_len1 } + s = format_es_old(x, + pad_ch: pad_ch + len0: len0 + len1: len1 + positive: positive + sign_flag: sign + allign: allign + rm_tail_zero: true + ) + } + res.write_string(if ch == `G` { s.to_upper() } else { s }) } - res.write_string(if ch == `G` { s.to_upper() } else { s }) status = .reset_params p_index++ i++ diff --git a/vlib/v/gen/c/auto_str_methods.v b/vlib/v/gen/c/auto_str_methods.v index ffec50cf68..aa9ddcc4a3 100644 --- a/vlib/v/gen/c/auto_str_methods.v +++ b/vlib/v/gen/c/auto_str_methods.v @@ -117,7 +117,7 @@ fn (mut g Gen) gen_str_default(sym ast.TypeSymbol, styp string, str_fn_name stri g.auto_str_funcs.writeln('}') } -fn (mut g Gen) gen_str_for_type(typ ast.Type) string { +fn (mut g Gen) gen_str_method_for_type(typ ast.Type) string { styp := g.typ(typ).replace('*', '') mut sym := g.table.get_type_symbol(g.unwrap_generic(typ)) mut str_fn_name := styp_to_str_fn_name(styp) @@ -134,6 +134,15 @@ fn (mut g Gen) gen_str_for_type(typ ast.Type) string { eprintln('> gen_str_for_type: |typ: ${typ:5}, ${sym.name:20}|has_str: ${sym_has_str_method:5}|expects_ptr: ${str_method_expects_ptr:5}|nr_args: ${str_nr_args:1}|fn_name: ${str_fn_name:20}') } g.str_types << already_generated_key + if g.pref.nofloat { + if sym.name == 'f32' { + return g.gen_str_method_for_type(ast.u32_type) + // return '' + } else if sym.name == 'f64' { + return g.gen_str_method_for_type(ast.u64_type) + // return '' + } + } match mut sym.info { ast.Alias { if sym.info.is_import { @@ -176,7 +185,8 @@ fn (mut g Gen) gen_str_for_type(typ ast.Type) string { g.gen_str_for_thread(sym.info, styp, str_fn_name) } else { - verror("could not generate string method $str_fn_name for type '$styp'") + println(g.table.type_str(typ)) + verror("1could not generate string method '$str_fn_name' for type '$styp'") } } } @@ -195,7 +205,7 @@ fn (mut g Gen) gen_str_for_option(typ ast.Type, styp string, str_fn_name string) parent_type := typ.clear_flag(.optional) sym := g.table.get_type_symbol(parent_type) sym_has_str_method, _, _ := sym.str_method_info() - parent_str_fn_name := g.gen_str_for_type(parent_type) + parent_str_fn_name := g.gen_str_method_for_type(parent_type) g.type_definitions.writeln('string ${str_fn_name}($styp it); // auto') g.auto_str_funcs.writeln('string ${str_fn_name}($styp it) { return indent_${str_fn_name}(it, 0); }') @@ -222,7 +232,7 @@ fn (mut g Gen) gen_str_for_option(typ ast.Type, styp string, str_fn_name string) } fn (mut g Gen) gen_str_for_alias(info ast.Alias, styp string, str_fn_name string) { - parent_str_fn_name := g.gen_str_for_type(info.parent_type) + parent_str_fn_name := g.gen_str_method_for_type(info.parent_type) mut clean_type_v_type_name := util.strip_main_name(styp.replace('__', '.')) g.type_definitions.writeln('static string ${str_fn_name}($styp it); // auto') g.auto_str_funcs.writeln('static string ${str_fn_name}($styp it) { return indent_${str_fn_name}(it, 0); }') @@ -251,7 +261,7 @@ fn (mut g Gen) gen_str_for_multi_return(info ast.MultiReturn, styp string, str_f sym := g.table.get_type_symbol(typ) is_arg_ptr := typ.is_ptr() sym_has_str_method, str_method_expects_ptr, _ := sym.str_method_info() - arg_str_fn_name := g.gen_str_for_type(typ) + arg_str_fn_name := g.gen_str_method_for_type(typ) if should_use_indent_func(sym.kind) && !sym_has_str_method { fn_builder.writeln('\tstrings__Builder_write_string(&sb, ${arg_str_fn_name}(a.arg$i));') @@ -336,7 +346,7 @@ fn (mut g Gen) gen_str_for_interface(info ast.Interface, styp string, str_fn_nam fn_builder.writeln('static string indent_${str_fn_name}($styp x, int indent_count) { /* gen_str_for_interface */') for typ in info.types { subtype := g.table.get_type_symbol(typ) - mut func_name := g.gen_str_for_type(typ) + mut func_name := g.gen_str_method_for_type(typ) sym_has_str_method, str_method_expects_ptr, _ := subtype.str_method_info() if should_use_indent_func(subtype.kind) && !sym_has_str_method { func_name = 'indent_$func_name' @@ -395,7 +405,7 @@ fn (mut g Gen) gen_str_for_union_sum_type(info ast.SumType, styp string, str_fn_ fn_builder.writeln('\tswitch(x._typ) {') for typ in info.variants { typ_str := g.typ(typ) - mut func_name := g.gen_str_for_type(typ) + mut func_name := g.gen_str_method_for_type(typ) sym := g.table.get_type_symbol(typ) sym_has_str_method, str_method_expects_ptr, _ := sym.str_method_info() deref := if sym_has_str_method && str_method_expects_ptr { ' ' } else { '*' } @@ -502,7 +512,7 @@ fn (mut g Gen) gen_str_for_array(info ast.Array, styp string, str_fn_name string field_styp := g.typ(typ) is_elem_ptr := typ.is_ptr() sym_has_str_method, str_method_expects_ptr, _ := sym.str_method_info() - mut elem_str_fn_name := g.gen_str_for_type(typ) + mut elem_str_fn_name := g.gen_str_method_for_type(typ) if sym.kind == .byte { elem_str_fn_name = elem_str_fn_name + '_escaped' } @@ -574,7 +584,7 @@ fn (mut g Gen) gen_str_for_array_fixed(info ast.ArrayFixed, styp string, str_fn_ } is_elem_ptr := typ.is_ptr() sym_has_str_method, str_method_expects_ptr, _ := sym.str_method_info() - elem_str_fn_name := g.gen_str_for_type(typ) + elem_str_fn_name := g.gen_str_method_for_type(typ) g.type_definitions.writeln('static string ${str_fn_name}($styp a); // auto') g.auto_str_funcs.writeln('static string ${str_fn_name}($styp a) { return indent_${str_fn_name}(a, 0);}') @@ -635,7 +645,7 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) { key_styp := g.typ(key_typ) key_str_fn_name := key_styp.replace('*', '') + '_str' if !key_sym.has_method('str') { - g.gen_str_for_type(key_typ) + g.gen_str_method_for_type(key_typ) } mut val_typ := info.value_type @@ -647,7 +657,7 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) { val_styp := g.typ(val_typ) elem_str_fn_name := val_styp.replace('*', '') + '_str' if !val_sym.has_method('str') { - g.gen_str_for_type(val_typ) + g.gen_str_method_for_type(val_typ) } g.type_definitions.writeln('static string ${str_fn_name}($styp m); // auto') @@ -803,7 +813,7 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name stri field_styp_fn_name := if has_custom_str { '${field_styp}_str' } else { - g.gen_str_for_type(field.typ) + g.gen_str_method_for_type(field.typ) } // manage the fact hat with float we use always the g representation diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 869576b3c0..7c7486e6f4 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -2245,9 +2245,16 @@ fn (mut g Gen) asm_arg(arg ast.AsmArg, stmt ast.AsmStmt) { ast.CharLiteral { g.write("'$arg.val'") } - ast.IntegerLiteral, ast.FloatLiteral { + ast.IntegerLiteral { g.write('\$$arg.val') } + ast.FloatLiteral { + if g.pref.nofloat { + g.write('\$$arg.val.int()') + } else { + g.write('\$$arg.val') + } + } ast.BoolLiteral { g.write('\$$arg.val.str()') } @@ -3451,7 +3458,11 @@ fn (mut g Gen) expr(node ast.Expr) { g.write('${styp}__$node.val') } ast.FloatLiteral { - g.write(node.val) + if g.pref.nofloat { + g.write(node.val.int().str()) + } else { + g.write(node.val) + } } ast.GoExpr { g.go_expr(node) diff --git a/vlib/v/gen/c/dumpexpr.v b/vlib/v/gen/c/dumpexpr.v index fcb6bbd750..e7a6554af1 100644 --- a/vlib/v/gen/c/dumpexpr.v +++ b/vlib/v/gen/c/dumpexpr.v @@ -21,7 +21,7 @@ fn (mut g Gen) dump_expr_definitions() { mut dump_typedefs := map[string]bool{} mut dump_fns := strings.new_builder(100) for dump_type, cname in g.table.dumps { - to_string_fn_name := g.gen_str_for_type(dump_type) + to_string_fn_name := g.gen_str_method_for_type(dump_type) is_ptr := ast.Type(dump_type).is_ptr() ptr_asterisk := if is_ptr { '*' } else { '' } dump_sym := g.table.get_type_symbol(dump_type) diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v index 389881d179..f1759e5241 100644 --- a/vlib/v/gen/c/fn.v +++ b/vlib/v/gen/c/fn.v @@ -795,7 +795,7 @@ fn (mut g Gen) method_call(node ast.CallExpr) { if rec_type.has_flag(.shared_f) { rec_type = rec_type.clear_flag(.shared_f).set_nr_muls(0) } - g.gen_str_for_type(rec_type) + g.gen_str_method_for_type(rec_type) } mut has_cast := false if left_sym.kind == .map && node.name in ['clone', 'move'] { diff --git a/vlib/v/gen/c/str.v b/vlib/v/gen/c/str.v index 788da2c23d..6b8c195afe 100644 --- a/vlib/v/gen/c/str.v +++ b/vlib/v/gen/c/str.v @@ -80,7 +80,7 @@ fn (mut g Gen) gen_expr_to_string(expr ast.Expr, etype ast.Type) { } sym_has_str_method, str_method_expects_ptr, _ := sym.str_method_info() if typ.has_flag(.variadic) { - str_fn_name := g.gen_str_for_type(typ) + str_fn_name := g.gen_str_method_for_type(typ) g.write('${str_fn_name}(') g.expr(expr) g.write(')') @@ -93,7 +93,7 @@ fn (mut g Gen) gen_expr_to_string(expr ast.Expr, etype ast.Type) { g.write('_SLIT("")') } else if sym.kind == .enum_ { if expr !is ast.EnumVal { - str_fn_name := g.gen_str_for_type(typ) + str_fn_name := g.gen_str_method_for_type(typ) g.write('${str_fn_name}(') g.enum_expr(expr) g.write(')') @@ -106,7 +106,7 @@ fn (mut g Gen) gen_expr_to_string(expr ast.Expr, etype ast.Type) { || sym.kind in [.array, .array_fixed, .map, .struct_, .multi_return, .sum_type, .interface_] { is_ptr := typ.is_ptr() is_var_mut := expr.is_auto_deref_var() - str_fn_name := g.gen_str_for_type(typ) + str_fn_name := g.gen_str_method_for_type(typ) if is_ptr && !is_var_mut { g.write('str_intp(1, _MOV((StrIntpData[]){{_SLIT("&"), $si_s_code ,{.d_s=') } @@ -132,7 +132,7 @@ fn (mut g Gen) gen_expr_to_string(expr ast.Expr, etype ast.Type) { // g.write(')') } } else { - str_fn_name := g.gen_str_for_type(typ) + str_fn_name := g.gen_str_method_for_type(typ) g.write('${str_fn_name}(') if expr.is_auto_deref_var() { g.write('*')