Changeset 8a0a64d9 for src/Parser

Timestamp:

Nov 28, 2017, 11:49:12 AM (8 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:

36982fc, 6c2ba38, d5a52cc

Parents:

8a78dd3 (diff), 8eb348a (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/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (3 diffs)
• parser.yy (modified) (3 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Sep 23 18:11:22 2017
-// Update Count     : 821
+// Last Modified On : Mon Nov 27 17:33:35 2017
+// Update Count     : 824
 //
 
@@ -292 +292 @@
         DeclarationNode * set_extension( bool exten ) { extension = exten; return this; }
   public:
+        DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); }
+
         struct Variable_t {
 //              const std::string * name;

src/Parser/TypeData.cc

@@ -792 +792 @@
 
 
-NamedTypeDecl * buildSymbolic( const TypeData * td, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
+NamedTypeDecl * buildSymbolic( const TypeData * td, std::list< Attribute * > attributes, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Symbolic );
         NamedTypeDecl * ret;
@@ -803 +803 @@
         buildList( td->symbolic.params, ret->get_parameters() );
         buildList( td->symbolic.assertions, ret->get_assertions() );
+        ret->base->attributes.splice( ret->base->attributes.end(), attributes );
         return ret;
 } // buildSymbolic
@@ -866 +867 @@
                 return buildEnum( td, attributes, linkage );
         } else if ( td->kind == TypeData::Symbolic ) {
-                return buildSymbolic( td, name, scs, linkage );
+                return buildSymbolic( td, attributes, name, scs, linkage );
         } else {
                 return (new ObjectDecl( name, scs, linkage, bitfieldWidth, typebuild( td ), init, attributes ))->set_asmName( asmName );

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