Changeset 3d5701e for src/AST/Type.cpp

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict

File:

• src/AST/Type.cpp (modified) (3 diffs)

src/AST/Type.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Mon May 13 15:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon May 13 15:00:00 2019
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Dec 15 16:56:28 2019
+// Update Count     : 4
 //
 
@@ -48 +48 @@
 // --- BasicType
 
-const char *BasicType::typeNames[] = {
+// GENERATED START, DO NOT EDIT
+// GENERATED BY BasicTypes-gen.cc
+const char * BasicType::typeNames[] = {
         "_Bool",
         "char",
@@ -86 +88 @@
         "_Float128x _Complex",
 };
-static_assert(
-        sizeof(BasicType::typeNames)/sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
-        "Each basic type name should have a corresponding kind enum value"
-);
+// GENERATED END
 
 // --- FunctionType