Changes in src/SynTree/FunctionDecl.cc [3a5131ed:a7c90d4]

File:

• src/SynTree/FunctionDecl.cc (modified) (5 diffs)

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 15:01:52 2017
-// Update Count     : 23
+// Last Modified On : Tue Mar  7 07:54:58 2017
+// Update Count     : 68
 //
 
@@ -26 +26 @@
 extern bool translation_unit_nomain;
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
-                : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) {
-        set_isInline( isInline );
-        set_isNoreturn( isNoreturn );
-        // this is a brazen hack to force the function "main" to have Cforall linkage
-        // because we want to replace the main even if it is inside an extern
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
+        : Parent( name, scs, linkage, attributes, fs ), type( type ), statements( statements ) {
+        // hack forcing the function "main" to have Cforall linkage to replace main even if it is inside an extern
         if ( name == "main" ) {
                 set_linkage( CodeGen::FixMain::mainLinkage() );
@@ -38 +35 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+                : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
 }
 
@@ -65 +62 @@
                 os << LinkageSpec::linkageName( get_linkage() ) << " ";
         } // if
-        if ( get_isInline() ) {
-                os << "inline ";
-        } // if
-        if ( get_isNoreturn() ) {
-                os << "_Noreturn ";
-        } // if
 
         printAll( get_attributes(), os, indent );
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
+        DeclarationNode::print_FuncSpec( os, get_funcSpec() );
+
         if ( get_type() ) {
                 get_type()->print( os, indent );
@@ -97 +88 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_isInline() ) {
-                os << "inline ";
-        } // if
-        if ( get_isNoreturn() ) {
-                os << "_Noreturn ";
-        } // if
 
         // xxx - should printShort print attributes?
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
+        DeclarationNode::print_FuncSpec( os, get_funcSpec() );
+
         if ( get_type() ) {
                 get_type()->print( os, indent );