Fix Reg Ex bug

JMRI · Jun 10, 2021 · acd22b7 · acd22b7
1 parent 809eacd
commit acd22b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/java/src/jmri/jmrit/logixng/expressions/ExpressionLocalVariable.java b/java/src/jmri/jmrit/logixng/expressions/ExpressionLocalVariable.java
@@ -337,6 +337,9 @@ public boolean evaluate() {
             case LocalVariable:
                 otherValue = TypeConversionUtil.convertToString(getConditionalNG().getSymbolTable().getValue(_otherLocalVariable), false);
                 break;
+            case RegEx:
+                // Do nothing
+                break;
             default:
                 throw new IllegalArgumentException("_compareTo has unknown value: "+_compareTo.name());
         }
@@ -364,11 +367,11 @@ public boolean evaluate() {
                 break;
 
             case MatchRegex:
-                result = matchRegex(variableValue, otherValue);
+                result = matchRegex(variableValue, _regEx);
                 break;
 
             case NotMatchRegex:
-                result = !matchRegex(variableValue, otherValue);
+                result = !matchRegex(variableValue, _regEx);
                 break;
 
             default:

diff --git a/java/src/jmri/jmrit/logixng/expressions/ExpressionMemory.java b/java/src/jmri/jmrit/logixng/expressions/ExpressionMemory.java
@@ -366,6 +366,9 @@ public boolean evaluate() {
             case LocalVariable:
                 otherValue = TypeConversionUtil.convertToString(getConditionalNG().getSymbolTable().getValue(_localVariable), false);
                 break;
+            case RegEx:
+                // Do nothing
+                break;
             default:
                 throw new IllegalArgumentException("_compareTo has unknown value: "+_compareTo.name());
         }
@@ -393,11 +396,11 @@ public boolean evaluate() {
                 break;
 
             case MatchRegex:
-                result = matchRegex(memoryValue, otherValue);
+                result = matchRegex(memoryValue, _regEx);
                 break;
 
             case NotMatchRegex:
-                result = !matchRegex(memoryValue, otherValue);
+                result = !matchRegex(memoryValue, _regEx);
                 break;
 
             default: