Changeset 6d2af204 for tests

Timestamp:

Feb 5, 2023, 11:42:15 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

8fa77eb

Parents:

9ef5516 (diff), 35d1de5 (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:

tests

Files:

• .expect/forall.txt (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• concurrent/actors/.expect/dynamic.txt (added)
• concurrent/actors/.expect/executor.txt (added)
• concurrent/actors/.expect/static.txt (added)
• concurrent/actors/dynamic.cfa (added)
• concurrent/actors/executor.cfa (added)
• concurrent/actors/matrix.cfa (modified) (1 diff)
• concurrent/actors/static.cfa (added)
• concurrent/actors/types.cfa (modified) (3 diffs)
• forall.cfa (modified) (10 diffs)

tests/.expect/forall.txt

@@ -1 @@
-forall.cfa:244:25: warning: Compiled
+1
+f
+97
+f
+g
+f
+f
+g
+fT
+fT
+fT
+fTU
+fTU
+fTU
+1 2
+2 1
+1, 2
+@ 0 2 0 4 6.4 6.4 6.4 6.4+3.i 4
+3. 3.
+45
+12 3

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Jun  5 14:49:25 2021
-## Update Count     : 92
+## Last Modified On : Fri Feb  3 23:06:44 2023
+## Update Count     : 94
 ###############################################################################
 
@@ -89 +89 @@
         meta/fork+exec.hfa \
         concurrent/unified_locking/mutex_test.hfa \
-    concurrent/channels/parallel_harness.hfa
+        concurrent/channels/parallel_harness.hfa
 
 dist-hook:
@@ -183 +183 @@
 CFACOMPILE_SYNTAX = $(CFACOMPILETEST) -Wno-unused-variable -Wno-unused-label -c -fsyntax-only -o $(abspath ${@})
 
-SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
+SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator \
         init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment
 $(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)

tests/concurrent/actors/matrix.cfa

@@ -5 +5 @@
 #include <stdio.h>
 
-unsigned int xr = 100, xc = 100, yc = 100, Processors = 1; // default values
+unsigned int xr = 500, xc = 500, yc = 500, Processors = 1; // default values
 
 struct derived_actor {

tests/concurrent/actors/types.cfa

@@ -5 +5 @@
 #include <stdio.h>
 #include <mutex_stmt.hfa>
+
+struct dummy_actor { actor a; }; // this won't work since the actor isn't inlined
 
 struct derived_actor {
@@ -26 +28 @@
 }
 
+Allocation receive( derived_actor & receiver, d_msg & msg ) {
+    return receive( receiver, msg.num );
+}
+
 struct derived_actor2 {
+    struct nested { int i; }; // testing nested before inline
     inline actor;
 };
 static inline void ?{}( derived_actor2 & this ) { ((actor &)this){}; }
+
+Allocation receive( derived_actor2 & receiver, d_msg & msg ) {
+    mutex(sout) sout | msg.num;
+    return Finished;
+}
 
 struct derived_actor3 {
@@ -41 +53 @@
 };
 static inline void ?{}( d_msg2 & this ) { ((message &)this){}; }
-
-Allocation receive( derived_actor2 & receiver, d_msg & msg ) {
-    mutex(sout) sout | msg.num;
-    return Finished;
-}
-
-Allocation receive( derived_actor & receiver, d_msg & msg ) {
-    return receive( receiver, msg.num );
-}
 
 Allocation receive( derived_actor3 & receiver, d_msg & msg ) {

tests/forall.cfa

@@ -10 +10 @@
 // Created On       : Wed May  9 08:48:15 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  5 10:06:08 2021
-// Update Count     : 36
-//
+// Last Modified On : Sun Feb  5 07:54:43 2023
+// Update Count     : 90
+//
+
+#include <fstream.hfa>
 
 void g1() {
-        forall( T ) T f( T ) {};
-        void f( int ) {};
-        void h( void (*p)(void) ) {};
-
-        int x;
-        void (*y)(void);
-        char z;
-        float w;
+        forall( T ) T f( T p ) { sout | 'f'; return p;  };
+        void f( int p ) { sout | p; };
+        void g( void ) { sout | 'g'; };
+        void h( void (*p)(void) ) { p(); };
+
+        int x = 1;
+        void (*y)(void) = g;
+        char z = 'a';
+        float w = 3.5;
 
         f( x );
@@ -28 +31 @@
         f( z );
         f( w );
+        h( y );
+        f( y );
         h( f( y ) );
 }
 
 void g2() {
-        forall( T ) void f( T, T ) {}
-        forall( T, U ) void f( T, U ) {}
+        forall( T ) void f( T, T ) { sout | "fT"; }
+        forall( T, U ) void f( T, U ) { sout | "fTU"; }
 
         int x;
         float y;
-        int *z;
-        float *w;
-
+        int * z;
+        float * w;
+
+        f( x, x );
+        f( y, y );
+        f( w, w );
         f( x, y );
         f( z, w );
@@ -50 +58 @@
 
 forall( T )
-void swap( T left, T right ) {
-        T temp = left;
-        left = right;
-        right = temp;
-}
-
-trait sumable( T ) {
+void swap( T & left, T & right ) {                                              // by reference
+    T temp = left;
+    left = right;
+    right = temp;
+}
+
+forall( T )
+[ T, T ] swap( T i, T j ) {                                                             // by value
+    return [ j, i ];
+}
+
+forall( T ) trait sumable {
         void ?{}( T &, zero_t );                                                        // 0 literal constructor
         T ?+?( T, T );                                                                          // assortment of additions
@@ -64 +77 @@
 }; // sumable
 
-forall( T | sumable( T ) )                                              // use trait
+forall( T | sumable( T ) )                                                              // use trait
 T sum( size_t size, T a[] ) {
         T total = 0;                                                                            // initialize by 0 constructor
@@ -72 +85 @@
 } // sum
 
-forall( T | { T ?+?( T, T ); T ?++( T & ); [T] ?+=?( T &,T ); } )
+forall( T | { T ?+?( T, T ); T ?++( T & ); [T] ?+=?( T &, T ); } )
 T twice( T t ) {
         return t + t;
@@ -82 +95 @@
 }
 
-int fred() {
-        int x = 1, y = 2, a[10];
+void fred() {
+        int x = 1, y = 2, a[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
         float f;
 
+        sout | x | y;
         swap( x, y );
-        twice( x );
+        sout | x | y | nl | swap( x, y );
+        // [ x, y ] = swap( y, x );
+        sout | twice( ' ' ) | ' ' | twice( 0hh ) | twice( 1h ) | twice( 0n ) | twice( 2 )
+                 | twice( 3.2f ) | twice( 3.2 ) | twice( 3.2d ) | twice( 3.2+1.5i ) | twice( x );
         f = min( 4.0, 3.0 );
-        sum( 10, a );
+        sout | f | min( 4.0, 3.0 );
+        sout | sum( 10, a );
 }
 
@@ -186 +204 @@
 
 forall( T ) {
-        extern "C" {
+//      extern "C" {
                 struct SS { T t; };
-                T foo( T ) {}
-        }
+                T foo( T p ) { return p; }
+//      }
 }
 
@@ -195 +213 @@
 W(int,int) w;
 
-int jane() {
+void jane() {
 //      int j = bar( 3, 4 );
         int k = baz( 3, 4, 5 );
         int i = foo( 3 );
+        sout | k | i;
 }
 
@@ -211 +230 @@
         T t;
         T t2 = t;
+        sout | &tr | tp;
 }
 
@@ -242 +262 @@
 
 int main( void ) {
-    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
+        g1();
+        g2();
+        fred();
+        jane();
 }