Changeset 7030dab for src/Parser/DeclarationNode.cc

Timestamp:

Apr 6, 2020, 4:46:28 PM (5 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:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

File:

• src/Parser/DeclarationNode.cc (modified) (12 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:17:10 2019
-// Update Count     : 1116
+// Last Modified On : Mon Dec 16 15:32:22 2019
+// Update Count     : 1133
 //
 
@@ -24 +24 @@
 #include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for maybeClone, maybeBuild, CodeLocation
-#include "Parser/LinkageSpec.h"    // for Spec, linkageName, Cforall
 #include "Parser/ParseNode.h"      // for DeclarationNode, ExpressionNode
+#include "SynTree/LinkageSpec.h"   // for Spec, linkageName, Cforall
 #include "SynTree/Attribute.h"     // for Attribute
 #include "SynTree/Declaration.h"   // for TypeDecl, ObjectDecl, Declaration
@@ -47 +47 @@
 const char * DeclarationNode::signednessNames[] = { "signed", "unsigned", "NoSignednessNames" };
 const char * DeclarationNode::lengthNames[] = { "short", "long", "long long", "NoLengthNames" };
-const char * DeclarationNode::aggregateNames[] = { "struct", "union", "trait", "coroutine", "monitor", "thread", "NoAggregateNames" };
-const char * DeclarationNode::typeClassNames[] = { "otype", "dtype", "ftype", "NoTypeClassNames" };
 const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "__auto_type", "zero_t", "one_t", "NoBuiltinTypeNames" };
 
@@ -59 +57 @@
 
 //      variable.name = nullptr;
-        variable.tyClass = NoTypeClass;
+        variable.tyClass = TypeDecl::NUMBER_OF_KINDS;
         variable.assertions = nullptr;
         variable.initializer = nullptr;
@@ -135 +133 @@
 
         if ( linkage != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( linkage ) << " ";
+                os << LinkageSpec::name( linkage ) << " ";
         } // if
 
@@ -267 +265 @@
 }
 
-DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
+DeclarationNode * DeclarationNode::newAggregate( AggregateDecl::Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
@@ -313 +311 @@
 } // DeclarationNode::newFromTypeGen
 
-DeclarationNode * DeclarationNode::newTypeParam( TypeClass tc, const string * name ) {
+DeclarationNode * DeclarationNode::newTypeParam( TypeDecl::Kind tc, const string * name ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
@@ -328 +326 @@
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate.name = name;
-        newnode->type->aggregate.kind = Trait;
+        newnode->type->aggregate.kind = AggregateDecl::Trait;
         newnode->type->aggregate.params = params;
         newnode->type->aggregate.fields = asserts;
@@ -338 +336 @@
         newnode->type = new TypeData( TypeData::AggregateInst );
         newnode->type->aggInst.aggregate = new TypeData( TypeData::Aggregate );
-        newnode->type->aggInst.aggregate->aggregate.kind = Trait;
+        newnode->type->aggInst.aggregate->aggregate.kind = AggregateDecl::Trait;
         newnode->type->aggInst.aggregate->aggregate.name = name;
         newnode->type->aggInst.params = params;
@@ -671 +669 @@
 
 DeclarationNode * DeclarationNode::addAssertions( DeclarationNode * assertions ) {
-        if ( variable.tyClass != NoTypeClass ) {
+        if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 if ( variable.assertions ) {
                         variable.assertions->appendList( assertions );
@@ -876 +874 @@
 
 DeclarationNode * DeclarationNode::addTypeInitializer( DeclarationNode * init ) {
-        assertf( variable.tyClass != NoTypeClass, "Called addTypeInitializer on something that isn't a type variable." );
+        assertf( variable.tyClass != TypeDecl::NUMBER_OF_KINDS, "Called addTypeInitializer on something that isn't a type variable." );
         variable.initializer = init;
         return this;
@@ -1075 +1073 @@
         } // if
 
-        if ( variable.tyClass != NoTypeClass ) {
+        if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 // otype is internally converted to dtype + otype parameters
                 static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype };
-                assertf( sizeof(kindMap)/sizeof(kindMap[0]) == NoTypeClass, "DeclarationNode::build: kindMap is out of sync." );
+                static_assert( sizeof(kindMap)/sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;