Changeset dd020c0 for src/SynTree

Timestamp:

Mar 3, 2017, 10:12:02 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

8191203

Parents:

f37147b

Message:

first attempt to create function specifiers

Location:

src/SynTree

Files:

• Declaration.cc (modified) (2 diffs)
• Declaration.h (modified) (8 diffs)
• DeclarationWithType.cc (modified) (2 diffs)
• FunctionDecl.cc (modified) (4 diffs)
• NamedTypeDecl.cc (modified) (3 diffs)
• ObjectDecl.cc (modified) (4 diffs)
• Type.h (modified) (3 diffs)

src/SynTree/Declaration.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:28:05 2017
-// Update Count     : 16
+// Last Modified On : Wed Mar  1 20:11:57 2017
+// Update Count     : 17
 //
 
@@ -28 +28 @@
 
 Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage )
-                : name( name ), storageClass( sc ), linkage( linkage ), isInline( false ), isNoreturn( false ), uniqueId( 0 ) {
+                : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
 }
 
 Declaration::Declaration( const Declaration &other )
-        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), isInline( other.isInline ), isNoreturn( other.isNoreturn ), uniqueId( other.uniqueId ) {
+        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
 }
 

src/SynTree/Declaration.h ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:53:35 2017
-// Update Count     : 57
+// Last Modified On : Fri Mar  3 20:59:27 2017
+// Update Count     : 96
 //
 
@@ -38 +38 @@
         LinkageSpec::Spec get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Spec newValue ) { linkage = newValue; }
-        bool get_isInline() const { return isInline; }
-        void set_isInline( bool newValue ) { isInline = newValue; }
-        bool get_isNoreturn() const { return isNoreturn; }
-        void set_isNoreturn( bool newValue ) { isNoreturn = newValue; }
         UniqueId get_uniqueId() const { return uniqueId; }
         bool get_extension() const { return extension; }
@@ -59 +55 @@
         DeclarationNode::StorageClass storageClass;
         LinkageSpec::Spec linkage;
-        bool isInline, isNoreturn;
         UniqueId uniqueId;
         bool extension = false;
@@ -66 +61 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpec fs = DeclarationNode::FuncSpec() );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -83 +78 @@
         std::list< Attribute * >& get_attributes() { return attributes; }
         const std::list< Attribute * >& get_attributes() const { return attributes; }
+
+        DeclarationNode::FuncSpec get_funcSpec() const { return fs; }
+        void set_functionSpecifiers( DeclarationNode::FuncSpec newValue ) { fs = newValue; }
 
         virtual DeclarationWithType *clone() const = 0;
@@ -97 +95 @@
         ConstantExpr *asmName;
         std::list< Attribute * > attributes;
+        DeclarationNode::FuncSpec fs;
 };
 
@@ -102 +101 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init,
+                                const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpec fs = DeclarationNode::FuncSpec() );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -129 +129 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
+                                  const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpec fs = DeclarationNode::FuncSpec() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();

src/SynTree/DeclarationWithType.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 13 14:49:43 2016
-// Update Count     : 7
+// Last Modified On : Fri Mar  3 20:59:28 2017
+// Update Count     : 19
 //
 
@@ -19 +19 @@
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes )
-        : Declaration( name, sc, linkage ), asmName( nullptr ), attributes( attributes ) {
+DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpec fs )
+        : Declaration( name, sc, linkage ), asmName( nullptr ), attributes( attributes ), fs( fs ) {
 }
 
 DeclarationWithType::DeclarationWithType( const DeclarationWithType &other )
-                : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ) {
+        : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ), fs( other.fs ) {
         cloneAll( other.attributes, attributes );
         asmName = maybeClone( other.asmName );

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 : Fri Mar  3 21:29:41 2017
+// Update Count     : 55
 //
 
@@ -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::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, DeclarationNode::FuncSpec fs )
+                : Parent( name, sc, linkage, attributes, fs ), type( type ), statements( statements ) {
+        set_functionSpecifiers( fs );
+
+        // 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() );
@@ -65 +64 @@
                 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() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
+        DeclarationNode::print_FuncSpec( os, get_funcSpec() );
+
         if ( get_type() ) {
                 get_type()->print( os, indent );
@@ -97 +92 @@
                 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() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
+        DeclarationNode::print_FuncSpec( os, get_funcSpec() );
+
         if ( get_type() ) {
                 get_type()->print( os, indent );

src/SynTree/NamedTypeDecl.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:13:55 2015
-// Update Count     : 3
+// Last Modified On : Tue Feb 28 16:13:24 2017
+// Update Count     : 4
 //
 
@@ -40 +40 @@
         } // if
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
         os << typeString();
@@ -64 +64 @@
         } // if
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
         os << typeString();

src/SynTree/ObjectDecl.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct  1 23:05:56 2016
-// Update Count     : 32
+// Last Modified On : Fri Mar  3 20:59:27 2017
+// Update Count     : 45
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
-        : Parent( name, sc, linkage, attributes ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
-        set_isInline( isInline );
-        set_isNoreturn( isNoreturn );
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpec fs )
+        : Parent( name, sc, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
+        set_functionSpecifiers( fs );
 }
 
@@ -50 +49 @@
 
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
 
@@ -86 +85 @@
 
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
 

src/SynTree/Type.h ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 16:38:53 2017
-// Update Count     : 34
+// Last Modified On : Wed Mar  1 09:11:45 2017
+// Update Count     : 41
 //
 
@@ -21 +21 @@
 #include "SynTree.h"
 #include "Visitor.h"
-#include "Common/utility.h"
 
 class Type : public BaseSyntaxNode {
@@ -213 +212 @@
         bool get_isVarArgs() const { return isVarArgs; }
         void set_isVarArgs( bool newValue ) { isVarArgs = newValue; }
-
         bool isTtype() const;