Skip to content

Commit 1a00d02

Browse files
KelimionKelimion
committed
Merge branch 'master' of github.com:odin-lang/Odin
2 parents 5b6889c + 074a8d7 commit 1a00d02

File tree

5 files changed

+85
-18
lines changed

5 files changed

+85
-18
lines changed

‎base/intrinsics/intrinsics.odin‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,11 @@ constant_utf16_cstring :: proc($literal: string) -> [^]u16 ---
244244

245245
constant_log2 :: proc($v: $T) -> T where type_is_integer(T) ---
246246

247+
constant_floor :: proc($v: $T) -> T where type_is_integer(T) || type_is_float(T) ---
248+
constant_trunc :: proc($v: $T) -> T where type_is_integer(T) || type_is_float(T) ---
249+
constant_ceil :: proc($v: $T) -> T where type_is_integer(T) || type_is_float(T) ---
250+
constant_round :: proc($v: $T) -> T where type_is_integer(T) || type_is_float(T) ---
251+
247252
// SIMD related
248253
simd_add :: proc(a, b: #simd[N]T) -> #simd[N]T ---
249254
simd_sub :: proc(a, b: #simd[N]T) -> #simd[N]T ---

‎src/check_builtin.cpp‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ gb_global BuiltinTypeIsProc *builtin_type_is_procs[BuiltinProc__type_simple_bool
1313
nullptr, // BuiltinProc__type_simple_boolean_begin
1414

1515
is_type_boolean,
16+
is_type_bit_field,
1617
is_type_integer,
1718
is_type_rune,
1819
is_type_float,
@@ -24,6 +25,7 @@ gb_global BuiltinTypeIsProc *builtin_type_is_procs[BuiltinProc__type_simple_bool
2425
is_type_cstring16,
2526
is_type_typeid,
2627
is_type_any,
28+
2729
is_type_endian_platform,
2830
is_type_endian_little,
2931
is_type_endian_big,
@@ -34,8 +36,8 @@ gb_global BuiltinTypeIsProc *builtin_type_is_procs[BuiltinProc__type_simple_bool
3436
is_type_indexable,
3537
is_type_sliceable,
3638
is_type_comparable,
37-
is_type_simple_compare,
38-
is_type_nearly_simple_compare,
39+
is_type_simple_compare, // easily compared using memcmp
40+
is_type_nearly_simple_compare, // easily compared using memcmp (including floats)
3941
is_type_dereferenceable,
4042
is_type_valid_for_keys,
4143
is_type_valid_for_matrix_elems,
@@ -47,14 +49,12 @@ gb_global BuiltinTypeIsProc *builtin_type_is_procs[BuiltinProc__type_simple_bool
4749
is_type_enumerated_array,
4850
is_type_slice,
4951
is_type_dynamic_array,
50-
5152
is_type_map,
5253
is_type_struct,
5354
is_type_union,
5455
is_type_enum,
5556
is_type_proc,
5657
is_type_bit_set,
57-
is_type_bit_field,
5858
is_type_simd_vector,
5959
is_type_matrix,
6060
is_type_raw_union,
@@ -4768,6 +4768,42 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
47684768
break;
47694769
}
47704770

4771+
case BuiltinProc_constant_floor:
4772+
case BuiltinProc_constant_trunc:
4773+
case BuiltinProc_constant_ceil:
4774+
case BuiltinProc_constant_round:
4775+
{
4776+
Operand o = {};
4777+
check_expr(c, &o, ce->args[0]);
4778+
4779+
if (!is_type_integer_or_float(o.type) && (o.mode != Addressing_Constant)) {
4780+
error(ce->args[0], "Expected a constant number for '%.*s'", LIT(builtin_name));
4781+
return false;
4782+
}
4783+
operand->mode = Addressing_Constant;
4784+
operand->type = o.type;
4785+
4786+
ExactValue value = o.value;
4787+
if (value.kind == ExactValue_Integer) {
4788+
// do nothing
4789+
} else if (value.kind == ExactValue_Float) {
4790+
f64 f = value.value_float;
4791+
switch (id) {
4792+
case BuiltinProc_constant_floor: f = floor(f); break;
4793+
case BuiltinProc_constant_trunc: f = trunc(f); break;
4794+
case BuiltinProc_constant_ceil: f = ceil(f); break;
4795+
case BuiltinProc_constant_round: f = round(f); break;
4796+
default:
4797+
GB_PANIC("Unhandled built-in: %.*s", LIT(builtin_name));
4798+
break;
4799+
}
4800+
value = exact_value_float(f);
4801+
}
4802+
4803+
operand->value = value;
4804+
break;
4805+
}
4806+
47714807
case BuiltinProc_soa_struct: {
47724808
Operand x = {};
47734809
Operand y = {};
@@ -6552,17 +6588,18 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
65526588

65536589

65546590
case BuiltinProc_type_is_boolean:
6591+
case BuiltinProc_type_is_bit_field:
65556592
case BuiltinProc_type_is_integer:
65566593
case BuiltinProc_type_is_rune:
65576594
case BuiltinProc_type_is_float:
65586595
case BuiltinProc_type_is_complex:
65596596
case BuiltinProc_type_is_quaternion:
6560-
case BuiltinProc_type_is_typeid:
6561-
case BuiltinProc_type_is_any:
65626597
case BuiltinProc_type_is_string:
65636598
case BuiltinProc_type_is_string16:
65646599
case BuiltinProc_type_is_cstring:
65656600
case BuiltinProc_type_is_cstring16:
6601+
case BuiltinProc_type_is_typeid:
6602+
case BuiltinProc_type_is_any:
65666603
case BuiltinProc_type_is_endian_platform:
65676604
case BuiltinProc_type_is_endian_little:
65686605
case BuiltinProc_type_is_endian_big:
@@ -6573,8 +6610,8 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
65736610
case BuiltinProc_type_is_indexable:
65746611
case BuiltinProc_type_is_sliceable:
65756612
case BuiltinProc_type_is_comparable:
6576-
case BuiltinProc_type_is_simple_compare:
6577-
case BuiltinProc_type_is_nearly_simple_compare:
6613+
case BuiltinProc_type_is_simple_compare: // easily compared using memcmp
6614+
case BuiltinProc_type_is_nearly_simple_compare: // easily compared using memcmp (including floats)
65786615
case BuiltinProc_type_is_dereferenceable:
65796616
case BuiltinProc_type_is_valid_map_key:
65806617
case BuiltinProc_type_is_valid_matrix_elements:
@@ -6591,7 +6628,6 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
65916628
case BuiltinProc_type_is_enum:
65926629
case BuiltinProc_type_is_proc:
65936630
case BuiltinProc_type_is_bit_set:
6594-
case BuiltinProc_type_is_bit_field:
65956631
case BuiltinProc_type_is_simd_vector:
65966632
case BuiltinProc_type_is_matrix:
65976633
case BuiltinProc_type_is_raw_union:

‎src/checker_builtin_procs.hpp‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ enum BuiltinProcId {
4949

5050
BuiltinProc_constant_log2,
5151

52+
BuiltinProc_constant_floor,
53+
BuiltinProc_constant_trunc,
54+
BuiltinProc_constant_ceil,
55+
BuiltinProc_constant_round,
56+
5257
BuiltinProc_transpose,
5358
BuiltinProc_outer_product,
5459
BuiltinProc_hadamard_product,
@@ -420,7 +425,11 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = {
420425

421426
{STR_LIT("has_target_feature"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
422427

423-
{STR_LIT("constant_log2"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
428+
{STR_LIT("constant_log2"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
429+
{STR_LIT("constant_floor"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
430+
{STR_LIT("constant_trunc"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
431+
{STR_LIT("constant_ceil"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
432+
{STR_LIT("constant_round"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
424433

425434
{STR_LIT("transpose"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
426435
{STR_LIT("outer_product"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics},
@@ -615,17 +624,18 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = {
615624

616625
{STR_LIT(""), 0, false, Expr_Stmt, BuiltinProcPkg_intrinsics},
617626
{STR_LIT("type_is_boolean"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
627+
{STR_LIT("type_is_bit_field"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
618628
{STR_LIT("type_is_integer"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
619629
{STR_LIT("type_is_rune"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
620630
{STR_LIT("type_is_float"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
621631
{STR_LIT("type_is_complex"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
622632
{STR_LIT("type_is_quaternion"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
623-
{STR_LIT("type_is_typeid"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
624-
{STR_LIT("type_is_any"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
625633
{STR_LIT("type_is_string"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
626634
{STR_LIT("type_is_string16"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
627-
{STR_LIT("type_is_cstring"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
628-
{STR_LIT("type_is_cstring16"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
635+
{STR_LIT("type_is_cstring"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
636+
{STR_LIT("type_is_cstring16"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
637+
{STR_LIT("type_is_typeid"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
638+
{STR_LIT("type_is_any"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
629639

630640
{STR_LIT("type_is_endian_platform"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
631641
{STR_LIT("type_is_endian_little"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
@@ -656,7 +666,6 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = {
656666
{STR_LIT("type_is_enum"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
657667
{STR_LIT("type_is_proc"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
658668
{STR_LIT("type_is_bit_set"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
659-
{STR_LIT("type_is_bit_field"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
660669
{STR_LIT("type_is_simd_vector"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
661670
{STR_LIT("type_is_matrix"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
662671
{STR_LIT("type_is_raw_union"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},

‎src/parser.cpp‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2739,7 +2739,7 @@ gb_internal Ast *parse_operand(AstFile *f, bool lhs) {
27392739
while (allow_token(f, Token_Comma)) {
27402740
Ast *dummy_name = parse_ident(f);
27412741
if (!err_once) {
2742-
error(dummy_name, "'bit_field' fields do not support multiple names per field");
2742+
syntax_error(dummy_name, "'bit_field' fields do not support multiple names per field");
27432743
err_once = true;
27442744
}
27452745
}
@@ -3299,8 +3299,16 @@ gb_internal Ast *parse_atom_expr(AstFile *f, Ast *operand, bool lhs) {
32993299
open = expect_token(f, Token_OpenBracket);
33003300

33013301
if (f->curr_token.kind == Token_CloseBracket) {
3302-
error(f->curr_token, "Expected an operand, got ]");
3302+
ERROR_BLOCK();
3303+
syntax_error(f->curr_token, "Expected an operand, got ]");
33033304
close = expect_token(f, Token_CloseBracket);
3305+
3306+
if (f->allow_type) {
3307+
gbString s = expr_to_string(operand);
3308+
error_line("\tSuggestion: If a type was wanted, did you mean '[]%s'?", s);
3309+
gb_string_free(s);
3310+
}
3311+
33043312
operand = ast_index_expr(f, operand, nullptr, open, close);
33053313
break;
33063314
}
@@ -6594,7 +6602,7 @@ gb_internal bool parse_file_tag(const String &lc, const Token &tok, AstFile *f)
65946602
} else if (lc == "no-instrumentation") {
65956603
f->flags |= AstFile_NoInstrumentation;
65966604
} else {
6597-
error(tok, "Unknown tag '%.*s'", LIT(lc));
6605+
syntax_error(tok, "Unknown tag '%.*s'", LIT(lc));
65986606
}
65996607

66006608
return true;

‎src/types.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,15 @@ gb_internal bool is_type_rune(Type *t) {
12961296
}
12971297
return false;
12981298
}
1299+
gb_internal bool is_type_integer_or_float(Type *t) {
1300+
t = base_type(t);
1301+
if (t == nullptr) { return false; }
1302+
if (t->kind == Type_Basic) {
1303+
return (t->Basic.flags & (BasicFlag_Integer|BasicFlag_Float)) != 0;
1304+
}
1305+
return false;
1306+
}
1307+
12991308
gb_internal bool is_type_numeric(Type *t) {
13001309
t = base_type(t);
13011310
if (t == nullptr) { return false; }

0 commit comments

Comments
 (0)