Changes in src/SynTree/Declaration.h [65cdc1e:6b0b624]

File:

• src/SynTree/Declaration.h (modified) (16 diffs)

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 14:45:00 2017
-// Update Count     : 126
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:52:59 2017
+// Update Count     : 124
 //
 
@@ -27 +27 @@
 class Declaration : public BaseSyntaxNode {
   public:
-        std::string name;
-        LinkageSpec::Spec linkage;
-        bool extension = false;
-
         Declaration( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage );
         Declaration( const Declaration &other );
@@ -57 +53 @@
         static void dumpIds( std::ostream &os );
         static Declaration *declFromId( UniqueId id );
-
-  private:
+  private:
+        std::string name;
         Type::StorageClasses storageClasses;
+        LinkageSpec::Spec linkage;
         UniqueId uniqueId;
+        bool extension = false;
 };
 
 class DeclarationWithType : public Declaration {
   public:
+        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();
+
+        std::string get_mangleName() const { return mangleName; }
+        DeclarationWithType * set_mangleName( std::string newValue ) { mangleName = newValue; return this; }
+
+        std::string get_scopedMangleName() const { return mangleName + "_" + std::to_string(scopeLevel); }
+
+        int get_scopeLevel() const { return scopeLevel; }
+        DeclarationWithType * set_scopeLevel( int newValue ) { scopeLevel = newValue; return this; }
+
+        ConstantExpr *get_asmName() const { return asmName; }
+        DeclarationWithType * set_asmName( ConstantExpr *newValue ) { asmName = newValue; return this; }
+
+        std::list< Attribute * >& get_attributes() { return attributes; }
+        const std::list< Attribute * >& get_attributes() const { return attributes; }
+
+        Type::FuncSpecifiers get_funcSpec() const { return fs; }
+        //void set_functionSpecifiers( Type::FuncSpecifiers newValue ) { fs = newValue; }
+
+        virtual DeclarationWithType *clone() const = 0;
+        virtual DeclarationWithType *acceptMutator( Mutator &m ) = 0;
+
+        virtual Type *get_type() const = 0;
+        virtual void set_type(Type *) = 0;
+  private:
         // this represents the type with all types and typedefs expanded it is generated by SymTab::Validate::Pass2
         std::string mangleName;
@@ -72 +97 @@
         ConstantExpr *asmName;
         std::list< Attribute * > attributes;
-
-        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();
-
-        std::string get_mangleName() const { return mangleName; }
-        DeclarationWithType * set_mangleName( std::string newValue ) { mangleName = newValue; return this; }
-
-        std::string get_scopedMangleName() const { return mangleName + "_" + std::to_string(scopeLevel); }
-
-        int get_scopeLevel() const { return scopeLevel; }
-        DeclarationWithType * set_scopeLevel( int newValue ) { scopeLevel = newValue; return this; }
-
-        ConstantExpr *get_asmName() const { return asmName; }
-        DeclarationWithType * set_asmName( ConstantExpr *newValue ) { asmName = newValue; return this; }
-
-        std::list< Attribute * >& get_attributes() { return attributes; }
-        const std::list< Attribute * >& get_attributes() const { return attributes; }
-
-        Type::FuncSpecifiers get_funcSpec() const { return fs; }
-        //void set_functionSpecifiers( Type::FuncSpecifiers newValue ) { fs = newValue; }
-
-        virtual DeclarationWithType *clone() const = 0;
-        virtual DeclarationWithType *acceptMutator( Mutator &m ) = 0;
-
-        virtual Type *get_type() const = 0;
-        virtual void set_type(Type *) = 0;
-
-  private:
         Type::FuncSpecifiers fs;
 };
@@ -107 +103 @@
         typedef DeclarationWithType Parent;
   public:
-        Type *type;
-        Initializer *init;
-        Expression *bitfieldWidth;
-
         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 * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
@@ -130 +122 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
+  private:
+        Type *type;
+        Initializer *init;
+        Expression *bitfieldWidth;
 };
 
@@ -135 +131 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionType *type;
-        CompoundStmt *statements;
-
         FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
                                   const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
@@ -156 +149 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
+  private:
+        FunctionType *type;
+        CompoundStmt *statements;
 };
 
@@ -161 +157 @@
         typedef Declaration Parent;
   public:
-        Type *base;
-        std::list< TypeDecl* > parameters;
-        std::list< DeclarationWithType* > assertions;
-
         NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *type );
         NamedTypeDecl( const NamedTypeDecl &other );
@@ -179 +171 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
+  protected:
+  private:
+        Type *base;
+        std::list< TypeDecl* > parameters;
+        std::list< DeclarationWithType* > assertions;
 };
 
@@ -185 +182 @@
   public:
         enum Kind { Any, Dtype, Ftype, Ttype };
-
-        Type * init;
-        bool sized;
-
         /// Data extracted from a type decl
         struct Data {
@@ -223 +216 @@
   private:
         Kind kind;
+        Type * init;
+        bool sized;
 };
 
@@ -228 +223 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) : Parent( name, scs, type ) { set_linkage( spec ); }
+        TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type ) : Parent( name, scs, type ) {}
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 
@@ -242 +237 @@
         typedef Declaration Parent;
   public:
+        AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );
+        AggregateDecl( const AggregateDecl &other );
+        virtual ~AggregateDecl();
+
+        std::list<Declaration*>& get_members() { return members; }
+        std::list<TypeDecl*>& get_parameters() { return parameters; }
+
+        std::list< Attribute * >& get_attributes() { return attributes; }
+        const std::list< Attribute * >& get_attributes() const { return attributes; }
+
+        bool has_body() const { return body; }
+        AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; }
+
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void printShort( std::ostream &os, int indent = 0 ) const;
+  protected:
+        virtual std::string typeString() const = 0;
+
+  private:
         std::list<Declaration*> members;
         std::list<TypeDecl*> parameters;
         bool body;
         std::list< Attribute * > attributes;
-
-        AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );
-        AggregateDecl( const AggregateDecl &other );
-        virtual ~AggregateDecl();
-
-        std::list<Declaration*>& get_members() { return members; }
-        std::list<TypeDecl*>& get_parameters() { return parameters; }
-
-        std::list< Attribute * >& get_attributes() { return attributes; }
-        const std::list< Attribute * >& get_attributes() const { return attributes; }
-
-        bool has_body() const { return body; }
-        AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; }
-
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const;
-  protected:
-        virtual std::string typeString() const = 0;
 };
 
@@ -337 +333 @@
 class AsmDecl : public Declaration {
   public:
-        AsmStmt *stmt;
-
         AsmDecl( AsmStmt *stmt );
         AsmDecl( const AsmDecl &other );
@@ -351 +345 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
+  private:
+        AsmStmt *stmt;
 };