Changeset d298e03 for src

Timestamp:

May 19, 2017, 2:51:10 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

11ab8ea8

Parents:

0661678 (diff), 535adab (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

Location:

src

Files:

• Parser/parser.yy (modified) (4 diffs)
• tests/tuplePolymorphism.c (modified) (3 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 15:42:32 2017
-// Update Count     : 2318
+// Last Modified On : Thu May 18 18:06:17 2017
+// Update Count     : 2338
 //
 
@@ -85 +85 @@
         } // for
 } // distExt
+
+bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 %}
 
@@ -1556 +1558 @@
 sue_type_specifier:                                                                             // struct, union, enum + type specifier
         elaborated_type
-        | type_qualifier_list elaborated_type
-                { $$ = $2->addQualifiers( $1 ); }
+        | type_qualifier_list
+                { if ( $1->type != nullptr && $1->type->forall ) forall = true; } // remember generic type
+          elaborated_type
+                { $$ = $3->addQualifiers( $1 ); }
         | sue_type_specifier type_qualifier
                 { $$ = $1->addQualifiers( $2 ); }
@@ -1613 +1617 @@
                 { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
-                { typedefTable.makeTypedef( *$3 ); }
+                {
+                        typedefTable.makeTypedef( *$3 );                        // create typedef
+                        if ( forall ) typedefTable.changeKind( *$3, TypedefTable::TG ); // possibly update
+                        forall = false;                                                         // reset
+                }
           '{' field_declaration_list '}'
                 { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }

src/tests/tuplePolymorphism.c

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Nov 16 10:38:00 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 16 10:39:18 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu May 18 18:05:12 2017
+// Update Count     : 4
 //
 
 // 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;
+        double x;
+        char y;
+        double z;
 };
 
 __attribute__((packed)) struct B {
-  long long x;
-  char y;
-  long long z;
+        long long x;
+        char y;
+        long long z;
 };
 
@@ -39 +39 @@
 
 int main() {
-  int x1 = 123, x3 = 456;
-  double x2 = 999.123;
+        int x1 = 123, x3 = 456;
+        double x2 = 999.123;
 
-  int i1 = 111, i3 = 222;
-  double i2 = 333;
+        int i1 = 111, i3 = 222;
+        double i2 = 333;
 
-  int d1 = 555, d3 = 444;
-  double d2 = 666;
+        int d1 = 555, d3 = 444;
+        double d2 = 666;
 
 
-  [i1, i2, i3] = ([x1, (int)x2, x3]) + ([9, 2, 3]);
-  [d1, d2, d3] = ([x1, x2, x3]) + ([9, 2, 3]);
-  printf("%d %g %d\n", i1, i2, i3);
-  printf("%d %g %d\n", d1, d2, d3);
+        [i1, i2, i3] = ([x1, (int)x2, x3]) + ([9, 2, 3]);
+        [d1, d2, d3] = ([x1, x2, x3]) + ([9, 2, 3]);
+        printf("%d %g %d\n", i1, i2, i3);
+        printf("%d %g %d\n", d1, d2, d3);
 
-  [double, double, double] zzz;
-  zzz = [x1, x2, x3];
-  printf("%g %g %g\n", zzz);
-  [x1, x2, x3] = zzz+zzz;
-  printf("%d %g %d\n", x1, x2, x3);
+        [double, double, double] zzz;
+        zzz = [x1, x2, x3];
+        printf("%g %g %g\n", zzz);
+        [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 });
+        // ensure non-matching assertions are specialized correctly
+        g((A){ 1.21, 'x', 10.21}, (B){ 1111LL, 'v', 54385938LL });
 }
 
@@ -73 +73 @@
 // tab-width: 4 //
 // End: //
-