fluencelabs/asmble
1
0
Fork 0
mirror of https://github.com/fluencelabs/asmble synced 2025-04-25 06:42:22 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade kotlin and minor warning suppression

Browse Source
This commit is contained in:
Chad Retz 2017-10-10 16:14:27 -05:00
parent 3e912b2b15
commit cb8470f54f
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -2,7 +2,7 @@ group 'asmble'
version '0.1.0' version '0.1.0'
buildscript { buildscript {
ext.kotlin_version = '1.1.2' ext.kotlin_version = '1.1.51'
ext.asm_version = '5.2' ext.asm_version = '5.2'
repositories { repositories {

1
compiler/src/main/kotlin/asmble/cli/Compile.kt
View File

@ -6,6 +6,7 @@ import asmble.compile.jvm.ClsContext
import asmble.compile.jvm.withComputedFramesAndMaxs import asmble.compile.jvm.withComputedFramesAndMaxs
import java.io.FileOutputStream import java.io.FileOutputStream
@Suppress("NAME_SHADOWING")
open class Compile : Command<Compile.Args>() { open class Compile : Command<Compile.Args>() {
override val name = "compile" override val name = "compile"

1
compiler/src/main/kotlin/asmble/compile/jvm/AsmExt.kt
View File

@ -28,6 +28,7 @@ fun KFunction<*>.invokeStatic() =
fun KFunction<*>.invokeVirtual() = fun KFunction<*>.invokeVirtual() =
MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.declarer.ref.asmName, this.name, this.asmDesc, false) MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.declarer.ref.asmName, this.name, this.asmDesc, false)
@Suppress("NOTHING_TO_INLINE")
inline fun <T : Function<*>> forceFnType(fn: T) = fn as KFunction<*> inline fun <T : Function<*>> forceFnType(fn: T) = fn as KFunction<*>
val KClass<*>.const: LdcInsnNode get() = (if (this == Void::class) Void.TYPE else this.java).const val KClass<*>.const: LdcInsnNode get() = (if (this == Void::class) Void.TYPE else this.java).const

2
compiler/src/main/kotlin/asmble/io/AstToSExpr.kt
View File

@ -21,11 +21,9 @@ open class AstToSExpr(val parensInstrs: Boolean = true) {
newMulti("assert_trap") + fromAction(v.action) + v.failure newMulti("assert_trap") + fromAction(v.action) + v.failure
is Script.Cmd.Assertion.Malformed -> when (v.module) { is Script.Cmd.Assertion.Malformed -> when (v.module) {
is Script.LazyModule.SExpr -> newMulti("assert_malformed") + v.module.sexpr + v.failure is Script.LazyModule.SExpr -> newMulti("assert_malformed") + v.module.sexpr + v.failure
else -> newMulti("assert_malformed") + fromModule(v.module.value) + v.failure
} }
is Script.Cmd.Assertion.Invalid -> when (v.module) { is Script.Cmd.Assertion.Invalid -> when (v.module) {
is Script.LazyModule.SExpr -> newMulti("assert_invalid") + v.module.sexpr + v.failure is Script.LazyModule.SExpr -> newMulti("assert_invalid") + v.module.sexpr + v.failure
else -> newMulti("assert_invalid") + fromModule(v.module.value) + v.failure
} }
is Script.Cmd.Assertion.SoftInvalid -> is Script.Cmd.Assertion.SoftInvalid ->
newMulti("assert_soft_invalid") + fromModule(v.module) + v.failure newMulti("assert_soft_invalid") + fromModule(v.module) + v.failure

1
compiler/src/main/kotlin/asmble/run/jvm/ScriptContext.kt
View File

@ -283,6 +283,7 @@ data class ScriptContext(
bindImport(import, true, MethodType.methodType(Class.forName(mem.memType.asm.className))). bindImport(import, true, MethodType.methodType(Class.forName(mem.memType.asm.className))).
invokeWithArguments()!! invokeWithArguments()!!
@Suppress("UNCHECKED_CAST")
fun resolveImportTable(import: Node.Import, tableType: Node.Type.Table) = fun resolveImportTable(import: Node.Import, tableType: Node.Type.Table) =
bindImport(import, true, MethodType.methodType(Array<MethodHandle>::class.java)). bindImport(import, true, MethodType.methodType(Array<MethodHandle>::class.java)).
invokeWithArguments()!! as Array<MethodHandle> invokeWithArguments()!! as Array<MethodHandle>