Changeset 937e51d for src/Parser/ParseNode.h

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

File:

• src/Parser/ParseNode.h (modified) (23 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 13:30:24 2015
-// Update Count     : 3
+// Last Modified On : Wed Jun 24 14:09:51 2015
+// Update Count     : 81
 //
 
@@ -22 +22 @@
 
 #include "utility.h"
-#include "SynTree/Declaration.h"
+#include "Parser/LinkageSpec.h"
+#include "SynTree/Type.h"
+//#include "SynTree/Declaration.h"
 #include "UniqueName.h"
 
@@ -36 +38 @@
 class ParseNode {
   public:
-        ParseNode( void );
-        ParseNode ( std::string );
-        virtual ~ParseNode( void );
-
-        ParseNode *set_name ( std::string ) ;
-        ParseNode *set_name ( std::string * ) ;
-
-        std::string get_name( void );
-
-        ParseNode *get_link( void ) const;
-        ParseNode *get_last( void );
+        ParseNode();
+        ParseNode( const std::string * );
+        virtual ~ParseNode();
+
+        ParseNode *get_link() const;
+        ParseNode *get_last();
         ParseNode *set_link( ParseNode * );
         void set_next( ParseNode *newlink ) { next = newlink; }
@@ -52 +49 @@
         virtual ParseNode *clone() const { return 0; };
 
-        const std::string get_name( void ) const;
+        const std::string &get_name() const { return *name; }
         virtual void print( std::ostream &, int indent = 0 ) const;
         virtual void printList( std::ostream &, int indent = 0 ) const;
@@ -58 +55 @@
         ParseNode &operator,( ParseNode &);
   protected:
-        std::string name;
+        const std::string *name;
         ParseNode *next;
         static int indent_by;
@@ -68 +65 @@
   public:
         ExpressionNode();
-        ExpressionNode( std::string * );
+        ExpressionNode( const std::string * );
         ExpressionNode( const ExpressionNode &other );
         virtual ~ExpressionNode() {} // cannot delete asArgName because it might be referenced elsewhere
@@ -77 +74 @@
 
         ExpressionNode *get_argName() const { return argName; }
-        ExpressionNode *set_asArgName( std::string *aName );
+        ExpressionNode *set_asArgName( const std::string *aName );
         ExpressionNode *set_asArgName( ExpressionNode *aDesignator );
 
@@ -105 +102 @@
 class ConstantNode : public ExpressionNode {
   public:
-        enum Type {
-                Integer, Float, Character, String /* , Range, EnumConstant  */
-        };
-
-        ConstantNode( void );
-        ConstantNode( std::string * );
+        enum Type { Integer, Float, Character, String };
+
         ConstantNode( Type, std::string * );
-        ConstantNode( const ConstantNode &other );
 
         virtual ConstantNode *clone() const { return new ConstantNode( *this ); }
-
-        Type get_type( void ) const ;
+        Type get_type( void ) const { return type; }
         virtual void print( std::ostream &, int indent = 0) const;
         virtual void printOneLine( std::ostream &, int indent = 0) const;
 
-        std::string get_value() const { return value; }
-        ConstantNode *append( std::string *newValue );
+        const std::string &get_value() const { return value; }
+        ConstantNode *appendstr( const std::string *newValue );
 
         Expression *build() const;
   private:
-        void classify( std::string &);
         Type type;
-        std::string value;
-        bool sign;
-        short base;
-        int longs, size;
+        BasicType::Kind btype;
+        std::string &value;
 };
 
@@ -136 +124 @@
   public:
         VarRefNode();
-        VarRefNode( std::string *, bool isLabel = false );
+        VarRefNode( const std::string *, bool isLabel = false );
         VarRefNode( const VarRefNode &other );
 
@@ -143 +131 @@
         virtual VarRefNode *clone() const { return new VarRefNode( *this ); }
 
-        virtual void print( std::ostream &, int indent = 0) const;
-        virtual void printOneLine( std::ostream &, int indent = 0) const;
+        virtual void print( std::ostream &, int indent = 0 ) const;
+        virtual void printOneLine( std::ostream &, int indent = 0 ) const;
   private:
         bool isLabel;
@@ -183 +171 @@
         virtual OperatorNode *clone() const { return new OperatorNode( *this ); }
 
-        Type get_type( void ) const;
-        std::string get_typename( void ) const;
+        Type get_type() const;
+        const char *get_typename() const;
 
         virtual void print( std::ostream &, int indent = 0) const;
@@ -198 +186 @@
 class CompositeExprNode : public ExpressionNode {
   public:
-        CompositeExprNode( void );
-        CompositeExprNode( std::string * );
+        CompositeExprNode();
+        CompositeExprNode( const std::string * );
         CompositeExprNode( ExpressionNode *f, ExpressionNode *args = 0 );
         CompositeExprNode( ExpressionNode *f, ExpressionNode *arg1, ExpressionNode *arg2 );
@@ -278 +266 @@
   public:
         enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, Attribute };
-        enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran };
+        enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
-        enum Modifier { Signed, Unsigned, Short, Long };
-        enum TyCon { Struct, Union, Context };
+        enum Modifier  { Signed, Unsigned, Short, Long };
+        enum Aggregate { Struct, Union, Context };
         enum TypeClass { Type, Dtype, Ftype };
 
+        static const char *storageName[];  
         static const char *qualifierName[];
         static const char *basicTypeName[];
         static const char *modifierName[];
-        static const char *tyConName[];
+        static const char *aggregateName[];
         static const char *typeClassName[];
 
@@ -298 +287 @@
         static DeclarationNode *newForall( DeclarationNode *);
         static DeclarationNode *newFromTypedef( std::string *);
-        static DeclarationNode *newAggregate( TyCon kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields );
+        static DeclarationNode *newAggregate( Aggregate kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields );
         static DeclarationNode *newEnum( std::string *name, DeclarationNode *constants );
         static DeclarationNode *newEnumConstant( std::string *name, ExpressionNode *constant );
         static DeclarationNode *newName( std::string *);
-        static DeclarationNode *newFromTypeGen( std::string*, ExpressionNode *params );
+        static DeclarationNode *newFromTypeGen( std::string *, ExpressionNode *params );
         static DeclarationNode *newTypeParam( TypeClass, std::string *);
         static DeclarationNode *newContext( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
@@ -313 +302 @@
         static DeclarationNode *newTuple( DeclarationNode *members );
         static DeclarationNode *newTypeof( ExpressionNode *expr );
-        static DeclarationNode *newAttr( std::string*, ExpressionNode *expr );
-        static DeclarationNode *newAttr( std::string*, DeclarationNode *type );
+        static DeclarationNode *newAttr( std::string *, ExpressionNode *expr );
+        static DeclarationNode *newAttr( std::string *, DeclarationNode *type );
 
         DeclarationNode *addQualifiers( DeclarationNode *);
@@ -340 +329 @@
         DeclarationNode *cloneBaseType( DeclarationNode *newdecl );
 
-        DeclarationNode *appendList( DeclarationNode  *);
+        DeclarationNode *appendList( DeclarationNode * );
 
         DeclarationNode *clone() const;
@@ -350 +339 @@
 
         bool get_hasEllipsis() const;
-        std::string get_name() const { return name; }
+        const std::string &get_name() const { return name; }
         LinkageSpec::Type get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
@@ -357 +346 @@
         ~DeclarationNode();
   private:
-        Declaration::StorageClass buildStorageClass() const;
-        bool buildInline() const;
+        StorageClass buildStorageClass() const;
+        bool buildFuncSpecifier( StorageClass key ) const;
 
         TypeData *type;
@@ -380 +369 @@
         };
 
-        StatementNode( void );
-        StatementNode( std::string );
+        StatementNode();
+        StatementNode( const std::string * );
         StatementNode( Type, ExpressionNode *e = 0, StatementNode *s = 0 );
         StatementNode( Type, std::string *target );
@@ -387 +376 @@
 
 
-        ~StatementNode( void );
-
-        static StatementNode  *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false );
+        ~StatementNode();
+
+        static StatementNode *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false );
 
         void set_control( ExpressionNode * );
@@ -396 +385 @@
         ExpressionNode *get_control() const ;
         StatementNode *get_block() const;
-        StatementNode::Type get_type( void ) const;
-
-        StatementNode *add_label( std::string * );
+        StatementNode::Type get_type() const;
+
+        StatementNode *add_label( const std::string * );
         std::list<std::string> *get_labels() const;
 
@@ -429 +418 @@
 class CompoundStmtNode : public StatementNode {
   public:
-        CompoundStmtNode( void );
-        CompoundStmtNode( std::string * );
+        CompoundStmtNode();
+        CompoundStmtNode( const std::string * );
         CompoundStmtNode( StatementNode * );
         ~CompoundStmtNode();
@@ -499 +488 @@
 
 // in DeclarationNode.cc
-void buildList( const DeclarationNode *firstNode, std::list< Declaration *> &outputList );
+void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList );
 void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList );
-void buildTypeList( const DeclarationNode *firstNode, std::list< Type *> &outputList );
+void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList );
 
 // in ExpressionNode.cc