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.

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

Rollback pr #338 and fixed warnings #343

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ data class KListStmt
private constructor(val name: String, val fields: List<String>, override val position: Position?) : Statement(position), StatementThatCanDefineData {
companion object {
operator fun invoke(name: String, fields: List<String>, position: Position? = null): KListStmt {
return KListStmt(name.toUpperCase(), fields, position)
return KListStmt(name.uppercase(Locale.getDefault()), fields, position)
}
}

Expand Down Expand Up @@ -942,7 +942,6 @@ data class DefineStmt(
override val position: Position? = null
) : Statement(position), StatementThatCanDefineData {
override fun dataDefinition(): List<InStatementDataDefinition> {
var inStmtDataDefinitionList = mutableListOf<InStatementDataDefinition>()
val containingCU = this.ancestor(CompilationUnit::class.java)
?: return emptyList()

Expand All @@ -960,31 +959,16 @@ data class DefineStmt(
if (originalDataDefinition != null) {
return listOf(InStatementDataDefinition(newVarName, originalDataDefinition.type, position))
} else {

containingCU.subroutines.forEach {
val inSubroutineDataDefinition = it.stmts
.filterIsInstance(StatementThatCanDefineData::class.java)
.filter { it != this }
.asSequence()
.map(StatementThatCanDefineData::dataDefinition)
.flatten()
.find { it.name == originalName }
if (inSubroutineDataDefinition != null)
inStmtDataDefinitionList.add(InStatementDataDefinition(newVarName, inSubroutineDataDefinition.type, position))
}

val inStatementDataDefinition =
containingCU.main.stmts
.filterIsInstance(StatementThatCanDefineData::class.java)
.filter { it != this }
.asSequence()
.map(StatementThatCanDefineData::dataDefinition)
.flatten()
.find { it.name == originalName }
if (inStatementDataDefinition != null)
inStmtDataDefinitionList.add(InStatementDataDefinition(newVarName, inStatementDataDefinition.type, position))
.find { it.name == originalName } ?: return emptyList()

return inStmtDataDefinitionList
return listOf(InStatementDataDefinition(newVarName, inStatementDataDefinition.type, position))
}
}

Expand Down Expand Up @@ -1360,7 +1344,7 @@ data class OtherStmt(override val position: Position? = null) : Statement(positi
@Serializable
data class TagStmt private constructor(val tag: String, override val position: Position? = null) : Statement(position) {
companion object {
operator fun invoke(tag: String, position: Position? = null): TagStmt = TagStmt(tag.toUpperCase(), position)
operator fun invoke(tag: String, position: Position? = null): TagStmt = TagStmt(tag.uppercase(Locale.getDefault()), position)
}
override fun execute(interpreter: InterpreterCore) {
// Nothing to do here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,10 @@ open class ToAstSmokeTest : AbstractTest() {
}
}

// rollback like define from params inside subroutine because it is not clear the reason of stack overflow
// in the context of ast syntax checking
@Test
@Ignore
fun buildAstForLIKEDEFINE02() {
assertASTCanBeProduced(exampleName = "LIKEDEFINE02", printTree = false).apply {
// this function must not throw "Data definition §§ORA was not found"
Expand Down