Commit 2234788fa80dfaf1e58df51ff576701f8161b0df | zig

src/bigfloat.cpp+4

...	@@ -150,3 +150,7 @@ Cmp bigfloat_cmp_zero(const BigFloat *bigfloat) {	...	@@ -150,3 +150,7 @@ Cmp bigfloat_cmp_zero(const BigFloat *bigfloat) {
150	return CmpEQ;	150	return CmpEQ;
151	}	151	}
152	}	152	}
		153
		154	bool bigfloat_has_fraction(const BigFloat *bigfloat) {
		155	return floorl(bigfloat->value) != bigfloat->value;
		156	}

src/bigfloat.hpp+1

...	@@ -43,5 +43,6 @@ void bigfloat_read_ieee597(BigFloat dest, const uint8_t buf, size_t bit_count,	...	@@ -43,5 +43,6 @@ void bigfloat_read_ieee597(BigFloat dest, const uint8_t buf, size_t bit_count,
43		43
44	// convenience functions	44	// convenience functions
45	Cmp bigfloat_cmp_zero(const BigFloat *bigfloat);	45	Cmp bigfloat_cmp_zero(const BigFloat *bigfloat);
		46	bool bigfloat_has_fraction(const BigFloat *bigfloat);
46		47
47	#endif	48	#endif

src/ir.cpp+37-9

 @@ -6206,7 +6206,9 @@ static bool const_val_fits_in_num_lit(ConstExprValue *const_val, TypeTableEntry
         (const_val->type->id == TypeTableEntryIdInt || const_val->type->id == TypeTableEntryIdNumLitInt)));
 }
-static bool ir_num_lit_fits_in_other_type(IrAnalyze *ira, IrInstruction *instruction, TypeTableEntry *other_type) {
+static bool ir_num_lit_fits_in_other_type(IrAnalyze *ira, IrInstruction *instruction, TypeTableEntry *other_type,
+        bool explicit_cast)
+{
     if (type_is_invalid(other_type)) {
         return false;
     }
 @@ -6243,6 +6245,32 @@ static bool ir_num_lit_fits_in_other_type(IrAnalyze *ira, IrInstruction *instruc
             return true;
         }
     }
+    if (explicit_cast && (other_type->id == TypeTableEntryIdInt || other_type->id == TypeTableEntryIdNumLitInt) &&
+        const_val_is_float)
+    {
+        if (bigfloat_has_fraction(&const_val->data.x_bigfloat)) {
+            Buf *val_buf = buf_alloc();
+            bigfloat_write_buf(val_buf, &const_val->data.x_bigfloat);
+            ir_add_error(ira, instruction,
+                buf_sprintf("fractional component prevents float value %s from being casted to type '%s'",
+                    buf_ptr(val_buf),
+                    buf_ptr(&other_type->name)));
+            return false;
+        } else {
+            BigInt bigint;
+            bigint_init_bigfloat(&bigint, &const_val->data.x_bigfloat);
+            if (other_type->id == TypeTableEntryIdNumLitInt) {
+                return true;
+            } else {
+                if (bigint_fits_in_bits(&bigint, other_type->data.integral.bit_count,
+                    other_type->data.integral.is_signed))
+                {
+                    return true;
+                }
+            }
+        }
+    }
     const char *num_lit_str;
     Buf *val_buf = buf_alloc();
 @@ -6425,12 +6453,12 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,
         if (expected_type->id == TypeTableEntryIdPointer &&
             expected_type->data.pointer.is_const)
         {
-            if (ir_num_lit_fits_in_other_type(ira, value, expected_type->data.pointer.child_type)) {
+            if (ir_num_lit_fits_in_other_type(ira, value, expected_type->data.pointer.child_type, false)) {
                 return ImplicitCastMatchResultYes;
             } else {
                 return ImplicitCastMatchResultReportedError;
             }
-        } else if (ir_num_lit_fits_in_other_type(ira, value, expected_type)) {
+        } else if (ir_num_lit_fits_in_other_type(ira, value, expected_type, false)) {
             return ImplicitCastMatchResultYes;
         } else {
             return ImplicitCastMatchResultReportedError;
 @@ -6542,7 +6570,7 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
         } else if (prev_type->id == TypeTableEntryIdNumLitInt ||
                     prev_type->id == TypeTableEntryIdNumLitFloat)
         {
-            if (ir_num_lit_fits_in_other_type(ira, prev_inst, cur_type)) {
+            if (ir_num_lit_fits_in_other_type(ira, prev_inst, cur_type, false)) {
                 prev_inst = cur_inst;
                 continue;
             } else {
 @@ -6551,7 +6579,7 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
         } else if (cur_type->id == TypeTableEntryIdNumLitInt ||
                    cur_type->id == TypeTableEntryIdNumLitFloat)
         {
-            if (ir_num_lit_fits_in_other_type(ira, cur_inst, prev_type)) {
+            if (ir_num_lit_fits_in_other_type(ira, cur_inst, prev_type, false)) {
                 continue;
             } else {
                 return ira->codegen->builtin_types.entry_invalid;
 @@ -7636,7 +7664,7 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst
         } else if (actual_type->id == TypeTableEntryIdNumLitInt ||
                    actual_type->id == TypeTableEntryIdNumLitFloat)
         {
-            if (ir_num_lit_fits_in_other_type(ira, value, wanted_type->data.maybe.child_type)) {
+            if (ir_num_lit_fits_in_other_type(ira, value, wanted_type->data.maybe.child_type, true)) {
                 return ir_analyze_maybe_wrap(ira, source_instr, value, wanted_type);
             } else {
                 return ira->codegen->invalid_instruction;
 @@ -7658,7 +7686,7 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst
         } else if (actual_type->id == TypeTableEntryIdNumLitInt ||
                    actual_type->id == TypeTableEntryIdNumLitFloat)
         {
-            if (ir_num_lit_fits_in_other_type(ira, value, wanted_type->data.error.child_type)) {
+            if (ir_num_lit_fits_in_other_type(ira, value, wanted_type->data.error.child_type, true)) {
                 return ir_analyze_err_wrap_payload(ira, source_instr, value, wanted_type);
             } else {
                 return ira->codegen->invalid_instruction;
 @@ -7736,7 +7764,7 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst
                 return ira->codegen->invalid_instruction;
             return cast2;
-        } else if (ir_num_lit_fits_in_other_type(ira, value, wanted_type)) {
+        } else if (ir_num_lit_fits_in_other_type(ira, value, wanted_type, true)) {
             CastOp op;
             if ((actual_type->id == TypeTableEntryIdNumLitFloat &&
                  wanted_type->id == TypeTableEntryIdFloat) ||
 @@ -8630,7 +8658,7 @@ static TypeTableEntry *ir_analyze_bin_op_math(IrAnalyze *ira, IrInstructionBinOp
             return ira->codegen->builtin_types.entry_invalid;
         }
-        ir_num_lit_fits_in_other_type(ira, &bin_op_instruction->base, resolved_type);
+        ir_num_lit_fits_in_other_type(ira, &bin_op_instruction->base, resolved_type, false);
         return resolved_type;
     }

std/fmt/errol/index.zig+1-2

...	@@ -43,8 +43,7 @@ fn errol3u(val: f64, buffer: []u8) -> FloatDecimal {	...	@@ -43,8 +43,7 @@ fn errol3u(val: f64, buffer: []u8) -> FloatDecimal {
43		43
44	// normalize the midpoint	44	// normalize the midpoint
45		45
46	var e: i32 = undefined;	46	const e = math.frexp(val).exponent;
47	_ = math.frexp(val, &e);
48	var exp = i16(math.floor(307 + f64(e) * 0.30103));	47	var exp = i16(math.floor(307 + f64(e) * 0.30103));
49	if (exp < 20) {	48	if (exp < 20) {
50	exp = 20;	49	exp = 20;

std/math/index.zig+1-1

...	@@ -95,7 +95,7 @@ pub const isSignalNan = @import("isnan.zig").isSignalNan;	...	@@ -95,7 +95,7 @@ pub const isSignalNan = @import("isnan.zig").isSignalNan;
95	pub const fabs = @import("fabs.zig").fabs;	95	pub const fabs = @import("fabs.zig").fabs;
96	pub const ceil = @import("ceil.zig").ceil;	96	pub const ceil = @import("ceil.zig").ceil;
97	pub const floor = @import("floor.zig").floor;	97	pub const floor = @import("floor.zig").floor;
98	pub const trunc = @import("floor.zig").trunc;	98	pub const trunc = @import("trunc.zig").trunc;
99	pub const round = @import("round.zig").round;	99	pub const round = @import("round.zig").round;
100	pub const frexp = @import("frexp.zig").frexp;	100	pub const frexp = @import("frexp.zig").frexp;
101	pub const frexp32_result = @import("frexp.zig").frexp32_result;	101	pub const frexp32_result = @import("frexp.zig").frexp32_result;

test/cases/cast.zig+7

...	@@ -251,3 +251,10 @@ fn testPeerErrorAndArray2(x: u8) -> %[]const u8 {	...	@@ -251,3 +251,10 @@ fn testPeerErrorAndArray2(x: u8) -> %[]const u8 {
251	else => error.BadValue,	251	else => error.BadValue,
252	}	252	}
253	}	253	}
		254
		255	test "explicit cast float number literal to integer if no fraction component" {
		256	const x = i32(1e4);
		257	assert(x == 10000);
		258	const y = i32(f32(1e4));
		259	assert(y == 10000);
		260	}

test/compile_errors.zig+7

...	@@ -1945,4 +1945,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {	...	@@ -1945,4 +1945,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1945	\\}	1945	\\}
1946	,	1946	,
1947	".tmp_source.zig:2:15: error: float literal out of range of any type");	1947	".tmp_source.zig:2:15: error: float literal out of range of any type");
		1948
		1949	cases.add("explicit cast float literal to integer when there is a fraction component",
		1950	\\export fn entry() -> i32 {
		1951	\\ i32(12.34)
		1952	\\}
		1953	,
		1954	".tmp_source.zig:2:9: error: fractional component prevents float value 12.340000 from being casted to type 'i32'");
1948	}	1955	}

author	Andrew Kelley <andrew@ziglang.org> 2017-08-07 15:57:41-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-08-07 15:57:41-04:00
log	2234788fa80dfaf1e58df51ff576701f8161b0df
tree	c544704e7d4981e2cae1c54abb4e6b17bc872268
parent	38b47d8aca57efbb10b8000cb726eb24b1f37ccb

add ability to explicitly cast float to integer