Disable non-comparison operations for enum (use bit_set for flags)

This commit is contained in:
gingerBill
2018-08-17 15:24:44 +01:00
parent b216e44870
commit 1d0ac72e4a
3 changed files with 17 additions and 14 deletions
+6 -1
View File
@@ -614,6 +614,11 @@ using_enum :: proc() {
f2 := C;
fmt.println(f0, f1, f2);
fmt.println(len(Foo));
// Non-comparsion operations are not allowed with enum
// You must convert to an integer if you want to do this
// x := f0 + f1;
y := int(f0) + int(f1);
}
explicit_procedure_overloading :: proc() {
@@ -772,6 +777,6 @@ main :: proc() {
complete_switch();
cstring_example();
deprecated_attribute();
}
bit_set_type();
}
}
+1 -1
View File
@@ -253,7 +253,7 @@ void check_type_decl(CheckerContext *ctx, Entity *e, Ast *type_expr, Type *def)
if (decl->is_using) {
// NOTE(bill): Must be an enum declaration
if (te->kind == Ast_EnumType) {
Scope *parent = ctx->scope->parent;
Scope *parent = e->scope;
if (parent->flags&ScopeFlag_File) {
// NOTE(bill): Use package scope
parent = parent->parent;
+10 -12
View File
@@ -659,42 +659,40 @@ bool is_type_named_alias(Type *t) {
}
bool is_type_boolean(Type *t) {
t = core_type(t);
// t = core_type(t);
t = base_type(t);
if (t->kind == Type_Basic) {
return (t->Basic.flags & BasicFlag_Boolean) != 0;
}
return false;
}
bool is_type_integer(Type *t) {
t = core_type(t);
// t = core_type(t);
t = base_type(t);
if (t->kind == Type_Basic) {
return (t->Basic.flags & BasicFlag_Integer) != 0;
}
return false;
}
bool is_type_unsigned(Type *t) {
t = core_type(t);
t = base_type(t);
// t = core_type(t);
if (t->kind == Type_Basic) {
return (t->Basic.flags & BasicFlag_Unsigned) != 0;
}
return false;
}
bool is_type_rune(Type *t) {
t = core_type(t);
// t = core_type(t);
t = base_type(t);
if (t->kind == Type_Basic) {
return (t->Basic.flags & BasicFlag_Rune) != 0;
}
return false;
}
bool is_type_number(Type *t) {
t = core_type(t);
if (t->kind == Type_Basic) {
return (t->Basic.flags & BasicFlag_Numeric) != 0;
}
return false;
}
bool is_type_numeric(Type *t) {
t = core_type(t);
// t = core_type(t);
t = base_type(t);
if (t->kind == Type_Basic) {
return (t->Basic.flags & BasicFlag_Numeric) != 0;
}