|
@@ -21,13 +21,11 @@ are_types_identical :: proc(a, b: ^Type_Info) -> bool {
|
|
|
|
|
|
switch x in a.variant {
|
|
switch x in a.variant {
|
|
case Type_Info_Named:
|
|
case Type_Info_Named:
|
|
- y, ok := b.variant.(Type_Info_Named);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Named) or_return;
|
|
return x.base == y.base;
|
|
return x.base == y.base;
|
|
|
|
|
|
case Type_Info_Integer:
|
|
case Type_Info_Integer:
|
|
- y, ok := b.variant.(Type_Info_Integer);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Integer) or_return;
|
|
return x.signed == y.signed && x.endianness == y.endianness;
|
|
return x.signed == y.signed && x.endianness == y.endianness;
|
|
|
|
|
|
case Type_Info_Rune:
|
|
case Type_Info_Rune:
|
|
@@ -63,13 +61,15 @@ are_types_identical :: proc(a, b: ^Type_Info) -> bool {
|
|
return ok;
|
|
return ok;
|
|
|
|
|
|
case Type_Info_Pointer:
|
|
case Type_Info_Pointer:
|
|
- y, ok := b.variant.(Type_Info_Pointer);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Pointer) or_return;
|
|
|
|
+ return are_types_identical(x.elem, y.elem);
|
|
|
|
+
|
|
|
|
+ case Type_Info_Multi_Pointer:
|
|
|
|
+ y := b.variant.(Type_Info_Multi_Pointer) or_return;
|
|
return are_types_identical(x.elem, y.elem);
|
|
return are_types_identical(x.elem, y.elem);
|
|
|
|
|
|
case Type_Info_Procedure:
|
|
case Type_Info_Procedure:
|
|
- y, ok := b.variant.(Type_Info_Procedure);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Procedure) or_return;
|
|
switch {
|
|
switch {
|
|
case x.variadic != y.variadic,
|
|
case x.variadic != y.variadic,
|
|
x.convention != y.convention:
|
|
x.convention != y.convention:
|
|
@@ -79,31 +79,26 @@ are_types_identical :: proc(a, b: ^Type_Info) -> bool {
|
|
return are_types_identical(x.params, y.params) && are_types_identical(x.results, y.results);
|
|
return are_types_identical(x.params, y.params) && are_types_identical(x.results, y.results);
|
|
|
|
|
|
case Type_Info_Array:
|
|
case Type_Info_Array:
|
|
- y, ok := b.variant.(Type_Info_Array);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Array) or_return;
|
|
if x.count != y.count { return false; }
|
|
if x.count != y.count { return false; }
|
|
return are_types_identical(x.elem, y.elem);
|
|
return are_types_identical(x.elem, y.elem);
|
|
|
|
|
|
case Type_Info_Enumerated_Array:
|
|
case Type_Info_Enumerated_Array:
|
|
- y, ok := b.variant.(Type_Info_Enumerated_Array);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Enumerated_Array) or_return;
|
|
if x.count != y.count { return false; }
|
|
if x.count != y.count { return false; }
|
|
return are_types_identical(x.index, y.index) &&
|
|
return are_types_identical(x.index, y.index) &&
|
|
are_types_identical(x.elem, y.elem);
|
|
are_types_identical(x.elem, y.elem);
|
|
|
|
|
|
case Type_Info_Dynamic_Array:
|
|
case Type_Info_Dynamic_Array:
|
|
- y, ok := b.variant.(Type_Info_Dynamic_Array);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Dynamic_Array) or_return;
|
|
return are_types_identical(x.elem, y.elem);
|
|
return are_types_identical(x.elem, y.elem);
|
|
|
|
|
|
case Type_Info_Slice:
|
|
case Type_Info_Slice:
|
|
- y, ok := b.variant.(Type_Info_Slice);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Slice) or_return;
|
|
return are_types_identical(x.elem, y.elem);
|
|
return are_types_identical(x.elem, y.elem);
|
|
|
|
|
|
case Type_Info_Tuple:
|
|
case Type_Info_Tuple:
|
|
- y, ok := b.variant.(Type_Info_Tuple);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Tuple) or_return;
|
|
if len(x.types) != len(y.types) { return false; }
|
|
if len(x.types) != len(y.types) { return false; }
|
|
for _, i in x.types {
|
|
for _, i in x.types {
|
|
xt, yt := x.types[i], y.types[i];
|
|
xt, yt := x.types[i], y.types[i];
|
|
@@ -114,8 +109,7 @@ are_types_identical :: proc(a, b: ^Type_Info) -> bool {
|
|
return true;
|
|
return true;
|
|
|
|
|
|
case Type_Info_Struct:
|
|
case Type_Info_Struct:
|
|
- y, ok := b.variant.(Type_Info_Struct);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Struct) or_return;
|
|
switch {
|
|
switch {
|
|
case len(x.types) != len(y.types),
|
|
case len(x.types) != len(y.types),
|
|
x.is_packed != y.is_packed,
|
|
x.is_packed != y.is_packed,
|
|
@@ -138,8 +132,7 @@ are_types_identical :: proc(a, b: ^Type_Info) -> bool {
|
|
return true;
|
|
return true;
|
|
|
|
|
|
case Type_Info_Union:
|
|
case Type_Info_Union:
|
|
- y, ok := b.variant.(Type_Info_Union);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Union) or_return;
|
|
if len(x.variants) != len(y.variants) { return false; }
|
|
if len(x.variants) != len(y.variants) { return false; }
|
|
|
|
|
|
for _, i in x.variants {
|
|
for _, i in x.variants {
|
|
@@ -153,28 +146,23 @@ are_types_identical :: proc(a, b: ^Type_Info) -> bool {
|
|
return false;
|
|
return false;
|
|
|
|
|
|
case Type_Info_Map:
|
|
case Type_Info_Map:
|
|
- y, ok := b.variant.(Type_Info_Map);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Map) or_return;
|
|
return are_types_identical(x.key, y.key) && are_types_identical(x.value, y.value);
|
|
return are_types_identical(x.key, y.key) && are_types_identical(x.value, y.value);
|
|
|
|
|
|
case Type_Info_Bit_Set:
|
|
case Type_Info_Bit_Set:
|
|
- y, ok := b.variant.(Type_Info_Bit_Set);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Bit_Set) or_return;
|
|
return x.elem == y.elem && x.lower == y.lower && x.upper == y.upper;
|
|
return x.elem == y.elem && x.lower == y.lower && x.upper == y.upper;
|
|
|
|
|
|
case Type_Info_Simd_Vector:
|
|
case Type_Info_Simd_Vector:
|
|
- y, ok := b.variant.(Type_Info_Simd_Vector);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Simd_Vector) or_return;
|
|
return x.count == y.count && x.elem == y.elem;
|
|
return x.count == y.count && x.elem == y.elem;
|
|
|
|
|
|
case Type_Info_Relative_Pointer:
|
|
case Type_Info_Relative_Pointer:
|
|
- y, ok := b.variant.(Type_Info_Relative_Pointer);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Relative_Pointer) or_return;
|
|
return x.base_integer == y.base_integer && x.pointer == y.pointer;
|
|
return x.base_integer == y.base_integer && x.pointer == y.pointer;
|
|
|
|
|
|
case Type_Info_Relative_Slice:
|
|
case Type_Info_Relative_Slice:
|
|
- y, ok := b.variant.(Type_Info_Relative_Slice);
|
|
|
|
- if !ok { return false; }
|
|
|
|
|
|
+ y := b.variant.(Type_Info_Relative_Slice) or_return;
|
|
return x.base_integer == y.base_integer && x.slice == y.slice;
|
|
return x.base_integer == y.base_integer && x.slice == y.slice;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -257,6 +245,11 @@ is_pointer :: proc(info: ^Type_Info) -> bool {
|
|
_, ok := type_info_base(info).variant.(Type_Info_Pointer);
|
|
_, ok := type_info_base(info).variant.(Type_Info_Pointer);
|
|
return ok;
|
|
return ok;
|
|
}
|
|
}
|
|
|
|
+is_multi_pointer :: proc(info: ^Type_Info) -> bool {
|
|
|
|
+ if info == nil { return false; }
|
|
|
|
+ _, ok := type_info_base(info).variant.(Type_Info_Multi_Pointer);
|
|
|
|
+ return ok;
|
|
|
|
+}
|
|
is_procedure :: proc(info: ^Type_Info) -> bool {
|
|
is_procedure :: proc(info: ^Type_Info) -> bool {
|
|
if info == nil { return false; }
|
|
if info == nil { return false; }
|
|
_, ok := type_info_base(info).variant.(Type_Info_Procedure);
|
|
_, ok := type_info_base(info).variant.(Type_Info_Procedure);
|
|
@@ -424,6 +417,9 @@ write_type_writer :: proc(w: io.Writer, ti: ^Type_Info) -> (n: int) {
|
|
write_string(w, "^");
|
|
write_string(w, "^");
|
|
write_type(w, info.elem);
|
|
write_type(w, info.elem);
|
|
}
|
|
}
|
|
|
|
+ case Type_Info_Multi_Pointer:
|
|
|
|
+ write_string(w, "[^]");
|
|
|
|
+ write_type(w, info.elem);
|
|
case Type_Info_Procedure:
|
|
case Type_Info_Procedure:
|
|
n += write_string(w, "proc");
|
|
n += write_string(w, "proc");
|
|
if info.params == nil {
|
|
if info.params == nil {
|