Changeset b5b0907 for src/SynTree

Timestamp:

Jun 15, 2015, 12:45:26 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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' into resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (2 diffs)
• Declaration.cc (modified) (3 diffs)
• Declaration.h (modified) (10 diffs)
• DeclarationWithType.cc (modified) (2 diffs)
• FunctionDecl.cc (modified) (4 diffs)
• NamedTypeDecl.cc (modified) (4 diffs)
• ObjectDecl.cc (modified) (4 diffs)
• TypeDecl.cc (modified) (2 diffs)

src/SynTree/AggregateDecl.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 23:56:39 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:52:08 2015
-// Update Count     : 5
+// Last Modified On : Sat Jun 13 08:12:49 2015
+// Update Count     : 6
 //
 
@@ -19 +19 @@
 
 
-AggregateDecl::AggregateDecl( const std::string &name ) : Parent( name, Declaration::NoStorageClass, LinkageSpec::Cforall ) {
+AggregateDecl::AggregateDecl( const std::string &name ) : Parent( name, DeclarationNode::NoStorageClass, LinkageSpec::Cforall ) {
 }
 

src/SynTree/Declaration.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:18:35 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:07:20 2015
+// Update Count     : 9
 //
 
@@ -22 +22 @@
 #include "utility.h"
 
-const char* Declaration::storageClassName[] = { "", "auto", "static", "extern", "register" };  
-
 static UniqueId lastUniqueId = 0;
 typedef std::map< UniqueId, Declaration* > IdMapType;
 static IdMapType idMap;
 
-Declaration::Declaration( const std::string &name, StorageClass sc, LinkageSpec::Type linkage )
-        : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
+Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
+                : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
 }
 
 Declaration::Declaration( const Declaration &other )
-        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
+                : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
 }
 
@@ -44 +42 @@
 }
 
-/* static class method */
 Declaration *Declaration::declFromId( UniqueId id ) {
         IdMapType::const_iterator i = idMap.find( id );
-        if ( i != idMap.end() ) {
-                return i->second;
-        } else {
-                return 0;
-        } // if
+        return i != idMap.end() ? i->second : 0;
 }
 
-/* static class method */
 void Declaration::dumpIds( std::ostream &os ) {
         for ( IdMapType::const_iterator i = idMap.begin(); i != idMap.end(); ++i ) {

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 22:03:43 2015
-// Update Count     : 7
+// Last Modified On : Fri Jun 12 23:55:26 2015
+// Update Count     : 24
 //
 
@@ -21 +21 @@
 #include "Mutator.h"
 #include "Parser/LinkageSpec.h"
+#include "Parser/ParseNode.h"
 
 class Declaration {
   public:
-        enum StorageClass {  
-                NoStorageClass,
-                Extern,
-                Static,
-                Auto,
-                Register,
-                Inline,
-                Fortran,
-        };      
-
-        Declaration( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
+        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
@@ -40 +31 @@
         const std::string &get_name() const { return name; }
         void set_name( std::string newValue ) { name = newValue; }
-        StorageClass get_storageClass() const { return storageClass; }
-        void set_storageClass( StorageClass newValue ) { storageClass = newValue; }
+        DeclarationNode::StorageClass get_storageClass() const { return storageClass; }
+        void set_storageClass( DeclarationNode::StorageClass newValue ) { storageClass = newValue; }
         LinkageSpec::Type get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
@@ -53 +44 @@
         virtual void printShort( std::ostream &os, int indent = 0 ) const = 0;
 
-        static const char* storageClassName[];  
-
         static void dumpIds( std::ostream &os );
         static Declaration *declFromId( UniqueId id );
   private:
         std::string name;
-        StorageClass storageClass;
+        DeclarationNode::StorageClass storageClass;
         LinkageSpec::Type linkage;
         UniqueId uniqueId;
@@ -66 +55 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -86 +75 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -112 +101 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -144 +133 @@
         typedef Declaration Parent;
   public:
-        NamedTypeDecl( const std::string &name, StorageClass sc, Type *type );
+        NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type );
         NamedTypeDecl( const TypeDecl &other );
         virtual ~NamedTypeDecl();
@@ -169 +158 @@
         enum Kind { Any, Dtype, Ftype };
 
-        TypeDecl( const std::string &name, StorageClass sc, Type *type, Kind kind );
+        TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind );
         TypeDecl( const TypeDecl &other );
 
@@ -185 +174 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
+        TypedefDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 

src/SynTree/DeclarationWithType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:20:23 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:08:07 2015
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 #include "utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, StorageClass sc, LinkageSpec::Type linkage )
+DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
                 : Declaration( name, sc, linkage ) {
 }

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 08:36:44 2015
-// Update Count     : 12
+// Last Modified On : Sat Jun 13 08:12:20 2015
+// Update Count     : 14
 //
 
@@ -21 +21 @@
 #include "utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline )
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline )
                 : Parent( name, sc, linkage ), type( type ), statements( statements ), isInline( isInline ) {
         // this is a brazen hack to force the function "main" to have C linkage
@@ -60 +60 @@
                 os << "inline ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         if ( get_type() ) {
@@ -96 +96 @@
                 os << "inline ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         if ( get_type() ) {

src/SynTree/NamedTypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 08:36:09 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:13:55 2015
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 #include "utility.h"
 
-NamedTypeDecl::NamedTypeDecl( const std::string &name, StorageClass sc, Type *base )
+NamedTypeDecl::NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *base )
         : Parent( name, sc, LinkageSpec::Cforall ), base( base ) {}
 
@@ -39 +39 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         os << typeString();
@@ -63 +63 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ 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 : Thu Jun  4 21:21:12 2015
-// Update Count     : 10
+// Last Modified On : Sat Jun 13 08:10:16 2015
+// Update Count     : 15
 //
 
@@ -20 +20 @@
 #include "utility.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init )
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init )
         : Parent( name, sc, linkage ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
 }
@@ -43 +43 @@
         } // if
 
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
 
@@ -74 +74 @@
         } // if
 
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
 

src/SynTree/TypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 11:02:11 2015
-// Update Count     : 1
+// Last Modified On : Sat Jun 13 08:14:35 2015
+// Update Count     : 2
 //
 
@@ -18 +18 @@
 #include "utility.h"
 
-TypeDecl::TypeDecl( const std::string &name, StorageClass sc, Type *type, Kind kind ) : Parent( name, sc, type ), kind( kind ) {
+TypeDecl::TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind ) : Parent( name, sc, type ), kind( kind ) {
 }