Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support lambda expressions #825

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 10 commits into from
Sep 18, 2022
Merged

Support lambda expressions #825

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0f48597
Support anonymous classes
ArsenHD Jul 14, 2022
ded6d11
Support lambda expressions
ArsenHD Jul 14, 2022
2d2792d
Add tests on lambdas
ArsenHD Sep 2, 2022
10ec634
Fix review comments
ArsenHD Sep 3, 2022
6bcbdd0
Some fixes
ArsenHD Sep 5, 2022
45b988d
Fix subtype check
ArsenHD Sep 15, 2022
95357a1
Minor fix
ArsenHD Sep 15, 2022
97ba522
Minor fix
ArsenHD Sep 15, 2022
848f660
Fix Kotlin nested class code generation
ArsenHD Sep 18, 2022
105615c
Do not run compilation on Kotlin tests on lambdas due to generics issues
ArsenHD Sep 18, 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
Fix subtype check
  • Loading branch information
@ArsenHD
ArsenHD committed Sep 18, 2022
commit 45b988d32a738f6411a604e84ae6857ff4c39384
12 changes: 11 additions & 1 deletion utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,12 @@ open class ClassId @JvmOverloads constructor(
open val outerClass: Class<*>?
get() = jClass.enclosingClass

open val superclass: Class<*>?
get() = jClass.superclass

open val interfaces: Array<Class<*>>
get() = jClass.interfaces

/**
* For member classes returns a name including
* enclosing classes' simple names e.g. `A.B`.
Expand Down Expand Up @@ -846,7 +852,7 @@ class BuiltinClassId(
elementClassId: ClassId? = null,
override val canonicalName: String,
override val simpleName: String,
// by default we assume that the class is not a member class
// by default, we assume that the class is not a member class
override val simpleNameWithEnclosings: String = simpleName,
override val isNullable: Boolean = false,
override val isPublic: Boolean = true,
Expand All @@ -864,6 +870,10 @@ class BuiltinClassId(
override val allMethods: Sequence<MethodId> = emptySequence(),
override val allConstructors: Sequence<ConstructorId> = emptySequence(),
override val outerClass: Class<*>? = null,
// by default, we assume that the class does not have a superclass (other than Object)
override val superclass: Class<*>? = java.lang.Object::class.java,
// by default, we assume that the class does not implement any interfaces
override val interfaces: Array<Class<*>> = emptyArray(),
override val packageName: String =
when (val index = canonicalName.lastIndexOf('.')) {
-1, 0 -> ""
Expand Down
10 changes: 6 additions & 4 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,19 @@ infix fun ClassId.isSubtypeOf(type: ClassId): Boolean {
if (left == right) {
return true
}
val leftClass = this.jClass
val leftClass = this
val interfaces = sequence {
var types = listOf(leftClass)
while (types.isNotEmpty()) {
yieldAll(types)
types = types.map { it.interfaces }.flatMap { it.toList() }
types = types
.flatMap { it.interfaces.toList() }
.map { it.id }
}
}
val superclasses = generateSequence(leftClass) { it.superclass }
val superclasses = generateSequence(leftClass) { it.superclass?.id }
val superTypes = interfaces + superclasses
return right in superTypes.map { it.id }
return right in superTypes
}

infix fun ClassId.isNotSubtypeOf(type: ClassId): Boolean = !(this isSubtypeOf type)
Expand Down