Changeset 7527e63 for src/Parser/DeclarationNode.cc

Timestamp:

Aug 16, 2016, 3:20:06 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1f6d4624

Parents:

950f7a7 (diff), 7880579 (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) (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 : Tue Jul 12 20:49:31 2016
-// Update Count     : 164
+// Last Modified On : Mon Aug 15 20:48:55 2016
+// Update Count     : 178
 //
 
@@ -49 +49 @@
         newnode->name = name;
         newnode->storageClasses = storageClasses;
-        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
+        newnode->bitfieldWidth = bitfieldWidth;
         newnode->hasEllipsis = hasEllipsis;
         newnode->initializer = initializer;
-        newnode->next = maybeClone( next );
+        newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
         return newnode;
@@ -283 +283 @@
         newnode->type->array->dimension = size;
         newnode->type->array->isStatic = isStatic;
-        if ( newnode->type->array->dimension == 0 || dynamic_cast<ConstantNode *>( newnode->type->array->dimension ) ) {
+        if ( newnode->type->array->dimension == 0 || dynamic_cast< ConstantExpr * >( newnode->type->array->dimension->build() ) ) {
                 newnode->type->array->isVarLen = false;
         } else {
@@ -469 +469 @@
 
                 // there may be typedefs chained onto the type
-                if ( o->get_link() ) {
-                        set_link( o->get_link()->clone() );
+                if ( o->get_next() ) {
+                        set_last( o->get_next()->clone() );
                 } // if
         } // if
@@ -756 +756 @@
 DeclarationNode *DeclarationNode::appendList( DeclarationNode *node ) {
         if ( node != 0 ) {
-                set_link( node );
+                set_last( node );
         } // if
         return this;
@@ -775 +775 @@
 void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< Declaration *> > out( outputList );
+        std::back_insert_iterator< std::list< Declaration * > > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -793 +793 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast<DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -800 +800 @@
 }
 
-void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList ) {
+void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< DeclarationWithType *> > out( outputList );
+        std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -816 +816 @@
                         Declaration *decl = cur->build();
                         if ( decl ) {
-                                if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType *>( decl ) ) {
+                                if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
                                         *out++ = dwt;
-                                } else if ( StructDecl *agg = dynamic_cast< StructDecl *>( decl ) ) {
+                                } else if ( StructDecl *agg = dynamic_cast< StructDecl * >( decl ) ) {
                                         StructInstType *inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, 0, inst, 0 );
                                         delete agg;
-                                } else if ( UnionDecl *agg = dynamic_cast< UnionDecl *>( decl ) ) {
+                                } else if ( UnionDecl *agg = dynamic_cast< UnionDecl * >( decl ) ) {
                                         UnionInstType *inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, 0, inst, 0 );
@@ -830 +830 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -837 +837 @@
 }
 
-void buildTypeList( const DeclarationNode *firstNode, std::list< Type *> &outputList ) {
+void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< Type *> > out( outputList );
+        std::back_insert_iterator< std::list< Type * > > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -847 +847 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {