Changeset 0ddb713 for src/Parser

Timestamp:

Dec 2, 2015, 11:58:59 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, 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:

9cb8e88d

Parents:

9ed3237 (diff), f2b2029 (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 ctor

File:

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

src/Parser/TypeData.cc

@@ -799 +799 @@
           case DeclarationNode::Struct:
                 at = new StructDecl( aggregate->name );
+                buildForall( aggregate->params, at->get_parameters() );
                 break;
           case DeclarationNode::Union:
                 at = new UnionDecl( aggregate->name );
+                buildForall( aggregate->params, at->get_parameters() );
                 break;
           case DeclarationNode::Context:
                 at = new ContextDecl( aggregate->name );
+                buildList( aggregate->params, at->get_parameters() );
                 break;
           default:
                 assert( false );
         } // switch
-        buildList( aggregate->params, at->get_parameters() );
+//      buildList( aggregate->params, at->get_parameters() );
         buildList( aggregate->fields, at->get_members() );