Skip to content

Commit

Permalink
Merge pull request #686 from smeup/bugfix/nullpointer_rpgParserDs_nam…
Browse files Browse the repository at this point in the history 
…eContext.getText

Bugfix/nullpointer in evaluateNumberOfElementsOf
  • Loading branch information
@lanarimarco
lanarimarco authored Dec 12, 2024
2 parents 599a13a + 124ccc7 commit f5692af
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 25 deletions.
47 changes: 23 additions & 24 deletions ...erpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/compile_time_interpreter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.smeup.rpgparser.interpreter

import com.smeup.rpgparser.RpgParser
import com.smeup.rpgparser.RpgParser.*
import com.smeup.rpgparser.execution.MainExecutionContext
import com.smeup.rpgparser.parsing.ast.*
Expand All @@ -32,10 +31,10 @@ import com.strumenta.kolasu.model.tryToResolve
* It should consider only statically evaluable elements.
*/
interface CompileTimeInterpreter {
fun evaluate(rContext: RpgParser.RContext, expression: Expression): Value
fun evaluateElementSizeOf(rContext: RpgParser.RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String? = null): Int
fun evaluateTypeOf(rContext: RpgParser.RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String? = null): Type
fun evaluateNumberOfElementsOf(rContext: RpgParser.RContext, declName: String): Int
fun evaluate(rContext: RContext, expression: Expression): Value
fun evaluateElementSizeOf(rContext: RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String? = null): Int
fun evaluateTypeOf(rContext: RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String? = null): Type
fun evaluateNumberOfElementsOf(rContext: RContext, declName: String): Int
}

object CommonCompileTimeInterpreter : BaseCompileTimeInterpreter(emptyList())
Expand All @@ -45,15 +44,15 @@ class InjectableCompileTimeInterpreter(
fileDefinitions: Map<FileDefinition, List<DataDefinition>>? = null,
delegatedCompileTimeInterpreter: CompileTimeInterpreter? = null
) : BaseCompileTimeInterpreter(knownDataDefinitions, fileDefinitions, delegatedCompileTimeInterpreter) {
override fun evaluateNumberOfElementsOf(rContext: RpgParser.RContext, declName: String): Int {
override fun evaluateNumberOfElementsOf(rContext: RContext, declName: String): Int {
return mockedDecls[declName]?.numberOfElements() ?: super.evaluateNumberOfElementsOf(rContext, declName)
}

override fun evaluateElementSizeOf(rContext: RpgParser.RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Int {
override fun evaluateElementSizeOf(rContext: RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Int {
return mockedDecls[declName]?.elementSize() ?: super.evaluateElementSizeOf(rContext, declName, conf, procedureName)
}

override fun evaluateTypeOf(rContext: RpgParser.RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Type {
override fun evaluateTypeOf(rContext: RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Type {
return mockedDecls[declName] ?: super.evaluateTypeOf(rContext, declName, conf, procedureName)
}

Expand All @@ -72,7 +71,7 @@ open class BaseCompileTimeInterpreter(
private val delegatedCompileTimeInterpreter: CompileTimeInterpreter? = null
) : CompileTimeInterpreter {

override fun evaluate(rContext: RpgParser.RContext, expression: Expression): Value {
override fun evaluate(rContext: RContext, expression: Expression): Value {
return when (expression) {
is NumberOfElementsExpr -> IntValue(evaluateNumberOfElementsOf(rContext, expression.value).toLong())
is IntLiteral -> IntValue(expression.value)
Expand All @@ -87,7 +86,7 @@ open class BaseCompileTimeInterpreter(
}
}

private fun evaluateNumberOfElementsOf(rContext: RpgParser.RContext, expression: Expression): Int {
private fun evaluateNumberOfElementsOf(rContext: RContext, expression: Expression): Int {
return when (expression) {
is DataRefExpr -> {
try {
Expand All @@ -104,7 +103,7 @@ open class BaseCompileTimeInterpreter(
}
}

override fun evaluateNumberOfElementsOf(rContext: RpgParser.RContext, declName: String): Int {
override fun evaluateNumberOfElementsOf(rContext: RContext, declName: String): Int {
val conf = MainExecutionContext.getConfiguration().options.toAstConfiguration
knownDataDefinitions.forEach {
if (it.name == declName) {
Expand All @@ -119,7 +118,7 @@ open class BaseCompileTimeInterpreter(
.forEach {
when {
it.dspec() != null -> {
val name = it.dspec().ds_name().text
val name = it.dspec().ds_name()?.text
if (name == declName) {
return it.dspec().toAst(
conf = conf,
Expand All @@ -146,7 +145,7 @@ open class BaseCompileTimeInterpreter(
throw NotFoundAtCompileTimeException(declName)
}

open fun evaluateElementSizeOf(rContext: RpgParser.RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Int {
open fun evaluateElementSizeOf(rContext: RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Int {
knownDataDefinitions.forEach {
if (it.name.equals(declName, ignoreCase = true)) {
return it.elementSize()
Expand All @@ -158,7 +157,7 @@ open class BaseCompileTimeInterpreter(
return findSize(rContext.getStatements(procedureName), declName, conf, false)!!
}

private fun findSize(statements: List<RpgParser.StatementContext>, declName: String, conf: ToAstConfiguration, innerBlock: Boolean = true): Int? {
private fun findSize(statements: List<StatementContext>, declName: String, conf: ToAstConfiguration, innerBlock: Boolean = true): Int? {
statements.forEach {
kotlin.runCatching {
when {
Expand Down Expand Up @@ -226,7 +225,7 @@ open class BaseCompileTimeInterpreter(
throw NotFoundAtCompileTimeException(declName)
}

override fun evaluateElementSizeOf(rContext: RpgParser.RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String?): Int {
override fun evaluateElementSizeOf(rContext: RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String?): Int {
return try {
evaluateTypeOf(rContext, expression, conf, procedureName).elementSize()
} catch (e: RuntimeException) {
Expand All @@ -238,7 +237,7 @@ open class BaseCompileTimeInterpreter(
}
}

override fun evaluateTypeOf(rContext: RpgParser.RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String?): Type {
override fun evaluateTypeOf(rContext: RContext, expression: Expression, conf: ToAstConfiguration, procedureName: String?): Type {
return when (expression) {
is DataRefExpr -> {
try {
Expand Down Expand Up @@ -272,7 +271,7 @@ open class BaseCompileTimeInterpreter(
}
}

open fun evaluateTypeOf(rContext: RpgParser.RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Type {
open fun evaluateTypeOf(rContext: RContext, declName: String, conf: ToAstConfiguration, procedureName: String?): Type {
knownDataDefinitions.forEach {
if (it.name.equals(declName, ignoreCase = true)) {
return it.type
Expand Down Expand Up @@ -301,7 +300,7 @@ open class BaseCompileTimeInterpreter(
return findType(statements, match.originalName, conf)
}

private fun findType(statements: List<RpgParser.StatementContext>, declName: String, conf: ToAstConfiguration, innerBlock: Boolean = true): Type? {
private fun findType(statements: List<StatementContext>, declName: String, conf: ToAstConfiguration, innerBlock: Boolean = true): Type? {
statements
.forEach { it ->
kotlin.runCatching {
Expand All @@ -320,7 +319,7 @@ open class BaseCompileTimeInterpreter(
knownDataDefinitions = knownDataDefinitions,
fileDefinitions = fileDefinitions,
parentDataDefinitions = emptyList()
)?.type
).type
} else {
it.dcl_ds().parm_fixed().find {
it.ds_name().text.equals(declName, ignoreCase = true)
Expand Down Expand Up @@ -371,8 +370,8 @@ open class BaseCompileTimeInterpreter(
}
}

private fun RpgParser.BlockContext.findType(declName: String, conf: ToAstConfiguration): Type? {
return this.findAllDescendants(type = RpgParser.StatementContext::class, includingMe = false).let { descendants ->
private fun BlockContext.findType(declName: String, conf: ToAstConfiguration): Type? {
return this.findAllDescendants(type = StatementContext::class, includingMe = false).let { descendants ->
findType(descendants, declName, conf)
}
}
Expand All @@ -397,14 +396,14 @@ open class BaseCompileTimeInterpreter(
}
}

private fun Parm_fixedContext.findType(conf: ToAstConfiguration): Type? {
private fun Parm_fixedContext.findType(conf: ToAstConfiguration): Type {
return this.toAst(conf, emptyList()).type
}

private fun RpgParser.RContext.getStatements(procedureName: String?): List<StatementContext> {
private fun RContext.getStatements(procedureName: String?): List<StatementContext> {
val statements: MutableList<StatementContext> = mutableListOf()
if (procedureName != null) {
val procedureContext: RpgParser.ProcedureContext? = this.procedure().firstOrNull { it.beginProcedure().psBegin().ps_name().text.equals(procedureName, ignoreCase = true) }
val procedureContext: ProcedureContext? = this.procedure().firstOrNull { it.beginProcedure().psBegin().ps_name().text.equals(procedureName, ignoreCase = true) }
if (procedureContext != null) {
statements.addAll(
procedureContext.subprocedurestatement().mapNotNull { it.subroutine() }.flatMap { it.statement() } +
Expand Down
6 changes: 5 additions & 1 deletion rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/AbstractTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,11 +449,15 @@ abstract class AbstractTest {
"Errors don't correspond.\n" +
"Expected:\n${expectedSorted.map { "Line ${it.key}, \"${it.value}\"" }.joinToString(separator = "\n") { it } }\n" +
"Actual:\n${found.map { "Line ${it.key}, \"${it.value}\"" }.joinToString(separator = "\n") { it } }\n",
found == expectedSorted
found.toString().sanitize() == expectedSorted.toString().sanitize()
)
}
}

private fun String.sanitize(): String {
return this.replace(Regex("\\s+"), " ").replace(Regex("[^Print]"), "")
}

private fun Map.Entry<Int, String>.contains(list: Map<Int, String>): Boolean {
list.forEach {
if (this.value.contains(it.value) && this.key == it.key) {
Expand Down
6 changes: 6 additions & 0 deletions rpgJavaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/evaluation/InterpreterTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2619,4 +2619,10 @@ Test 6
jarikoKillerThread.start()
jarikoExecutorThread.join()
}

@Test
fun executeNULLPTR01() {
// Test that the program does not throw a NullPointerException
"NULLPTR01".outputOf()
}
}
11 changes: 11 additions & 0 deletions rpgJavaInterpreter-core/src/test/resources/NULLPTR01.rpgle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
D NUMAZI C 58
D £JAXSWK S 100 DIM(300)

D DS
* Error:
* java.lang.NullPointerException
* at com.smeup.rpgparser.interpreter.BaseCompileTimeInterpreter.evaluateNumberOfElementsOf(compile_time_interpreter.kt:122)
* at com.smeup.rpgparser.interpreter.InjectableCompileTimeInterpreter.evaluateNumberOfElementsOf(compile_time_interpreter.kt:49)
* ...
D £JAXSW2 100 DIM(%elem(£JAXSWK))
D £JAXSW2Key 10 OVERLAY(£JAXSW2:01)

0 comments on commit f5692af

Please sign in to comment.