Changeset 6c2ba38 for src/Parser/parser.yy

Timestamp:

Nov 28, 2017, 3:52:06 PM (6 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:

383e159, 8d5b9cf

Parents:

cf966b5 (diff), 8a0a64d9 (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

File:

• src/Parser/parser.yy (modified) (17 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 : Mon Nov 27 17:23:35 2017
+// Update Count     : 2992
 //
 
@@ -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
         ;
 
@@ -1362 +1364 @@
                         $$ = $3->addQualifiers( $1 )->addQualifiers( $2 );
                 }
-        | cfa_function_declaration pop ',' push identifier_or_type_name
-                {
-                        typedefTable.addToEnclosingScope( *$5, TypedefTable::ID );
-                        $$ = $1->appendList( $1->cloneType( $5 ) );
+        | cfa_function_declaration pop ',' push identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+                {
+                        // Append the return type at the start (left-hand-side) to each identifier in the list.
+                        DeclarationNode * ret = new DeclarationNode;
+                        ret->type = maybeClone( $1->type->base );
+                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) );
                 }
         ;
@@ -1587 +1591 @@
         | ATOMIC
                 { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
-        | FORALL '('
+        | forall
+        ;
+
+forall:
+        FORALL '('
                 {
                         typedefTable.enterScope();
@@ -2374 +2382 @@
                         $$ = $2;
                 }
+        | forall '{' external_definition_list '}'                       // CFA, namespace
         ;
 
@@ -2399 +2408 @@
 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
         ;
 
@@ -2409 +2418 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $1->addFunctionBody( $3 );
+                        // Add the function body to the last identifier in the function definition list, i.e., foo3:
+                        //   [const double] foo1(), foo2( int ), foo3( double ) { return 3.0; }
+                        $1->get_last()->addFunctionBody( $3 );
+                        $$ = $1;
                 }
         | declaration_specifier function_declarator with_clause_opt compound_statement
@@ -2418 +2430 @@
                         $$ = $2->addFunctionBody( $4 )->addType( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | type_qualifier_list function_declarator with_clause_opt compound_statement
                 {
@@ -2424 +2437 @@
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
                 }
+                // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list function_declarator with_clause_opt compound_statement
                 {
@@ -2430 +2444 @@
                         $$ = $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 +2460 @@
                         $$ = $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 +2467 @@
                         $$ = $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 +2474 @@
                         $$ = $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
                 {