Typekind enums are changed CONST_ENUM -> CONSTDEF, DISTINCT -> TYPEDEF.

This commit is contained in:
Christoffer Lerno
2026-02-25 23:52:13 +01:00
parent 98e0985a10
commit c990b5aaf1
21 changed files with 94 additions and 90 deletions

View File

@@ -115,8 +115,8 @@ macro bool is_native_atomic_type($Type)
$case FLOAT:
$case BOOL:
return true;
$case DISTINCT:
$case CONST_ENUM:
$case TYPEDEF:
$case CONSTDEF:
return is_native_atomic_type($Type.inner);
$default:
return false;

View File

@@ -97,8 +97,8 @@ macro bool is_subtype_of($Type, $OtherType)
macro bool is_numerical($Type)
{
$switch $Type.kindof:
$case DISTINCT:
$case CONST_ENUM:
$case TYPEDEF:
$case CONSTDEF:
return is_numerical($Type.inner);
$case SIGNED_INT:
$case UNSIGNED_INT:
@@ -170,7 +170,7 @@ macro bool is_unsigned($Type) @const
macro typeid flat_type($Type) @const
{
$if $Type.kindof == DISTINCT || $Type.kindof == CONST_ENUM:
$if $Type.kindof == TYPEDEF || $Type.kindof == CONSTDEF:
return flat_type($Type.inner);
$else
return $Type.typeid;
@@ -179,7 +179,7 @@ macro typeid flat_type($Type) @const
macro TypeKind flat_kind($Type) @const
{
$if $Type.kindof == DISTINCT || $Type.kindof == CONST_ENUM:
$if $Type.kindof == TYPEDEF || $Type.kindof == CONSTDEF:
return flat_type($Type.inner);
$else
return $Type.kindof;
@@ -203,8 +203,8 @@ macro bool is_flat_intlike($Type) @const
$case UNSIGNED_INT:
return true;
$case VECTOR:
$case DISTINCT:
$case CONST_ENUM:
$case TYPEDEF:
$case CONSTDEF:
return is_flat_intlike($Type.inner);
$default:
return false;
@@ -230,7 +230,7 @@ macro bool is_underlying_int($Type) @const
$case SIGNED_INT:
$case UNSIGNED_INT:
return true;
$case DISTINCT:
$case TYPEDEF:
return is_underlying_int($Type.inner);
$default:
return false;
@@ -258,7 +258,7 @@ macro bool is_vector($Type) @const
macro typeid inner_type($Type) @const
{
$if $Type.kindof == DISTINCT || $Type.kindof == CONST_ENUM:
$if $Type.kindof == TYPEDEF || $Type.kindof == CONSTDEF:
return inner_type($Type.inner);
$else
return $Type.typeid;
@@ -298,7 +298,7 @@ macro bool may_load_atomic($Type) @const
$case POINTER:
$case FLOAT:
return true;
$case DISTINCT:
$case TYPEDEF:
$case ENUM:
return may_load_atomic($Type.inner);
$default:
@@ -313,8 +313,8 @@ macro lower_to_atomic_compatible_type($Type) @const
$case SIGNED_INT:
$case UNSIGNED_INT:
return $Type.typeid;
$case DISTINCT:
$case CONST_ENUM:
$case TYPEDEF:
$case CONSTDEF:
return lower_to_atomic_compatible_type($Type.inner);
$case FLOAT:
$switch $Type:
@@ -379,6 +379,9 @@ macro bool @comparable_value(#value) @const
$endif
}
const CONST_ENUM @builtin @deprecated("Use TypeKind.CONSTDEF instead") = TypeKind.CONSTDEF;
const DISTINCT @builtin @deprecated("Use TypeKind.TYPEDEF instead") = TypeKind.TYPEDEF;
enum TypeKind : char
{
VOID,
@@ -390,7 +393,7 @@ enum TypeKind : char
FAULT,
ANY,
ENUM,
CONST_ENUM,
CONSTDEF,
STRUCT,
UNION,
BITSTRUCT,
@@ -399,7 +402,7 @@ enum TypeKind : char
ARRAY,
SLICE,
VECTOR,
DISTINCT,
TYPEDEF,
POINTER,
INTERFACE,
}

View File

@@ -43,8 +43,8 @@ fn uint128? int_from_any(any arg, bool *is_neg) @private
case POINTER:
*is_neg = false;
return (uint128)(uptr)*(void**)arg.ptr;
case DISTINCT:
case CONST_ENUM:
case TYPEDEF:
case CONSTDEF:
return int_from_any(arg.as_inner(), is_neg);
default:
break;
@@ -95,7 +95,7 @@ fn FloatType? float_from_any(any arg) @private
$if env::F128_SUPPORT:
if (arg.type == float128.typeid) return (FloatType)*((float128*)arg.ptr);
$endif
if (arg.type.kindof == DISTINCT || arg.type.kindof == CONST_ENUM)
if (arg.type.kindof == TYPEDEF || arg.type.kindof == CONSTDEF)
{
return float_from_any(arg.as_inner());
}
@@ -945,8 +945,8 @@ fn usz? formatter_out_str(Formatter* self, any arg) @private
return formatter_out_unknown(self, "union", arg);
case BITSTRUCT:
return formatter_out_unknown(self, "bitstruct", arg);
case CONST_ENUM:
case DISTINCT:
case CONSTDEF:
case TYPEDEF:
if (arg.type == String.typeid)
{
return formatter_out_substr(self, *(String*)arg);