Changes in src/Parser/ParseNode.h [7f5566b:1db21619]

File:

• src/Parser/ParseNode.h (modified) (13 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 : Thu Jul 30 15:11:39 2015
-// Update Count     : 141
+// Last Modified On : Tue Jul 14 14:58:25 2015
+// Update Count     : 91
 //
 
@@ -67 +67 @@
         ExpressionNode( const std::string * );
         ExpressionNode( const ExpressionNode &other );
-        virtual ~ExpressionNode() { delete argName; } // cannot delete argName because it might be referenced elsewhere
+        virtual ~ExpressionNode() {} // cannot delete asArgName because it might be referenced elsewhere
 
         virtual ExpressionNode *clone() const = 0;
@@ -74 +74 @@
 
         ExpressionNode *get_argName() const { return argName; }
-        ExpressionNode *set_argName( const std::string *aName );
-        ExpressionNode *set_argName( ExpressionNode *aDesignator );
+        ExpressionNode *set_asArgName( const std::string *aName );
+        ExpressionNode *set_asArgName( ExpressionNode *aDesignator );
 
         virtual void print( std::ostream &, int indent = 0) const = 0;
@@ -105 +105 @@
 
         ConstantNode( Type, std::string * );
-        ~ConstantNode() { delete &value; }
 
         virtual ConstantNode *clone() const { return new ConstantNode( *this ); }
@@ -184 +183 @@
 };
 
+
 class CompositeExprNode : public ExpressionNode {
   public:
@@ -211 +211 @@
 };
 
-class AsmExprNode : public ExpressionNode {
-  public:
-        AsmExprNode();
-        AsmExprNode( ExpressionNode *inout, ConstantNode *constraint, ExpressionNode *operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
-        virtual ~AsmExprNode() { delete inout; delete constraint; delete operand; }
-
-        virtual AsmExprNode *clone() const { return new AsmExprNode( *this ); }
-        virtual Expression *build() const;
-
-        virtual void print( std::ostream &, int indent = 0) const;
-        virtual void printOneLine( std::ostream &, int indent = 0) const;
-
-        ExpressionNode *get_inout() const { return inout; };
-        void set_inout( ExpressionNode *newValue ) { inout = newValue; }
-
-        ConstantNode *get_constraint() const { return constraint; };
-        void set_constraint( ConstantNode *newValue ) { constraint = newValue; }
-
-        ExpressionNode *get_operand() const { return operand; };
-        void set_operand( ExpressionNode *newValue ) { operand = newValue; }
-  private:
-        ExpressionNode *inout;
-        ConstantNode *constraint;
-        ExpressionNode *operand;
-};
-
-class LabelNode : public ExpressionNode {
-  public:
-        virtual Expression *build() const { return NULL; }
-        virtual LabelNode *clone() const { return new LabelNode( *this ); }
-
-        virtual void print( std::ostream &, int indent = 0) const;
-        virtual void printOneLine( std::ostream &, int indent = 0) const;
-
-        const std::list< std::string > &get_labels() const { return labels; };
-        void append_label( std::string *label ) { labels.push_back( *label ); delete label; }
-  private:
-        std::list< std::string > labels;
-};
-
 class CommaExprNode : public CompositeExprNode {
   public:
@@ -319 +279 @@
         static const char *typeClassName[];
 
-        static DeclarationNode *newFunction( std::string *name, DeclarationNode *ret, DeclarationNode *param, StatementNode *body, bool newStyle = false );
+        static DeclarationNode *newFunction( std::string *name, DeclarationNode *ret, DeclarationNode *param,
+                                                                                 StatementNode *body, bool newStyle = false );
         static DeclarationNode *newQualifier( Qualifier );
         static DeclarationNode *newStorageClass( StorageClass );
@@ -410 +371 @@
 
         StatementNode();
-        StatementNode( const std::string *name );
-        StatementNode( Type t, ExpressionNode *control = 0, StatementNode *block = 0 );
-        StatementNode( Type t, std::string *target );
+        StatementNode( const std::string * );
+        StatementNode( Type, ExpressionNode *e = 0, StatementNode *s = 0 );
+        StatementNode( Type, std::string *target );
         StatementNode( DeclarationNode *decl );
+
 
         ~StatementNode();
@@ -440 +402 @@
 
         void print( std::ostream &, int indent = 0) const;
+
         virtual StatementNode *clone() const;
+
         virtual Statement *build() const;
   private:
@@ -450 +414 @@
         std::string *target;                            // target label for jump statements
         DeclarationNode *decl;
+
         bool isCatchRest;
 }; // StatementNode
@@ -463 +428 @@
 
         void print( std::ostream &, int indent = 0 ) const;
+
         virtual Statement *build() const;
   private:
@@ -468 +434 @@
 };
 
-class AsmStmtNode : public StatementNode {
-  public:
-        AsmStmtNode( Type, bool voltile, ConstantNode *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ConstantNode *clobber = 0, LabelNode *gotolabels = 0 );
-        ~AsmStmtNode();
-
-        void print( std::ostream &, int indent = 0 ) const;
+class NullStmtNode : public CompoundStmtNode {
+  public:
         Statement *build() const;
-  private:
-        bool voltile;
-        ConstantNode *instruction;
-        ExpressionNode *output, *input;
-        ConstantNode *clobber;
-        std::list<std::string> gotolabels;
-};
-
-class NullStmtNode : public CompoundStmtNode {
-  public:
-        Statement *build() const;
-        void print( std::ostream &, int indent = 0 ) const;
+        void print( std::ostream &, int indent = 0) const;
 };
 
@@ -512 +463 @@
         InitializerNode *kids;
 };
+
+
 
 template< typename SynTreeType, typename NodeType >