diff --git a/src/codeview/codeview.mdesk b/src/codeview/codeview.mdesk index 3cfb11e6..ac511efd 100644 --- a/src/codeview/codeview.mdesk +++ b/src/codeview/codeview.mdesk @@ -395,48 +395,48 @@ CV_BasicTypeTable: {FBASICSTR 0x06 "" } {NOTTRANS 0x07 "" } {HRESULT 0x08 "HRESULT" } - {CHAR 0x10 "char" } - {SHORT 0x11 "S16" } - {LONG 0x12 "S32" } - {QUAD 0x13 "S64" } - {OCT 0x14 "S128" } + {CHAR 0x10 "CHAR" } + {SHORT 0x11 "SHORT" } + {LONG 0x12 "LONG" } + {QUAD 0x13 "QUAD" } + {OCT 0x14 "OCT" } {UCHAR 0x20 "UCHAR" } - {USHORT 0x21 "U16" } - {ULONG 0x22 "U32" } - {UQUAD 0x23 "U64" } - {UOCT 0x24 "U128" } - {BOOL8 0x30 "B8" } - {BOOL16 0x31 "B16" } - {BOOL32 0x32 "B32" } - {BOOL64 0x33 "B64" } - {FLOAT32 0x40 "F32" } - {FLOAT64 0x41 "F64" } - {FLOAT80 0x42 "F80" } - {FLOAT128 0x43 "F128" } - {FLOAT48 0x44 "F48" } - {FLOAT32PP 0x45 "F32PP" } - {FLOAT16 0x46 "F16" } + {USHORT 0x21 "USHORT" } + {ULONG 0x22 "ULONG" } + {UQUAD 0x23 "UQUAD" } + {UOCT 0x24 "UOCT" } + {BOOL8 0x30 "BOOL8" } + {BOOL16 0x31 "BOOL16" } + {BOOL32 0x32 "BOOL32" } + {BOOL64 0x33 "BOOL64" } + {FLOAT32 0x40 "FLOAT32" } + {FLOAT64 0x41 "FLOAT64" } + {FLOAT80 0x42 "FLOAT80" } + {FLOAT128 0x43 "FLOAT128" } + {FLOAT48 0x44 "FLOAT48" } + {FLOAT32PP 0x45 "FLOAT32PP" } + {FLOAT16 0x46 "FLOAT16" } {COMPLEX32 0x50 "ComplexF32" } {COMPLEX64 0x51 "ComplexF64" } {COMPLEX80 0x52 "ComplexF80" } {COMPLEX128 0x53 "ComplexF128" } {BIT 0x60 "" } {PASCHAR 0x61 "" } - {BOOL32FF 0x62 "B32FF" } - {INT8 0x68 "S8" } - {UINT8 0x69 "U8" } + {BOOL32FF 0x62 "BOOL32FF" } + {INT8 0x68 "int8" } + {UINT8 0x69 "uint8" } {RCHAR 0x70 "char" } {WCHAR 0x71 "WCHAR" } - {INT16 0x72 "S16" } - {UINT16 0x73 "U16" } - {INT32 0x74 "S32" } - {UINT32 0x75 "U32" } - {INT64 0x76 "S64" } - {UINT64 0x77 "U64" } - {INT128 0x78 "S128" } - {UINT128 0x79 "U128" } - {CHAR16 0x7a "CHAR16" } - {CHAR32 0x7b "CHAR32" } + {INT16 0x72 "int16" } + {UINT16 0x73 "uint16" } + {INT32 0x74 "int32" } + {UINT32 0x75 "uint32" } + {INT64 0x76 "int64" } + {UINT64 0x77 "uint64" } + {INT128 0x78 "int128" } + {UINT128 0x79 "uint128" } + {CHAR16 0x7a "char16" } + {CHAR32 0x7b "char32" } {CHAR8 0x7c "char" } {PTR 0xf0 "PTR" } } diff --git a/src/codeview/generated/codeview.meta.c b/src/codeview/generated/codeview.meta.c index 7e5be454..898e4989 100644 --- a/src/codeview/generated/codeview.meta.c +++ b/src/codeview/generated/codeview.meta.c @@ -392,48 +392,48 @@ case CV_BasicType_NBASICSTR:{result = str8_lit("");}break; case CV_BasicType_FBASICSTR:{result = str8_lit("");}break; case CV_BasicType_NOTTRANS:{result = str8_lit("");}break; case CV_BasicType_HRESULT:{result = str8_lit("HRESULT");}break; -case CV_BasicType_CHAR:{result = str8_lit("char");}break; -case CV_BasicType_SHORT:{result = str8_lit("S16");}break; -case CV_BasicType_LONG:{result = str8_lit("S32");}break; -case CV_BasicType_QUAD:{result = str8_lit("S64");}break; -case CV_BasicType_OCT:{result = str8_lit("S128");}break; +case CV_BasicType_CHAR:{result = str8_lit("CHAR");}break; +case CV_BasicType_SHORT:{result = str8_lit("SHORT");}break; +case CV_BasicType_LONG:{result = str8_lit("LONG");}break; +case CV_BasicType_QUAD:{result = str8_lit("QUAD");}break; +case CV_BasicType_OCT:{result = str8_lit("OCT");}break; case CV_BasicType_UCHAR:{result = str8_lit("UCHAR");}break; -case CV_BasicType_USHORT:{result = str8_lit("U16");}break; -case CV_BasicType_ULONG:{result = str8_lit("U32");}break; -case CV_BasicType_UQUAD:{result = str8_lit("U64");}break; -case CV_BasicType_UOCT:{result = str8_lit("U128");}break; -case CV_BasicType_BOOL8:{result = str8_lit("B8");}break; -case CV_BasicType_BOOL16:{result = str8_lit("B16");}break; -case CV_BasicType_BOOL32:{result = str8_lit("B32");}break; -case CV_BasicType_BOOL64:{result = str8_lit("B64");}break; -case CV_BasicType_FLOAT32:{result = str8_lit("F32");}break; -case CV_BasicType_FLOAT64:{result = str8_lit("F64");}break; -case CV_BasicType_FLOAT80:{result = str8_lit("F80");}break; -case CV_BasicType_FLOAT128:{result = str8_lit("F128");}break; -case CV_BasicType_FLOAT48:{result = str8_lit("F48");}break; -case CV_BasicType_FLOAT32PP:{result = str8_lit("F32PP");}break; -case CV_BasicType_FLOAT16:{result = str8_lit("F16");}break; +case CV_BasicType_USHORT:{result = str8_lit("USHORT");}break; +case CV_BasicType_ULONG:{result = str8_lit("ULONG");}break; +case CV_BasicType_UQUAD:{result = str8_lit("UQUAD");}break; +case CV_BasicType_UOCT:{result = str8_lit("UOCT");}break; +case CV_BasicType_BOOL8:{result = str8_lit("BOOL8");}break; +case CV_BasicType_BOOL16:{result = str8_lit("BOOL16");}break; +case CV_BasicType_BOOL32:{result = str8_lit("BOOL32");}break; +case CV_BasicType_BOOL64:{result = str8_lit("BOOL64");}break; +case CV_BasicType_FLOAT32:{result = str8_lit("FLOAT32");}break; +case CV_BasicType_FLOAT64:{result = str8_lit("FLOAT64");}break; +case CV_BasicType_FLOAT80:{result = str8_lit("FLOAT80");}break; +case CV_BasicType_FLOAT128:{result = str8_lit("FLOAT128");}break; +case CV_BasicType_FLOAT48:{result = str8_lit("FLOAT48");}break; +case CV_BasicType_FLOAT32PP:{result = str8_lit("FLOAT32PP");}break; +case CV_BasicType_FLOAT16:{result = str8_lit("FLOAT16");}break; case CV_BasicType_COMPLEX32:{result = str8_lit("ComplexF32");}break; case CV_BasicType_COMPLEX64:{result = str8_lit("ComplexF64");}break; case CV_BasicType_COMPLEX80:{result = str8_lit("ComplexF80");}break; case CV_BasicType_COMPLEX128:{result = str8_lit("ComplexF128");}break; case CV_BasicType_BIT:{result = str8_lit("");}break; case CV_BasicType_PASCHAR:{result = str8_lit("");}break; -case CV_BasicType_BOOL32FF:{result = str8_lit("B32FF");}break; -case CV_BasicType_INT8:{result = str8_lit("S8");}break; -case CV_BasicType_UINT8:{result = str8_lit("U8");}break; +case CV_BasicType_BOOL32FF:{result = str8_lit("BOOL32FF");}break; +case CV_BasicType_INT8:{result = str8_lit("int8");}break; +case CV_BasicType_UINT8:{result = str8_lit("uint8");}break; case CV_BasicType_RCHAR:{result = str8_lit("char");}break; case CV_BasicType_WCHAR:{result = str8_lit("WCHAR");}break; -case CV_BasicType_INT16:{result = str8_lit("S16");}break; -case CV_BasicType_UINT16:{result = str8_lit("U16");}break; -case CV_BasicType_INT32:{result = str8_lit("S32");}break; -case CV_BasicType_UINT32:{result = str8_lit("U32");}break; -case CV_BasicType_INT64:{result = str8_lit("S64");}break; -case CV_BasicType_UINT64:{result = str8_lit("U64");}break; -case CV_BasicType_INT128:{result = str8_lit("S128");}break; -case CV_BasicType_UINT128:{result = str8_lit("U128");}break; -case CV_BasicType_CHAR16:{result = str8_lit("CHAR16");}break; -case CV_BasicType_CHAR32:{result = str8_lit("CHAR32");}break; +case CV_BasicType_INT16:{result = str8_lit("int16");}break; +case CV_BasicType_UINT16:{result = str8_lit("uint16");}break; +case CV_BasicType_INT32:{result = str8_lit("int32");}break; +case CV_BasicType_UINT32:{result = str8_lit("uint32");}break; +case CV_BasicType_INT64:{result = str8_lit("int64");}break; +case CV_BasicType_UINT64:{result = str8_lit("uint64");}break; +case CV_BasicType_INT128:{result = str8_lit("int128");}break; +case CV_BasicType_UINT128:{result = str8_lit("uint128");}break; +case CV_BasicType_CHAR16:{result = str8_lit("char16");}break; +case CV_BasicType_CHAR32:{result = str8_lit("char32");}break; case CV_BasicType_CHAR8:{result = str8_lit("char");}break; case CV_BasicType_PTR:{result = str8_lit("PTR");}break; } diff --git a/src/eval/eval_parse.c b/src/eval/eval_parse.c index 980f2977..ed79b907 100644 --- a/src/eval/eval_parse.c +++ b/src/eval/eval_parse.c @@ -533,7 +533,7 @@ e_leaf_type_from_name(String8 name) { #define Case(str) (str8_match(name, str8_lit(str), 0)) if(0){} - else if(Case("u8") || Case("uint8") || Case("uint8_t") || Case("U8")) + else if(Case("uint8") || Case("uint8_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U8); @@ -543,7 +543,7 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_UChar8); } - else if(Case("u16") || Case("uint16") || Case("uint16_t") || Case("U16")) + else if(Case("uint16") || Case("uint16_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U16); @@ -553,7 +553,7 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_UChar16); } - else if(Case("u32") || Case("uint32") || Case("uint32_t") || Case("U32") || Case("uint")) + else if(Case("uint32") || Case("uint32_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U32); @@ -563,27 +563,27 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_UChar32); } - else if(Case("u64") || Case("uint64") || Case("uint64_t") || Case("U64") || Case("size_t")) + else if(Case("uint64") || Case("uint64_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U64); } - else if(Case("u128") || Case("uint128") || Case("uint128_t") || Case("U128")) + else if(Case("uint128") || Case("uint128_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U128); } - else if(Case("u256") || Case("uint256") || Case("uint256_t") || Case("U256")) + else if(Case("uint256") || Case("uint256_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U256); } - else if(Case("u512") || Case("uint512") || Case("uint512_t") || Case("U512")) + else if(Case("uint512") || Case("uint512_t")) { found = 1; key = e_type_key_basic(E_TypeKind_U512); } - else if(Case("s8") || Case("b8") || Case("B8") || Case("i8") || Case("int8") || Case("int8_t") || Case("S8")) + else if(Case("s8") || Case("b8") || Case("B8") || Case("i8") || Case("int8") || Case("int8_t")) { found = 1; key = e_type_key_basic(E_TypeKind_S8); @@ -593,7 +593,7 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_Char8); } - else if(Case("s16") || Case("b16") || Case("B16") || Case("i16") || Case("int16") || Case("int16_t") || Case("S16")) + else if(Case("int16") || Case("int16_t")) { found = 1; key = e_type_key_basic(E_TypeKind_S16); @@ -603,7 +603,7 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_Char16); } - else if(Case("s32") || Case("b32") || Case("B32") || Case("i32") || Case("int32") || Case("int32_t") || Case("char32") || Case("S32") || Case("int")) + else if(Case("int32") || Case("int32_t") || Case("char32")) { found = 1; key = e_type_key_basic(E_TypeKind_S32); @@ -613,17 +613,17 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_Char32); } - else if(Case("s64") || Case("b64") || Case("B64") || Case("i64") || Case("int64") || Case("int64_t") || Case("S64") || Case("ssize_t")) + else if(Case("int64") || Case("int64_t")) { found = 1; key = e_type_key_basic(E_TypeKind_S64); } - else if(Case("s256") || Case("i256") || Case("int256") || Case("int256_t") || Case("S256")) + else if(Case("int256") || Case("int256_t")) { found = 1; key = e_type_key_basic(E_TypeKind_S256); } - else if(Case("s512") || Case("i512") || Case("int512") || Case("int512_t") || Case("S512")) + else if(Case("int512") || Case("int512_t")) { found = 1; key = e_type_key_basic(E_TypeKind_S512); @@ -638,12 +638,12 @@ e_leaf_type_from_name(String8 name) found = 1; key = e_type_key_basic(E_TypeKind_Bool); } - else if(Case("float") || Case("float32") || Case("f32") || Case("F32") || Case("r32") || Case("R32")) + else if(Case("float") || Case("float32")) { found = 1; key = e_type_key_basic(E_TypeKind_F32); } - else if(Case("double") || Case("float64") || Case("f64") || Case("F64") || Case("r64") || Case("R64")) + else if(Case("double") || Case("float64")) { found = 1; key = e_type_key_basic(E_TypeKind_F64);