Changeset 395fc37 for src/tests

Timestamp:

Mar 16, 2017, 6:14:32 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

615a096

Parents:

6f95000 (diff), 1fbab5a (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 plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/tuplePolymorphism.txt (modified) (1 diff)
• memberCtors.c (modified) (1 diff)
• tuplePolymorphism.c (modified) (2 diffs)

src/tests/.expect/tuplePolymorphism.txt

@@ -3 +3 @@
 123 999.123 456
 246 1998.25 912
+1.21 x 10.21 1111 v 54385938 1111 v 54385938

src/tests/memberCtors.c

@@ -30 +30 @@
   WrappedInt x, y, z;
 };
+
+void ?{}(A * a) {
+  // currently must define default ctor, since there's no "= default" syntax
+}
 
 void ?{}(A * a, int x) {

src/tests/tuplePolymorphism.c

@@ -14 +14 @@
 //
 
+// packed is needed so that structs are not passed with the same alignment as function arguments
+__attribute__((packed)) struct A {
+  double x;
+  char y;
+  double z;
+};
+
+__attribute__((packed)) struct B {
+  long long x;
+  char y;
+  long long z;
+};
+
+// ensure that f is a viable candidate for g, even though its parameter structure does not exactly match
+[A] f([A, B] x, B y) { printf("%g %c %g %lld %c %lld %lld %c %lld\n", x.0.[x,y,z], x.1.[x,y,z], y.[x,y,z]); return x.0; }
+forall(otype T, otype U | { T f(T, U, U); })
+void g(T x, U y) { f(x, y, y); }
+
+// add two triples
 forall(otype T | { T ?+?(T, T); })
 [T, T, T] ?+?([T, T, T] x, [T, T, T] y) {
@@ -40 +59 @@
   [x1, x2, x3] = zzz+zzz;
   printf("%d %g %d\n", x1, x2, x3);
+
+  // ensure non-matching assertions are specialized correctly
+  g((A){ 1.21, 'x', 10.21}, (B){ 1111LL, 'v', 54385938LL });
 }