Changes in src/AST/Decl.cpp [07de76b:d76c588]

File:

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

src/AST/Decl.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 16:23:15 2019
-// Update Count     : 20
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu May 9 10:00:00 2019
+// Update Count     : 1
 //
 
@@ -18 +18 @@
 #include <cassert>             // for assert, strict_dynamic_cast
 #include <iostream>
+#include <string>
 #include <unordered_map>
 
@@ -26 +27 @@
 #include "Node.hpp"            // for readonly
 #include "Type.hpp"            // for readonly
+#include "Parser/ParseNode.h"  // for DeclarationNode
 
 namespace ast {
@@ -54 +56 @@
 // --- TypeDecl
 
-const char * TypeDecl::typeString() const {
-        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'
+std::string TypeDecl::typeString() const {
+        static const std::string kindNames[] = { "object type", "function type", "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." );
+        return (sized ? "sized " : "") + kindNames[ kind ];
 }
 
-const char * TypeDecl::genTypeString() const {
-        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." );
+std::string TypeDecl::genTypeString() const {
+        static const std::string 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." );
         return kindNames[ kind ];
 }
@@ -70 +73 @@
 std::ostream & operator<< ( std::ostream & out, const TypeDecl::Data & data ) {
         return out << data.kind << ", " << data.isComplete;
-}
-
-// --- AggregateDecl
-
-// These must harmonize with the corresponding AggregateDecl::Aggregate enumerations.
-static const char * aggregateNames[] = { "struct", "union", "enum", "exception", "trait", "generator", "coroutine", "monitor", "thread", "NoAggregateName" };
-
-const char * AggregateDecl::aggrString( AggregateDecl::Aggregate aggr ) {
-        return aggregateNames[aggr];
 }