renamed condition_node_visitor to criteria_visitor.hpp and condition_operators to criteria_operators

src/CMakeLists.txt

@@ -1,10 +1,11 @@
 SET(SOURCE
+  ../include/matador/criteria/abstract_criteria.hpp
   ../include/matador/criteria/between_criteria.hpp
   ../include/matador/criteria/collection_criteria.hpp
   ../include/matador/criteria/column.hpp
-  ../include/matador/criteria/condition_node_visitor.hpp
-  ../include/matador/criteria/condition_operators.hpp
-  ../include/matador/criteria/abstract_criteria.hpp
+  ../include/matador/criteria/criteria.hpp
+  ../include/matador/criteria/criteria_operators.hpp
+  ../include/matador/criteria/criteria_visitor.hpp
   ../include/matador/criteria/like_criteria.hpp
   ../include/matador/criteria/logical_criteria.hpp
   ../include/matador/criteria/types.hpp
@@ -13,11 +14,10 @@ SET(SOURCE
   criteria/binary_criteria.cpp
   criteria/collection_criteria.cpp
   criteria/column.cpp
-  criteria/condition_operators.cpp
+  criteria/criteria_operators.cpp
   criteria/like_criteria.cpp
   criteria/logical_criteria.cpp
   criteria/not_criteria.cpp
-  ../include/matador/criteria/criteria.hpp
 )
 
 add_library(matador-criteria STATIC ${SOURCE})

src/criteria/between_criteria.cpp

@@ -1,6 +1,6 @@
 #include "matador/criteria/between_criteria.hpp"
 
-#include "matador/criteria/condition_node_visitor.hpp"
+#include "matador/criteria/criteria_visitor.hpp"
 
 namespace matador::criteria {
 between_criteria::between_criteria( column column, value min, value max )
@@ -9,7 +9,7 @@ between_criteria::between_criteria( column column, value min, value max )
 , max_(std::move(max))
 {}
 
-void between_criteria::accept( condition_node_visitor& visitor ) const {
+void between_criteria::accept( criteria_visitor& visitor ) const {
     visitor.visit(*this);
 }
 }

src/criteria/binary_criteria.cpp

@@ -1,6 +1,6 @@
 #include "matador/criteria/binary_criteria.hpp"
 
-#include "matador/criteria/condition_node_visitor.hpp"
+#include "matador/criteria/criteria_visitor.hpp"
 
 namespace matador::criteria {
 binary_criteria::binary_criteria( column column, const binary_operator operator_, value value )
@@ -9,7 +9,7 @@ binary_criteria::binary_criteria( column column, const binary_operator operator_
 , value_(std::move(value))
 {}
 
-void binary_criteria::accept( condition_node_visitor& visitor ) const {
+void binary_criteria::accept( criteria_visitor& visitor ) const {
     visitor.visit(*this);
 }
 }

src/criteria/collection_criteria.cpp

@@ -1,6 +1,6 @@
 #include "matador/criteria/collection_criteria.hpp"
 
-#include "matador/criteria/condition_node_visitor.hpp"
+#include "matador/criteria/criteria_visitor.hpp"
 
 namespace matador::criteria {
 collection_criteria::collection_criteria( column col, collection_operator operator_, std::vector<value> values )
@@ -15,7 +15,7 @@ collection_criteria::collection_criteria(column col, const collection_operator o
 , values_(values)
 {}
 
-void collection_criteria::accept( condition_node_visitor& visitor ) const {
+void collection_criteria::accept( criteria_visitor& visitor ) const {
     visitor.visit(*this);
 }
 }

src/criteria/criteria_operators.cpp

@@ -1,4 +1,4 @@
-#include "matador/criteria/condition_operators.hpp"
+#include "matador/criteria/criteria_operators.hpp"
 
 #include "matador/criteria/between_criteria.hpp"
 #include "matador/criteria/like_criteria.hpp"
@@ -6,23 +6,23 @@
 #include "matador/criteria/not_criteria.hpp"
 
 namespace matador::criteria {
-condition_node_ptr operator&&(condition_node_ptr left, condition_node_ptr right) {
+criteria_ptr operator&&(criteria_ptr left, criteria_ptr right) {
     return std::make_unique<logical_criteria>(std::move(left), logical_operator::AND, std::move(right));
 }
 
-condition_node_ptr operator||(condition_node_ptr left, condition_node_ptr right) {
+criteria_ptr operator||(criteria_ptr left, criteria_ptr right) {
     return std::make_unique<logical_criteria>(std::move(left), logical_operator::OR, std::move(right));
 }
 
-condition_node_ptr operator!(condition_node_ptr cond) {
-    return std::make_unique<not_criteria>(std::move(cond));
+criteria_ptr operator!(criteria_ptr clause) {
+    return std::make_unique<not_criteria>(std::move(clause));
 }
 
-condition_node_ptr between(const column &col, value min, value max) {
+criteria_ptr between(const column &col, value min, value max) {
     return std::make_unique<between_criteria>(col, std::move(min), std::move(max));
 }
 
-condition_node_ptr like(const column &col, const std::string &pattern) {
+criteria_ptr like(const column &col, const std::string &pattern) {
     return std::make_unique<like_criteria>(col, pattern);
 }
 }

src/criteria/like_criteria.cpp

@@ -1,13 +1,13 @@
 #include "matador/criteria/like_criteria.hpp"
 
-#include "matador/criteria/condition_node_visitor.hpp"
+#include "matador/criteria/criteria_visitor.hpp"
 
 namespace matador::criteria {
 like_criteria::like_criteria(column column, std::string pattern)
 : column_(std::move(column))
 , pattern_(std::move(pattern)){}
 
-void like_criteria::accept(condition_node_visitor &visitor) const {
+void like_criteria::accept(criteria_visitor &visitor) const {
   visitor.visit(*this);
 }
 }

src/criteria/logical_criteria.cpp

@@ -1,15 +1,15 @@
 #include "matador/criteria/logical_criteria.hpp"
 
-#include "matador/criteria/condition_node_visitor.hpp"
+#include "matador/criteria/criteria_visitor.hpp"
 
 namespace matador::criteria {
-logical_criteria::logical_criteria( condition_node_ptr left, const logical_operator op, condition_node_ptr right )
-: left_(std::move(left))
-, op_(op)
-, right_(std::move(right))
+logical_criteria::logical_criteria( criteria_ptr left, const logical_operator op, criteria_ptr right )
+: left_criteria_(std::move(left))
+, operand_(op)
+, right_criteria_(std::move(right))
 {}
 
-void logical_criteria::accept(condition_node_visitor& visitor) const {
+void logical_criteria::accept(criteria_visitor& visitor) const {
     visitor.visit(*this);
 }
 }

src/criteria/not_criteria.cpp

@@ -1,13 +1,13 @@
 #include "matador/criteria/not_criteria.hpp"
 
-#include "matador/criteria/condition_node_visitor.hpp"
+#include "matador/criteria/criteria_visitor.hpp"
 
 namespace matador::criteria {
-not_criteria::not_criteria(condition_node_ptr condition)
-: condition_(std::move(condition))
+not_criteria::not_criteria(criteria_ptr clause)
+: criteria_(std::move(clause))
 {}
 
-void not_criteria::accept( condition_node_visitor& visitor ) const {
+void not_criteria::accept( criteria_visitor& visitor ) const {
     visitor.visit(*this);
 }
 }