mirror of
https://github.com/odin-lang/Odin.git
synced 2026-01-01 02:42:09 +00:00
Remove #relative types from the compiler
This commit is contained in:
@@ -272,14 +272,6 @@ struct TypeProc {
|
||||
Type *elem; \
|
||||
Type *generic_count; \
|
||||
}) \
|
||||
TYPE_KIND(RelativePointer, struct { \
|
||||
Type *pointer_type; \
|
||||
Type *base_integer; \
|
||||
}) \
|
||||
TYPE_KIND(RelativeMultiPointer, struct { \
|
||||
Type *pointer_type; \
|
||||
Type *base_integer; \
|
||||
}) \
|
||||
TYPE_KIND(Matrix, struct { \
|
||||
Type *elem; \
|
||||
i64 row_count; \
|
||||
@@ -367,8 +359,6 @@ enum Typeid_Kind : u8 {
|
||||
Typeid_Map,
|
||||
Typeid_Bit_Set,
|
||||
Typeid_Simd_Vector,
|
||||
Typeid_Relative_Pointer,
|
||||
Typeid_Relative_Multi_Pointer,
|
||||
Typeid_Matrix,
|
||||
Typeid_SoaPointer,
|
||||
Typeid_Bit_Field,
|
||||
@@ -678,8 +668,6 @@ gb_global Type *t_type_info_enum = nullptr;
|
||||
gb_global Type *t_type_info_map = nullptr;
|
||||
gb_global Type *t_type_info_bit_set = nullptr;
|
||||
gb_global Type *t_type_info_simd_vector = nullptr;
|
||||
gb_global Type *t_type_info_relative_pointer = nullptr;
|
||||
gb_global Type *t_type_info_relative_multi_pointer = nullptr;
|
||||
gb_global Type *t_type_info_matrix = nullptr;
|
||||
gb_global Type *t_type_info_soa_pointer = nullptr;
|
||||
gb_global Type *t_type_info_bit_field = nullptr;
|
||||
@@ -708,8 +696,6 @@ gb_global Type *t_type_info_enum_ptr = nullptr;
|
||||
gb_global Type *t_type_info_map_ptr = nullptr;
|
||||
gb_global Type *t_type_info_bit_set_ptr = nullptr;
|
||||
gb_global Type *t_type_info_simd_vector_ptr = nullptr;
|
||||
gb_global Type *t_type_info_relative_pointer_ptr = nullptr;
|
||||
gb_global Type *t_type_info_relative_multi_pointer_ptr = nullptr;
|
||||
gb_global Type *t_type_info_matrix_ptr = nullptr;
|
||||
gb_global Type *t_type_info_soa_pointer_ptr = nullptr;
|
||||
gb_global Type *t_type_info_bit_field_ptr = nullptr;
|
||||
@@ -1118,24 +1104,6 @@ gb_internal Type *alloc_type_bit_field() {
|
||||
return t;
|
||||
}
|
||||
|
||||
gb_internal Type *alloc_type_relative_pointer(Type *pointer_type, Type *base_integer) {
|
||||
GB_ASSERT(is_type_pointer(pointer_type));
|
||||
GB_ASSERT(is_type_integer(base_integer));
|
||||
Type *t = alloc_type(Type_RelativePointer);
|
||||
t->RelativePointer.pointer_type = pointer_type;
|
||||
t->RelativePointer.base_integer = base_integer;
|
||||
return t;
|
||||
}
|
||||
|
||||
gb_internal Type *alloc_type_relative_multi_pointer(Type *pointer_type, Type *base_integer) {
|
||||
GB_ASSERT(is_type_multi_pointer(pointer_type));
|
||||
GB_ASSERT(is_type_integer(base_integer));
|
||||
Type *t = alloc_type(Type_RelativeMultiPointer);
|
||||
t->RelativeMultiPointer.pointer_type = pointer_type;
|
||||
t->RelativeMultiPointer.base_integer = base_integer;
|
||||
return t;
|
||||
}
|
||||
|
||||
gb_internal Type *alloc_type_named(String name, Type *base, Entity *type_name) {
|
||||
Type *t = alloc_type(Type_Named);
|
||||
t->Named.name = name;
|
||||
@@ -1227,8 +1195,6 @@ gb_internal Type *type_deref(Type *t, bool allow_multi_pointer) {
|
||||
switch (bt->kind) {
|
||||
case Type_Pointer:
|
||||
return bt->Pointer.elem;
|
||||
case Type_RelativePointer:
|
||||
return type_deref(bt->RelativePointer.pointer_type);
|
||||
case Type_SoaPointer:
|
||||
{
|
||||
Type *elem = base_type(bt->SoaPointer.elem);
|
||||
@@ -1667,15 +1633,6 @@ gb_internal bool is_type_generic(Type *t) {
|
||||
return t->kind == Type_Generic;
|
||||
}
|
||||
|
||||
gb_internal bool is_type_relative_pointer(Type *t) {
|
||||
t = base_type(t);
|
||||
return t->kind == Type_RelativePointer;
|
||||
}
|
||||
gb_internal bool is_type_relative_multi_pointer(Type *t) {
|
||||
t = base_type(t);
|
||||
return t->kind == Type_RelativeMultiPointer;
|
||||
}
|
||||
|
||||
gb_internal bool is_type_u8_slice(Type *t) {
|
||||
t = base_type(t);
|
||||
if (t->kind == Type_Slice) {
|
||||
@@ -2118,8 +2075,6 @@ gb_internal bool is_type_indexable(Type *t) {
|
||||
return true;
|
||||
case Type_EnumeratedArray:
|
||||
return true;
|
||||
case Type_RelativeMultiPointer:
|
||||
return true;
|
||||
case Type_Matrix:
|
||||
return true;
|
||||
}
|
||||
@@ -2137,8 +2092,6 @@ gb_internal bool is_type_sliceable(Type *t) {
|
||||
return true;
|
||||
case Type_EnumeratedArray:
|
||||
return false;
|
||||
case Type_RelativeMultiPointer:
|
||||
return true;
|
||||
case Type_Matrix:
|
||||
return false;
|
||||
}
|
||||
@@ -2345,27 +2298,7 @@ gb_internal bool is_type_polymorphic(Type *t, bool or_specialized=false) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
|
||||
case Type_RelativeMultiPointer:
|
||||
if (is_type_polymorphic(t->RelativeMultiPointer.pointer_type, or_specialized)) {
|
||||
return true;
|
||||
}
|
||||
if (t->RelativeMultiPointer.base_integer != nullptr &&
|
||||
is_type_polymorphic(t->RelativeMultiPointer.base_integer, or_specialized)) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case Type_RelativePointer:
|
||||
if (is_type_polymorphic(t->RelativePointer.pointer_type, or_specialized)) {
|
||||
return true;
|
||||
}
|
||||
if (t->RelativePointer.base_integer != nullptr &&
|
||||
is_type_polymorphic(t->RelativePointer.base_integer, or_specialized)) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2407,10 +2340,6 @@ gb_internal bool type_has_nil(Type *t) {
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
case Type_RelativePointer:
|
||||
case Type_RelativeMultiPointer:
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -2579,10 +2508,6 @@ gb_internal bool is_type_load_safe(Type *type) {
|
||||
}
|
||||
return true;
|
||||
|
||||
case Type_RelativePointer:
|
||||
case Type_RelativeMultiPointer:
|
||||
return true;
|
||||
|
||||
case Type_Pointer:
|
||||
case Type_MultiPointer:
|
||||
case Type_Slice:
|
||||
@@ -3945,11 +3870,6 @@ gb_internal i64 type_align_of_internal(Type *t, TypePath *path) {
|
||||
case Type_Matrix:
|
||||
return matrix_align_of(t, path);
|
||||
|
||||
case Type_RelativePointer:
|
||||
return type_align_of_internal(t->RelativePointer.base_integer, path);
|
||||
case Type_RelativeMultiPointer:
|
||||
return type_align_of_internal(t->RelativeMultiPointer.base_integer, path);
|
||||
|
||||
case Type_SoaPointer:
|
||||
return build_context.int_size;
|
||||
}
|
||||
@@ -4242,11 +4162,6 @@ gb_internal i64 type_size_of_internal(Type *t, TypePath *path) {
|
||||
|
||||
case Type_BitField:
|
||||
return type_size_of_internal(t->BitField.backing_type, path);
|
||||
|
||||
case Type_RelativePointer:
|
||||
return type_size_of_internal(t->RelativePointer.base_integer, path);
|
||||
case Type_RelativeMultiPointer:
|
||||
return type_size_of_internal(t->RelativeMultiPointer.base_integer, path);
|
||||
}
|
||||
|
||||
// Catch all
|
||||
@@ -4872,19 +4787,6 @@ gb_internal gbString write_type_to_string(gbString str, Type *type, bool shortha
|
||||
str = gb_string_append_fmt(str, "#simd[%d]", cast(int)type->SimdVector.count);
|
||||
str = write_type_to_string(str, type->SimdVector.elem);
|
||||
break;
|
||||
|
||||
case Type_RelativePointer:
|
||||
str = gb_string_append_fmt(str, "#relative(");
|
||||
str = write_type_to_string(str, type->RelativePointer.base_integer);
|
||||
str = gb_string_append_fmt(str, ") ");
|
||||
str = write_type_to_string(str, type->RelativePointer.pointer_type);
|
||||
break;
|
||||
case Type_RelativeMultiPointer:
|
||||
str = gb_string_append_fmt(str, "#relative(");
|
||||
str = write_type_to_string(str, type->RelativePointer.base_integer);
|
||||
str = gb_string_append_fmt(str, ") ");
|
||||
str = write_type_to_string(str, type->RelativePointer.pointer_type);
|
||||
break;
|
||||
|
||||
case Type_Matrix:
|
||||
if (type->Matrix.is_row_major) {
|
||||
|
||||
Reference in New Issue
Block a user