Merge pull request #594 from smeup/bugfix/LS24003774/unlimited-string…

…-duplications
smeup · Aug 14, 2024 · 58a4998 · 58a4998
2 parents bbe79d8 + 9fe1104
commit 58a4998
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 7 deletions.
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt
@@ -2224,6 +2224,7 @@ internal fun getProgramNameToCopyBlocks(): ProgramNameToCopyBlocks {
 }
 
 internal fun <T : AbstractDataDefinition> List<T>.removeDuplicatedDataDefinition(): List<T> {
+    // NOTE: With current logic when type matches on duplications the first definition wins
     val dataDefinitionMap = mutableMapOf<String, AbstractDataDefinition>()
     return removeUnnecessaryRecordFormat().filter {
         val dataDefinition = dataDefinitionMap[it.name]
@@ -2241,14 +2242,17 @@ internal fun <T : AbstractDataDefinition> List<T>.removeDuplicatedDataDefinition
 
 internal fun AbstractDataDefinition.matchType(dataDefinition: AbstractDataDefinition): Boolean {
     fun Type.matchType(other: Any?): Boolean {
-        if (this is NumberType && other is NumberType) {
-            val resultDigits = this.entireDigits == other.entireDigits && this.decimalDigits == other.decimalDigits
-            if (rpgType?.isNotBlank()!! && other.rpgType?.isNotEmpty()!!) {
-                return resultDigits && rpgType == other.rpgType
+        // TODO: Improve logic for StringType/UnlimitedStringType matching
+        return when {
+            this is NumberType && other is NumberType -> {
+                val resultDigits = this.entireDigits == other.entireDigits && this.decimalDigits == other.decimalDigits
+                if (rpgType?.isNotBlank()!! && other.rpgType?.isNotEmpty()!!) {
+                    return resultDigits && rpgType == other.rpgType
+                }
+                resultDigits
             }
-            return resultDigits
-        } else {
-            return this == other
+            this is UnlimitedStringType && other is StringType -> true
+            else -> this == other
         }
     }
 

diff --git a/...aInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT02ConstAndDSpecTest.kt b/...aInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT02ConstAndDSpecTest.kt
@@ -548,4 +548,10 @@ open class MULANGT02ConstAndDSpecTest : MULANGTTest() {
         val expected = listOf("ok")
         assertEquals(expected, "smeup/MUDRNRAPU00245".outputOf(configuration = smeupConfig))
     }
+
+    @Test
+    fun executeMUDRNRAPU00246() {
+        val expected = listOf("ok")
+        assertEquals(expected, "smeup/MUDRNRAPU00246".outputOf(configuration = smeupConfig))
+    }
 }
diff --git a/rpgJavaInterpreter-core/src/test/resources/smeup/MUDRNRAPU00246.rpgle b/rpgJavaInterpreter-core/src/test/resources/smeup/MUDRNRAPU00246.rpgle
@@ -0,0 +1,34 @@
+     D £DBG_Str        S             2
+
+     ********** PREPROCESSOR COPYSTART QILEGEN,£UIBDS
+     V* ==============================================================
+     V* MODIFICHE Ril.  T Au Descrizione
+     V* gg/mm/aa  nn.mm i xx Breve descrizione
+     V* ==============================================================
+     V* 10/05/21  V5R1    BONMAI Creazione
+     V* 18/05/24  V6R1    FORDAR Estensione
+     V* /COPY £UIBDS
+     V* ==============================================================
+      *--------------------------------------------------------------------------------------------*
+      *IF NOT DEFINED(UIBDS_INCLUDED)
+      *DEFINE UIBDS_INCLUDED
+     D £UIBDS          DS            10
+     D £UIBME                          0
+      *--------------------------------------------------------------------------------------------*
+     ********** PREPROCESSOR COPYEND QILEGEN,£UIBDS
+
+     DXUIBME           S                   LIKE(£UIBME)
+
+      *--------------------------------------------------------------*
+    RD*  Impostazioni iniziali
+      *--------------------------------------------------------------*
+     C     IMP0          BEGSR
+     C                   IF        %SUBST(£UIBME:1:3)='STA'
+     C                   MOVEL(P)  'STA'         XUIBME           10
+     C                   ELSE
+     C                   MOVEL(P)  £UIBME        XUIBME           10
+     C                   ENDIF
+     C                   ENDSR
+
+     C                   EVAL      £DBG_Str='ok'
+     C     £DBG_Str      DSPLY