Skip to content

Replace casts with checks, ignore CastExpr in LHS of AssignStmt #357

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

Merged
merged 1 commit into from
Oct 30, 2025
Merged

Replace casts with checks, ignore CastExpr in LHS of AssignStmt #357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,11 @@ class EtsMethodBuilder(
if (entity is EtsExpr || entity is EtsFieldRef || entity is EtsArrayAccess) {
return ensureLocal(entity)
} else {
check(entity is EtsValue) {
"Expected EtsValue, but got $entity"
if (entity !is EtsValue) {
logger.error {
"Expected EtsValue, but got ${entity::class.java}: $entity\nMethod: $method"
}
error("Expected EtsValue, but got ${entity::class.java}")
}
return entity
}
Expand All @@ -207,9 +210,19 @@ class EtsMethodBuilder(
}

is AssignStmtDto -> {
val lhv = left.toEtsEntity() as EtsValue // safe cast
check(lhv is EtsLocal || lhv is EtsFieldRef || lhv is EtsArrayAccess) {
"LHV of AssignStmt should be EtsLocal, EtsFieldRef, or EtsArrayAccess, but got $lhv"
val lhv = left.toEtsEntity().let {
// Drop cast on LHV
if (it is EtsCastExpr) {
it.arg
} else {
it
}
}
if (!(lhv is EtsLocal || lhv is EtsFieldRef || lhv is EtsArrayAccess)) {
logger.error {
"LHV of AssignStmt should be EtsLocal, EtsFieldRef, or EtsArrayAccess, but got ${lhv::class.java}: $lhv\nMethod: $method\nStmt: $this"
}
error("LHV of AssignStmt should be EtsLocal, EtsFieldRef, or EtsArrayAccess, but got ${lhv::class.java}")
}
val rhv = right.toEtsEntity().let { rhv ->
if (lhv is EtsLocal) {
Expand All @@ -232,7 +245,13 @@ class EtsMethodBuilder(
}

is CallStmtDto -> {
val expr = expr.toEtsEntity() as EtsCallExpr // safe cast
val expr = expr.toEtsEntity()
if (expr !is EtsCallExpr) {
logger.error {
"Expr in CallStmt should be EtsCallExpr, but got ${expr::class.java}: $expr\nMethod: $method\nStmt: $this"
}
error("Expr in CallStmt should be EtsCallExpr, but got ${expr::class.java}")
}
EtsCallStmt(
location = loc(),
expr = expr,
Expand Down
Loading