durable_rules 0.34.34 → 0.34.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23a2b69698c386b592b25d31c9047e011bafa47
-  data.tar.gz: 82c5f1f4a37e88c0e4a6ff60364bb93cb735a812
+  metadata.gz: d4dac8eb12717b1ab1df781c340385dd775089e2
+  data.tar.gz: 203c76635664dfbcabac912ac74093c3a0b5677a
 SHA512:
-  metadata.gz: 6d2156f08e81ac88bbc2ed931780e0d7f558af066484e8c2f7c1d1dac143b770ef2b4d4da8bcd0f7a6119b9dfa1e80e8c14ad6ff8b471bb520924973ae66a759
-  data.tar.gz: 4ddda7262500bd9f504766f62f1880e14380612718c43243ae88416a8d5d8eef5b9a63e99ac905252c8c9a44214daf62bea8c24a36c3aa59e7b483cdb71f26df
+  metadata.gz: 5f2c2d3e579ad6d486a4c71879baafb6879260c88b80652600c7de7f061fbdb8c4491e2a4facc9331b16709b2de737893a7f0cc95921bd411a56d3a1e5d9ea9f
+  data.tar.gz: c22086988ac401f2f2a3502dac8151d63e5c02128108325dc4e01b3ec9a4427b9edc67aadff855d8a580a7cee62de0e462c7ff43e0c03811fc0a6f21b8fcb720

data/src/rules/regex.c

@@ -900,7 +900,7 @@ static unsigned int ensureState(unsigned short *id,
                                 unsigned short stateListLength, 
                                 state **newState) {
     CREATE_STATE(id, newState);
-    unsigned short dotTransitions = 0;
+    unsigned short cancelSpecificTransitions = 0;
     for (unsigned short i = 0; i < stateListLength; ++i) {
         state *targetState = list[i];
         for (unsigned short ii = 0; ii < targetState->transitionsLength; ++ii) {
@@ -910,8 +910,8 @@ static unsigned int ensureState(unsigned short *id,
                 return result;
             }
 
-            if (targetTransition->symbol == REGEX_DOT) {
-                ++dotTransitions;
+            if (targetTransition->symbol == REGEX_DOT && targetState->isAccept) {
+                cancelSpecificTransitions = 1;
             }
         }
 
@@ -928,10 +928,9 @@ static unsigned int ensureState(unsigned short *id,
         }        
     }
 
-    // when merging two states results in two or more dot transitions
-    // all specific transitions are cancelled, this allows for the
-    // first match to succeed.
-    if (dotTransitions > 1) {
+    // if the current state has any dot transitions to accept states
+    // then all specific transitions are cancelled, this allows for the first match to succeed.
+    if (cancelSpecificTransitions) {
         for (unsigned short i = 0; i < (*newState)->transitionsLength; ++i) {
             transition *currentTransition = &(*newState)->transitions[i];
             if (currentTransition->symbol != REGEX_DOT) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.34
+  version: 0.34.35
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake