Merge pull request #1057 from ziglang/comptime-int

Rename integer literal type and float literal type
ziglang · Jun 5, 2018 · 677eaf2 · 677eaf2
2 parents e53b683 + a8146ad
commit 677eaf2
Show file tree

Hide file tree

Showing 13 changed files with 355 additions and 341 deletions.
diff --git a/doc/langref.html.in b/doc/langref.html.in
@@ -4893,10 +4893,10 @@ pub const TypeId = enum {
     Pointer,
     Array,
     Struct,
-    FloatLiteral,
-    IntLiteral,
-    UndefinedLiteral,
-    NullLiteral,
+    ComptimeFloat,
+    ComptimeInt,
+    Undefined,
+    Null,
     Nullable,
     ErrorUnion,
     Error,
@@ -4927,10 +4927,10 @@ pub const TypeInfo = union(TypeId) {
     Pointer: Pointer,
     Array: Array,
     Struct: Struct,
-    FloatLiteral: void,
-    IntLiteral: void,
-    UndefinedLiteral: void,
-    NullLiteral: void,
+    ComptimeFloat: void,
+    ComptimeInt: void,
+    Undefined: void,
+    Null: void,
     Nullable: Nullable,
     ErrorUnion: ErrorUnion,
     ErrorSet: ErrorSet,
@@ -5685,10 +5685,10 @@ pub const TypeId = enum {
     Pointer,
     Array,
     Struct,
-    FloatLiteral,
-    IntLiteral,
-    UndefinedLiteral,
-    NullLiteral,
+    ComptimeFloat,
+    ComptimeInt,
+    Undefined,
+    Null,
     Nullable,
     ErrorUnion,
     ErrorSet,
@@ -5713,10 +5713,10 @@ pub const TypeInfo = union(TypeId) {
     Pointer: Pointer,
     Array: Array,
     Struct: Struct,
-    FloatLiteral: void,
-    IntLiteral: void,
-    UndefinedLiteral: void,
-    NullLiteral: void,
+    ComptimeFloat: void,
+    ComptimeInt: void,
+    Undefined: void,
+    Null: void,
     Nullable: Nullable,
     ErrorUnion: ErrorUnion,
     ErrorSet: ErrorSet,

diff --git a/src/all_types.hpp b/src/all_types.hpp
@@ -1159,10 +1159,10 @@ enum TypeTableEntryId {
     TypeTableEntryIdPointer,
     TypeTableEntryIdArray,
     TypeTableEntryIdStruct,
-    TypeTableEntryIdNumLitFloat,
-    TypeTableEntryIdNumLitInt,
-    TypeTableEntryIdUndefLit,
-    TypeTableEntryIdNullLit,
+    TypeTableEntryIdComptimeFloat,
+    TypeTableEntryIdComptimeInt,
+    TypeTableEntryIdUndefined,
+    TypeTableEntryIdNull,
     TypeTableEntryIdMaybe,
     TypeTableEntryIdErrorUnion,
     TypeTableEntryIdErrorSet,