mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-15 07:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow bitwise operation on enums

Browse Source
This commit is contained in:
gingerBill
2018-08-26 18:05:59 +01:00
parent e5735af6d6
commit 1830c1e57c
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/check_expr.cpp
View File

@@ -1158,6 +1158,7 @@ bool check_unary_op(CheckerContext *c, Operand *o, Token op) {
bool check_binary_op(CheckerContext *c, Operand *o, Token op) {
// TODO(bill): Handle errors correctly
Type *type = base_type(core_array_type(o->type));
Type *ct = core_type(type);
switch (op.kind) {
case Token_Sub:
case Token_SubEq:
@@ -1197,7 +1198,7 @@ bool check_binary_op(CheckerContext *c, Operand *o, Token op) {
case Token_OrEq:
case Token_Xor:
case Token_XorEq:
if (!is_type_integer(type) && !is_type_boolean(type) && !is_type_bit_set(type)) {
if (!is_type_integer(ct) && !is_type_boolean(ct) && !is_type_bit_set(ct)) {
error(op, "Operator '%.*s' is only allowed with integers, booleans, or bit sets", LIT(op.string));
return false;
}
@@ -1215,7 +1216,7 @@ bool check_binary_op(CheckerContext *c, Operand *o, Token op) {
case Token_AndNot:
case Token_AndNotEq:
if (!is_type_integer(type) && !is_type_bit_set(type)) {
if (!is_type_integer(ct) && !is_type_bit_set(ct)) {
error(op, "Operator '%.*s' is only allowed with integers and bit sets", LIT(op.string));
return false;
}
@@ -3746,18 +3747,16 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
operand->mode = Addressing_Value;
operand->type = type;
convert_to_typed(c, &x, y.type);
if (x.mode == Addressing_Invalid) { return false; }
convert_to_typed(c, &y, x.type);
if (y.mode == Addressing_Invalid) { return false; }
convert_to_typed(c, &x, z.type);
if (x.mode == Addressing_Invalid) { return false; }
convert_to_typed(c, &z, x.type);
if (z.mode == Addressing_Invalid) { return false; }
convert_to_typed(c, &y, z.type);
if (y.mode == Addressing_Invalid) { return false; }
convert_to_typed(c, &z, y.type);
if (z.mode == Addressing_Invalid) { return false; }
Operand *ops[3] = {&x, &y, &z};
for (isize i = 0; i < 3; i++) {
Operand *a = ops[i];
for (isize j = 0; j < 3; j++) {
if (i == j) continue;
Operand *b = ops[j];
convert_to_typed(c, a, b->type);
if (a->mode == Addressing_Invalid) { return false; }
}
}
if (!are_types_identical(x.type, y.type) || !are_types_identical(x.type, z.type)) {
gbString type_x = type_to_string(x.type);