authorgravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-06-05 11:54:11+02:00
committergravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-06-05 11:54:11+02:00
loga8146ade2a57bea12ea2d16bd273f03578e5d559
tree3046287688eeb219464fcb2c2ba1fd34185b1a0c
parent236c680f6bae490fddab4935892bd75240176d0b

Renamed UndefinedLiteral to Undefined

6 files changed, 57 insertions(+), 57 deletions(-)

doc/langref.html.in+4-4
...@@ -4895,7 +4895,7 @@ pub const TypeId = enum {...@@ -4895,7 +4895,7 @@ pub const TypeId = enum {
4895 Struct,4895 Struct,
4896 ComptimeFloat,4896 ComptimeFloat,
4897 ComptimeInt,4897 ComptimeInt,
4898 UndefinedLiteral,4898 Undefined,
4899 Null,4899 Null,
4900 Nullable,4900 Nullable,
4901 ErrorUnion,4901 ErrorUnion,
...@@ -4929,7 +4929,7 @@ pub const TypeInfo = union(TypeId) {...@@ -4929,7 +4929,7 @@ pub const TypeInfo = union(TypeId) {
4929 Struct: Struct,4929 Struct: Struct,
4930 ComptimeFloat: void,4930 ComptimeFloat: void,
4931 ComptimeInt: void,4931 ComptimeInt: void,
4932 UndefinedLiteral: void,4932 Undefined: void,
4933 Null: void,4933 Null: void,
4934 Nullable: Nullable,4934 Nullable: Nullable,
4935 ErrorUnion: ErrorUnion,4935 ErrorUnion: ErrorUnion,
...@@ -5687,7 +5687,7 @@ pub const TypeId = enum {...@@ -5687,7 +5687,7 @@ pub const TypeId = enum {
5687 Struct,5687 Struct,
5688 ComptimeFloat,5688 ComptimeFloat,
5689 ComptimeInt,5689 ComptimeInt,
5690 UndefinedLiteral,5690 Undefined,
5691 Null,5691 Null,
5692 Nullable,5692 Nullable,
5693 ErrorUnion,5693 ErrorUnion,
...@@ -5715,7 +5715,7 @@ pub const TypeInfo = union(TypeId) {...@@ -5715,7 +5715,7 @@ pub const TypeInfo = union(TypeId) {
5715 Struct: Struct,5715 Struct: Struct,
5716 ComptimeFloat: void,5716 ComptimeFloat: void,
5717 ComptimeInt: void,5717 ComptimeInt: void,
5718 UndefinedLiteral: void,5718 Undefined: void,
5719 Null: void,5719 Null: void,
5720 Nullable: Nullable,5720 Nullable: Nullable,
5721 ErrorUnion: ErrorUnion,5721 ErrorUnion: ErrorUnion,
src/all_types.hpp+1-1
...@@ -1161,7 +1161,7 @@ enum TypeTableEntryId {...@@ -1161,7 +1161,7 @@ enum TypeTableEntryId {
1161 TypeTableEntryIdStruct,1161 TypeTableEntryIdStruct,
1162 TypeTableEntryIdComptimeFloat,1162 TypeTableEntryIdComptimeFloat,
1163 TypeTableEntryIdComptimeInt,1163 TypeTableEntryIdComptimeInt,
1164 TypeTableEntryIdUndefLit,1164 TypeTableEntryIdUndefined,
1165 TypeTableEntryIdNull,1165 TypeTableEntryIdNull,
1166 TypeTableEntryIdMaybe,1166 TypeTableEntryIdMaybe,
1167 TypeTableEntryIdErrorUnion,1167 TypeTableEntryIdErrorUnion,
src/analyze.cpp+22-22
...@@ -234,7 +234,7 @@ bool type_is_complete(TypeTableEntry *type_entry) {...@@ -234,7 +234,7 @@ bool type_is_complete(TypeTableEntry *type_entry) {
234 case TypeTableEntryIdArray:234 case TypeTableEntryIdArray:
235 case TypeTableEntryIdComptimeFloat:235 case TypeTableEntryIdComptimeFloat:
236 case TypeTableEntryIdComptimeInt:236 case TypeTableEntryIdComptimeInt:
237 case TypeTableEntryIdUndefLit:237 case TypeTableEntryIdUndefined:
238 case TypeTableEntryIdNull:238 case TypeTableEntryIdNull:
239 case TypeTableEntryIdMaybe:239 case TypeTableEntryIdMaybe:
240 case TypeTableEntryIdErrorUnion:240 case TypeTableEntryIdErrorUnion:
...@@ -270,7 +270,7 @@ bool type_has_zero_bits_known(TypeTableEntry *type_entry) {...@@ -270,7 +270,7 @@ bool type_has_zero_bits_known(TypeTableEntry *type_entry) {
270 case TypeTableEntryIdArray:270 case TypeTableEntryIdArray:
271 case TypeTableEntryIdComptimeFloat:271 case TypeTableEntryIdComptimeFloat:
272 case TypeTableEntryIdComptimeInt:272 case TypeTableEntryIdComptimeInt:
273 case TypeTableEntryIdUndefLit:273 case TypeTableEntryIdUndefined:
274 case TypeTableEntryIdNull:274 case TypeTableEntryIdNull:
275 case TypeTableEntryIdMaybe:275 case TypeTableEntryIdMaybe:
276 case TypeTableEntryIdErrorUnion:276 case TypeTableEntryIdErrorUnion:
...@@ -1335,7 +1335,7 @@ static bool type_allowed_in_packed_struct(TypeTableEntry *type_entry) {...@@ -1335,7 +1335,7 @@ static bool type_allowed_in_packed_struct(TypeTableEntry *type_entry) {
1335 case TypeTableEntryIdUnreachable:1335 case TypeTableEntryIdUnreachable:
1336 case TypeTableEntryIdComptimeFloat:1336 case TypeTableEntryIdComptimeFloat:
1337 case TypeTableEntryIdComptimeInt:1337 case TypeTableEntryIdComptimeInt:
1338 case TypeTableEntryIdUndefLit:1338 case TypeTableEntryIdUndefined:
1339 case TypeTableEntryIdNull:1339 case TypeTableEntryIdNull:
1340 case TypeTableEntryIdErrorUnion:1340 case TypeTableEntryIdErrorUnion:
1341 case TypeTableEntryIdErrorSet:1341 case TypeTableEntryIdErrorSet:
...@@ -1376,7 +1376,7 @@ static bool type_allowed_in_extern(CodeGen *g, TypeTableEntry *type_entry) {...@@ -1376,7 +1376,7 @@ static bool type_allowed_in_extern(CodeGen *g, TypeTableEntry *type_entry) {
1376 case TypeTableEntryIdMetaType:1376 case TypeTableEntryIdMetaType:
1377 case TypeTableEntryIdComptimeFloat:1377 case TypeTableEntryIdComptimeFloat:
1378 case TypeTableEntryIdComptimeInt:1378 case TypeTableEntryIdComptimeInt:
1379 case TypeTableEntryIdUndefLit:1379 case TypeTableEntryIdUndefined:
1380 case TypeTableEntryIdNull:1380 case TypeTableEntryIdNull:
1381 case TypeTableEntryIdErrorUnion:1381 case TypeTableEntryIdErrorUnion:
1382 case TypeTableEntryIdErrorSet:1382 case TypeTableEntryIdErrorSet:
...@@ -1511,7 +1511,7 @@ static TypeTableEntry *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *c...@@ -1511,7 +1511,7 @@ static TypeTableEntry *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *c
1511 case TypeTableEntryIdInvalid:1511 case TypeTableEntryIdInvalid:
1512 return g->builtin_types.entry_invalid;1512 return g->builtin_types.entry_invalid;
1513 case TypeTableEntryIdUnreachable:1513 case TypeTableEntryIdUnreachable:
1514 case TypeTableEntryIdUndefLit:1514 case TypeTableEntryIdUndefined:
1515 case TypeTableEntryIdNull:1515 case TypeTableEntryIdNull:
1516 case TypeTableEntryIdArgTuple:1516 case TypeTableEntryIdArgTuple:
1517 case TypeTableEntryIdOpaque:1517 case TypeTableEntryIdOpaque:
...@@ -1599,7 +1599,7 @@ static TypeTableEntry *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *c...@@ -1599,7 +1599,7 @@ static TypeTableEntry *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *c
1599 case TypeTableEntryIdInvalid:1599 case TypeTableEntryIdInvalid:
1600 zig_unreachable();1600 zig_unreachable();
16011601
1602 case TypeTableEntryIdUndefLit:1602 case TypeTableEntryIdUndefined:
1603 case TypeTableEntryIdNull:1603 case TypeTableEntryIdNull:
1604 case TypeTableEntryIdArgTuple:1604 case TypeTableEntryIdArgTuple:
1605 case TypeTableEntryIdOpaque:1605 case TypeTableEntryIdOpaque:
...@@ -3337,7 +3337,7 @@ TypeTableEntry *validate_var_type(CodeGen *g, AstNode *source_node, TypeTableEnt...@@ -3337,7 +3337,7 @@ TypeTableEntry *validate_var_type(CodeGen *g, AstNode *source_node, TypeTableEnt
3337 case TypeTableEntryIdInvalid:3337 case TypeTableEntryIdInvalid:
3338 return g->builtin_types.entry_invalid;3338 return g->builtin_types.entry_invalid;
3339 case TypeTableEntryIdUnreachable:3339 case TypeTableEntryIdUnreachable:
3340 case TypeTableEntryIdUndefLit:3340 case TypeTableEntryIdUndefined:
3341 case TypeTableEntryIdNull:3341 case TypeTableEntryIdNull:
3342 case TypeTableEntryIdBlock:3342 case TypeTableEntryIdBlock:
3343 case TypeTableEntryIdArgTuple:3343 case TypeTableEntryIdArgTuple:
...@@ -3732,7 +3732,7 @@ static bool is_container(TypeTableEntry *type_entry) {...@@ -3732,7 +3732,7 @@ static bool is_container(TypeTableEntry *type_entry) {
3732 case TypeTableEntryIdArray:3732 case TypeTableEntryIdArray:
3733 case TypeTableEntryIdComptimeFloat:3733 case TypeTableEntryIdComptimeFloat:
3734 case TypeTableEntryIdComptimeInt:3734 case TypeTableEntryIdComptimeInt:
3735 case TypeTableEntryIdUndefLit:3735 case TypeTableEntryIdUndefined:
3736 case TypeTableEntryIdNull:3736 case TypeTableEntryIdNull:
3737 case TypeTableEntryIdMaybe:3737 case TypeTableEntryIdMaybe:
3738 case TypeTableEntryIdErrorUnion:3738 case TypeTableEntryIdErrorUnion:
...@@ -3781,7 +3781,7 @@ void resolve_container_type(CodeGen *g, TypeTableEntry *type_entry) {...@@ -3781,7 +3781,7 @@ void resolve_container_type(CodeGen *g, TypeTableEntry *type_entry) {
3781 case TypeTableEntryIdArray:3781 case TypeTableEntryIdArray:
3782 case TypeTableEntryIdComptimeFloat:3782 case TypeTableEntryIdComptimeFloat:
3783 case TypeTableEntryIdComptimeInt:3783 case TypeTableEntryIdComptimeInt:
3784 case TypeTableEntryIdUndefLit:3784 case TypeTableEntryIdUndefined:
3785 case TypeTableEntryIdNull:3785 case TypeTableEntryIdNull:
3786 case TypeTableEntryIdMaybe:3786 case TypeTableEntryIdMaybe:
3787 case TypeTableEntryIdErrorUnion:3787 case TypeTableEntryIdErrorUnion:
...@@ -4285,7 +4285,7 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {...@@ -4285,7 +4285,7 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {
4285 case TypeTableEntryIdMetaType:4285 case TypeTableEntryIdMetaType:
4286 case TypeTableEntryIdComptimeFloat:4286 case TypeTableEntryIdComptimeFloat:
4287 case TypeTableEntryIdComptimeInt:4287 case TypeTableEntryIdComptimeInt:
4288 case TypeTableEntryIdUndefLit:4288 case TypeTableEntryIdUndefined:
4289 case TypeTableEntryIdNull:4289 case TypeTableEntryIdNull:
4290 case TypeTableEntryIdNamespace:4290 case TypeTableEntryIdNamespace:
4291 case TypeTableEntryIdBlock:4291 case TypeTableEntryIdBlock:
...@@ -4672,7 +4672,7 @@ static uint32_t hash_const_val(ConstExprValue *const_val) {...@@ -4672,7 +4672,7 @@ static uint32_t hash_const_val(ConstExprValue *const_val) {
4672 case TypeTableEntryIdPromise:4672 case TypeTableEntryIdPromise:
4673 // TODO better hashing algorithm4673 // TODO better hashing algorithm
4674 return 223048345;4674 return 223048345;
4675 case TypeTableEntryIdUndefLit:4675 case TypeTableEntryIdUndefined:
4676 return 162837799;4676 return 162837799;
4677 case TypeTableEntryIdNull:4677 case TypeTableEntryIdNull:
4678 return 844854567;4678 return 844854567;
...@@ -4756,7 +4756,7 @@ static bool can_mutate_comptime_var_state(ConstExprValue *value) {...@@ -4756,7 +4756,7 @@ static bool can_mutate_comptime_var_state(ConstExprValue *value) {
4756 case TypeTableEntryIdFloat:4756 case TypeTableEntryIdFloat:
4757 case TypeTableEntryIdComptimeFloat:4757 case TypeTableEntryIdComptimeFloat:
4758 case TypeTableEntryIdComptimeInt:4758 case TypeTableEntryIdComptimeInt:
4759 case TypeTableEntryIdUndefLit:4759 case TypeTableEntryIdUndefined:
4760 case TypeTableEntryIdNull:4760 case TypeTableEntryIdNull:
4761 case TypeTableEntryIdNamespace:4761 case TypeTableEntryIdNamespace:
4762 case TypeTableEntryIdBoundFn:4762 case TypeTableEntryIdBoundFn:
...@@ -4821,7 +4821,7 @@ static bool return_type_is_cacheable(TypeTableEntry *return_type) {...@@ -4821,7 +4821,7 @@ static bool return_type_is_cacheable(TypeTableEntry *return_type) {
4821 case TypeTableEntryIdFloat:4821 case TypeTableEntryIdFloat:
4822 case TypeTableEntryIdComptimeFloat:4822 case TypeTableEntryIdComptimeFloat:
4823 case TypeTableEntryIdComptimeInt:4823 case TypeTableEntryIdComptimeInt:
4824 case TypeTableEntryIdUndefLit:4824 case TypeTableEntryIdUndefined:
4825 case TypeTableEntryIdNull:4825 case TypeTableEntryIdNull:
4826 case TypeTableEntryIdNamespace:4826 case TypeTableEntryIdNamespace:
4827 case TypeTableEntryIdBoundFn:4827 case TypeTableEntryIdBoundFn:
...@@ -4932,7 +4932,7 @@ bool type_requires_comptime(TypeTableEntry *type_entry) {...@@ -4932,7 +4932,7 @@ bool type_requires_comptime(TypeTableEntry *type_entry) {
4932 zig_unreachable();4932 zig_unreachable();
4933 case TypeTableEntryIdComptimeFloat:4933 case TypeTableEntryIdComptimeFloat:
4934 case TypeTableEntryIdComptimeInt:4934 case TypeTableEntryIdComptimeInt:
4935 case TypeTableEntryIdUndefLit:4935 case TypeTableEntryIdUndefined:
4936 case TypeTableEntryIdNull:4936 case TypeTableEntryIdNull:
4937 case TypeTableEntryIdMetaType:4937 case TypeTableEntryIdMetaType:
4938 case TypeTableEntryIdNamespace:4938 case TypeTableEntryIdNamespace:
...@@ -5410,7 +5410,7 @@ bool const_values_equal(ConstExprValue *a, ConstExprValue *b) {...@@ -5410,7 +5410,7 @@ bool const_values_equal(ConstExprValue *a, ConstExprValue *b) {
5410 return false;5410 return false;
5411 }5411 }
5412 return true;5412 return true;
5413 case TypeTableEntryIdUndefLit:5413 case TypeTableEntryIdUndefined:
5414 zig_panic("TODO");5414 zig_panic("TODO");
5415 case TypeTableEntryIdNull:5415 case TypeTableEntryIdNull:
5416 zig_panic("TODO");5416 zig_panic("TODO");
...@@ -5651,7 +5651,7 @@ void render_const_value(CodeGen *g, Buf *buf, ConstExprValue *const_val) {...@@ -5651,7 +5651,7 @@ void render_const_value(CodeGen *g, Buf *buf, ConstExprValue *const_val) {
5651 buf_appendf(buf, "null");5651 buf_appendf(buf, "null");
5652 return;5652 return;
5653 }5653 }
5654 case TypeTableEntryIdUndefLit:5654 case TypeTableEntryIdUndefined:
5655 {5655 {
5656 buf_appendf(buf, "undefined");5656 buf_appendf(buf, "undefined");
5657 return;5657 return;
...@@ -5763,7 +5763,7 @@ uint32_t type_id_hash(TypeId x) {...@@ -5763,7 +5763,7 @@ uint32_t type_id_hash(TypeId x) {
5763 case TypeTableEntryIdStruct:5763 case TypeTableEntryIdStruct:
5764 case TypeTableEntryIdComptimeFloat:5764 case TypeTableEntryIdComptimeFloat:
5765 case TypeTableEntryIdComptimeInt:5765 case TypeTableEntryIdComptimeInt:
5766 case TypeTableEntryIdUndefLit:5766 case TypeTableEntryIdUndefined:
5767 case TypeTableEntryIdNull:5767 case TypeTableEntryIdNull:
5768 case TypeTableEntryIdMaybe:5768 case TypeTableEntryIdMaybe:
5769 case TypeTableEntryIdErrorSet:5769 case TypeTableEntryIdErrorSet:
...@@ -5809,7 +5809,7 @@ bool type_id_eql(TypeId a, TypeId b) {...@@ -5809,7 +5809,7 @@ bool type_id_eql(TypeId a, TypeId b) {
5809 case TypeTableEntryIdStruct:5809 case TypeTableEntryIdStruct:
5810 case TypeTableEntryIdComptimeFloat:5810 case TypeTableEntryIdComptimeFloat:
5811 case TypeTableEntryIdComptimeInt:5811 case TypeTableEntryIdComptimeInt:
5812 case TypeTableEntryIdUndefLit:5812 case TypeTableEntryIdUndefined:
5813 case TypeTableEntryIdNull:5813 case TypeTableEntryIdNull:
5814 case TypeTableEntryIdMaybe:5814 case TypeTableEntryIdMaybe:
5815 case TypeTableEntryIdPromise:5815 case TypeTableEntryIdPromise:
...@@ -5931,7 +5931,7 @@ static const TypeTableEntryId all_type_ids[] = {...@@ -5931,7 +5931,7 @@ static const TypeTableEntryId all_type_ids[] = {
5931 TypeTableEntryIdStruct,5931 TypeTableEntryIdStruct,
5932 TypeTableEntryIdComptimeFloat,5932 TypeTableEntryIdComptimeFloat,
5933 TypeTableEntryIdComptimeInt,5933 TypeTableEntryIdComptimeInt,
5934 TypeTableEntryIdUndefLit,5934 TypeTableEntryIdUndefined,
5935 TypeTableEntryIdNull,5935 TypeTableEntryIdNull,
5936 TypeTableEntryIdMaybe,5936 TypeTableEntryIdMaybe,
5937 TypeTableEntryIdErrorUnion,5937 TypeTableEntryIdErrorUnion,
...@@ -5984,7 +5984,7 @@ size_t type_id_index(TypeTableEntry *entry) {...@@ -5984,7 +5984,7 @@ size_t type_id_index(TypeTableEntry *entry) {
5984 return 9;5984 return 9;
5985 case TypeTableEntryIdComptimeInt:5985 case TypeTableEntryIdComptimeInt:
5986 return 10;5986 return 10;
5987 case TypeTableEntryIdUndefLit:5987 case TypeTableEntryIdUndefined:
5988 return 11;5988 return 11;
5989 case TypeTableEntryIdNull:5989 case TypeTableEntryIdNull:
5990 return 12;5990 return 12;
...@@ -6042,8 +6042,8 @@ const char *type_id_name(TypeTableEntryId id) {...@@ -6042,8 +6042,8 @@ const char *type_id_name(TypeTableEntryId id) {
6042 return "ComptimeFloat";6042 return "ComptimeFloat";
6043 case TypeTableEntryIdComptimeInt:6043 case TypeTableEntryIdComptimeInt:
6044 return "ComptimeInt";6044 return "ComptimeInt";
6045 case TypeTableEntryIdUndefLit:6045 case TypeTableEntryIdUndefined:
6046 return "UndefinedLiteral";6046 return "Undefined";
6047 case TypeTableEntryIdNull:6047 case TypeTableEntryIdNull:
6048 return "Null";6048 return "Null";
6049 case TypeTableEntryIdMaybe:6049 case TypeTableEntryIdMaybe:
src/codegen.cpp+7-7
...@@ -4918,7 +4918,7 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Con...@@ -4918,7 +4918,7 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Con
4918 case TypeTableEntryIdUnreachable:4918 case TypeTableEntryIdUnreachable:
4919 case TypeTableEntryIdComptimeFloat:4919 case TypeTableEntryIdComptimeFloat:
4920 case TypeTableEntryIdComptimeInt:4920 case TypeTableEntryIdComptimeInt:
4921 case TypeTableEntryIdUndefLit:4921 case TypeTableEntryIdUndefined:
4922 case TypeTableEntryIdNull:4922 case TypeTableEntryIdNull:
4923 case TypeTableEntryIdErrorUnion:4923 case TypeTableEntryIdErrorUnion:
4924 case TypeTableEntryIdErrorSet:4924 case TypeTableEntryIdErrorSet:
...@@ -5364,7 +5364,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val, const c...@@ -5364,7 +5364,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val, const c
5364 case TypeTableEntryIdUnreachable:5364 case TypeTableEntryIdUnreachable:
5365 case TypeTableEntryIdComptimeFloat:5365 case TypeTableEntryIdComptimeFloat:
5366 case TypeTableEntryIdComptimeInt:5366 case TypeTableEntryIdComptimeInt:
5367 case TypeTableEntryIdUndefLit:5367 case TypeTableEntryIdUndefined:
5368 case TypeTableEntryIdNull:5368 case TypeTableEntryIdNull:
5369 case TypeTableEntryIdNamespace:5369 case TypeTableEntryIdNamespace:
5370 case TypeTableEntryIdBlock:5370 case TypeTableEntryIdBlock:
...@@ -6026,7 +6026,7 @@ static void define_builtin_types(CodeGen *g) {...@@ -6026,7 +6026,7 @@ static void define_builtin_types(CodeGen *g) {
6026 g->primitive_type_table.put(&entry->name, entry);6026 g->primitive_type_table.put(&entry->name, entry);
6027 }6027 }
6028 {6028 {
6029 TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdUndefLit);6029 TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdUndefined);
6030 buf_init_from_str(&entry->name, "(undefined)");6030 buf_init_from_str(&entry->name, "(undefined)");
6031 entry->zero_bits = true;6031 entry->zero_bits = true;
6032 g->builtin_types.entry_undef = entry;6032 g->builtin_types.entry_undef = entry;
...@@ -6499,7 +6499,7 @@ static void define_builtin_compile_vars(CodeGen *g) {...@@ -6499,7 +6499,7 @@ static void define_builtin_compile_vars(CodeGen *g) {
6499 " Struct: Struct,\n"6499 " Struct: Struct,\n"
6500 " ComptimeFloat: void,\n"6500 " ComptimeFloat: void,\n"
6501 " ComptimeInt: void,\n"6501 " ComptimeInt: void,\n"
6502 " UndefinedLiteral: void,\n"6502 " Undefined: void,\n"
6503 " Null: void,\n"6503 " Null: void,\n"
6504 " Nullable: Nullable,\n"6504 " Nullable: Nullable,\n"
6505 " ErrorUnion: ErrorUnion,\n"6505 " ErrorUnion: ErrorUnion,\n"
...@@ -7074,7 +7074,7 @@ static void prepend_c_type_to_decl_list(CodeGen *g, GenH *gen_h, TypeTableEntry...@@ -7074,7 +7074,7 @@ static void prepend_c_type_to_decl_list(CodeGen *g, GenH *gen_h, TypeTableEntry
7074 case TypeTableEntryIdMetaType:7074 case TypeTableEntryIdMetaType:
7075 case TypeTableEntryIdComptimeFloat:7075 case TypeTableEntryIdComptimeFloat:
7076 case TypeTableEntryIdComptimeInt:7076 case TypeTableEntryIdComptimeInt:
7077 case TypeTableEntryIdUndefLit:7077 case TypeTableEntryIdUndefined:
7078 case TypeTableEntryIdNull:7078 case TypeTableEntryIdNull:
7079 case TypeTableEntryIdNamespace:7079 case TypeTableEntryIdNamespace:
7080 case TypeTableEntryIdBlock:7080 case TypeTableEntryIdBlock:
...@@ -7259,7 +7259,7 @@ static void get_c_type(CodeGen *g, GenH *gen_h, TypeTableEntry *type_entry, Buf...@@ -7259,7 +7259,7 @@ static void get_c_type(CodeGen *g, GenH *gen_h, TypeTableEntry *type_entry, Buf
7259 case TypeTableEntryIdBlock:7259 case TypeTableEntryIdBlock:
7260 case TypeTableEntryIdComptimeFloat:7260 case TypeTableEntryIdComptimeFloat:
7261 case TypeTableEntryIdComptimeInt:7261 case TypeTableEntryIdComptimeInt:
7262 case TypeTableEntryIdUndefLit:7262 case TypeTableEntryIdUndefined:
7263 case TypeTableEntryIdNull:7263 case TypeTableEntryIdNull:
7264 case TypeTableEntryIdArgTuple:7264 case TypeTableEntryIdArgTuple:
7265 case TypeTableEntryIdPromise:7265 case TypeTableEntryIdPromise:
...@@ -7412,7 +7412,7 @@ static void gen_h_file(CodeGen *g) {...@@ -7412,7 +7412,7 @@ static void gen_h_file(CodeGen *g) {
7412 case TypeTableEntryIdComptimeFloat:7412 case TypeTableEntryIdComptimeFloat:
7413 case TypeTableEntryIdComptimeInt:7413 case TypeTableEntryIdComptimeInt:
7414 case TypeTableEntryIdArray:7414 case TypeTableEntryIdArray:
7415 case TypeTableEntryIdUndefLit:7415 case TypeTableEntryIdUndefined:
7416 case TypeTableEntryIdNull:7416 case TypeTableEntryIdNull:
7417 case TypeTableEntryIdErrorUnion:7417 case TypeTableEntryIdErrorUnion:
7418 case TypeTableEntryIdErrorSet:7418 case TypeTableEntryIdErrorSet:
src/ir.cpp+22-22
...@@ -8142,7 +8142,7 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,...@@ -8142,7 +8142,7 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,
8142 }8142 }
81438143
8144 // implicit undefined literal to anything8144 // implicit undefined literal to anything
8145 if (actual_type->id == TypeTableEntryIdUndefLit) {8145 if (actual_type->id == TypeTableEntryIdUndefined) {
8146 return ImplicitCastMatchResultYes;8146 return ImplicitCastMatchResultYes;
8147 }8147 }
81488148
...@@ -8546,11 +8546,11 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod...@@ -8546,11 +8546,11 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
8546 continue;8546 continue;
8547 }8547 }
85488548
8549 if (cur_type->id == TypeTableEntryIdUndefLit) {8549 if (cur_type->id == TypeTableEntryIdUndefined) {
8550 continue;8550 continue;
8551 }8551 }
85528552
8553 if (prev_type->id == TypeTableEntryIdUndefLit) {8553 if (prev_type->id == TypeTableEntryIdUndefined) {
8554 prev_inst = cur_inst;8554 prev_inst = cur_inst;
8555 continue;8555 continue;
8556 }8556 }
...@@ -10230,7 +10230,7 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst...@@ -10230,7 +10230,7 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst
1023010230
1023110231
10232 // explicit cast from undefined to anything10232 // explicit cast from undefined to anything
10233 if (actual_type->id == TypeTableEntryIdUndefLit) {10233 if (actual_type->id == TypeTableEntryIdUndefined) {
10234 return ir_analyze_undefined_to_anything(ira, source_instr, value, wanted_type);10234 return ir_analyze_undefined_to_anything(ira, source_instr, value, wanted_type);
10235 }10235 }
1023610236
...@@ -10795,7 +10795,7 @@ static TypeTableEntry *ir_analyze_bin_op_cmp(IrAnalyze *ira, IrInstructionBinOp...@@ -10795,7 +10795,7 @@ static TypeTableEntry *ir_analyze_bin_op_cmp(IrAnalyze *ira, IrInstructionBinOp
10795 case TypeTableEntryIdUnreachable:10795 case TypeTableEntryIdUnreachable:
10796 case TypeTableEntryIdArray:10796 case TypeTableEntryIdArray:
10797 case TypeTableEntryIdStruct:10797 case TypeTableEntryIdStruct:
10798 case TypeTableEntryIdUndefLit:10798 case TypeTableEntryIdUndefined:
10799 case TypeTableEntryIdNull:10799 case TypeTableEntryIdNull:
10800 case TypeTableEntryIdMaybe:10800 case TypeTableEntryIdMaybe:
10801 case TypeTableEntryIdErrorUnion:10801 case TypeTableEntryIdErrorUnion:
...@@ -11643,7 +11643,7 @@ static VarClassRequired get_var_class_required(TypeTableEntry *type_entry) {...@@ -11643,7 +11643,7 @@ static VarClassRequired get_var_class_required(TypeTableEntry *type_entry) {
11643 return VarClassRequiredAny;11643 return VarClassRequiredAny;
11644 case TypeTableEntryIdComptimeFloat:11644 case TypeTableEntryIdComptimeFloat:
11645 case TypeTableEntryIdComptimeInt:11645 case TypeTableEntryIdComptimeInt:
11646 case TypeTableEntryIdUndefLit:11646 case TypeTableEntryIdUndefined:
11647 case TypeTableEntryIdBlock:11647 case TypeTableEntryIdBlock:
11648 case TypeTableEntryIdNull:11648 case TypeTableEntryIdNull:
11649 case TypeTableEntryIdOpaque:11649 case TypeTableEntryIdOpaque:
...@@ -11912,7 +11912,7 @@ static TypeTableEntry *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructi...@@ -11912,7 +11912,7 @@ static TypeTableEntry *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructi
11912 case TypeTableEntryIdUnreachable:11912 case TypeTableEntryIdUnreachable:
11913 case TypeTableEntryIdComptimeFloat:11913 case TypeTableEntryIdComptimeFloat:
11914 case TypeTableEntryIdComptimeInt:11914 case TypeTableEntryIdComptimeInt:
11915 case TypeTableEntryIdUndefLit:11915 case TypeTableEntryIdUndefined:
11916 case TypeTableEntryIdNull:11916 case TypeTableEntryIdNull:
11917 case TypeTableEntryIdMaybe:11917 case TypeTableEntryIdMaybe:
11918 case TypeTableEntryIdErrorUnion:11918 case TypeTableEntryIdErrorUnion:
...@@ -11936,7 +11936,7 @@ static TypeTableEntry *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructi...@@ -11936,7 +11936,7 @@ static TypeTableEntry *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructi
11936 case TypeTableEntryIdArray:11936 case TypeTableEntryIdArray:
11937 case TypeTableEntryIdComptimeFloat:11937 case TypeTableEntryIdComptimeFloat:
11938 case TypeTableEntryIdComptimeInt:11938 case TypeTableEntryIdComptimeInt:
11939 case TypeTableEntryIdUndefLit:11939 case TypeTableEntryIdUndefined:
11940 case TypeTableEntryIdNull:11940 case TypeTableEntryIdNull:
11941 case TypeTableEntryIdMaybe:11941 case TypeTableEntryIdMaybe:
11942 case TypeTableEntryIdErrorUnion:11942 case TypeTableEntryIdErrorUnion:
...@@ -12900,7 +12900,7 @@ static TypeTableEntry *ir_analyze_maybe(IrAnalyze *ira, IrInstructionUnOp *un_op...@@ -12900,7 +12900,7 @@ static TypeTableEntry *ir_analyze_maybe(IrAnalyze *ira, IrInstructionUnOp *un_op
12900 case TypeTableEntryIdStruct:12900 case TypeTableEntryIdStruct:
12901 case TypeTableEntryIdComptimeFloat:12901 case TypeTableEntryIdComptimeFloat:
12902 case TypeTableEntryIdComptimeInt:12902 case TypeTableEntryIdComptimeInt:
12903 case TypeTableEntryIdUndefLit:12903 case TypeTableEntryIdUndefined:
12904 case TypeTableEntryIdNull:12904 case TypeTableEntryIdNull:
12905 case TypeTableEntryIdMaybe:12905 case TypeTableEntryIdMaybe:
12906 case TypeTableEntryIdErrorUnion:12906 case TypeTableEntryIdErrorUnion:
...@@ -13153,7 +13153,7 @@ static TypeTableEntry *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionP...@@ -13153,7 +13153,7 @@ static TypeTableEntry *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionP
13153 if (resolved_type->id == TypeTableEntryIdComptimeFloat ||13153 if (resolved_type->id == TypeTableEntryIdComptimeFloat ||
13154 resolved_type->id == TypeTableEntryIdComptimeInt ||13154 resolved_type->id == TypeTableEntryIdComptimeInt ||
13155 resolved_type->id == TypeTableEntryIdNull ||13155 resolved_type->id == TypeTableEntryIdNull ||
13156 resolved_type->id == TypeTableEntryIdUndefLit)13156 resolved_type->id == TypeTableEntryIdUndefined)
13157 {13157 {
13158 ir_add_error_node(ira, phi_instruction->base.source_node,13158 ir_add_error_node(ira, phi_instruction->base.source_node,
13159 buf_sprintf("unable to infer expression type"));13159 buf_sprintf("unable to infer expression type"));
...@@ -14215,7 +14215,7 @@ static TypeTableEntry *ir_analyze_instruction_typeof(IrAnalyze *ira, IrInstructi...@@ -14215,7 +14215,7 @@ static TypeTableEntry *ir_analyze_instruction_typeof(IrAnalyze *ira, IrInstructi
14215 zig_unreachable(); // handled above14215 zig_unreachable(); // handled above
14216 case TypeTableEntryIdComptimeFloat:14216 case TypeTableEntryIdComptimeFloat:
14217 case TypeTableEntryIdComptimeInt:14217 case TypeTableEntryIdComptimeInt:
14218 case TypeTableEntryIdUndefLit:14218 case TypeTableEntryIdUndefined:
14219 case TypeTableEntryIdNull:14219 case TypeTableEntryIdNull:
14220 case TypeTableEntryIdNamespace:14220 case TypeTableEntryIdNamespace:
14221 case TypeTableEntryIdBlock:14221 case TypeTableEntryIdBlock:
...@@ -14479,7 +14479,7 @@ static TypeTableEntry *ir_analyze_instruction_slice_type(IrAnalyze *ira,...@@ -14479,7 +14479,7 @@ static TypeTableEntry *ir_analyze_instruction_slice_type(IrAnalyze *ira,
14479 case TypeTableEntryIdInvalid: // handled above14479 case TypeTableEntryIdInvalid: // handled above
14480 zig_unreachable();14480 zig_unreachable();
14481 case TypeTableEntryIdUnreachable:14481 case TypeTableEntryIdUnreachable:
14482 case TypeTableEntryIdUndefLit:14482 case TypeTableEntryIdUndefined:
14483 case TypeTableEntryIdNull:14483 case TypeTableEntryIdNull:
14484 case TypeTableEntryIdBlock:14484 case TypeTableEntryIdBlock:
14485 case TypeTableEntryIdArgTuple:14485 case TypeTableEntryIdArgTuple:
...@@ -14587,7 +14587,7 @@ static TypeTableEntry *ir_analyze_instruction_array_type(IrAnalyze *ira,...@@ -14587,7 +14587,7 @@ static TypeTableEntry *ir_analyze_instruction_array_type(IrAnalyze *ira,
14587 case TypeTableEntryIdInvalid: // handled above14587 case TypeTableEntryIdInvalid: // handled above
14588 zig_unreachable();14588 zig_unreachable();
14589 case TypeTableEntryIdUnreachable:14589 case TypeTableEntryIdUnreachable:
14590 case TypeTableEntryIdUndefLit:14590 case TypeTableEntryIdUndefined:
14591 case TypeTableEntryIdNull:14591 case TypeTableEntryIdNull:
14592 case TypeTableEntryIdBlock:14592 case TypeTableEntryIdBlock:
14593 case TypeTableEntryIdArgTuple:14593 case TypeTableEntryIdArgTuple:
...@@ -14656,7 +14656,7 @@ static TypeTableEntry *ir_analyze_instruction_size_of(IrAnalyze *ira,...@@ -14656,7 +14656,7 @@ static TypeTableEntry *ir_analyze_instruction_size_of(IrAnalyze *ira,
14656 case TypeTableEntryIdInvalid: // handled above14656 case TypeTableEntryIdInvalid: // handled above
14657 zig_unreachable();14657 zig_unreachable();
14658 case TypeTableEntryIdUnreachable:14658 case TypeTableEntryIdUnreachable:
14659 case TypeTableEntryIdUndefLit:14659 case TypeTableEntryIdUndefined:
14660 case TypeTableEntryIdNull:14660 case TypeTableEntryIdNull:
14661 case TypeTableEntryIdBlock:14661 case TypeTableEntryIdBlock:
14662 case TypeTableEntryIdComptimeFloat:14662 case TypeTableEntryIdComptimeFloat:
...@@ -15099,7 +15099,7 @@ static TypeTableEntry *ir_analyze_instruction_switch_target(IrAnalyze *ira,...@@ -15099,7 +15099,7 @@ static TypeTableEntry *ir_analyze_instruction_switch_target(IrAnalyze *ira,
15099 case TypeTableEntryIdUnreachable:15099 case TypeTableEntryIdUnreachable:
15100 case TypeTableEntryIdArray:15100 case TypeTableEntryIdArray:
15101 case TypeTableEntryIdStruct:15101 case TypeTableEntryIdStruct:
15102 case TypeTableEntryIdUndefLit:15102 case TypeTableEntryIdUndefined:
15103 case TypeTableEntryIdNull:15103 case TypeTableEntryIdNull:
15104 case TypeTableEntryIdMaybe:15104 case TypeTableEntryIdMaybe:
15105 case TypeTableEntryIdBlock:15105 case TypeTableEntryIdBlock:
...@@ -15620,7 +15620,7 @@ static TypeTableEntry *ir_analyze_min_max(IrAnalyze *ira, IrInstruction *source_...@@ -15620,7 +15620,7 @@ static TypeTableEntry *ir_analyze_min_max(IrAnalyze *ira, IrInstruction *source_
15620 case TypeTableEntryIdStruct:15620 case TypeTableEntryIdStruct:
15621 case TypeTableEntryIdComptimeFloat:15621 case TypeTableEntryIdComptimeFloat:
15622 case TypeTableEntryIdComptimeInt:15622 case TypeTableEntryIdComptimeInt:
15623 case TypeTableEntryIdUndefLit:15623 case TypeTableEntryIdUndefined:
15624 case TypeTableEntryIdNull:15624 case TypeTableEntryIdNull:
15625 case TypeTableEntryIdMaybe:15625 case TypeTableEntryIdMaybe:
15626 case TypeTableEntryIdErrorUnion:15626 case TypeTableEntryIdErrorUnion:
...@@ -16282,7 +16282,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, TypeTableEntry *t...@@ -16282,7 +16282,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, TypeTableEntry *t
16282 case TypeTableEntryIdUnreachable:16282 case TypeTableEntryIdUnreachable:
16283 case TypeTableEntryIdComptimeFloat:16283 case TypeTableEntryIdComptimeFloat:
16284 case TypeTableEntryIdComptimeInt:16284 case TypeTableEntryIdComptimeInt:
16285 case TypeTableEntryIdUndefLit:16285 case TypeTableEntryIdUndefined:
16286 case TypeTableEntryIdNull:16286 case TypeTableEntryIdNull:
16287 case TypeTableEntryIdNamespace:16287 case TypeTableEntryIdNamespace:
16288 case TypeTableEntryIdBlock:16288 case TypeTableEntryIdBlock:
...@@ -17878,7 +17878,7 @@ static TypeTableEntry *ir_analyze_instruction_align_of(IrAnalyze *ira, IrInstruc...@@ -17878,7 +17878,7 @@ static TypeTableEntry *ir_analyze_instruction_align_of(IrAnalyze *ira, IrInstruc
17878 case TypeTableEntryIdUnreachable:17878 case TypeTableEntryIdUnreachable:
17879 case TypeTableEntryIdComptimeFloat:17879 case TypeTableEntryIdComptimeFloat:
17880 case TypeTableEntryIdComptimeInt:17880 case TypeTableEntryIdComptimeInt:
17881 case TypeTableEntryIdUndefLit:17881 case TypeTableEntryIdUndefined:
17882 case TypeTableEntryIdNull:17882 case TypeTableEntryIdNull:
17883 case TypeTableEntryIdNamespace:17883 case TypeTableEntryIdNamespace:
17884 case TypeTableEntryIdBlock:17884 case TypeTableEntryIdBlock:
...@@ -18612,7 +18612,7 @@ static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ConstExprValue...@@ -18612,7 +18612,7 @@ static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ConstExprValue
18612 case TypeTableEntryIdUnreachable:18612 case TypeTableEntryIdUnreachable:
18613 case TypeTableEntryIdComptimeFloat:18613 case TypeTableEntryIdComptimeFloat:
18614 case TypeTableEntryIdComptimeInt:18614 case TypeTableEntryIdComptimeInt:
18615 case TypeTableEntryIdUndefLit:18615 case TypeTableEntryIdUndefined:
18616 case TypeTableEntryIdNull:18616 case TypeTableEntryIdNull:
18617 case TypeTableEntryIdPromise:18617 case TypeTableEntryIdPromise:
18618 zig_unreachable();18618 zig_unreachable();
...@@ -18679,7 +18679,7 @@ static void buf_read_value_bytes(CodeGen *codegen, uint8_t *buf, ConstExprValue...@@ -18679,7 +18679,7 @@ static void buf_read_value_bytes(CodeGen *codegen, uint8_t *buf, ConstExprValue
18679 case TypeTableEntryIdUnreachable:18679 case TypeTableEntryIdUnreachable:
18680 case TypeTableEntryIdComptimeFloat:18680 case TypeTableEntryIdComptimeFloat:
18681 case TypeTableEntryIdComptimeInt:18681 case TypeTableEntryIdComptimeInt:
18682 case TypeTableEntryIdUndefLit:18682 case TypeTableEntryIdUndefined:
18683 case TypeTableEntryIdNull:18683 case TypeTableEntryIdNull:
18684 case TypeTableEntryIdPromise:18684 case TypeTableEntryIdPromise:
18685 zig_unreachable();18685 zig_unreachable();
...@@ -18760,7 +18760,7 @@ static TypeTableEntry *ir_analyze_instruction_bit_cast(IrAnalyze *ira, IrInstruc...@@ -18760,7 +18760,7 @@ static TypeTableEntry *ir_analyze_instruction_bit_cast(IrAnalyze *ira, IrInstruc
18760 case TypeTableEntryIdUnreachable:18760 case TypeTableEntryIdUnreachable:
18761 case TypeTableEntryIdComptimeFloat:18761 case TypeTableEntryIdComptimeFloat:
18762 case TypeTableEntryIdComptimeInt:18762 case TypeTableEntryIdComptimeInt:
18763 case TypeTableEntryIdUndefLit:18763 case TypeTableEntryIdUndefined:
18764 case TypeTableEntryIdNull:18764 case TypeTableEntryIdNull:
18765 ir_add_error(ira, dest_type_value,18765 ir_add_error(ira, dest_type_value,
18766 buf_sprintf("unable to @bitCast from type '%s'", buf_ptr(&src_type->name)));18766 buf_sprintf("unable to @bitCast from type '%s'", buf_ptr(&src_type->name)));
...@@ -18786,7 +18786,7 @@ static TypeTableEntry *ir_analyze_instruction_bit_cast(IrAnalyze *ira, IrInstruc...@@ -18786,7 +18786,7 @@ static TypeTableEntry *ir_analyze_instruction_bit_cast(IrAnalyze *ira, IrInstruc
18786 case TypeTableEntryIdUnreachable:18786 case TypeTableEntryIdUnreachable:
18787 case TypeTableEntryIdComptimeFloat:18787 case TypeTableEntryIdComptimeFloat:
18788 case TypeTableEntryIdComptimeInt:18788 case TypeTableEntryIdComptimeInt:
18789 case TypeTableEntryIdUndefLit:18789 case TypeTableEntryIdUndefined:
18790 case TypeTableEntryIdNull:18790 case TypeTableEntryIdNull:
18791 ir_add_error(ira, dest_type_value,18791 ir_add_error(ira, dest_type_value,
18792 buf_sprintf("unable to @bitCast to type '%s'", buf_ptr(&dest_type->name)));18792 buf_sprintf("unable to @bitCast to type '%s'", buf_ptr(&dest_type->name)));
test/cases/misc.zig+1-1
...@@ -503,7 +503,7 @@ test "@typeId" {...@@ -503,7 +503,7 @@ test "@typeId" {
503 assert(@typeId(AStruct) == Tid.Struct);503 assert(@typeId(AStruct) == Tid.Struct);
504 assert(@typeId(@typeOf(1)) == Tid.ComptimeInt);504 assert(@typeId(@typeOf(1)) == Tid.ComptimeInt);
505 assert(@typeId(@typeOf(1.0)) == Tid.ComptimeFloat);505 assert(@typeId(@typeOf(1.0)) == Tid.ComptimeFloat);
506 assert(@typeId(@typeOf(undefined)) == Tid.UndefinedLiteral);506 assert(@typeId(@typeOf(undefined)) == Tid.Undefined);
507 assert(@typeId(@typeOf(null)) == Tid.Null);507 assert(@typeId(@typeOf(null)) == Tid.Null);
508 assert(@typeId(?i32) == Tid.Nullable);508 assert(@typeId(?i32) == Tid.Nullable);
509 assert(@typeId(error!i32) == Tid.ErrorUnion);509 assert(@typeId(error!i32) == Tid.ErrorUnion);