Changeset 19b5d6b for src/Parser/ParseNode.h

Timestamp:

Oct 4, 2016, 11:25:00 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

40744af8, a7976d79

Parents:

6295081 (diff), 4b1fd2c (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ParseNode.h (modified) (15 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 : Mon Sep 12 08:00:05 2016
-// Update Count     : 603
+// Last Modified On : Sat Sep 24 11:12:04 2016
+// Update Count     : 633
 //
 
@@ -41 +41 @@
   public:
         ParseNode() {};
-        ParseNode( const std::string * name ) : name( * name ) { assert( false ); delete name; }
-        ParseNode( const std::string &name ) : name( name ) { assert( false ); }
-        virtual ~ParseNode() { delete next; };
+        virtual ~ParseNode() { delete next; delete name; };
         virtual ParseNode * clone() const = 0;
 
         ParseNode * get_next() const { return next; }
         ParseNode * set_next( ParseNode * newlink ) { next = newlink; return this; }
+
         ParseNode * get_last() {
                 ParseNode * current;
-                for ( current = this; current->get_next() != 0; current = current->get_next() );
+                for ( current = this; current->get_next() != nullptr; current = current->get_next() );
                 return current;
         }
         ParseNode * set_last( ParseNode * newlast ) {
-                if ( newlast != 0 ) get_last()->set_next( newlast );
+                if ( newlast != nullptr ) get_last()->set_next( newlast );
                 return this;
         }
-
-        const std::string &get_name() const { return name; }
-        void set_name( const std::string &newValue ) { name = newValue; }
 
         virtual void print( std::ostream &os, int indent = 0 ) const {}
         virtual void printList( std::ostream &os, int indent = 0 ) const {}
-  private:
+
         static int indent_by;
 
         ParseNode * next = nullptr;
-        std::string name;
+        std::string * name = nullptr;
 }; // ParseNode
 
@@ -74 +70 @@
 class InitializerNode : public ParseNode {
   public:
-        InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode * des = 0 );
-        InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode * des = 0 );
+        InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode * des = nullptr );
+        InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode * des = nullptr );
         ~InitializerNode();
         virtual InitializerNode * clone() const { assert( false ); return nullptr; }
@@ -106 +102 @@
   public:
         ExpressionNode( Expression * expr = nullptr ) : expr( expr ) {}
-        ExpressionNode( Expression * expr, const std::string * name ) : ParseNode( name ), expr( expr ) {}
         ExpressionNode( const ExpressionNode &other );
         virtual ~ExpressionNode() {}
@@ -183 +178 @@
 Expression * build_attrexpr( NameExpr * var, ExpressionNode * expr_node );
 Expression * build_attrtype( NameExpr * var, DeclarationNode * decl_node );
-Expression * build_tuple( ExpressionNode * expr_node = 0 );
+Expression * build_tuple( ExpressionNode * expr_node = nullptr );
 Expression * build_func( ExpressionNode * function, ExpressionNode * expr_node );
 Expression * build_range( ExpressionNode * low, ExpressionNode * high );
@@ -219 +214 @@
         static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle = false );
         static DeclarationNode * newQualifier( Qualifier );
-        static DeclarationNode * newForall( DeclarationNode *);
+        static DeclarationNode * newForall( DeclarationNode * );
         static DeclarationNode * newStorageClass( StorageClass );
         static DeclarationNode * newBasicType( BasicType );
@@ -226 +221 @@
         static DeclarationNode * newLength( Length lnth );
         static DeclarationNode * newBuiltinType( BuiltinType );
-        static DeclarationNode * newFromTypedef( std::string *);
+        static DeclarationNode * newFromTypedef( std::string * );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );
         static DeclarationNode * newEnum( std::string * name, DeclarationNode * constants );
         static DeclarationNode * newEnumConstant( std::string * name, ExpressionNode * constant );
-        static DeclarationNode * newName( std::string *);
+        static DeclarationNode * newName( std::string * );
         static DeclarationNode * newFromTypeGen( std::string *, ExpressionNode * params );
-        static DeclarationNode * newTypeParam( TypeClass, std::string *);
-        static DeclarationNode * newTrait( std::string * name, DeclarationNode * params, DeclarationNode * asserts );
-        static DeclarationNode * newTraitUse( std::string * name, ExpressionNode * params );
+        static DeclarationNode * newTypeParam( TypeClass, std::string * );
+        static DeclarationNode * newTrait( const std::string * name, DeclarationNode * params, DeclarationNode * asserts );
+        static DeclarationNode * newTraitUse( const std::string * name, ExpressionNode * params );
         static DeclarationNode * newTypeDecl( std::string * name, DeclarationNode * typeParams );
         static DeclarationNode * newPointer( DeclarationNode * qualifiers );
@@ -249 +244 @@
         DeclarationNode * clone() const;
 
-        DeclarationNode * addQualifiers( DeclarationNode *);
+        DeclarationNode * addQualifiers( DeclarationNode * );
         void checkQualifiers( const TypeData *, const TypeData * );
-        void checkStorageClasses( DeclarationNode *q );
-        DeclarationNode * copyStorageClasses( DeclarationNode *);
-        DeclarationNode * addType( DeclarationNode *);
+        void checkStorageClasses( DeclarationNode * );
+        DeclarationNode * copyStorageClasses( DeclarationNode * );
+        DeclarationNode * addType( DeclarationNode * );
         DeclarationNode * addTypedef();
-        DeclarationNode * addAssertions( DeclarationNode *);
-        DeclarationNode * addName( std::string *);
+        DeclarationNode * addAssertions( DeclarationNode * );
+        DeclarationNode * addName( std::string * );
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
@@ -270 +265 @@
 
         DeclarationNode * cloneType( std::string * newName );
-        DeclarationNode * cloneType( DeclarationNode * existing );
-        DeclarationNode * cloneType( int ) { return cloneType( ( std::string *)0 ); }
-        DeclarationNode * cloneBaseType( std::string * newName );
         DeclarationNode * cloneBaseType( DeclarationNode * newdecl );
 
@@ -286 +278 @@
 
         bool get_hasEllipsis() const;
-        const std::string &get_name() const { return name; }
         LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode * extractAggregate() const;
@@ -295 +286 @@
         DeclarationNode * set_extension( bool exten ) { extension = exten; return this; }
   public:
-        // StorageClass buildStorageClass() const;
-        // bool buildFuncSpecifier( StorageClass key ) const;
-
         struct Variable_t {
+                const std::string * name;
                 DeclarationNode::TypeClass tyClass;
-                std::string name;
                 DeclarationNode * assertions;
         };
@@ -306 +294 @@
 
         struct Attr_t {
-                std::string name;
+                const std::string * name;
                 ExpressionNode * expr;
                 DeclarationNode * type;
@@ -315 +303 @@
 
         TypeData * type;
-        std::string name;
         StorageClass storageClass;
         bool isInline, isNoreturn;
@@ -331 +318 @@
 
 Type * buildType( TypeData * type );
-//Type::Qualifiers buildQualifiers( const TypeData::Qualifiers & qualifiers );
 
 static inline Type * maybeMoveBuildType( const DeclarationNode * orig ) {
@@ -393 +379 @@
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );
-Statement * build_asmstmt( bool voltile, ConstantExpr * instruction, ExpressionNode * output = 0, ExpressionNode * input = 0, ExpressionNode * clobber = 0, LabelNode * gotolabels = 0 );
+Statement * build_asmstmt( bool voltile, ConstantExpr * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
 
 //##############################################################################