Changeset cd7ef0b for src/tests

Timestamp:

Aug 10, 2017, 3:39:11 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

38d70ab

Parents:

275f4b4 (diff), e1780a2 (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

Location:

src/tests

Files:

• .expect/32/math.txt (modified) (2 diffs)
• .expect/64/math.txt (modified) (2 diffs)
• .expect/div.txt (added)
• designations.c (modified) (4 diffs)
• div.c (added)
• except-0.c (modified) (3 diffs)
• except-1.c (added)
• except-2.c (added)
• math.c (modified) (3 diffs)

src/tests/.expect/32/math.txt

@@ -2 +2 @@
 remainder:-1 -1 -1
 remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7 0.0999999 7 0.1 7 0.0999999999999999999
+div:7, 0.2 7, 0.2 7, 0.2
 fma:-2 -2 -2
 fdim:2 2 2
@@ -55 +55 @@
 frexp:0.5 3 0.5 3 0.5 3
 ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3 nextafter:2 2 2
+modf:2 0.3 2 0.3 2 0.3
+modf:2, 0.3 2, 0.3 2, 0.3
+nextafter:2 2 2
 nexttoward:2 2 2
 scalbn:16 16 16

src/tests/.expect/64/math.txt

@@ -2 +2 @@
 remainder:-1 -1 -1
 remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7 0.0999999 7 0.1 7 0.0999999999999999999
+div:7, 0.2 7, 0.2 7, 0.2
 fma:-2 -2 -2
 fdim:2 2 2
@@ -55 +55 @@
 frexp:0.5 3 0.5 3 0.5 3
 ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3 nextafter:2 2 2
+modf:2 0.3 2 0.3 2 0.3
+modf:2, 0.3 2, 0.3 2, 0.3
+nextafter:2 2 2
 nexttoward:2 2 2
 scalbn:16 16 16

src/tests/designations.c

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Jun 29 15:26:36 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun 29 15:27:05 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 27 11:46:35 2017
+// Update Count     : 3
 //
 
@@ -89 +89 @@
 };
 
+struct Fred {
+    double i[3];
+    int j;
+    struct Mary {
+        struct Jane {
+            double j;
+        } j;
+        double i;
+    } m;
+};
+struct Fred s1 @= { .m.j : 3 };
+struct Fred s2 @= { .i : { [2] : 2 } };
+
 int main() {
         // simple designation case - starting from beginning of structure, leaves ptr default-initialized (zero)
@@ -199 +212 @@
         };
 #endif
-
+        // array designation
+        int i[2] = { [1] : 3 };
         // allowed to have 'too many' initialized lists - essentially they are ignored.
         int i1 = { 3 };
@@ -240 +254 @@
         const char * str0 = "hello";
         char str1[] = "hello";
+        const char c1[] = "abc";
+        const char c2[] = { 'a', 'b', 'c' };
+        const char c3[][2] = { { 'a', 'b' }, { 'c', 'd'}, { 'c', 'd'} };
 }
 

src/tests/except-0.c

@@ -6 +6 @@
 #include <stdbool.h>
 
+// Local type to mark exits from scopes. (see ERROR)
 struct signal_exit {
         const char * area;
@@ -19 +20 @@
 }
 
-void terminate(int except_value) {
+
+// Local Exception Types and manual vtable types.
+//#define TRIVIAL_EXCEPTION(name) //TRIVAL_EXCEPTION(yin)
+struct yin;
+struct yin_vtable {
+        struct exception_t_vtable const * parent;
+        size_t size;
+    void (*copy)(yin *this, yin * other);
+    void (*free)(yin *this);
+    const char (*msg)(yin *this);
+};
+struct yin {
+        struct yin_vtable const * parent;
+};
+void yin_msg(yin) {
+        return "in";
+}
+yin_vtable _yin_vtable_instance = {
+        &_exception_t_vtable_instance, sizeof(yin), ?{}, ^?{}, yin_msg
+}
+
+
+void terminate(exception * except_value) {
         signal_exit a = {"terminate function"};
         throw except_value;
@@ -25 +48 @@
 }
 
-void resume(int except_value) {
+void resume(exception * except_value) {
         signal_exit a = {"resume function"};
         throwResume except_value;

src/tests/math.c

@@ -10 +10 @@
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 10:32:04 2017
-// Update Count     : 73
+// Last Modified On : Wed Aug  9 07:20:49 2017
+// Update Count     : 77
 // 
 
@@ -31 +31 @@
         l = remquo( 3.6L, 0.5L, &quot );
         sout | quot | l | endl;
-        f = div( 3.6F, 0.5F, &quot );
-        sout | "div:" | quot | f;
-        d = div( 3.6D, 0.5F, &quot );
-        sout | quot | d;
-        l = div( 3.6L, 0.5L, &quot );
-        sout | quot | l | endl;
+        sout | "div:" | div( 3.6F, 0.5F ) | div( 3.6D, 0.5D ) | div( 3.6L, 0.5L ) | endl;
         sout | "fma:" | fma( 3.0F, -1.0F, 1.0F ) | fma( 3.0D, -1.0D, 1.0D ) | fma( 3.0L, -1.0L, , 1.0L ) | endl;
         sout | "fdim:" | fdim( 1.0F, -1.0F ) | fdim( 1.0D, -1.0D ) | fdim( 1.0L, -1.0L ) | endl;
@@ -137 +132 @@
         sout | di | d;
         l = modf( 2.3L, &ldi );
-        sout | ldi | l;
+        sout | ldi | l | endl;
+        sout | "modf:" | modf( 2.3F ) | modf( 2.3D ) | modf( 2.3L ) | endl;
         sout | "nextafter:" | nextafter( 2.0F, 3.0F ) | nextafter( 2.0D, 3.0D ) | nextafter( 2.0L, 3.0L ) | endl;
         sout | "nexttoward:" | nexttoward( 2.0F, 3.0F ) | nexttoward( 2.0D, 3.0D ) | nexttoward( 2.0L, 3.0L ) | endl;