Changeset dafbde8 for tests/zombies/typeGenerator.cfa

Timestamp:

Jan 20, 2021, 4:49:40 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

454f478

Parents:

92bfda0 (diff), fd54fef (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:

• tests/zombies/typeGenerator.cfa (modified) (2 diffs)

tests/zombies/typeGenerator.cfa

@@ -1 @@
-context addable( otype T ) {
+context addable( T ) {
         T ?+?( T,T );
         T ?=?( T*, T);
 };
 
-otype List1( otype T | addable( T ) ) = struct { T data; List1( T ) *next; } *;
+otype List1( T | addable( T ) ) = struct { T data; List1( T ) *next; } *;
 typedef List1( int ) ListOfIntegers;
 //List1( int ) li;
@@ -11 +11 @@
 [int] h( * List1( int ) p );                                                    // new declaration syntax
 
-struct( otype T ) S2 { T i; };                                                  // actual definition
+struct( T ) S2 { T i; };                                                        // actual definition
 struct( int ) S3 v1, *p;                                                                // expansion and instantiation
-struct( otype T )( int ) S24 { T i; } v2;                               // actual definition, expansion and instantiation
-struct( otype T )( int ) { T i; } v2;                                   // anonymous actual definition, expansion and instantiation
+struct( T )( int ) S24 { T i; } v2;                             // actual definition, expansion and instantiation
+struct( T )( int ) { T i; } v2;                                 // anonymous actual definition, expansion and instantiation
 
-struct( otype T | addable( T ) ) node { T data; struct( T ) node *next; };
-otype List( otype T ) = struct( T ) node *;
+struct( T | addable( T ) ) node { T data; struct( T ) node *next; };
+otype List( T ) = struct( T ) node *;
 List( int ) my_list;