Changes in src/Parser/ParseNode.h [44adf1b:5bf685f]

File:

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

src/Parser/ParseNode.h

@@ -33 +33 @@
 
 struct DeclarationNode;
-struct InitializerNode;
-struct ExpressionNode;
+class InitializerNode;
+class ExpressionNode;
 struct StatementNode;
 
@@ -45 +45 @@
 extern YYLTYPE yylloc;
 
-struct ParseNode {
-        ParseNode() {}
-        virtual ~ParseNode() {}
+class ParseNode {
+  public:
+        ParseNode() {};
+        virtual ~ParseNode() { delete next; delete name; };
         virtual ParseNode * clone() const = 0;
 
-        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
+        ParseNode * get_next() const { return next; }
+        ParseNode * set_next( ParseNode * newlink ) { next = newlink; return this; }
 
-        static int indent_by;
-
-        CodeLocation location = yylloc;
-}; // ParseNode
-
-/// Only ever use in the form `struct NAME final : public ParseList<NAME>`!
-template<typename Next>
-struct ParseList : public ParseNode {
-        ParseList() {}
-        virtual ~ParseList() { delete next; };
-        virtual ParseList<Next> * clone() const = 0;
-
-        Next * get_last() {
-                Next * current = static_cast<Next *>( this );
-                while ( current->next != nullptr ) current = current->next;
+        ParseNode * get_last() {
+                ParseNode * current;
+                for ( current = this; current->get_next() != nullptr; current = current->get_next() );
                 return current;
         }
-        Next * set_last( Next * newlast ) {
-                if ( newlast != nullptr ) get_last()->next = newlast;
-                return static_cast<Next *>( this );
+        ParseNode * set_last( ParseNode * newlast ) {
+                if ( newlast != nullptr ) get_last()->set_next( newlast );
+                return this;
         }
 
+        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
         virtual void printList( std::ostream & os, int indent = 0 ) const {
                 print( os, indent );
@@ -79 +70 @@
         }
 
-        Next * next = nullptr;
-};
+        static int indent_by;
+
+        ParseNode * next = nullptr;
+        const std::string * name = nullptr;
+        CodeLocation location = yylloc;
+}; // ParseNode
 
 // Must harmonize with OperName.