Changeset c08c3cf for tests/zombies/withStatement.cfa

Timestamp:

Jan 20, 2021, 8:46:31 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

481cf3a

Parents:

467c8b7 (diff), 9db2c92 (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:

fix conflict

File:

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

tests/zombies/withStatement.cfa

@@ -54 +54 @@
 }
 
-forall( otype T )
+forall( T )
 struct Box {
         T x;
 };
 
-forall( otype T )
+forall( T )
 void ?{}( Box(T) & this ) with( this ) { // with clause in polymorphic function
         x{};
@@ -66 +66 @@
 void print( int i ) { sout | i; }
 
-forall( otype T | { void print( T ); })
+forall( T | { void print( T ); })
 void foo( T t ) {
         Box( T ) b = { t };