Refactoring: renames Rule to RuleWithOperator

Author: zimmerle

headers/modsecurity/actions/action.h

@@ -31,7 +31,7 @@
 
 namespace modsecurity {
 class Transaction;
-class Rule;
+class RuleWithOperator;
 class RuleWithActions;
 
 namespace actions {

headers/modsecurity/modsecurity.h

@@ -229,7 +229,7 @@ namespace modsecurity {
 namespace actions {
 class Action;
 }
-class Rule;
+class RuleWithOperator;
 
 #ifdef __cplusplus
 extern "C" {

headers/modsecurity/rule.h

@@ -216,16 +216,16 @@ class RuleWithActions : public RuleBase {
 };
 
 
-class Rule : public RuleWithActions {
+class RuleWithOperator : public RuleWithActions {
  public:
-    Rule(operators::Operator *op,
+    RuleWithOperator(operators::Operator *op,
         variables::Variables *variables,
         std::vector<actions::Action *> *actions,
         Transformations *transformations,
         std::unique_ptr<std::string> fileName,
         int lineNumber);
 
-    virtual ~Rule();
+    virtual ~RuleWithOperator();
 
     bool evaluate(Transaction *transaction,
         std::shared_ptr<RuleMessage> rm) override;
@@ -250,8 +250,8 @@ class Rule : public RuleWithActions {
         return std::to_string(m_ruleId);
     }
 
-    std::unique_ptr<Rule> m_chainedRuleChild;
-    Rule *m_chainedRuleParent;
+    std::unique_ptr<RuleWithOperator> m_chainedRuleChild;
+    RuleWithOperator *m_chainedRuleParent;
 
  private:
     modsecurity::variables::Variables *m_variables;

headers/modsecurity/rule_message.h

@@ -41,7 +41,7 @@ class RuleMessage {
         ClientLogMessageInfo = 4
     };
 
-    explicit RuleMessage(Rule *rule, Transaction *trans) :
+    explicit RuleMessage(RuleWithOperator *rule, Transaction *trans) :
         m_accuracy(rule->m_accuracy),
         m_clientIpAddress(trans->m_clientIpAddress),
         m_data(""),
@@ -103,7 +103,7 @@ class RuleMessage {
     int m_phase;
     std::string m_reference;
     std::string m_rev;
-    Rule *m_rule;
+    RuleWithOperator *m_rule;
     std::shared_ptr<std::string> m_ruleFile;
     int m_ruleId;
     int m_ruleLine;

headers/modsecurity/rules.h

@@ -48,7 +48,7 @@ class Rules {
     int append(Rules *from, const std::vector<int64_t> &ids, std::ostringstream *err) {
          size_t j = 0;
          for (; j < from->size(); j++) {
-            Rule *rule = dynamic_cast<Rule *>(from->at(j).get());
+            RuleWithOperator *rule = dynamic_cast<RuleWithOperator *>(from->at(j).get());
             if (rule && std::binary_search(ids.begin(), ids.end(), rule->m_ruleId)) {
                  if (err != NULL) {
                      *err << "Rule id: " << std::to_string(rule->m_ruleId) \
@@ -66,8 +66,8 @@ class Rules {
     }
 
     bool insert(std::shared_ptr<RuleBase> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
-        Rule *r = dynamic_cast<Rule *>(rule.get());
-        if (ids != nullptr && std::binary_search(ids->begin(), ids->end(), r->m_ruleId)) {
+        RuleWithOperator *r = dynamic_cast<RuleWithOperator *>(rule.get());
+        if (r && ids != nullptr && std::binary_search(ids->begin(), ids->end(), r->m_ruleId)) {
             if (err != nullptr) {
                 *err << "Rule id: " << std::to_string(r->m_ruleId) \
                     << " is duplicated" << std::endl;

headers/modsecurity/rules_set.h

@@ -37,7 +37,7 @@
 #ifdef __cplusplus
 
 namespace modsecurity {
-class Rule;
+class RuleWithOperator;
 namespace Parser {
 class Driver;
 }

headers/modsecurity/rules_set_phases.h

@@ -34,7 +34,10 @@
 #ifdef __cplusplus
 
 namespace modsecurity {
-class Rule;
+class RuleWithOperator;
+namespace Parser {
+class Driver;
+}
 
 /** @ingroup ModSecurity_CPP_API */
 class RulesSetPhases {

src/actions/capture.h

@@ -22,7 +22,7 @@
 
 
 namespace modsecurity {
-class Rule;
+class RuleWithOperator;
 namespace actions {
 
 

src/actions/chain.h

@@ -25,7 +25,7 @@ class Transaction;
 
 namespace modsecurity {
 class Transaction;
-class Rule;
+class RuleWithOperator;
 
 namespace actions {
 

src/actions/disruptive/allow.h

@@ -25,7 +25,7 @@ class Transaction;
 
 namespace modsecurity {
 class Transaction;
-class Rule;
+class RuleWithOperator;
 
 namespace actions {
 namespace disruptive {