Changeset b7d6a36 for src/AST/Decl.cpp

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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' into relaxed_ready

File:

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

src/AST/Decl.cpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 11 16:41:39 2019
-// Update Count     : 18
+// Last Modified On : Fri Dec 13 16:23:15 2019
+// Update Count     : 20
 //
 
@@ -26 +26 @@
 #include "Node.hpp"            // for readonly
 #include "Type.hpp"            // for readonly
-#include "Parser/ParseNode.h"  // for DeclarationNode
 
 namespace ast {
@@ -56 +55 @@
 
 const char * TypeDecl::typeString() const {
-        static const char * kindNames[] = { "sized object type", "sized function type", "sized tuple type" };
-        assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1,
-                "typeString: kindNames is out of sync." );
-        assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
+        static const char * kindNames[] = { "sized data type", "sized object type", "sized function type", "sized tuple type" };
+        static_assert( sizeof(kindNames)/sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "typeString: kindNames is out of sync." );
+        assertf( kind < TypeDecl::NUMBER_OF_KINDS, "TypeDecl kind is out of bounds." );
         return sized ? kindNames[ kind ] : &kindNames[ kind ][ sizeof("sized") ]; // sizeof includes '\0'
 }
 
 const char * TypeDecl::genTypeString() const {
-        static const char * kindNames[] = { "dtype", "ftype", "ttype" };
-        assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "genTypeString: kindNames is out of sync." );
-        assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
+        static const char * kindNames[] = { "dtype", "otype", "ftype", "ttype" };
+        static_assert( sizeof(kindNames)/sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "genTypeString: kindNames is out of sync." );
+        assertf( kind < TypeDecl::NUMBER_OF_KINDS, "TypeDecl kind is out of bounds." );
         return kindNames[ kind ];
 }