durable_rules 2.0.21 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc03b88548e96951b82c22fe1ddf28d275130f79
-  data.tar.gz: da5f07e4f707e4aa68fa73077f023bb4dd046c97
+  metadata.gz: ea83e9efc9d1e06b799a9408e24dc95126cadcdc
+  data.tar.gz: 9334d4fb5bbe5c97d8e46cf00a624adcd782af86
 SHA512:
-  metadata.gz: 4c204fd504883152da43e0f6586fea6ed1898b1200b0844b4e9d0e80cc2dcd261dd1e9f25d9627c79c8d3c709806d97743bf4b0fcaa561a1231167ed771793f0
-  data.tar.gz: d698a703e5e87fe9d3e478ad8e416ebe2c2ac8f1fa038f2856c3ca0dc532db8555a63bc5b2cf6d25e98dadbdb6fbbd64bbba34fe09c7aef83c449b9256845ee1
+  metadata.gz: 9240234e76cf597c487320d53ec9ebe9ba9a7ba65a0f64a685de3eb2b037457a11eb89fd61eca7dc4135aa473ae86dc92aebea8eb941d504270c4de29416e974
+  data.tar.gz: 1056a380df74c2a30b266d33a09c6745bcd41b1b255e2f6a9628fb5c5d30db65c83606b45e7758d679f36a50026a9ea1ba98c94a308f51a323ace387ee3fd68e

data/src/rules/events.c

@@ -1000,7 +1000,7 @@ static unsigned int handleDeleteMessage(ruleset *tree,
                                         stateNode *state,
                                         char *mid,
                                         unsigned int messageOffset) {
-    unsigned int result;
+    unsigned int result = RULES_OK;
     unsigned int count = 0;
     unsigned int i = 1;
     messageNode *message = MESSAGE_NODE(state, messageOffset);
@@ -1340,15 +1340,22 @@ static unsigned int handleMatchFrames(ruleset *tree,
         }
     }
 
-    if(currentNode->value.b.gateType == GATE_OR && !currentNode->value.b.expressionSequence.length) {
-        return handleBetaFrame(tree,
-                               state,
-                               currentMessageOffset,
-                               currentNode, 
-                               nextNode,
-                               NULL,
-                               NULL,
-                               sideEffect);   
+    if(currentNode->value.b.gateType == GATE_OR) {
+        if (currentNode->value.b.expressionSequence.length == 0 ||
+            (currentNode->value.b.expressionSequence.length == 2 && 
+                currentNode->value.b.expressionSequence.expressions[1].operator == OP_END &&
+                    (currentNode->value.b.expressionSequence.expressions[0].operator == OP_AND || 
+                        currentNode->value.b.expressionSequence.expressions[0].operator == OP_OR))) {
+        
+            return handleBetaFrame(tree,
+                                   state,
+                                   currentMessageOffset,
+                                   currentNode, 
+                                   nextNode,
+                                   NULL,
+                                   NULL,
+                                   sideEffect);   
+        }
     }
 
     return RULES_OK;

data/src/rules/rete.h

@@ -1,6 +1,6 @@
 #include "state.h"
 
-//#define _PRINT 1
+// #define _PRINT 1
 
 #define OP_NOP 0
 #define OP_LT 0x01

data/src/rules/state.c

@@ -780,7 +780,7 @@ unsigned int storeMessage(void *tree,
 
     ruleset *rulesetTree = (ruleset*)tree;
     if (sideEffect && rulesetTree->storeMessageCallback) {
-        unsigned char actionType;
+        unsigned char actionType = ACTION_ASSERT_EVENT;
         switch (messageType) {
             case MESSAGE_TYPE_EVENT:
                 actionType = ACTION_ASSERT_EVENT;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.22
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake