kscience/dataforge-core
8
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

Fixed enum delegate

Browse Source
This commit is contained in:
Alexander Nozik 2019-10-07 13:27:54 +03:00
parent 3ff3a5d09e
commit 156a43d4bf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt
View File

@ -242,7 +242,7 @@ val MetaItem<*>?.long get() = number?.toLong()
val MetaItem<*>?.short get() = number?.toShort() val MetaItem<*>?.short get() = number?.toShort()
inline fun <reified E : Enum<E>> MetaItem<*>?.enum() = if (this is ValueItem && this.value is EnumValue<*>) { inline fun <reified E : Enum<E>> MetaItem<*>?.enum() = if (this is ValueItem && this.value is EnumValue<*>) {
this.value as E this.value.value as E
} else { } else {
string?.let { enumValueOf<E>(it) } string?.let { enumValueOf<E>(it) }
} }

5
dataforge-meta/src/jvmTest/kotlin/hep/dataforge/meta/MetaExtensionTest.kt → dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaExtensionTest.kt
View File

@ -1,6 +1,7 @@
package hep.dataforge.meta package hep.dataforge.meta
import org.junit.Test import kotlin.test.Test
class MetaExtensionTest { class MetaExtensionTest {
@ -15,7 +16,7 @@ class MetaExtensionTest {
} }
@Test @Test
fun testEnumByString(){ fun testEnumByString(){
val meta = buildMeta{"enum" to TestEnum.test.toString()} val meta = buildMeta{"enum" to TestEnum.test.name}
println(meta["enum"].enum<TestEnum>()) println(meta["enum"].enum<TestEnum>())
} }