Revert lastFound logic on %LOOKUP

smeup · Dec 11, 2024 · d4507ec · d4507ec
1 parent 17134ce
commit d4507ec
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/...aInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/ExpressionEvaluation.kt b/...aInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/ExpressionEvaluation.kt
@@ -261,19 +261,14 @@ class ExpressionEvaluation(
     }
 
     override fun eval(expression: LookupExpr): Value = proxyLogging(expression) {
-        val result = lookup(
+        lookup(
             array = expression.array.evalWith(this) as ArrayValue,
             arrayType = expression.array.type() as ArrayType,
             searchedValue = expression.searchedValued.evalWith(this),
             start = expression.start?.evalWith(this)?.asInt(),
             length = expression.length?.evalWith(this)?.asInt(),
             operator = ComparisonOperator.EQ
         )
-
-        // %LOOKUP is relevant for %FOUND
-        interpreterStatus.lastFound = result != IntValue.ZERO
-
-        result
     }
 
     override fun eval(expression: LookupGtExpr): Value = proxyLogging(expression) {

diff --git a/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT10BaseCodopTest.kt b/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT10BaseCodopTest.kt
@@ -847,7 +847,7 @@ open class MULANGT10BaseCodopTest : MULANGTTest() {
      */
     @Test
     fun executeMUDRNRAPU00280() {
-        val expected = listOf("1", "0", "1", "0")
+        val expected = listOf("1", "0")
         assertEquals(expected, "smeup/MUDRNRAPU00280".outputOf(configuration = smeupConfig))
     }
 }
diff --git a/rpgJavaInterpreter-core/src/test/resources/smeup/MUDRNRAPU00280.rpgle b/rpgJavaInterpreter-core/src/test/resources/smeup/MUDRNRAPU00280.rpgle
@@ -19,13 +19,5 @@
      C     'FOO'         LOOKUP    ARY                                    26
      C                   EVAL      FND=%FOUND
      C     FND           DSPLY
-     C* Lookup expression found
-     C                   EVAL      RESULT=%LOOKUP('ABC':ARY)
-     C                   EVAL      FND=%FOUND
-     C     FND           DSPLY
-     C* Lookup expression not found
-     C                   EVAL      RESULT=%LOOKUP('FOO':ARY)
-     C                   EVAL      FND=%FOUND
-     C     FND           DSPLY
 
      C                   SETON                                        RT