YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adde emitters, paths are different when running from gradle or intellij, will fix later

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-08-02 19:49:29 +02:00
parent 641fbceb3f
commit d8b92a6970
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
8 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/CommonLibsodiumGenerator.kt
View File

@ -32,7 +32,7 @@ object CommonLibsodiumGenerator {
MultiplatformModifier.EXPECT,
::createCommonMethodSpec
)
fileBuilder.addType(commonClassSpec)
fileBuilder.addType(commonClassSpec.build())
}
val file = fileBuilder.build()
file.writeTo(System.out)

8
kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/Coordinator.kt
View File

@ -18,13 +18,13 @@ object Coordinator {
val nativeFileSpec = NativeLibsodiumGenerator.createNativeFile(packageName, LibSodiumDefinitions.testKotlinFile)
val jsFileSpec = JsLibsodiumGenerator.createJsFile(packageName, LibSodiumDefinitions.testKotlinFile)
val commonFile = File("../multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/")
val commonFile = File("multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/")
commonFileSpec.writeTo(commonFile)
val jvmFile = File("../multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/")
val jvmFile = File("multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/")
jvmFileSpec.writeTo(jvmFile)
val nativeFile = File("../multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/")
val nativeFile = File("multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/")
nativeFileSpec.writeTo(nativeFile)
val jsFile = File("../multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/")
val jsFile = File("multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/")
jsFileSpec.writeTo(jsFile)
}

2
kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/JsLibsodiumGenerator.kt
View File

@ -26,7 +26,7 @@ object JsLibsodiumGenerator {
MultiplatformModifier.ACTUAL,
::createJsFunctionImplementation
)
fileBuilder.addType(commonClassSpec)
fileBuilder.addType(commonClassSpec.build())
}
val file = fileBuilder.build()
file.writeTo(System.out)

2
kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/JvmLibsodiumGenerator.kt
View File

@ -27,7 +27,7 @@ object JvmLibsodiumGenerator {
MultiplatformModifier.ACTUAL,
::createJvmFunctionImplementation
)
fileBuilder.addType(commonClassSpec)
fileBuilder.addType(commonClassSpec.build())
}
val file = fileBuilder.build()
file.writeTo(System.out)

10
kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/NativeLibsodiumGenerator.kt
View File

@ -18,6 +18,7 @@ object NativeLibsodiumGenerator {
fileBuilder.addImport("kotlinx.cinterop", "ptr")
fileBuilder.addImport("kotlinx.cinterop", "pin")
fileBuilder.addImport("kotlinx.cinterop", "addressOf")
for (commonClassDefinition in fileDefinition.commonClassList) {
//Create type-aliases
commonClassDefinition.innerClasses.forEach {
@ -29,7 +30,14 @@ object NativeLibsodiumGenerator {
MultiplatformModifier.ACTUAL,
::createNativeFunctionImplementation
)
fileBuilder.addType(commonClassSpec)
//Workarounds for native not emitting types
val byteEmitter = PropertySpec.builder("_emitByte", Byte::class.asTypeName())
byteEmitter.initializer(CodeBlock.of("0"))
val byteArrayEmitter = PropertySpec.builder("_emitByteArray", Byte::class.asTypeName())
byteArrayEmitter.initializer(CodeBlock.of("ByteArray(0) {}"))
commonClassSpec.addProperty(byteEmitter.build())
commonClassSpec.addProperty(byteArrayEmitter.build())
fileBuilder.addType(commonClassSpec.build())
}
val file = fileBuilder.build()
file.writeTo(System.out)

4
kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/SharedCreators.kt
View File

@ -15,13 +15,13 @@ fun createClass(
classDefinition: ClassDefinition,
multiplatformModifier: MultiplatformModifier,
methodCreator: (FunctionDefinition) -> FunSpec
): TypeSpec {
): TypeSpec.Builder {
val commonClassBuilder = TypeSpec.classBuilder(classDefinition.name)
commonClassBuilder.modifiers += multiplatformModifier.modifierList
for (methodDefinition in classDefinition.methods) {
commonClassBuilder.addFunction(methodCreator(methodDefinition))
}
return commonClassBuilder.build()
return commonClassBuilder
}

0
multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com.ionspin.kotlin.crypto/Initializer.kt → multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/Initializer.kt
View File

5
multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/debug/test/DebugTest.kt
View File

@ -1,5 +1,6 @@
package debug.test
import kotlin.Byte
import kotlin.Int
import kotlin.UByteArray
import kotlinx.cinterop.addressOf
@ -18,6 +19,10 @@ actual typealias Sha512State = crypto_hash_sha512_state
actual typealias GenericHashState = crypto_generichash_blake2b_state
actual class Crypto {
val _emitByte: Byte = 0
val _emitByteArray: Byte = ByteArray(0) {}
actual fun crypto_hash_sha256_init(state: Sha256State): Int {
println("Debug")
return libsodium.crypto_hash_sha256_init(state.ptr)