Changeset 4a7d895 for src/Parser/TypeData.cc

Timestamp:

Aug 20, 2016, 5:33:07 AM (9 years ago)

Author:

Aaron Moss <bruceiv@…>

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:

80722d0

Parents:

7b1bfc5 (diff), 2037f82 (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 plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/TypeData.cc (modified) (5 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 13 18:38:41 2016
-// Update Count     : 59
+// Last Modified On : Thu Aug 18 23:48:44 2016
+// Update Count     : 64
 //
 
@@ -182 +182 @@
                 break;
           case Array:
-//PAB           newtype->array->dimension = maybeClone( array->dimension );
                 newtype->array->dimension = array->dimension;
                 newtype->array->isVarLen = array->isVarLen;
@@ -479 +478 @@
 }
 
-Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Type linkage, Initializer *init ) const {
+Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer *init ) const {
         if ( kind == TypeData::Function ) {
                 FunctionDecl *decl;
@@ -489 +488 @@
                                 decl = new FunctionDecl( name, sc, linkage, buildFunction(), body, isInline, isNoreturn );
                         } else {
-                                // std::list<Label> ls;
-                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list<Label>() ), isInline, isNoreturn );
+                                // std::list< Label > ls;
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list< Label >() ), isInline, isNoreturn );
                         } // if
                 } else {
@@ -909 +908 @@
         buildList( enumeration->constants, ret->get_members() );
         std::list< Declaration * >::iterator members = ret->get_members().begin();
-        for ( const DeclarationNode *cur = enumeration->constants; cur != NULL; cur = dynamic_cast<DeclarationNode *>( cur->get_next() ), ++members ) {
-                if ( cur->get_enumeratorValue() != NULL ) {
-                        ObjectDecl *member = dynamic_cast<ObjectDecl *>(*members);
+        for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
+                if ( cur->get_enumeratorValue() != nullptr ) {
+                        ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
                         member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
                 } // if