Changeset 3d5701e for src/SynTree/Type.cc

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/SynTree/Type.cc (modified) (6 diffs)

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  4 21:05:07 2019
-// Update Count     : 45
+// Last Modified On : Sun Dec 15 16:52:37 2019
+// Update Count     : 49
 //
 #include "Type.h"
@@ -24 +24 @@
 using namespace std;
 
+// GENERATED START, DO NOT EDIT
+// GENERATED BY BasicTypes-gen.cc
 const char * BasicType::typeNames[] = {
         "_Bool",
@@ -45 +47 @@
         "float",
         "float _Complex",
-        //"float _Imaginary",
         "_Float32x",
         "_Float32x _Complex",
@@ -52 +53 @@
         "double",
         "double _Complex",
-        //"double _Imaginary",
         "_Float64x",
         "_Float64x _Complex",
@@ -61 +61 @@
         "long double",
         "long double _Complex",
-        //"long double _Imaginary",
         "_Float128x",
         "_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
 
 Type::Type( const Qualifiers &tq, const std::list< Attribute * > & attributes ) : tq( tq ), attributes( attributes ) {}
@@ -85 +81 @@
 const char * Type::FuncSpecifiersNames[] = { "inline", "_Noreturn", "fortran" };
 const char * Type::StorageClassesNames[] = { "extern", "static", "auto", "register", "_Thread_local" };
-const char * Type::QualifiersNames[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic" };
+const char * Type::QualifiersNames[] = { "const", "restrict", "volatile", "mutex", "_Atomic" };
 
 Type * Type::stripDeclarator() {