2 Commits

5 changed files with 28 additions and 25 deletions

View File

@ -21,7 +21,7 @@ buildscript {
allprojects { allprojects {
apply plugin: 'java' apply plugin: 'java'
group 'com.github.cretz.asmble' group 'com.github.cretz.asmble'
version '0.4.0-fl' version '0.4.0-fl-fix'
repositories { repositories {
mavenCentral() mavenCentral()
@ -143,17 +143,17 @@ project(':examples') {
} }
project(':examples:go-simple') { //project(':examples:go-simple') {
apply plugin: 'application' // apply plugin: 'application'
ext.wasmCompiledClassName = 'asmble.generated.GoSimple' // ext.wasmCompiledClassName = 'asmble.generated.GoSimple'
dependencies { // dependencies {
compile files('build/wasm-classes') // compile files('build/wasm-classes')
} // }
compileJava { // compileJava {
dependsOn compileGoWasm // dependsOn compileGoWasm
} // }
mainClassName = 'asmble.examples.gosimple.Main' // mainClassName = 'asmble.examples.gosimple.Main'
} //}
// todo temporary disable Rust regex, because some strings in wasm code exceed the size in 65353 bytes. // todo temporary disable Rust regex, because some strings in wasm code exceed the size in 65353 bytes.

View File

@ -56,16 +56,20 @@ abstract class ScriptCommand<T> : Command<T>() {
// if input file is class file // if input file is class file
"class" -> ctx.classLoader.addClass(File(inFile).readBytes()).let { ctx } "class" -> ctx.classLoader.addClass(File(inFile).readBytes()).let { ctx }
// if input file is wasm file // if input file is wasm file
else -> Translate.also { it.logger = logger }.inToAst(inFile, inFile.substringAfterLast('.')).let { inAst -> else -> {
val (mod, name) = (inAst.commands.singleOrNull() as? Script.Cmd.Module) ?: val translateCmd = Translate
translateCmd.logger = this.logger
translateCmd.inToAst(inFile, inFile.substringAfterLast('.')).let { inAst ->
val (mod, name) = (inAst.commands.singleOrNull() as? Script.Cmd.Module) ?:
error("Input file must only contain a single module") error("Input file must only contain a single module")
val className = name?.javaIdent?.capitalize() ?: val className = name?.javaIdent?.capitalize() ?:
"Temp" + UUID.randomUUID().toString().replace("-", "") "Temp" + UUID.randomUUID().toString().replace("-", "")
ctx.withCompiledModule(mod, className, name).let { ctx -> ctx.withCompiledModule(mod, className, name).let { ctx ->
if (name == null && index != args.inFiles.size - 1) if (name == null && index != args.inFiles.size - 1)
logger.warn { "File '$inFile' not last and has no name so will be unused" } logger.warn { "File '$inFile' not last and has no name so will be unused" }
if (name == null || args.disableAutoRegister) ctx if (name == null || args.disableAutoRegister) ctx
else ctx.runCommand(Script.Cmd.Register(name, null)) else ctx.runCommand(Script.Cmd.Register(name, null))
}
} }
} }
} }

View File

@ -70,7 +70,7 @@ open class Translate : Command<Translate.Args>() {
} }
} }
"wasm" -> "wasm" ->
Script(listOf(Script.Cmd.Module(BinaryToAst(logger = logger).toModule( Script(listOf(Script.Cmd.Module(BinaryToAst(logger = this.logger).toModule(
ByteReader.InputStream(inBytes.inputStream())), null))) ByteReader.InputStream(inBytes.inputStream())), null)))
else -> error("Unknown in format '$inFormat'") else -> error("Unknown in format '$inFormat'")
} }

View File

@ -2,12 +2,11 @@ package asmble.io
import asmble.ast.Node import asmble.ast.Node
import asmble.util.* import asmble.util.*
import java.io.ByteArrayInputStream
import java.nio.ByteBuffer import java.nio.ByteBuffer
open class BinaryToAst( open class BinaryToAst(
val version: Long = 1L, val version: Long = 1L,
val logger: Logger = Logger.Print(Logger.Level.OFF), val logger: Logger = Logger.Print(Logger.Level.WARN),
val includeNameSection: Boolean = true val includeNameSection: Boolean = true
) : Logger by logger { ) : Logger by logger {

View File

@ -2,7 +2,7 @@ rootProject.name = 'asmble'
include 'annotations', include 'annotations',
'compiler', 'compiler',
'examples:c-simple', 'examples:c-simple',
'examples:go-simple', // 'examples:go-simple',
'examples:rust-regex', // 'examples:rust-regex', // todo will be enabled when the problem with string max size will be solved
'examples:rust-simple', 'examples:rust-simple',
'examples:rust-string' 'examples:rust-string'