Changeset c08c3cf for tests/poly-selection.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/poly-selection.cfa (modified) (2 diffs)

tests/poly-selection.cfa

@@ -16 +16 @@
 
 void testSpecializationFromGenericOverBareTyvar() {
-    forall( dtype T )
+    forall( T & )
     void friend( T & ) {
         printf("friending generically\n");
     }
 
-    forall(dtype T)
+    forall(T &)
     struct thing {
         int x;
     };
 
-    forall( dtype T )
+    forall( T & )
     void friend( thing(T) & ) {
         printf("friending specifically\n");
@@ -37 +37 @@
 void testSpecializationFromGenericAccessibleWithExtraTyvars() {
 
-    forall( dtype T, dtype U )
+    forall( T &, U & )
     struct map {};
 
-    forall( dtype T )
+    forall( T & )
     void f( T & ) {
         printf("f-generic\n");
     }
 
-    forall( dtype T )
+    forall( T & )
     void f( map(T, T) & ) {
         printf("f-specific\n");