Changed FilterNode and HeaderIndexNode to inherit from IndexNode

P4-ACMMMRW · May 1, 2024 · cbf5300 · cbf5300
1 parent c587940
commit cbf5300
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/include/src/ast/nodes/AllNodeIncludes.hpp b/include/src/ast/nodes/AllNodeIncludes.hpp
@@ -36,7 +36,6 @@
 #include <ProgNode.hpp>
 #include <ReturnNode.hpp>
 #include <TableNode.hpp>
-#include <UnaryExprNode.hpp>
 #include <UnionExprNode.hpp>
 #include <WhileNode.hpp>
 

diff --git a/include/src/ast/nodes/FilterNode.hpp b/include/src/ast/nodes/FilterNode.hpp
@@ -1,11 +1,11 @@
 #ifndef FILTERNODE_HPP
 #define FILTERNODE_HPP
 
-#include <BinaryNode.hpp>
+#include <IndexNode.hpp>
 
-class FilterNode : public BinaryNode {
+class FilterNode : public IndexNode {
    public:
-    FilterNode(std::shared_ptr<AstNode> parent) : BinaryNode(std::move(parent)) {}
+    FilterNode(std::shared_ptr<AstNode> parent) : IndexNode(std::move(parent)) {}
 
     void accept(std::shared_ptr<AstVisitor> visitor) override {
         visitor->visit(std::static_pointer_cast<FilterNode>(shared_from_this()));

diff --git a/include/src/ast/nodes/HeaderIndexNode.hpp b/include/src/ast/nodes/HeaderIndexNode.hpp
@@ -1,11 +1,11 @@
 #ifndef HEADERINDEXNODE_HPP
 #define HEADERINDEXNODE_HPP
 
-#include <BinaryNode.hpp>
+#include <IndexNode.hpp>
 
-class HeaderIndexNode : public BinaryNode {
+class HeaderIndexNode : public IndexNode {
    public:
-    HeaderIndexNode(std::shared_ptr<AstNode> parent) : BinaryNode(std::move(parent)) {}
+    HeaderIndexNode(std::shared_ptr<AstNode> parent) : IndexNode(std::move(parent)) {}
 
     void accept(std::shared_ptr<AstVisitor> visitor) override {
         visitor->visit(std::static_pointer_cast<HeaderIndexNode>(shared_from_this()));

diff --git a/tests/ast/ReplaceWithParserTest.cpp b/tests/ast/ReplaceWithParserTest.cpp
@@ -26,30 +26,30 @@ AST_TEST("replace_with.dpl") {
         DplParser::RuleAssignstm,
         DplLexer::Identifier,
         DplParser::RuleUnaryexpr,
-        DplLexer::None,
         DplParser::RuleHeaderindex,
-        DplLexer::String,
         DplLexer::Identifier,
+        DplLexer::String,
+        DplLexer::None,
         DplParser::RuleAssignstm,
         DplParser::RuleHeaderindex,
-        DplLexer::String,
         DplLexer::Identifier,
+        DplLexer::String,
         DplParser::RuleMultexpr,
         DplParser::RuleHeaderindex,
-        DplLexer::String,
         DplLexer::Identifier,
-        DplParser::RuleHeaderindex,
         DplLexer::String,
+        DplParser::RuleHeaderindex,
         DplLexer::Identifier,
+        DplLexer::String,
         DplParser::RuleAssignstm,
         DplLexer::Identifier,
         DplParser::RuleHeaderindex,
-        DplLexer::String,
         DplParser::RuleUnaryexpr,
-        DplLexer::None,
         DplParser::RuleHeaderindex,
-        DplLexer::String,
         DplLexer::Identifier,
+        DplLexer::String,
+        DplLexer::None,
+        DplLexer::String,
         DplParser::RuleProccall,
         DplLexer::Identifier,
         DplLexer::Identifier,