Changeset 3f7e12cb for src/SynTree/FunctionDecl.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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/SynTree/FunctionDecl.cc (modified) (4 diffs)

src/SynTree/FunctionDecl.cc

@@ -26 +26 @@
 #include "Statement.h"           // for CompoundStmt
 #include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
+#include "VarExprReplacer.h"
 
 extern bool translation_unit_nomain;
@@ -39 +40 @@
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
                 : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+
+        VarExprReplacer::DeclMap declMap;
+        for ( auto p : group_iterate( other.type->parameters, type->parameters ) ) {
+                declMap[ std::get<0>(p) ] = std::get<1>(p);
+        }
+        for ( auto p : group_iterate( other.type->returnVals, type->returnVals ) ) {
+                declMap[ std::get<0>(p) ] = std::get<1>(p);
+        }
+        if ( ! declMap.empty() ) {
+                VarExprReplacer replacer( declMap );
+                accept( replacer );
+        }
 }
 
@@ -46 +59 @@
 }
 
-void FunctionDecl::print( std::ostream &os, int indent ) const {
+FunctionDecl * FunctionDecl::newFunction( const std::string & name, FunctionType * type, CompoundStmt * statements ) {
+        return new FunctionDecl( name, Type::StorageClasses(), LinkageSpec::C, type, statements );
+}
+
+void FunctionDecl::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
         using std::string;
 
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
+        if ( name != "" ) {
+                os << name << ": ";
         } // if
-        if ( get_linkage() != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( get_linkage() ) << " ";
+        if ( linkage != LinkageSpec::Cforall ) {
+                os << LinkageSpec::linkageName( linkage ) << " ";
         } // if
 
-        printAll( get_attributes(), os, indent );
+        printAll( attributes, os, indent );
 
         get_storageClasses().print( os );
         get_funcSpec().print( os );
 
-        if ( get_type() ) {
-                get_type()->print( os, indent );
+        if ( type ) {
+                type->print( os, indent );
         } else {
                 os << "untyped entity ";
@@ -69 +86 @@
 
         if ( statements ) {
-                os << string( indent + 2, ' ' ) << "with body " << endl;
-                os << string( indent + 4, ' ' );
-                statements->print( os, indent + 4 );
+                os << indent << "... with body " << endl << indent+1;
+                statements->print( os, indent+1 );
         } // if
 }
 
-void FunctionDecl::printShort( std::ostream &os, int indent ) const {
+void FunctionDecl::printShort( std::ostream &os, Indenter indent ) const {
         using std::endl;
         using std::string;
 
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
+        if ( name != "" ) {
+                os << name << ": ";
         } // if
-
-        // xxx - should printShort print attributes?
 
         get_storageClasses().print( os );
         get_funcSpec().print( os );
 
-        if ( get_type() ) {
-                get_type()->print( os, indent );
+        if ( type ) {
+                type->print( os, indent );
         } else {
                 os << "untyped entity ";