Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/nw23001440/like with arrays #400

Merged
merged 4 commits into from
Jan 18, 2024
Merged

Bugfix/nw23001440/like with arrays #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5834361
change array elements number from its DIM if there is the LIKE keyword
cosentino-smeup Jan 17, 2024
4ee7818
Merge branch 'develop' into bugfix/NW23001440/like_with_arrays
cosentino-smeup Jan 17, 2024
bd61bad
Merge branch 'develop' into bugfix/NW23001440/like_with_arrays
cosentino-smeup Jan 17, 2024
b7746d9
add executeT02_A50_P03
cosentino-smeup Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...reter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/data_definitions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,8 @@ internal fun RpgParser.DspecContext.toAst(
it.ascend = ascend
}
} else {
baseType
val el = compileTimeInterpreter.evaluate(this.rContext(), dim!!).asInt().value.toInt()
(baseType as ArrayType).copy(nElements = el)
}
} else {
baseType
Expand Down
8 changes: 7 additions & 1 deletion ...vaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/evaluation/SmeupInterpreterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ open class SmeupInterpreterTest : AbstractTest() {

@Test
fun executeT16_A70() {
val expected = listOf("A70_AR1(10) A70_AR2(20) A70_DS1(30) A70_AR3(10)")
val expected = listOf("A70_AR1(10) A70_AR2(20) A70_DS1(30) A70_AR3(10) A70_AR4(40)")
assertEquals(expected, "smeup/T16_A70".outputOf())
}

Expand Down Expand Up @@ -193,4 +193,10 @@ open class SmeupInterpreterTest : AbstractTest() {
)
assertEquals(expected, "smeup/T40_A10_P03D".outputOf())
}

@Test
fun executeT02_A50_P03() {
val expected = listOf("A50_AR1(10) A50_AR2(40)")
assertEquals(expected, "smeup/T02_A50_P03".outputOf())
}
}
17 changes: 17 additions & 0 deletions rpgJavaInterpreter-core/src/test/resources/smeup/T02_A50_P03.rpgle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
D £DBG_Pas S 3
D £DBG_Str S 100
*
D A50_AR1 S 10 DIM(10)
D A50_AR2 S LIKE(A50_AR1) DIM(40)
D A50_N3 S 2 0
*
C EVAL A50_N3 = %ELEM(A50_AR1)
C EVAL £DBG_Str='A50_AR1('+%CHAR(A50_N3)+')'
C EVAL A50_N3 = %ELEM(A50_AR2)
C EVAL £DBG_Str=%TRIMR(£DBG_Str)
C +' A50_AR2('+%CHAR(A50_N3)+')'
* Expected:
* 'A50_AR1(10) A50_AR2(40)'
*
C £DBG_Str DSPLY
C SETON LR
8 changes: 6 additions & 2 deletions rpgJavaInterpreter-core/src/test/resources/smeup/T16_A70.rpgle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
D A70_AR2 S 10 DIM(20)
D A70_DS1 DS 20 OCCURS(30)
D A70_AR3 S 30 DIM(%ELEM(A70_AR1))
D A70_AR4 S LIKE(A70_AR1) DIM(40)
*
D A70_N50 S 5P 0
D £DBG_Str S 72
D £DBG_Str S 100
*
C EVAL A70_N50 = %ELEM(A70_AR1)
C EVAL £DBG_Str ='A70_AR1('+%CHAR(A70_N50)+')'
Expand All @@ -17,7 +18,10 @@
C EVAL A70_N50=%ELEM(A70_AR3)
C EVAL £DBG_Str=%TRIMR(£DBG_Str)
C +' A70_AR3('+%CHAR(A70_N50)+')'
* Expect 'A70_AR1(10) A70_AR2(20) A70_DS1(30) A70_AR3(10)'
C EVAL A70_N50=%ELEM(A70_AR4)
C EVAL £DBG_Str=%TRIMR(£DBG_Str)
C +' A70_AR4('+%CHAR(A70_N50)+')'
* Expect 'A70_AR1(10) A70_AR2(20) A70_DS1(30) A70_AR3(10) A70_AR4(40)'
C £DBG_Str DSPLY
*
C SETON LR