Changeset c08c3cf for tests/tuple/tupleVariadic.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/tuple/tupleVariadic.cfa (modified) (3 diffs)

tests/tuple/tupleVariadic.cfa

@@ -19 +19 @@
         printf("called func(void)\n");
 }
-forall(otype T, ttype Params | { void process(T); void func(Params); })
+forall(T, Params... | { void process(T); void func(Params); })
 void func(T arg1, Params p) {
         process(arg1);
@@ -92 +92 @@
 }
 
-forall(otype T)
+forall(T)
 T * copy(T x) {
         // test calling new inside a polymorphic function
@@ -98 +98 @@
 }
 
-forall(ttype T | { void foo(T); }) void bar(T x) {}
+forall(T... | { void foo(T); }) void bar(T x) {}
 void foo(int) {}