Revert changes belonging to #182

kaitai-io · Sep 19, 2020 · c29835c · c29835c
1 parent 6ec3e87
commit c29835c
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala
@@ -447,6 +447,11 @@ class JavaCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
     importList.add("java.util.ArrayList")
   }
 
+  override def condRepeatEosHeader2(id: Identifier, io: String, dataType: DataType, needRaw: Boolean): Unit = {
+    out.puts(s"for (int i = 0; i < ${privateMemberName(id)}.size(); i++) {")
+    out.inc
+  }
+
   override def handleAssignmentRepeatEos(id: Identifier, expr: String): Unit = {
     out.puts(s"${privateMemberName(id)}.add($expr);")
   }
@@ -463,16 +468,16 @@ class JavaCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
     if (needRaw)
       out.puts(s"${privateMemberName(RawIdentifier(id))} = new ArrayList<byte[]>(((Number) (${expression(repeatExpr)})).intValue());")
     out.puts(s"${idToStr(id)} = new ${kaitaiType2JavaType(ArrayType(dataType))}(((Number) (${expression(repeatExpr)})).intValue());")
-    out.puts(s"for (int i = 0; i < ${expression(repeatExpr)}; i++) {")
-    out.inc
 
     importList.add("java.util.ArrayList")
+    condRepeatExprHeader2(id, io, dataType, needRaw, repeatExpr)
   }
 
-  // used for all repetitions in _write() and _check()
-  override def condRepeatCommonHeader(id: Identifier, io: String, dataType: DataType, needRaw: Boolean): Unit = {
-    out.puts(s"for (int i = 0; i < ${privateMemberName(id)}.size(); i++) {")
+  override def condRepeatExprHeader2(id: Identifier, io: String, dataType: DataType, needRaw: Boolean, repeatExpr: expr): Unit = {
+    out.puts(s"for (int i = 0; i < ${expression(repeatExpr)}; i++) {")
     out.inc
+
+    importList.add("java.util.ArrayList")
   }
 
   override def handleAssignmentRepeatExpr(id: Identifier, expr: String): Unit = {
@@ -485,7 +490,7 @@ class JavaCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
     out.puts(s"${privateMemberName(id)} = new ${kaitaiType2JavaType(ArrayType(dataType))}();")
     out.puts("{")
     out.inc
-    out.puts(s"${kaitaiType2JavaType(dataType)} ${translator.doName(Identifier.ITERATOR)};")
+    out.puts(s"${kaitaiType2JavaType(dataType)} ${translator.doName("_")};")
     out.puts("int i = 0;")
     out.puts("do {")
     out.inc