Changeset dc3fbe5 for src/Parser/ParseNode.h

Timestamp:

Feb 27, 2024, 12:28:58 PM (5 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

924534e

Parents:

4c0b674

Message:

Factored out the ParseNode?'s next field into a new child type. This is only type safe when used in the given one level curiously reoccurring template pattern, as it is now. This allowed most of the intermedate helpers to be removed.

File:

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

src/Parser/ParseNode.h

@@ -33 +33 @@
 
 struct DeclarationNode;
-class InitializerNode;
-class ExpressionNode;
+struct InitializerNode;
+struct ExpressionNode;
 struct StatementNode;
 
@@ -45 +45 @@
 extern YYLTYPE yylloc;
 
-class ParseNode {
-  public:
-        ParseNode() {};
-        virtual ~ParseNode() { delete next; };
+struct ParseNode {
+        ParseNode() {}
+        virtual ~ParseNode() {}
         virtual ParseNode * clone() const = 0;
 
-        ParseNode * get_next() const { return next; }
-        ParseNode * set_next( ParseNode * newlink ) { next = newlink; return this; }
+        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
 
-        ParseNode * get_last() {
-                ParseNode * current;
-                for ( current = this; current->get_next() != nullptr; current = current->get_next() );
+        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_next() const { return next; }
+        void set_next( Next * newlink ) { next = newlink; }
+
+        Next * get_last() {
+                Next * current = static_cast<Next *>( this );
+                while ( current->next != nullptr ) current = current->next;
                 return current;
         }
-        ParseNode * set_last( ParseNode * newlast ) {
-                if ( newlast != nullptr ) get_last()->set_next( newlast );
-                return this;
+        Next * set_last( Next * newlast ) {
+                if ( newlast != nullptr ) get_last()->next = newlast;
+                return static_cast<Next *>( 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 );
@@ -70 +82 @@
         }
 
-        static int indent_by;
-
-        ParseNode * next = nullptr;
-        CodeLocation location = yylloc;
-}; // ParseNode
+        Next * next = nullptr;
+};
 
 // Must harmonize with OperName.