Changes in src/Parser/ParseNode.h [7305915:8e9cbb2]

File:

• src/Parser/ParseNode.h (modified) (9 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 Jun 27 23:28:10 2016
-// Update Count     : 242
+// Last Modified On : Mon Jul  4 15:35:09 2016
+// Update Count     : 260
 //
 
@@ -28 +28 @@
 //#include "SynTree/Declaration.h"
 #include "Common/UniqueName.h"
+#include "SynTree/Label.h"
 
 class ExpressionNode;
@@ -42 +43 @@
         ParseNode();
         ParseNode( const std::string * );
-        ParseNode( const std::string & );  // for copy constructing subclasses
+        ParseNode( const std::string & );                                       // for copy constructing subclasses
         virtual ~ParseNode();
 
-        ParseNode *get_link() const;
+        ParseNode *get_link() const { return next; }
         ParseNode *get_last();
         ParseNode *set_link( ParseNode * );
@@ -61 +62 @@
   protected:
         std::string name;
+        static int indent_by;
         ParseNode *next;
-        static int indent_by;
 };
 
@@ -125 +126 @@
         enum Type { Integer, Float, Character, String };
 
-        ConstantNode( Type, std::string * );
-        ConstantNode( const ConstantNode &other ) : type( other.type ), btype( other.btype), value( *new std::string( other.value ) ) {};
-        ~ConstantNode() { delete &value; }
+        ConstantNode( ConstantExpr * );
+        ConstantNode( const ConstantNode &other ) : expr( other.expr->clone() ) {};
+        ~ConstantNode() { delete expr; }
 
         virtual ConstantNode *clone() const { return new ConstantNode( *this ); }
-        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;
 
-        const std::string &get_value() const { return value; }
         ConstantNode *appendstr( const std::string *newValue );
 
         Expression *build() const;
   private:
-        Type type;
-        BasicType::Kind btype;
-        std::string &value;
-};
+        ConstantExpr *expr;
+};
+
+ConstantNode *makeConstant( ConstantNode::Type, std::string * );
+ConstantNode *makeConstantStr( ConstantNode::Type type, std::string *str );
 
 class VarRefNode : public ExpressionNode {
@@ -284 +284 @@
         virtual void printOneLine( std::ostream &, int indent = 0) const;
 
-        const std::list< std::string > &get_labels() const { return labels; };
+        const std::list< Label > &get_labels() const { return labels; };
         void append_label( std::string *label ) { labels.push_back( *label ); delete label; }
   private:
-        std::list< std::string > labels;
+        std::list< Label > labels;
 };
 
@@ -481 +481 @@
         void setCatchRest( bool newVal ) { isCatchRest = newVal; }
 
-        bool get_extension() const { return extension; }
-        StatementNode *set_extension( bool exten ) { extension = exten; return this; }
-
         std::string get_target() const;
 
@@ -502 +499 @@
         DeclarationNode *decl;
         bool isCatchRest;
-        bool extension = false;
 }; // StatementNode
 
@@ -532 +528 @@
         ExpressionNode *output, *input;
         ConstantNode *clobber;
-        std::list<std::string> gotolabels;
+        std::list< Label > gotolabels;
 };