mirror of
https://github.com/Ed94/Odin.git
synced 2026-07-27 18:00:05 +00:00
Remove dead #maybe code
This commit is contained in:
@@ -695,11 +695,6 @@ void check_union_type(CheckerContext *ctx, Type *union_type, Ast *node, Array<Op
|
||||
error(ut->align, "A union with #no_nil must have at least 2 variants");
|
||||
}
|
||||
break;
|
||||
case UnionType_maybe:
|
||||
if (variants.count != 1) {
|
||||
error(ut->align, "A union with #maybe must have at 1 variant, got %lld", cast(long long)variants.count);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (ut->align != nullptr) {
|
||||
|
||||
@@ -98,7 +98,6 @@ enum OdinDocTypeFlag_Struct : u32 {
|
||||
enum OdinDocTypeFlag_Union : u32 {
|
||||
OdinDocTypeFlag_Union_polymorphic = 1<<0,
|
||||
OdinDocTypeFlag_Union_no_nil = 1<<1,
|
||||
OdinDocTypeFlag_Union_maybe = 1<<2,
|
||||
OdinDocTypeFlag_Union_shared_nil = 1<<3,
|
||||
};
|
||||
|
||||
|
||||
+3
-9
@@ -2548,21 +2548,15 @@ Ast *parse_operand(AstFile *f, bool lhs) {
|
||||
syntax_error(tag, "Invalid union tag '#%.*s'", LIT(tag.string));
|
||||
}
|
||||
}
|
||||
if (no_nil && maybe) {
|
||||
syntax_error(f->curr_token, "#maybe and #no_nil cannot be applied together");
|
||||
}
|
||||
|
||||
if (no_nil && shared_nil) {
|
||||
syntax_error(f->curr_token, "#shared_nil and #no_nil cannot be applied together");
|
||||
}
|
||||
if (shared_nil && maybe) {
|
||||
syntax_error(f->curr_token, "#maybe and #shared_nil cannot be applied together");
|
||||
}
|
||||
|
||||
|
||||
if (maybe) {
|
||||
union_kind = UnionType_maybe;
|
||||
syntax_error(f->curr_token, "#maybe functionality has now been merged with standard 'union' functionality");
|
||||
} else if (no_nil) {
|
||||
}
|
||||
if (no_nil) {
|
||||
union_kind = UnionType_no_nil;
|
||||
} else if (shared_nil) {
|
||||
union_kind = UnionType_shared_nil;
|
||||
|
||||
@@ -339,7 +339,6 @@ char const *inline_asm_dialect_strings[InlineAsmDialect_COUNT] = {
|
||||
|
||||
enum UnionTypeKind : u8 {
|
||||
UnionType_Normal = 0,
|
||||
UnionType_maybe = 1, // removed
|
||||
UnionType_no_nil = 2,
|
||||
UnionType_shared_nil = 3,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user