Changeset 8a78dd3

Timestamp:

Nov 27, 2017, 4:17:28 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

8a0a64d9

Parents:

56de6b39 (diff), a16a7ec (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

Files:

• Parser/parser.yy (modified) (15 diffs)
• tests/polymorphism.c (modified) (4 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 : Mon Nov 20 09:45:36 2017
-// Update Count     : 2945
+// Last Modified On : Sun Nov 26 11:36:36 2017
+// Update Count     : 2969
 //
 
@@ -345 +345 @@
 %type<en> type_list
 
-%type<decl> type_qualifier type_qualifier_name type_qualifier_list_opt type_qualifier_list
+%type<decl> type_qualifier type_qualifier_name forall type_qualifier_list_opt type_qualifier_list
 %type<decl> type_specifier type_specifier_nobody
 
@@ -379 +379 @@
 //   `---'                                              matches start of TYPEGENname '('
 // Must be:
-// Foo( int ) ( *fp )( int );
+//   Foo( int ) ( *fp )( int );
 
 // Order of these lines matters (low-to-high precedence).
@@ -1058 +1058 @@
 with_statement:
         WITH '(' tuple_expression_list ')' statement
-                { $$ = nullptr; }                                                               // FIX ME
+                { throw SemanticError("With clause is currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
@@ -1064 +1064 @@
 mutex_statement:
         MUTEX '(' argument_expression_list ')' statement
-                { $$ = nullptr; }                                                               // FIX ME
+                { throw SemanticError("Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
@@ -1280 +1280 @@
         c_declaration pop ';'
         | cfa_declaration pop ';'                                                       // CFA
+        | STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
+                { throw SemanticError("Static assert is currently unimplemented."); $$ = nullptr; }     // FIX ME
         ;
 
@@ -1587 +1589 @@
         | ATOMIC
                 { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
-        | FORALL '('
+        | forall
+        ;
+
+forall:
+        FORALL '('
                 {
                         typedefTable.enterScope();
@@ -2374 +2380 @@
                         $$ = $2;
                 }
+        | forall '{' external_definition_list '}'                       // CFA, namespace
         ;
 
@@ -2399 +2406 @@
 with_clause_opt:
         // empty
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = nullptr; }
         | WITH '(' tuple_expression_list ')'
-                { $$ = nullptr; }                                                               // FIX ME
+                { throw SemanticError("With clause is currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
@@ -2418 +2425 @@
                         $$ = $2->addFunctionBody( $4 )->addType( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | type_qualifier_list function_declarator with_clause_opt compound_statement
                 {
@@ -2424 +2432 @@
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list function_declarator with_clause_opt compound_statement
                 {
@@ -2430 +2439 @@
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list type_qualifier_list function_declarator with_clause_opt compound_statement
                 {
@@ -2445 +2455 @@
                         $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addType( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
@@ -2451 +2462 @@
                         $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 );
                 }
-
-                // Old-style K&R function definition with "implicit int" type_specifier, OBSOLESCENT (see 4)
+                // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
@@ -2459 +2469 @@
                         $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {

src/tests/polymorphism.c

@@ -47 +47 @@
         S s;
         s.i = i;
-        assert(s.i == i);
+        assertf(s.i == i, "struct operation fails in polymorphic context.");
 
         B b;
@@ -73 +73 @@
         {
                 // test aggregates with polymorphic members
-                typedef uint32_t x_type;
-                typedef uint64_t y_type;
+                typedef __attribute__((aligned(8))) uint32_t x_type;
+                typedef __attribute__((aligned(8))) uint64_t y_type;
 
                 x_type x = 3;
@@ -89 +89 @@
                 // ensure that the size of aggregates with polymorphic members
                 // matches the size of the aggregates in a monomorphic context
-                assert( struct_size(x, y) == sizeof(S) );
-                assert( union_size(x, y) == sizeof(U) );
+                assertf( struct_size(x, y) == sizeof(S), "struct size differs in polymorphic context." );
+                assertf( union_size(x, y) == sizeof(U), "union size differs in polymorphic context." );
 
                 y_type ?=?(y_type & this, zero_t) {
@@ -111 +111 @@
                 u.f2 = 0;
                 u.f1 = x;
-                assert(ret == u.f2);
+                assertf(ret == u.f2, "union operation fails in polymorphic context.");
         }
 }