Changeset b5b0907 for src/Tests/TypeGenerator.c

Timestamp:

Jun 15, 2015, 12:45:26 PM (11 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, string, with_gc

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

• src/Tests/TypeGenerator.c (modified) (1 diff)

src/Tests/TypeGenerator.c

@@ -11 +11 @@
 [int] h( * List1( int ) p );                                                    // new declaration syntax
 
-struct( type T ) S1;                                                                    // forward definition
-struct( type T ) S1 { T i; };                                                   // actual definition
-struct( int ) S1 v1, *p;                                                                // expansion and instantiation
-struct( type T )( int ) S2 { T i; } v2;                                 // actual definition, expansion and instantiation
+struct( type T ) S2 { T i; };                                                   // actual definition
+struct( int ) S3 v1, *p;                                                                // expansion and instantiation
+struct( type T )( int ) S24 { T i; } v2;                                // actual definition, expansion and instantiation
 struct( type T )( int ) { T i; } v2;                                    // anonymous actual definition, expansion and instantiation