Changeset 054514d for src/SynTree

Timestamp:

May 29, 2018, 3:26:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

3530f39a

Parents:

96812c0 (diff), da60c631 (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:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/SynTree

Files:

• BasicType.cc (modified) (1 diff)
• Type.cc (modified) (2 diffs)
• Type.h (modified) (1 diff)

src/SynTree/BasicType.cc

@@ -55 +55 @@
           case DoubleImaginary:
           case LongDoubleImaginary:
+          case Float80:
+          case Float128:
                 return false;
           case NUMBER_OF_BASIC_TYPES:

src/SynTree/Type.cc

@@ -24 +24 @@
 using namespace std;
 
-const char *BasicType::typeNames[BasicType::NUMBER_OF_BASIC_TYPES] = {
+const char *BasicType::typeNames[] = {
         "_Bool",
         "char",
@@ -48 +48 @@
         "__int128",
         "unsigned __int128",
+        "__float80",
+        "__float128"
 };
+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"
+);
 
 Type::Type( const Qualifiers &tq, const std::list< Attribute * > & attributes ) : tq( tq ), attributes( attributes ) {}

src/SynTree/Type.h

@@ -231 +231 @@
                 SignedInt128,
                 UnsignedInt128,
+                Float80,
+                Float128,
                 NUMBER_OF_BASIC_TYPES
         } kind;