Merge branch 'develop' into feature/LS24002651/implements-douxx

lanarimarco · web-flow · commit aa07b0a2a738 · 2024-05-23T10:01:34.000+02:00
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/compile_time_interpreter.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/compile_time_interpreter.kt
@@ -154,6 +154,12 @@ open class BaseCompileTimeInterpreter(
     private fun findSize(statements: List<RpgParser.StatementContext>, declName: String, conf: ToAstConfiguration, innerBlock: Boolean = true): Int? {
         statements.forEach {
             when {
+                it.fspec_fixed() != null -> {
+                    val size = it.fspec_fixed().runParserRuleContext(conf) { context ->
+                        kotlin.runCatching { context.toAst(conf).let { fileDefinition -> fileDefinition.toDataDefinitions() } }.getOrNull()
+                    }?.find { dataDefinition -> dataDefinition.name.equals(declName, ignoreCase = true) }?.elementSize()
+                    if (size != null) return size
+                }
                 it.dspec() != null -> {
                     val name = it.dspec().ds_name()?.text ?: it.dspec().dspecConstant().ds_name()?.text
                     if (declName.equals(name, ignoreCase = true)) {
@@ -234,6 +240,12 @@ open class BaseCompileTimeInterpreter(
         statements
             .forEach { it ->
                 when {
+                    it.fspec_fixed() != null -> {
+                        val type = it.fspec_fixed().runParserRuleContext(conf) { context ->
+                            kotlin.runCatching { context.toAst(conf).let { fileDefinition -> fileDefinition.toDataDefinitions() } }.getOrNull()
+                        }?.find { dataDefinition -> dataDefinition.name.equals(declName, ignoreCase = true) }?.type
+                        if (type != null) return type
+                    }
                     it.dcl_ds() != null -> {
                         val type = it.dcl_ds().parm_fixed().find { it.ds_name().text.equals(declName, ignoreCase = true) }?.findType(conf)
                         if (type != null) return type
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/serialization.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/serialization.kt
@@ -101,6 +101,7 @@ private val modules = SerializersModule {
         subclass(SubStmt::class)
         subclass(SubstStmt::class)
         subclass(TagStmt::class)
+        subclass(TestnStmt::class)
         subclass(TimeStmt::class)
         subclass(UnlockStmt::class)
         subclass(UpdateStmt::class)
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/statements.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/statements.kt
@@ -2386,4 +2386,47 @@ data class BitOffStmt(
 ) : Statement(position), StatementThatCanDefineData, MockStatement {
     override fun execute(interpreter: InterpreterCore) { }
     override fun dataDefinition(): List<InStatementDataDefinition> = dataDefinition?.let { listOf(it) } ?: emptyList()
+}
+
+@Serializable
+data class TestnStmt(
+    var expression: Expression,
+    @Derived val dataDefinition: InStatementDataDefinition? = null,
+    val rightIndicators: WithRightIndicators,
+    override val position: Position? = null
+
+) :
+    Statement(position), StatementThatCanDefineData, WithRightIndicators by rightIndicators {
+    override val loggableEntityName: String
+        get() = "TESTN"
+
+    override fun dataDefinition(): List<InStatementDataDefinition> {
+        if (dataDefinition != null) {
+            return listOf(dataDefinition)
+        }
+        return emptyList()
+    }
+
+    override fun execute(interpreter: InterpreterCore) {
+        if (expression.type() !is StringType) {
+            throw UnsupportedOperationException("The result expression is not a String type")
+        }
+        val valStr = (interpreter.eval(expression) as StringValue).value
+        val regex = "-?[0-9]+(\\.[0-9]+)?".toRegex()
+        val isNumeric = valStr.matches(regex)
+
+        if (isNumeric) {
+            interpreter.setIndicators(this, BooleanValue.TRUE, BooleanValue.FALSE, BooleanValue.FALSE)
+        } else {
+            if (valStr.trim().isEmpty()) {
+                interpreter.setIndicators(this, BooleanValue.FALSE, BooleanValue.FALSE, BooleanValue.TRUE)
+            } else {
+                if (valStr.startsWith(" ")) {
+                    interpreter.setIndicators(this, BooleanValue.FALSE, BooleanValue.TRUE, BooleanValue.FALSE)
+                } else {
+                    interpreter.setIndicators(this, BooleanValue.FALSE, BooleanValue.FALSE, BooleanValue.FALSE)
+                }
+            }
+        }
+    }
 }
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
@@ -155,7 +155,7 @@ private fun MutableMap<String, DataDefinition>.addIfNotPresent(dataDefinition: D
         dataDefinition.error("${dataDefinition.name} has been defined twice")
 }
 
-private fun FileDefinition.toDataDefinitions(): List<DataDefinition> {
+internal fun FileDefinition.toDataDefinitions(): List<DataDefinition> {
     val dataDefinitions = mutableListOf<DataDefinition>()
     val reloadConfig = MainExecutionContext.getConfiguration()
         .reloadConfig ?: error("Not found metadata for $this because missing property reloadConfig in configuration")
@@ -934,6 +934,9 @@ internal fun Cspec_fixed_standardContext.toAst(conf: ToAstConfiguration = ToAstC
         this.csBITOFF() != null -> this.csBITOFF()
             .let { it.cspec_fixed_standard_parts().validate(stmt = it.toAst(conf), conf = conf) }
 
+        this.csTESTN() != null -> this.csTESTN()
+            .let { it.cspec_fixed_standard_parts().validate(stmt = it.toAst(conf), conf = conf) }
+
         else -> todo(conf = conf)
     }
 }
@@ -2018,6 +2021,14 @@ internal fun CsUNLOCKContext.toAst(conf: ToAstConfiguration = ToAstConfiguration
     return UnlockStmt(position)
 }
 
+internal fun CsTESTNContext.toAst(conf: ToAstConfiguration = ToAstConfiguration()): TestnStmt {
+    val position = toPosition(conf.considerPosition)
+    val resultExpression = this.cspec_fixed_standard_parts().resultExpression(conf) as AssignableExpression
+    val result = this.cspec_fixed_standard_parts().result.text
+    val dataDefinition = this.cspec_fixed_standard_parts().toDataDefinition(result, position, conf)
+    return TestnStmt(resultExpression, dataDefinition, cspec_fixed_standard_parts().rightIndicators(), position)
+}
+
 // TODO
 internal fun CsFEODContext.toAst(conf: ToAstConfiguration = ToAstConfiguration()): Statement {
     val position = toPosition(conf.considerPosition)
diff --git a/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT02ConstAndDSpecTest.kt b/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT02ConstAndDSpecTest.kt
@@ -1,9 +1,31 @@
 package com.smeup.rpgparser.smeup
 
+import com.smeup.rpgparser.db.utilities.DBServer
+import com.smeup.rpgparser.smeup.dbmock.MULANGTLDbMock
 import org.junit.Test
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
 import kotlin.test.assertEquals
 
 open class MULANGT02ConstAndDSpecTest : MULANGTTest() {
+    @BeforeTest
+    override fun setUp() {
+        if (!DBServer.isRunning()) {
+            DBServer.startDB()
+        }
+
+        super.setUp()
+    }
+
+    @AfterTest()
+    override fun tearDown() {
+        /*
+         * This causes `connection exception: connection failure: java.net.SocketException: Pipe interrotta (Write failed)`
+         *  during `./gradle check`
+         */
+//        DBServer.stopDB()
+    }
+
     /**
      * /COPY recognized in CTDATA
      * @see #268
@@ -158,4 +180,21 @@ open class MULANGT02ConstAndDSpecTest : MULANGTTest() {
         val expected = listOf("A50_A14(A) A50_B14(ABCDEFGHIJ)")
         assertEquals(expected, "smeup/MU025014".outputOf(configuration = smeupConfig))
     }
+
+    /**
+     * Data definition not resolved for a specification that uses `LIKE` to a field from file. In addition,
+     *  there is a DS with an `%ELEM()` built-in function to that field.
+     * @see #LS24002645
+     */
+    @Test
+    fun executeMUDRNRAPU00101() {
+        MULANGTLDbMock().use {
+            com.smeup.rpgparser.db.utilities.execute(listOf(it.createTable(), it.populateTable()))
+            val expected = listOf("HELLO THERE")
+            assertEquals(
+                expected = expected,
+                "smeup/MUDRNRAPU00101".outputOf(configuration = smeupConfig)
+            )
+        }
+    }
 }
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
@@ -103,4 +103,13 @@ open class MULANGT10BaseCodopTest : MULANGTTest() {
         val expected = listOf("CALL(mod:inp   )")
         assertEquals(expected, "smeup/MU106011".outputOf())
     }
+
+    /**
+     * TESTN
+     */
+    @Test
+    fun executeMU102501() {
+        val expected = listOf("51=1,52=0,53=0")
+        assertEquals(expected, "smeup/MU102501".outputOf())
+    }
 }
diff --git a/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGTTest.kt b/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGTTest.kt
@@ -3,8 +3,10 @@ package com.smeup.rpgparser.smeup
 import com.smeup.dbnative.DBNativeAccessConfig
 import com.smeup.rpgparser.AbstractTest
 import com.smeup.rpgparser.execution.Configuration
+import com.smeup.rpgparser.execution.ConnectionConfig
 import com.smeup.rpgparser.execution.ReloadConfig
 import com.smeup.rpgparser.execution.SimpleReloadConfig
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 
 /**
@@ -14,21 +16,38 @@ import kotlin.test.BeforeTest
  * @see MULANGT60VideoTestCompiled see above
  */
 abstract class MULANGTTest : AbstractTest() {
-
     /**
      * The configuration used to execute some kind of tests, for example all test required files.
      * The required files are placed in the resources/smeup/metadata folder.
      */
     lateinit var smeupConfig: Configuration
 
     @BeforeTest
-    fun setUp() {
+    open fun setUp() {
         smeupConfig = Configuration()
         val path = javaClass.getResource("/smeup/metadata")!!.path
-        val reloadConfig = SimpleReloadConfig(metadataPath = path, connectionConfigs = listOf())
+        val connectionConfigs = listOf(ConnectionConfig(
+            fileName = "*",
+            url = "jdbc:hsqldb:hsql://127.0.0.1:9001/mainDb",
+            user = "SA",
+            password = "",
+            driver = "org.hsqldb.jdbc.JDBCDriver"
+        ))
+        val reloadConfig = SimpleReloadConfig(metadataPath = path, connectionConfigs = connectionConfigs)
         smeupConfig.reloadConfig = ReloadConfig(
-            nativeAccessConfig = DBNativeAccessConfig(emptyList()),
+            nativeAccessConfig = DBNativeAccessConfig(connectionConfigs.map {
+                com.smeup.dbnative.ConnectionConfig(
+                    fileName = it.fileName,
+                    url = it.url,
+                    user = it.user,
+                    password = it.password,
+                    driver = it.driver,
+                    impl = it.impl
+                )
+            }),
             metadataProducer = { dbFile: String -> reloadConfig.getMetadata(dbFile = dbFile) })
-        smeupConfig.options.debuggingInformation = true
     }
+
+    @AfterTest()
+    open fun tearDown() {}
 }
diff --git a/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/dbmock/DbMock.kt b/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/dbmock/DbMock.kt
@@ -0,0 +1,38 @@
+package com.smeup.rpgparser.smeup.dbmock
+
+import com.smeup.rpgparser.interpreter.DbField
+import com.smeup.rpgparser.interpreter.NumberType
+import com.smeup.rpgparser.interpreter.StringType
+import kotlin.test.todo
+
+interface DbMock : AutoCloseable {
+    fun createTable(): String
+    fun dropTable(): String
+    fun populateTable(): String
+
+    override fun close() {
+        dropTable()
+    }
+
+    fun buildDbColumnsFromDbFields(fields: List<DbField>): String {
+        return fields.mapIndexed { i, it ->
+            when {
+                it.type is StringType -> "${it.fieldName} VARCHAR(${it.type.size}) DEFAULT '' NOT NULL".plus(if (fields.lastIndex != i) ",\n" else "\n")
+                it.type is NumberType -> {
+                    var columnDeclaration = it.fieldName
+                    if ((it.type as NumberType).decimal) {
+                        columnDeclaration += " DECIMAL(${(it.type as NumberType).entireDigits}, ${(it.type as NumberType).decimalDigits}) DEFAULT 0.0"
+                    } else {
+                        columnDeclaration += " BIGINT DEFAULT 0"
+                    }
+
+                    columnDeclaration += " NOT NULL".plus(if (fields.lastIndex != i) ",\n" else "\n")
+
+                    columnDeclaration
+                }
+                else -> todo { "Implements ${it.type} for 'buildDbColumnsFromDbFields'." }
+            }
+        }
+        .joinToString("")
+    }
+}
diff --git a/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/dbmock/MULANGTLDbMock.kt b/rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/dbmock/MULANGTLDbMock.kt
@@ -0,0 +1,22 @@
+package com.smeup.rpgparser.smeup.dbmock
+
+import com.smeup.rpgparser.interpreter.FileMetadata
+import java.io.File
+
+class MULANGTLDbMock : DbMock {
+    val metadata = FileMetadata.createInstance(File("src/test/resources/smeup/metadata/MULANGTL.json").inputStream())
+
+    override fun createTable(): String = """
+        CREATE TABLE IF NOT EXISTS ${metadata.tableName} (
+            ${this.buildDbColumnsFromDbFields(metadata.fields)})
+        """
+        .trimIndent()
+    override fun dropTable(): String = "DROP TABLE IF EXISTS ${metadata.tableName}"
+    override fun populateTable(): String {
+        return """
+            INSERT INTO ${metadata.tableName}(MLSYST, MLLIBR, MLFILE, MLTIPO, MLPROG, MLPSEZ, MLPPAS, MLPDES, MLSQIN, MLSQFI, MLAAAT, MLAAVA, MLNNAT, MLNNVA, MLINDI, MLTEES, MLUSES, MLDTES, MLORES, MLASLA, MLASNR, MLLIBE) 
+            VALUES ('FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 'FOO', 1.0, 1.0, 'FOO', 1, 'FOO', 1, 1, 'FOO', 1, 'FOO')
+        """
+        .trimIndent()
+    }
+}
diff --git a/rpgJavaInterpreter-core/src/test/resources/smeup/MU102501.rpgle b/rpgJavaInterpreter-core/src/test/resources/smeup/MU102501.rpgle
@@ -0,0 +1,10 @@
+     D £DBG_Str        S             50          VARYING
+     C                   MOVEL     '0399999'     AAA003            3
+     C                   TESTN                   AAA003               515253
+     C                   EVAL      £DBG_Str='51='+%CHAR(*IN51)+
+     C                                      ',52='+%CHAR(*IN52)+
+     C                                      ',53='+%CHAR(*IN53)
+      * 51=1,52=0,53=0
+     C     £DBG_Str      DSPLY
+      *
+     C                   SETON                                        LR
diff --git a/rpgJavaInterpreter-core/src/test/resources/smeup/MUDRNRAPU00101.rpgle b/rpgJavaInterpreter-core/src/test/resources/smeup/MUDRNRAPU00101.rpgle
@@ -0,0 +1,12 @@
+     FMULANGTL  IF   E           K DISK
+     D PNCLAS          S                   DIM(1000) LIKE(MLLIBR)
+     D DSCLAS          DS                  OCCURS(%ELEM(PNCLAS))
+     D  XC£GRA                             LIKE(MLSYST)
+      *
+     C                   EVAL      MLSYST = 'HELLO THERE'
+     C                   EXSR      MEMREC
+      *
+     C     MEMREC        BEGSR
+     C                   EVAL      XC£GRA=MLSYST
+     C     XC£GRA        DSPLY
+     C                   ENDSR

Original file line number	Diff line number	Diff line change
`@@ -103,4 +103,13 @@ open class MULANGT10BaseCodopTest : MULANGTTest() {`
`103`	`103`	`val expected = listOf("CALL(mod:inp )")`
`104`	`104`	`assertEquals(expected, "smeup/MU106011".outputOf())`
`105`	`105`	`}`
	`106`	`+`
	`107`	`+ /**`
	`108`	`+ * TESTN`
	`109`	`+ */`
	`110`	`+ @Test`
	`111`	`+ fun executeMU102501() {`
	`112`	`+ val expected = listOf("51=1,52=0,53=0")`
	`113`	`+ assertEquals(expected, "smeup/MU102501".outputOf())`
	`114`	`+ }`
`106`	`115`	`}`