From a4cd50328609ca2403ca1040b7218c365b1f2ea0 Mon Sep 17 00:00:00 2001 From: Mingun Date: Mon, 18 Mar 2024 20:17:05 +0500 Subject: [PATCH] Lua: implement doByteArrayNonLiteral - create array from expression of `bytes` type Expressions of this type are created using: - omitting the `type:` field in attributes and parse instances - declaring parameters with `type: bytes` - using `.as` cast Fixes test ``` [info] - lua:[0 + 1, 5].as *** FAILED *** [info] scala.NotImplementedError: an implementation is missing [info] at scala.Predef$.$qmark$qmark$qmark(Predef.scala:344) [info] at io.kaitai.struct.translators.BaseTranslator.doByteArrayNonLiteral(BaseTranslator.scala:179) [info] at io.kaitai.struct.translators.BaseTranslator.doByteArrayNonLiteral(BaseTranslator.scala:28) [info] at io.kaitai.struct.translators.CommonArraysAndCast.doByteArray(CommonArraysAndCast.scala:85) [info] at io.kaitai.struct.translators.CommonArraysAndCast.doCastOrArray(CommonArraysAndCast.scala:62) [info] at io.kaitai.struct.translators.CommonArraysAndCast.doCastOrArray$(CommonArraysAndCast.scala:53) [info] at io.kaitai.struct.translators.BaseTranslator.doCastOrArray(BaseTranslator.scala:28) [info] at io.kaitai.struct.translators.BaseTranslator.translate(BaseTranslator.scala:147) [info] at io.kaitai.struct.translators.AbstractTranslator.translate(AbstractTranslator.scala:25) [info] at io.kaitai.struct.translators.AbstractTranslator.translate$(AbstractTranslator.scala:25) [info] ... ``` --- .../scala/io/kaitai/struct/translators/TranslatorSpec.scala | 2 +- .../scala/io/kaitai/struct/translators/LuaTranslator.scala | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jvm/src/test/scala/io/kaitai/struct/translators/TranslatorSpec.scala b/jvm/src/test/scala/io/kaitai/struct/translators/TranslatorSpec.scala index 355bf975b..094ea3e23 100644 --- a/jvm/src/test/scala/io/kaitai/struct/translators/TranslatorSpec.scala +++ b/jvm/src/test/scala/io/kaitai/struct/translators/TranslatorSpec.scala @@ -859,7 +859,7 @@ class TranslatorSpec extends AnyFunSpec { GoCompiler -> "[]uint8{0 + 1, 5}", JavaCompiler -> "new byte[] { 0 + 1, 5 }", JavaScriptCompiler -> "new Uint8Array([0 + 1, 5])", - LuaCompiler -> "???", + LuaCompiler -> "string.char(0 + 1, 5)", PerlCompiler -> "pack('C*', (0 + 1, 5))", PHPCompiler -> "pack('C*', 0 + 1, 5)", PythonCompiler -> "struct.pack('2B', 0 + 1, 5)", diff --git a/shared/src/main/scala/io/kaitai/struct/translators/LuaTranslator.scala b/shared/src/main/scala/io/kaitai/struct/translators/LuaTranslator.scala index c9ef6ce0f..2e5e6fd73 100644 --- a/shared/src/main/scala/io/kaitai/struct/translators/LuaTranslator.scala +++ b/shared/src/main/scala/io/kaitai/struct/translators/LuaTranslator.scala @@ -67,10 +67,14 @@ class LuaTranslator(provider: TypeProvider, importList: ImportList) extends Base override def doBoolLiteral(n: Boolean): String = if (n) "true" else "false" + override def doArrayLiteral(t: DataType, value: Seq[Ast.expr]): String = "{" + value.map((v) => translate(v)).mkString(", ") + "}" override def doByteArrayLiteral(arr: Seq[Byte]): String = "\"" + decEscapeByteArray(arr) + "\"" + override def doByteArrayNonLiteral(values: Seq[Ast.expr]): String = + // It is assumed that every expression produces integer in the range [0; 255] + "string.char(" + values.map(translate).mkString(", ") + ")" override def doLocalName(s: String) = s match { case Identifier.ITERATOR => "_"