Changeset d5a52cc for src/Parser/parser.yy

Timestamp:

Nov 28, 2017, 3:04:37 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:

4e7a4e6

Parents:

1393df07 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/parser.yy (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 : Sun Nov 26 11:36:36 2017
-// Update Count     : 2969
+// Last Modified On : Mon Nov 27 17:23:35 2017
+// Update Count     : 2992
 //
 
@@ -1364 +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 ) );
                 }
         ;
@@ -2416 +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