teldufalsari/kmath
2
0
Fork 0
forked from kscience/kmath
Code Pull Requests 1 Activity

Merge pull request #352 from mipt-npm/commandertvis/fix-type-param

Browse Source 
Fix unresolved reference in generated type parameter
This commit is contained in:
Alexander Nozik 2021-05-21 16:28:30 +03:00 committed by GitHub
commit 889244902b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
View File

@ -342,8 +342,8 @@ internal class AsmBuilder<T>(
val MAP_INTRINSICS_TYPE: Type by lazy { getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") } val MAP_INTRINSICS_TYPE: Type by lazy { getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") }
/** /**
* ASM Type for [space.kscience.kmath.misc.Symbol]. * ASM Type for [space.kscience.kmath.expressions.Symbol].
*/ */
val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/misc/Symbol") } val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/expressions/Symbol") }
} }
} }

8
kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
View File

@ -12,13 +12,13 @@ import kotlin.properties.ReadOnlyProperty
* A marker interface for a symbol. A symbol must have an identity. * A marker interface for a symbol. A symbol must have an identity.
* Ic * Ic
*/ */
public interface Symbol: MST { public interface Symbol : MST {
/** /**
* Identity object for the symbol. Two symbols with the same identity are considered to be the same symbol. * Identity object for the symbol. Two symbols with the same identity are considered to be the same symbol.
*/ */
public val identity: String public val identity: String
public companion object{ public companion object {
public val x: StringSymbol = StringSymbol("x") public val x: StringSymbol = StringSymbol("x")
public val y: StringSymbol = StringSymbol("y") public val y: StringSymbol = StringSymbol("y")
public val z: StringSymbol = StringSymbol("z") public val z: StringSymbol = StringSymbol("z")
@ -48,7 +48,7 @@ public operator fun <T> Map<String, T>.get(symbol: Symbol): T? = get(symbol.iden
/** /**
* Set a value of [String]-keyed map by a [Symbol] * Set a value of [String]-keyed map by a [Symbol]
*/ */
public operator fun <T> MutableMap<String, T>.set(symbol: Symbol, value: T){ public operator fun <T> MutableMap<String, T>.set(symbol: Symbol, value: T) {
set(symbol.identity, value) set(symbol.identity, value)
} }
@ -60,6 +60,6 @@ public operator fun <T> Map<Symbol, T>.get(string: String): T? = get(StringSymbo
/** /**
* Set a value of [String]-keyed map by a [Symbol] * Set a value of [String]-keyed map by a [Symbol]
*/ */
public operator fun <T> MutableMap<Symbol, T>.set(string: String, value: T){ public operator fun <T> MutableMap<Symbol, T>.set(string: String, value: T) {
set(StringSymbol(string), value) set(StringSymbol(string), value)
} }