Changeset cdbab55 for examples/Tuple.c

Timestamp:

Aug 21, 2018, 2:24:29 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6af (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:/u/cforall/software/cfa/cfa-cc

File:

• examples/Tuple.c (moved) (moved from src/examples/Tuple.c ) (6 diffs)

examples/Tuple.c

@@ -1 +1 @@
 int f( int, int );
 int g( int, int, int );
-static [ int, int *, * int, int ] h( int a, int b, * int c, [] char d );
+static
+[ int, int *, * int, int ] h( int a, int b, * int c, [] char d );
 
 struct inner {
@@ -14 +15 @@
 
 const volatile [ int, int ] t1;
-static const [ int, const int ] t2;
+static const [ int, int ] t2;
 const static [ int, const int ] t3;
 
@@ -21 +22 @@
 
 [ short x, unsigned y ] f1( int w ) {
-        [ y, x ] = [ x, y ] = [ w, 23 ];
+//      return [ y, x ] = [ x, y ] = [ w, 23 ];
 }
 
 [ [ int, char, long, int ] r ] g1() {
-        short x, p;
+        short int x, p;
         unsigned int y;
         [ int, int ] z;
 
-        [ x, y, z ] = [ p, f( 17 ), 3 ];
-        [ x, y, z ] = ([short, unsigned int, [int, int]])([ p, f( 17 ), 3 ]);
+        [ x, y, z ] = [ p, f( 17, 18 ), 4, 3 ];
+//      [ x, y, z ] = ([short, unsigned int, [int, int]])([ p, f( 17, 18 ), 4, 3 ]);
         r = [ x, y, z ];
 }
@@ -36 +37 @@
 [ int rc ] main( int argc, ** char argv ) {
         int a, b, c, d;
-        struct outer t = { .[ f1,f4 ] : [ 1,7.0 ] };
+//      struct outer t = { .[ f1, f4 ] : [ 1, 7.0 ] };
         f( [ 3,5 ] );
         g( [ 3,5 ], 3 );
@@ -42 +43 @@
         g( t1, 3 );
 
-        [ , , , ];                                              /* empty tuple */
+//      [ , , , ];                                              /* empty tuple */
         [ 3, 5 ];
         [ a, b ] = 3;
-        [ a, b ] = [ 4.6 ];
+//      [ a, b ] = [ 4.6 ];
+        [ a, b ] = 4.6;
         [ a, b ] = [ c, d ] = [ 3, 5 ];
-        [ a, b, [ c ] ] = [ 2,[ a, b ] ];
+//      [ a, b, [ c ] ] = [ 2, [ a, b ] ];
+        [ a, b, c ] = [ 2, [ a, b ] ];
         [ a, b ] = 3 > 4 ? [ b, 6 ] : [ 7, 8 ];
 
@@ -56 +59 @@
         [ a, b ] = t1 = [ c, d ];
         [ a, b ] = t1 = t2 = [ c, d ];
-        t1 = [ 3, 4 ] = [ 3, 4 ] = t1 = [ 3, 4 ];
+//      t1 = [ 3, 4 ] = [ 3, 4 ] = t1 = [ 3, 4 ];
 
         s.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
-        s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, 0, "abc" );
-        [ a, , b, ] = h( 3, 3, 0, "abc" );                      /* ignore some results */
-        sp->[ f4,f1 ] = sp->[ f1, f4 ];
+//      s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, (* int)0, "abc" );
+//      [ a, , b, ] = h( 3, 3, 0, "abc" );                      /* ignore some results */
+        sp->[ f4, f1 ] = sp->[ f1, f4 ];
         printf( "expecting 3, 17, 23, 4; got %d, %d, %d, %d\n", s.[ f4, i.[ f3, f2 ], f1 ] );
         rc = 0;