Skip to content

Commit 677eaf2

Browse files
andrewrkandrewrk
authoredJun 5, 2018
Merge pull request #1057 from ziglang/comptime-int
Rename integer literal type and float literal type
·
0.15.20.3.0
2 parents e53b683 + a8146ad commit 677eaf2

File tree

13 files changed

+355
-341
lines changed

13 files changed

+355
-341
lines changed
 

‎doc/langref.html.in‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4893,10 +4893,10 @@ pub const TypeId = enum {
48934893
Pointer,
48944894
Array,
48954895
Struct,
4896-
FloatLiteral,
4897-
IntLiteral,
4898-
UndefinedLiteral,
4899-
NullLiteral,
4896+
ComptimeFloat,
4897+
ComptimeInt,
4898+
Undefined,
4899+
Null,
49004900
Nullable,
49014901
ErrorUnion,
49024902
Error,
@@ -4927,10 +4927,10 @@ pub const TypeInfo = union(TypeId) {
49274927
Pointer: Pointer,
49284928
Array: Array,
49294929
Struct: Struct,
4930-
FloatLiteral: void,
4931-
IntLiteral: void,
4932-
UndefinedLiteral: void,
4933-
NullLiteral: void,
4930+
ComptimeFloat: void,
4931+
ComptimeInt: void,
4932+
Undefined: void,
4933+
Null: void,
49344934
Nullable: Nullable,
49354935
ErrorUnion: ErrorUnion,
49364936
ErrorSet: ErrorSet,
@@ -5685,10 +5685,10 @@ pub const TypeId = enum {
56855685
Pointer,
56865686
Array,
56875687
Struct,
5688-
FloatLiteral,
5689-
IntLiteral,
5690-
UndefinedLiteral,
5691-
NullLiteral,
5688+
ComptimeFloat,
5689+
ComptimeInt,
5690+
Undefined,
5691+
Null,
56925692
Nullable,
56935693
ErrorUnion,
56945694
ErrorSet,
@@ -5713,10 +5713,10 @@ pub const TypeInfo = union(TypeId) {
57135713
Pointer: Pointer,
57145714
Array: Array,
57155715
Struct: Struct,
5716-
FloatLiteral: void,
5717-
IntLiteral: void,
5718-
UndefinedLiteral: void,
5719-
NullLiteral: void,
5716+
ComptimeFloat: void,
5717+
ComptimeInt: void,
5718+
Undefined: void,
5719+
Null: void,
57205720
Nullable: Nullable,
57215721
ErrorUnion: ErrorUnion,
57225722
ErrorSet: ErrorSet,

‎src/all_types.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,10 +1159,10 @@ enum TypeTableEntryId {
11591159
TypeTableEntryIdPointer,
11601160
TypeTableEntryIdArray,
11611161
TypeTableEntryIdStruct,
1162-
TypeTableEntryIdNumLitFloat,
1163-
TypeTableEntryIdNumLitInt,
1164-
TypeTableEntryIdUndefLit,
1165-
TypeTableEntryIdNullLit,
1162+
TypeTableEntryIdComptimeFloat,
1163+
TypeTableEntryIdComptimeInt,
1164+
TypeTableEntryIdUndefined,
1165+
TypeTableEntryIdNull,
11661166
TypeTableEntryIdMaybe,
11671167
TypeTableEntryIdErrorUnion,
11681168
TypeTableEntryIdErrorSet,

0 commit comments

Comments
 (0)
Please sign in to comment.