Changeset ddfd945 for src/SynTree

Timestamp:

Mar 16, 2017, 8:47:36 AM (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:

fb04321

Parents:

26ba208

Message:

move type FuncSpecifiers? from DeclarationNode? to Type

Location:

src/SynTree

Files:

• Declaration.h (modified) (6 diffs)
• DeclarationWithType.cc (modified) (2 diffs)
• FunctionDecl.cc (modified) (2 diffs)
• ObjectDecl.cc (modified) (2 diffs)
• Type.cc (modified) (2 diffs)
• Type.h (modified) (2 diffs)

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 Mar 16 07:48:23 2017
-// Update Count     : 117
+// Last Modified On : Thu Mar 16 08:34:11 2017
+// Update Count     : 118
 //
 
@@ -64 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs );
+        DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -82 +82 @@
         const std::list< Attribute * >& get_attributes() const { return attributes; }
 
-        DeclarationNode::FuncSpecifiers get_funcSpec() const { return fs; }
-        //void set_functionSpecifiers( DeclarationNode::FuncSpecifiers newValue ) { fs = newValue; }
+        Type::FuncSpecifiers get_funcSpec() const { return fs; }
+        //void set_functionSpecifiers( Type::FuncSpecifiers newValue ) { fs = newValue; }
 
         virtual DeclarationWithType *clone() const = 0;
@@ -98 +98 @@
         ConstantExpr *asmName;
         std::list< Attribute * > attributes;
-        DeclarationNode::FuncSpecifiers fs;
+        Type::FuncSpecifiers fs;
 };
 
@@ -105 +105 @@
   public:
         ObjectDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init,
-                                const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpecifiers fs = DeclarationNode::FuncSpecifiers() );
+                                const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -133 +133 @@
   public:
         FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
-                                  const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpecifiers fs = DeclarationNode::FuncSpecifiers() );
+                                  const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
         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 : Thu Mar 16 07:49:27 2017
-// Update Count     : 24
+// Last Modified On : Thu Mar 16 08:34:35 2017
+// Update Count     : 25
 //
 
@@ -19 +19 @@
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs )
+DeclarationWithType::DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs )
         : Declaration( name, scs, linkage ), asmName( nullptr ), attributes( attributes ), fs( fs ) {
 }

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 Mar 16 07:49:35 2017
-// Update Count     : 73
+// Last Modified On : Thu Mar 16 08:33:41 2017
+// Update Count     : 74
 //
 
@@ -26 +26 @@
 extern bool translation_unit_nomain;
 
-FunctionDecl::FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
+FunctionDecl::FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, Type::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

src/SynTree/ObjectDecl.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:49:51 2017
-// Update Count     : 58
+// Last Modified On : Thu Mar 16 08:34:27 2017
+// Update Count     : 59
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
+ObjectDecl::ObjectDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, Type::FuncSpecifiers fs )
         : Parent( name, scs, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
 }

src/SynTree/Type.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:57:45 2017
-// Update Count     : 20
+// Last Modified On : Thu Mar 16 08:32:44 2017
+// Update Count     : 22
 //
 
@@ -60 +60 @@
 
 // These must remain in the same order as the corresponding bit fields.
+const char * Type::FuncSpecifiers::Names[] = { "inline", "fortran", "_Noreturn" };
 const char * Type::StorageClasses::Names[] = { "extern", "static", "auto", "register", "_Thread_local" };
 const char * Type::Qualifiers::Names[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic" };

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 Mar 16 07:45:29 2017
-// Update Count     : 90
+// Last Modified On : Thu Mar 16 08:28:02 2017
+// Update Count     : 91
 //
 
@@ -25 +25 @@
   public:
         // enum must remain in the same order as the corresponding bit fields.
+
+        enum { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NumFuncSpecifier = 3 };
+        union FuncSpecifiers {
+                static const char * Names[];
+                unsigned int val;
+                struct {
+                        bool is_inline : 1;
+                        bool is_noreturn : 1;
+                        bool is_fortran : 1;
+                };
+                FuncSpecifiers() : val( 0 ) {}
+                FuncSpecifiers( unsigned int val ) : val( val ) {}
+                bool operator[]( unsigned int i ) const { return val & (1 << i); }
+                bool any() const { return val != 0; }
+                void print( std::ostream & os ) const {
+                        if ( (*this).any() ) {                                          // any function specifiers ?
+                                for ( unsigned int i = 0; i < NumFuncSpecifier; i += 1 ) {
+                                        if ( (*this)[i] ) {
+                                                os << FuncSpecifiers::Names[i] << ' ';
+                                        } // if
+                                } // for
+                        } // if
+                }
+        }; // FuncSpecifiers
 
         enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NumStorageClass = 5 };