Skip to content

Replace Kotlin getters/setters with property access in codegen #496 #1002

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
volivan239 merged 9 commits into from
Sep 27, 2022
Merged

Replace Kotlin getters/setters with property access in codegen #496 #1002

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5950012
Replace Kotlin getters/setters with property access in codegen
volivan239 Sep 20, 2022
3a93809
Corrected behavior for static fields
volivan239 Sep 23, 2022
4a46a78
Always use safe call (?.) in Kotlin codegen
volivan239 Sep 23, 2022
2143680
Fix calling wrong unary plus
volivan239 Sep 23, 2022
c8739aa
Fixed test crashing due to nullability problems
volivan239 Sep 24, 2022
c8a8407
Treat java-accessible fields as accessible properties in Kotlin
volivan239 Sep 24, 2022
2245a09
Fix false-positive canBeSetIn result for private fields with getters …
volivan239 Sep 24, 2022
569e581
Add comments
volivan239 Sep 26, 2022
38fb0d0
Minor changes fixing issues found in review
volivan239 Sep 27, 2022
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
Prev Previous commit
Next Next commit
Treat java-accessible fields as accessible properties in Kotlin
  • Loading branch information
@volivan239
volivan239 committed Sep 27, 2022
commit c8a84075be32645fd6770be6d5d5dab449810f2c
18 changes: 13 additions & 5 deletions utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/FieldIdUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import org.utbot.framework.plugin.api.util.voidClassId
*/
// TODO: change parameter from packageName: String to context: CgContext in ClassId.isAccessibleFrom and ExecutableId.isAccessibleFrom ?
internal infix fun FieldId.isAccessibleFrom(context: CgContext): Boolean {
if (!isStatic && context.codegenLanguage == CodegenLanguage.KOTLIN) {
if (context.codegenLanguage == CodegenLanguage.KOTLIN) {
// Here we call field accessible iff its getter is accessible, checks for setter are made in FieldId.canBeSetIn
return declaringClass.allMethods.contains(getter) && getter.isAccessibleFrom(context.testClassPackageName)
if (!isStatic && declaringClass.allMethods.contains(getter) && getter.isAccessibleFrom(context.testClassPackageName))
return true
}
val packageName = context.testClassPackageName
val isClassAccessible = declaringClass.isAccessibleFrom(packageName)
Expand All @@ -31,10 +32,17 @@ internal infix fun FieldId.isAccessibleFrom(context: CgContext): Boolean {
* Whether or not a field can be set without reflection
*/
internal fun FieldId.canBeSetIn(context: CgContext): Boolean {
if (!isStatic && context.codegenLanguage == CodegenLanguage.KOTLIN) {
return declaringClass.allMethods.contains(setter) && setter.isAccessibleFrom(context.testClassPackageName)
if (!isAccessibleFrom(context)) {
return false
}
return isAccessibleFrom(context) && !isFinal

if (context.codegenLanguage == CodegenLanguage.KOTLIN) {
if (!isStatic && declaringClass.allMethods.contains(setter) && setter.isAccessibleFrom(context.testClassPackageName)) {
return true
}
}

return !isFinal
}

/**
Expand Down