Changeset 5407cdc for src/Parser/DeclarationNode.cc

Timestamp:

Apr 28, 2021, 4:56:50 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8d66610

Parents:

feacef9 (diff), b7fd2db6 (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:software/cfa/cfa-cc

File:

• src/Parser/DeclarationNode.cc (modified) (10 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 : Mon Jan 11 20:58:07 2021
-// Update Count     : 1137
+// Last Modified On : Tue Mar 23 08:44:08 2021
+// Update Count     : 1149
 //
 
@@ -167 +167 @@
 }
 
-DeclarationNode * DeclarationNode::newFunction( const string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->name = name;
-        newnode->type = new TypeData( TypeData::Function );
-        newnode->type->function.params = param;
-        newnode->type->function.body = body;
-
-        if ( ret ) {
-                newnode->type->base = ret->type;
-                ret->type = nullptr;
-                delete ret;
-        } // if
-
-        return newnode;
-} // DeclarationNode::newFunction
-
-
 DeclarationNode * DeclarationNode::newStorageClass( Type::StorageClasses sc ) {
         DeclarationNode * newnode = new DeclarationNode;
@@ -237 +220 @@
         return newnode;
 } // DeclarationNode::newForall
-
-DeclarationNode * DeclarationNode::newFromTypedef( const string * name ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::SymbolicInst );
-        newnode->type->symbolic.name = name;
-        newnode->type->symbolic.isTypedef = true;
-        newnode->type->symbolic.params = nullptr;
-        return newnode;
-} // DeclarationNode::newFromTypedef
 
 DeclarationNode * DeclarationNode::newFromGlobalScope() {
@@ -289 +263 @@
 } // DeclarationNode::newEnum
 
+DeclarationNode * DeclarationNode::newName( const string * name ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        assert( ! newnode->name );
+        newnode->name = name;
+        return newnode;
+} // DeclarationNode::newName
+
 DeclarationNode * DeclarationNode::newEnumConstant( const string * name, ExpressionNode * constant ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->name = name;
+        DeclarationNode * newnode = newName( name );
         newnode->enumeratorValue.reset( constant );
         return newnode;
 } // DeclarationNode::newEnumConstant
 
-DeclarationNode * DeclarationNode::newName( const string * name ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->name = name;
-        return newnode;
-} // DeclarationNode::newName
+DeclarationNode * DeclarationNode::newFromTypedef( const string * name ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::SymbolicInst );
+        newnode->type->symbolic.name = name;
+        newnode->type->symbolic.isTypedef = true;
+        newnode->type->symbolic.params = nullptr;
+        return newnode;
+} // DeclarationNode::newFromTypedef
 
 DeclarationNode * DeclarationNode::newFromTypeGen( const string * name, ExpressionNode * params ) {
@@ -312 +295 @@
 
 DeclarationNode * DeclarationNode::newTypeParam( TypeDecl::Kind tc, const string * name ) {
-        DeclarationNode * newnode = new DeclarationNode;
+        DeclarationNode * newnode = newName( name );
         newnode->type = nullptr;
-        assert( ! newnode->name );
-//      newnode->variable.name = name;
-        newnode->name = name;
         newnode->variable.tyClass = tc;
         newnode->variable.assertions = nullptr;
@@ -343 +323 @@
 
 DeclarationNode * DeclarationNode::newTypeDecl( const string * name, DeclarationNode * typeParams ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->name = name;
+        DeclarationNode * newnode = newName( name );
         newnode->type = new TypeData( TypeData::Symbolic );
         newnode->type->symbolic.isTypedef = false;
@@ -417 +396 @@
 } // DeclarationNode::newBuiltinType
 
+DeclarationNode * DeclarationNode::newFunction( const string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body ) {
+        DeclarationNode * newnode = newName( name );
+        newnode->type = new TypeData( TypeData::Function );
+        newnode->type->function.params = param;
+        newnode->type->function.body = body;
+
+        if ( ret ) {
+                newnode->type->base = ret->type;
+                ret->type = nullptr;
+                delete ret;
+        } // if
+
+        return newnode;
+} // DeclarationNode::newFunction
+
 DeclarationNode * DeclarationNode::newAttribute( const string * name, ExpressionNode * expr ) {
         DeclarationNode * newnode = new DeclarationNode;
@@ -424 +418 @@
         newnode->attributes.push_back( new Attribute( *name, exprs ) );
         delete name;
+        return newnode;
+}
+
+DeclarationNode * DeclarationNode::newDirectiveStmt( StatementNode * stmt ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->directiveStmt = stmt;
         return newnode;
 }
@@ -879 +879 @@
 }
 
-DeclarationNode * DeclarationNode::cloneType( string * newName ) {
-        DeclarationNode * newnode = new DeclarationNode;
+DeclarationNode * DeclarationNode::cloneType( string * name ) {
+        DeclarationNode * newnode = newName( name );
         newnode->type = maybeClone( type );
         newnode->copySpecifiers( this );
-        assert( newName );
-        newnode->name = newName;
         return newnode;
 }
@@ -1072 +1070 @@
                 return new AsmDecl( strict_dynamic_cast<AsmStmt *>( asmStmt->build() ) );
         } // if
+        if ( directiveStmt ) {
+                return new DirectiveDecl( strict_dynamic_cast<DirectiveStmt *>( directiveStmt->build() ) );
+        } // if
 
         if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {