Skip to content

Bump JacoDB #284

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
Lipen merged 4 commits into from
Jun 2, 2025
Merged

Bump JacoDB #284

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
721fe7c
Bump jacodb
Lipen May 30, 2025
85bc2b8
Use AA branch 'neo/2025-05-30b'
Lipen May 30, 2025
1b8edf0
Support EnumValueType
Lipen May 30, 2025
afcddd2
Update EtsValue.toDto()
Lipen May 30, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
DEST_DIR="arkanalyzer"
MAX_RETRIES=10
RETRY_DELAY=3 # Delay between retries in seconds
BRANCH="neo/2025-05-12"
BRANCH="neo/2025-05-30b"

for ((i=1; i<=MAX_RETRIES; i++)); do
git clone --depth=1 --branch $BRANCH $REPO_URL $DEST_DIR && break
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Versions {
const val clikt = "5.0.0"
const val detekt = "1.23.7"
const val ini4j = "0.5.4"
const val jacodb = "3b6a17f000"
const val jacodb = "4ca8d08f1d"
const val juliet = "1.3.2"
const val junit = "5.9.3"
const val kotlin = "2.1.0"
Expand Down
9 changes: 9 additions & 0 deletions usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/infer/dto/EtsTypeToDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.jacodb.ets.dto.AnyTypeDto
import org.jacodb.ets.dto.ArrayTypeDto
import org.jacodb.ets.dto.BooleanTypeDto
import org.jacodb.ets.dto.ClassTypeDto
import org.jacodb.ets.dto.EnumValueTypeDto
import org.jacodb.ets.dto.FunctionTypeDto
import org.jacodb.ets.dto.GenericTypeDto
import org.jacodb.ets.dto.IntersectionTypeDto
Expand All @@ -43,6 +44,7 @@ import org.jacodb.ets.model.EtsAnyType
import org.jacodb.ets.model.EtsArrayType
import org.jacodb.ets.model.EtsBooleanType
import org.jacodb.ets.model.EtsClassType
import org.jacodb.ets.model.EtsEnumValueType
import org.jacodb.ets.model.EtsFunctionType
import org.jacodb.ets.model.EtsGenericType
import org.jacodb.ets.model.EtsIntersectionType
Expand Down Expand Up @@ -97,6 +99,13 @@ private object EtsTypeToDto : EtsType.Visitor<TypeDto> {
)
}

override fun visit(type: EtsEnumValueType): TypeDto {
return EnumValueTypeDto(
signature = type.signature.toDto(),
constant = type.constant?.toDto(),
)
}

override fun visit(type: EtsBooleanType): TypeDto {
return BooleanTypeDto
}
Expand Down
36 changes: 18 additions & 18 deletions usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/infer/dto/EtsValueToDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,43 +40,43 @@ import org.jacodb.ets.model.EtsValue

fun EtsValue.toDto(): ValueDto = accept(EtsValueToDto)

private object EtsValueToDto : EtsValue.Visitor<ValueDto> {
override fun visit(value: EtsLocal): ValueDto {
return LocalDto(
name = value.name,
type = value.type.toDto(),
)
}
fun EtsLocal.toDto(): LocalDto = LocalDto(
name = name,
type = type.toDto(),
)

private fun visitConstant(value: EtsConstant): ValueDto {
return ConstantDto(
value = value.toString(),
type = value.type.toDto(),
)
fun EtsConstant.toDto(): ConstantDto = ConstantDto(
value = toString(),
type = type.toDto(),
)

private object EtsValueToDto : EtsValue.Visitor<ValueDto> {
override fun visit(value: EtsLocal): LocalDto {
return value.toDto()
}

override fun visit(value: EtsConstant): ValueDto {
return visitConstant(value)
return value.toDto()
}

override fun visit(value: EtsStringConstant): ValueDto {
return visitConstant(value)
return value.toDto()
}

override fun visit(value: EtsBooleanConstant): ValueDto {
return visitConstant(value)
return value.toDto()
}

override fun visit(value: EtsNumberConstant): ValueDto {
return visitConstant(value)
return value.toDto()
}

override fun visit(value: EtsNullConstant): ValueDto {
return visitConstant(value)
return value.toDto()
}

override fun visit(value: EtsUndefinedConstant): ValueDto {
return visitConstant(value)
return value.toDto()
}

override fun visit(value: EtsThis): ValueDto {
Expand Down