Changeset 2acf5fc for src/Parser/TypeData.cc

Timestamp:

Aug 22, 2016, 3:11:00 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

837a17c, bd9f8be, c1c1112

Parents:

ab57786 (diff), 8d2844a (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:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

• src/Parser/TypeData.cc (modified) (1 diff)

src/Parser/TypeData.cc

@@ -909 +909 @@
         std::list< Declaration * >::iterator members = ret->get_members().begin();
         for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( cur->get_enumeratorValue() != nullptr ) {
+                if ( cur->has_enumeratorValue() ) {
                         ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
-                        member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
+                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) );
                 } // if
         } // for