kaitai-struct-compiler 0.10.0-SNAPSHOT20220409.5702.c4cb01b0 → 0.10.0-SNAPSHOT20220415.194636.880ae970

package/kaitai-struct-compiler.js

@@ -1505,28 +1505,26 @@ function $f_Lio_kaitai_struct_languages_components_CommonReads__needRaw__Lio_kai
   return (((rawIo === true) && (rawProcess === false)) ? $m_Lio_kaitai_struct_datatype_RawIo$() : (((rawIo === false) && (rawProcess === true)) ? $m_Lio_kaitai_struct_datatype_RawProcess$() : (((rawIo === true) && (rawProcess === true)) ? $m_Lio_kaitai_struct_datatype_RawIoProcess$() : $m_Lio_kaitai_struct_datatype_NotRaw$())))
 }
 function $f_Lio_kaitai_struct_languages_components_CommonReads__attrParse0__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_format_AttrLikeSpec__T__s_Option__V($thiz, id, attr, io, defEndian) {
+  var x = attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1;
+  var x$2 = $m_Lio_kaitai_struct_format_NoRepeat$();
+  if ((!((x !== null) && x.equals__O__Z(x$2)))) {
+    var jsx$2 = $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz);
+    var jsx$1 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
+    var dataType = attr.dataType__Lio_kaitai_struct_datatype_DataType();
+    jsx$2.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V(id, jsx$1, $f_Lio_kaitai_struct_languages_components_CommonReads__needRaw__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw($thiz, dataType))
+  };
   var x1 = attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1;
   matchEnd9: {
-    var x = $m_Lio_kaitai_struct_format_RepeatEos$();
-    if ((x === x1)) {
-      var jsx$2 = $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz);
-      var jsx$1 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-      var dataType = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-      jsx$2.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V(id, io, jsx$1, $f_Lio_kaitai_struct_languages_components_CommonReads__needRaw__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw($thiz, dataType));
-      $thiz.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(id, attr.dataType__Lio_kaitai_struct_datatype_DataType(), io, attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1, false, defEndian, $thiz.attrParse2$default$7__s_Option());
-      $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatEosFooter__V();
+    var x$3 = $m_Lio_kaitai_struct_format_RepeatEos$();
+    if ((x$3 === x1)) {
+      $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V(id, io, attr.dataType__Lio_kaitai_struct_datatype_DataType());
       break matchEnd9
     };
     if ((x1 instanceof $c_Lio_kaitai_struct_format_RepeatExpr)) {
       var x2 = $as_Lio_kaitai_struct_format_RepeatExpr(x1);
       var repeatExpr = x2.expr$1;
       if ((repeatExpr !== null)) {
-        var jsx$4 = $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz);
-        var jsx$3 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-        var dataType$1 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-        jsx$4.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V(id, io, jsx$3, $f_Lio_kaitai_struct_languages_components_CommonReads__needRaw__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw($thiz, dataType$1), repeatExpr);
-        $thiz.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(id, attr.dataType__Lio_kaitai_struct_datatype_DataType(), io, attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1, false, defEndian, $thiz.attrParse2$default$7__s_Option());
-        $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatExprFooter__V();
+        $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V(id, io, attr.dataType__Lio_kaitai_struct_datatype_DataType(), repeatExpr);
         break matchEnd9
       }
     };
@@ -1534,24 +1532,41 @@ function $f_Lio_kaitai_struct_languages_components_CommonReads__attrParse0__Lio_
       var x3 = $as_Lio_kaitai_struct_format_RepeatUntil(x1);
       var untilExpr = x3.expr$1;
       if ((untilExpr !== null)) {
-        var jsx$6 = $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz);
-        var jsx$5 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-        var dataType$2 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-        jsx$6.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V(id, io, jsx$5, $f_Lio_kaitai_struct_languages_components_CommonReads__needRaw__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw($thiz, dataType$2), untilExpr);
-        $thiz.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(id, attr.dataType__Lio_kaitai_struct_datatype_DataType(), io, attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1, false, defEndian, $thiz.attrParse2$default$7__s_Option());
-        var jsx$8 = $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz);
-        var jsx$7 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-        var dataType$3 = attr.dataType__Lio_kaitai_struct_datatype_DataType();
-        jsx$8.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V(id, io, jsx$7, $f_Lio_kaitai_struct_languages_components_CommonReads__needRaw__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw($thiz, dataType$3), untilExpr);
+        $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V(id, io, attr.dataType__Lio_kaitai_struct_datatype_DataType(), untilExpr);
         break matchEnd9
       }
     };
-    var x$3 = $m_Lio_kaitai_struct_format_NoRepeat$();
-    if ((x$3 === x1)) {
-      $thiz.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(id, attr.dataType__Lio_kaitai_struct_datatype_DataType(), io, attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1, false, defEndian, $thiz.attrParse2$default$7__s_Option());
+    var x$5 = $m_Lio_kaitai_struct_format_NoRepeat$();
+    if ((x$5 === x1)) {
       break matchEnd9
     };
     throw new $c_s_MatchError().init___O(x1)
+  };
+  $thiz.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(id, attr.dataType__Lio_kaitai_struct_datatype_DataType(), io, attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1, false, defEndian, $thiz.attrParse2$default$7__s_Option());
+  var x1$2 = attr.cond__Lio_kaitai_struct_format_ConditionalSpec().repeat$1;
+  matchEnd8: {
+    var x$7 = $m_Lio_kaitai_struct_format_RepeatEos$();
+    if ((x$7 === x1$2)) {
+      $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatEosFooter__V();
+      break matchEnd8
+    };
+    if ((x1$2 instanceof $c_Lio_kaitai_struct_format_RepeatExpr)) {
+      $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatExprFooter__V();
+      break matchEnd8
+    };
+    if ((x1$2 instanceof $c_Lio_kaitai_struct_format_RepeatUntil)) {
+      var x2$2 = $as_Lio_kaitai_struct_format_RepeatUntil(x1$2);
+      var untilExpr$2 = x2$2.expr$1;
+      if ((untilExpr$2 !== null)) {
+        $as_Lio_kaitai_struct_languages_components_LanguageCompiler($thiz).condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V(id, io, attr.dataType__Lio_kaitai_struct_datatype_DataType(), untilExpr$2);
+        break matchEnd8
+      }
+    };
+    var x$9 = $m_Lio_kaitai_struct_format_NoRepeat$();
+    if ((x$9 === x1$2)) {
+      break matchEnd8
+    };
+    throw new $c_s_MatchError().init___O(x1$2)
   }
 }
 function $f_Lio_kaitai_struct_languages_components_CommonReads__attrValidateAll__Lio_kaitai_struct_format_AttrLikeSpec__V($thiz, attr) {
@@ -4415,9 +4430,9 @@ function $h_Lio_kaitai_struct_Version$() {
 $h_Lio_kaitai_struct_Version$.prototype = $c_Lio_kaitai_struct_Version$.prototype;
 $c_Lio_kaitai_struct_Version$.prototype.init___ = (function() {
   this.name$1 = "kaitai-struct-compiler-js";
-  this.version$1 = "0.10-SNAPSHOT20220409.005702.c4cb01b0";
-  this.gitCommit$1 = "c4cb01b0";
-  this.gitTime$1 = "2022-04-09T00:57:02+00:00";
+  this.version$1 = "0.10-SNAPSHOT20220415.194636.880ae970";
+  this.gitCommit$1 = "880ae970";
+  this.gitTime$1 = "2022-04-15T19:46:36+00:00";
   return this
 });
 var $d_Lio_kaitai_struct_Version$ = new $TypeData().initClass({
@@ -20698,11 +20713,11 @@ $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.compileParseInstance__Lio_
   }
 });
 $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.compileEnum__Lio_kaitai_struct_format_EnumSpec__V = (function(enumSpec) {
+  var this$1 = this.importList$1;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "import enum");
   var jsx$1 = this.out$1;
-  var this$1 = enumSpec.name$1;
-  jsx$1.puts__T__V((("def " + $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "__", "")) + "(subcon):"));
-  this.out$1.inc__V();
-  this.out$1.puts__T__V("return Enum(subcon,");
+  var name = enumSpec.name$1;
+  jsx$1.puts__T__V((("class " + $f_sc_TraversableOnce__mkString__T__T__T__T(name, "", "__", "")) + "(enum.IntEnum):"));
   this.out$1.inc__V();
   enumSpec.sortedSeq__sc_Seq().foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
     return (function(x0$1$2) {
@@ -20712,17 +20727,20 @@ $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.compileEnum__Lio_kaitai_st
         var lo = t.lo$2;
         var hi = t.hi$2;
         var valueSpec = $as_Lio_kaitai_struct_format_EnumValueSpec(x0$1.$$und2__O());
-        $this.out$1.puts__T__V((((valueSpec.name$1 + "=") + new $c_sjsr_RuntimeLong().init___I__I(lo, hi)) + ","))
+        var jsx$3 = $this.out$1;
+        var jsx$2 = valueSpec.name$1;
+        var this$3 = $m_s_math_BigInt$();
+        var n = this$3.apply__J__s_math_BigInt(new $c_sjsr_RuntimeLong().init___I__I(lo, hi));
+        var this$5 = n.bigInteger$3;
+        jsx$3.puts__T__V(((jsx$2 + " = ") + $m_Ljava_math_Conversion$().toDecimalScaledString__Ljava_math_BigInteger__T(this$5)))
       } else {
         throw new $c_s_MatchError().init___O(x0$1)
       }
     })
   })(this)));
   this.out$1.dec__V();
-  this.out$1.puts__T__V(")");
-  this.out$1.dec__V();
-  var this$2 = this.out$1;
-  this$2.sb$2.append__T__scm_StringBuilder("\n")
+  var this$6 = this.out$1;
+  this$6.sb$2.append__T__scm_StringBuilder("\n")
 });
 $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.fixedEndianToStr__Lio_kaitai_struct_datatype_FixedEndian__T = (function(e) {
   var x = $m_Lio_kaitai_struct_datatype_LittleEndian$();
@@ -20738,29 +20756,31 @@ $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.fixedEndianToStr__Lio_kait
   }
 });
 $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.compile__Lio_kaitai_struct_CompileLog$SpecSuccess = (function() {
-  this.out$1.puts__T__V("from construct import *");
-  this.out$1.puts__T__V("from construct.lib import *");
-  var this$1 = this.out$1;
-  this$1.sb$2.append__T__scm_StringBuilder("\n");
+  var this$1 = this.importList$1;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "from construct import *");
+  var this$2 = this.importList$1;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$2.list$1, "from construct.lib import *");
   this.compileClass__Lio_kaitai_struct_format_ClassSpec__V(this.topClass$1);
   var jsx$1 = this.out$1;
-  var cs = this.topClass$1;
-  var this$2 = cs.name$1;
-  jsx$1.puts__T__V(("_schema = " + $f_sc_TraversableOnce__mkString__T__T__T__T(this$2, "", "__", "")));
+  var name = this.topClass$1.name$1;
+  jsx$1.puts__T__V(("_schema = " + $f_sc_TraversableOnce__mkString__T__T__T__T(name, "", "__", "")));
   $m_sci_List$();
-  var this$3 = this.topClass$1;
-  var this$4 = this$3.name$1;
-  var jsx$2 = this.outFileName__T__T($f_sc_TraversableOnce__mkString__T__T__T__T(this$4, "", "::", ""));
-  var this$5 = this.out$1;
-  var this$6 = this$5.sb$2;
-  var array = [new $c_Lio_kaitai_struct_CompileLog$FileSuccess().init___T__T(jsx$2, this$6.underlying$5.java$lang$StringBuilder$$content$f)];
+  var this$4 = this.topClass$1;
+  var this$5 = this$4.name$1;
+  var jsx$3 = this.outFileName__T__T($f_sc_TraversableOnce__mkString__T__T__T__T(this$5, "", "::", ""));
+  var this$6 = this.importList$1;
+  var this$7 = this$6.list$1.toList__sci_List();
+  var jsx$2 = $f_sc_TraversableOnce__mkString__T__T__T__T(this$7, "", "\n", "");
+  var this$8 = this.out$1;
+  var this$9 = this$8.sb$2;
+  var array = [new $c_Lio_kaitai_struct_CompileLog$FileSuccess().init___T__T(jsx$3, ((jsx$2 + "\n\n") + this$9.underlying$5.java$lang$StringBuilder$$content$f))];
   var i = (((-1) + $uI(array.length)) | 0);
   var result = $m_sci_Nil$();
   while ((i >= 0)) {
-    var this$10 = result;
+    var this$13 = result;
     var index = i;
     var x = array[index];
-    result = new $c_sci_$colon$colon().init___O__sci_List(x, this$10);
+    result = new $c_sci_$colon$colon().init___O__sci_List(x, this$13);
     i = (((-1) + i) | 0)
   };
   return new $c_Lio_kaitai_struct_CompileLog$SpecSuccess().init___T__sci_List("", result)
@@ -20939,8 +20959,8 @@ $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.compileClass__Lio_kaitai_s
     })
   })(this)));
   var jsx$1 = this.out$1;
-  var this$1 = cs.name$1;
-  jsx$1.puts__T__V(($f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "__", "") + " = Struct("));
+  var name = cs.name$1;
+  jsx$1.puts__T__V(($f_sc_TraversableOnce__mkString__T__T__T__T(name, "", "__", "") + " = Struct("));
   this.out$1.inc__V();
   this.provider$1.nowClass$1 = cs;
   var this$3 = cs.seq$1;
@@ -21118,9 +21138,8 @@ $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.typeToStr__Lio_kaitai_stru
     }
   } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$UserTypeInstream)) {
     var x9 = $as_Lio_kaitai_struct_datatype_DataType$UserTypeInstream(dataType);
-    var cs = $as_Lio_kaitai_struct_format_ClassSpec(x9.classSpec$3.get__O());
-    var this$1 = cs.name$1;
-    return (("LazyBound(lambda: " + $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "__", "")) + ")")
+    var name = $as_Lio_kaitai_struct_format_ClassSpec(x9.classSpec$3.get__O()).name$1;
+    return (("LazyBound(lambda: " + $f_sc_TraversableOnce__mkString__T__T__T__T(name, "", "__", "")) + ")")
   } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$UserTypeFromBytes)) {
     var x10 = $as_Lio_kaitai_struct_datatype_DataType$UserTypeFromBytes(dataType);
     var x1$3 = x10.bytes$4;
@@ -21128,17 +21147,16 @@ $c_Lio_kaitai_struct_ConstructClassCompiler.prototype.typeToStr__Lio_kaitai_stru
       var x2$2 = $as_Lio_kaitai_struct_datatype_DataType$BytesLimitType(x1$3);
       var size = x2$2.size$2;
       var jsx$1 = this.translator$1.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(size);
-      var cs$1 = $as_Lio_kaitai_struct_format_ClassSpec(x10.classSpec$3.get__O());
-      var this$2 = cs$1.name$1;
-      return (((("FixedSized(" + jsx$1) + ", LazyBound(lambda: ") + $f_sc_TraversableOnce__mkString__T__T__T__T(this$2, "", "__", "")) + "))")
+      var name$1 = $as_Lio_kaitai_struct_format_ClassSpec(x10.classSpec$3.get__O()).name$1;
+      return (((("FixedSized(" + jsx$1) + ", LazyBound(lambda: ") + $f_sc_TraversableOnce__mkString__T__T__T__T(name$1, "", "__", "")) + "))")
     } else {
       return "???"
     }
   } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$EnumType)) {
     var x11 = $as_Lio_kaitai_struct_datatype_DataType$EnumType(dataType);
-    var enumSpec = $as_Lio_kaitai_struct_format_EnumSpec(x11.enumSpec$1.get__O());
-    var this$3 = enumSpec.name$1;
-    return ((($f_sc_TraversableOnce__mkString__T__T__T__T(this$3, "", "__", "") + "(") + this.typeToStr__Lio_kaitai_struct_datatype_DataType__T(x11.basedOn$1)) + ")")
+    var jsx$2 = this.typeToStr__Lio_kaitai_struct_datatype_DataType__T(x11.basedOn$1);
+    var name$2 = $as_Lio_kaitai_struct_format_EnumSpec(x11.enumSpec$1.get__O()).name$1;
+    return (((("Enum(" + jsx$2) + ", ") + $f_sc_TraversableOnce__mkString__T__T__T__T(name$2, "", "__", "")) + ")")
   } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$SwitchType)) {
     var x12 = $as_Lio_kaitai_struct_datatype_DataType$SwitchType(dataType);
     return this.attrSwitchType__Lio_kaitai_struct_datatype_DataType$SwitchType__T(x12)
@@ -34561,7 +34579,7 @@ function $f_Lio_kaitai_struct_languages_components_GoReads__handleAssignment__Li
   if ((x === rep)) {
     $thiz.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_translators_TranslatorResult__V(id, expr)
   } else if ((rep instanceof $c_Lio_kaitai_struct_format_RepeatExpr)) {
-    $thiz.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_translators_TranslatorResult__V(id, expr)
+    $thiz.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_translators_TranslatorResult__V(id, expr)
   } else if ((rep instanceof $c_Lio_kaitai_struct_format_RepeatUntil)) {
     $thiz.handleAssignmentRepeatUntil__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_translators_TranslatorResult__Z__V(id, expr, isRaw)
   } else {
@@ -69976,6 +69994,9 @@ $c_Lio_kaitai_struct_translators_ConstructTranslator.prototype.init___Lio_kaitai
   $c_Lio_kaitai_struct_translators_PythonTranslator.prototype.init___Lio_kaitai_struct_translators_TypeProvider__Lio_kaitai_struct_ImportList.call(this, provider, importList);
   return this
 });
+$c_Lio_kaitai_struct_translators_ConstructTranslator.prototype.doEnumByLabel__sci_List__T__T = (function(enumTypeAbs, label) {
+  return (("'" + label) + "'")
+});
 var $d_Lio_kaitai_struct_translators_ConstructTranslator = new $TypeData().initClass({
   Lio_kaitai_struct_translators_ConstructTranslator: 0
 }, false, "io.kaitai.struct.translators.ConstructTranslator", {
@@ -72354,6 +72375,14 @@ function $h_Lio_kaitai_struct_languages_CppCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_CppCompiler.prototype = $c_Lio_kaitai_struct_languages_CppCompiler.prototype;
+$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.outSrc$2.puts__T__V("i++;");
+  this.outSrc$2.dec__V();
+  this.outSrc$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"));
+  this.outSrc$2.dec__V();
+  this.outSrc$2.puts__T__V("}")
+});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.instanceDeclaration__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
   this.ensureMode__Lio_kaitai_struct_languages_CppCompiler$AccessMode__V(this.PrivateAccess__Lio_kaitai_struct_languages_CppCompiler$PrivateAccess$());
   this.outHdr$2.puts__T__V((("bool " + this.calculatedFlagForName__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"));
@@ -72372,23 +72401,11 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.stdMoveWrap__T__T = (functi
     return expr
   }
 });
-$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.importListHdr$2.addSystem__T__V("vector");
-  if ((needRaw.level__I() >= 1)) {
-    this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"));
-    if (needRaw.hasIO__Z()) {
-      this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_IoStorageIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$OwnedKaitaiStreamType$())) + ";"))
-    }
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"))
-  };
-  this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T(dataType)) + ";"));
+$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.outSrc$2.puts__T__V("{");
   this.outSrc$2.inc__V();
   this.outSrc$2.puts__T__V("int i = 0;");
-  this.outSrc$2.puts__T__V((((this.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__Z__T(dataType.asNonOwning__Lio_kaitai_struct_datatype_DataType(), false) + " ") + this.translator$2.doName__T__T("_")) + ";"));
-  this.outSrc$2.puts__T__V("do {");
+  this.outSrc$2.puts__T__V((("while (!" + io) + "->is_eof()) {"));
   this.outSrc$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.needsDestruction__Lio_kaitai_struct_datatype_DataType__Z = (function(t) {
@@ -72436,6 +72453,19 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.switchIfElseStart__V = (fun
   this.outSrc$2.puts__T__V("else {");
   this.outSrc$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  this.importListHdr$2.addSystem__T__V("vector");
+  if ((needRaw.level__I() >= 1)) {
+    this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"));
+    if (needRaw.hasIO__Z()) {
+      this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_IoStorageIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$OwnedKaitaiStreamType$())) + ";"))
+    }
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"))
+  };
+  this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T(dataType)) + ";"))
+});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.importDataType__Lio_kaitai_struct_datatype_DataType__V = (function(dt) {
   if ((dt instanceof $c_Lio_kaitai_struct_datatype_DataType$UserType)) {
     var x2 = $as_Lio_kaitai_struct_datatype_DataType$UserType(dt);
@@ -72513,24 +72543,6 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.destructVector__T__T__V = (
   this.outSrc$2.dec__V();
   this.outSrc$2.puts__T__V("}")
 });
-$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  this.importListHdr$2.addSystem__T__V("vector");
-  if ((needRaw.level__I() >= 1)) {
-    this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"));
-    if (needRaw.hasIO__Z()) {
-      this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_IoStorageIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$OwnedKaitaiStreamType$())) + ";"))
-    }
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"))
-  };
-  this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T(dataType)) + ";"));
-  this.outSrc$2.puts__T__V("{");
-  this.outSrc$2.inc__V();
-  this.outSrc$2.puts__T__V("int i = 0;");
-  this.outSrc$2.puts__T__V((("while (!" + io) + "->is_eof()) {"));
-  this.outSrc$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("m_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -73089,6 +73101,12 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.destructWithSafeguardHeader
   this.outSrc$2.puts__T__V((("if (" + ptr) + ") {"));
   this.outSrc$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  var lenVar = ("l_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id));
+  this.outSrc$2.puts__T__V((((("const int " + lenVar) + " = ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ";"));
+  this.outSrc$2.puts__T__V((("for (int i = 0; i < " + lenVar) + "; i++) {"));
+  this.outSrc$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.localTemporaryName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("_t_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -73183,7 +73201,7 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.handleAssignmentRepeatEos__
   this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "->push_back(") + this.stdMoveWrap__T__T(expr)) + ");"))
 });
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "->push_back(") + this.stdMoveWrap__T__T(expr)) + ");"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.classHeader__sci_List__V = (function(name) {
   var jsx$1 = $m_Lio_kaitai_struct_languages_CppCompiler$();
@@ -73297,6 +73315,14 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.classConstructorFooter__V =
   this.outSrc$2.dec__V();
   this.outSrc$2.puts__T__V("}")
 });
+$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.outSrc$2.puts__T__V("{");
+  this.outSrc$2.inc__V();
+  this.outSrc$2.puts__T__V("int i = 0;");
+  this.outSrc$2.puts__T__V((((this.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__Z__T(dataType.asNonOwning__Lio_kaitai_struct_datatype_DataType(), false) + " ") + this.translator$2.doName__T__T("_")) + ";"));
+  this.outSrc$2.puts__T__V("do {");
+  this.outSrc$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -73351,30 +73377,6 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.readFooter__V = (function()
   this.outSrc$2.dec__V();
   this.outSrc$2.puts__T__V("}")
 });
-$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  this.importListHdr$2.addSystem__T__V("vector");
-  var lenVar = ("l_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id));
-  this.outSrc$2.puts__T__V((((("int " + lenVar) + " = ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ";"));
-  if ((needRaw.level__I() >= 1)) {
-    var rawId = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id));
-    this.outSrc$2.puts__T__V((((rawId + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"));
-    this.outSrc$2.puts__T__V((((rawId + "->reserve(") + lenVar) + ");"));
-    if (needRaw.hasIO__Z()) {
-      var ioId = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_IoStorageIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)));
-      this.outSrc$2.puts__T__V((((ioId + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$OwnedKaitaiStreamType$())) + ";"));
-      this.outSrc$2.puts__T__V((((ioId + "->reserve(") + lenVar) + ");"))
-    }
-  };
-  if ((needRaw.level__I() >= 2)) {
-    var rawId$2 = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)));
-    this.outSrc$2.puts__T__V((((rawId$2 + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T($m_Lio_kaitai_struct_datatype_DataType$CalcBytesType$())) + ";"));
-    this.outSrc$2.puts__T__V((((rawId$2 + "->reserve(") + lenVar) + ");"))
-  };
-  this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ") + this.newVector__Lio_kaitai_struct_datatype_DataType__T(dataType)) + ";"));
-  this.outSrc$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "->reserve(") + lenVar) + ");"));
-  this.outSrc$2.puts__T__V((("for (int i = 0; i < " + lenVar) + "; i++) {"));
-  this.outSrc$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.ksErrorName__Lio_kaitai_struct_datatype_KSError__T = (function(err) {
   var x = $m_Lio_kaitai_struct_datatype_EndOfStreamError$();
   if ((x === err)) {
@@ -73757,14 +73759,6 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.translator__Lio_kaitai_stru
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.classDestructorFooter__V = (function() {
   this.classConstructorFooter__V()
 });
-$c_Lio_kaitai_struct_languages_CppCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.outSrc$2.puts__T__V("i++;");
-  this.outSrc$2.dec__V();
-  this.outSrc$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"));
-  this.outSrc$2.dec__V();
-  this.outSrc$2.puts__T__V("}")
-});
 $c_Lio_kaitai_struct_languages_CppCompiler.prototype.instanceCalculate__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(instName, dataType, value) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__instanceCalculate__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V(this, instName, dataType, value)
 });
@@ -74404,6 +74398,16 @@ function $h_Lio_kaitai_struct_languages_GoCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_GoCompiler.prototype = $c_Lio_kaitai_struct_languages_GoCompiler.prototype;
+$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + " {"));
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("break");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("}");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("}")
+});
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.switchEnd__V = (function() {
   this.out$2.puts__T__V("}")
 });
@@ -74411,15 +74415,17 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.instanceDeclaration__Lio_kai
   this.out$2.puts__T__V((this.calculatedFlagForName__Lio_kaitai_struct_format_Identifier__T(attrName) + " bool"));
   this.out$2.puts__T__V(((this.idToStr__Lio_kaitai_struct_format_Identifier__T(attrName) + " ") + $m_Lio_kaitai_struct_languages_GoCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(attrType)))
 });
-$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = make([][]byte, 0);"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = make([][]byte, 0);"))
-  };
+$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("for i := 1;; i++ {");
-  this.out$2.inc__V()
+  this.out$2.inc__V();
+  var eofVar = this.translator$2.allocateLocalVar__I();
+  this.out$2.puts__T__V((this.translator$2.localVarName__I__T(eofVar) + ", err := this._io.EOF()"));
+  this.translator$2.outAddErrCheck__V();
+  this.out$2.puts__T__V((("if " + this.translator$2.localVarName__I__T(eofVar)) + " {"));
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("break");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("}")
 });
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.switchCaseStartCompareFn__T__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(compareFn, switchOn, condition) {
   this.out$2.puts__T__V((((((("case " + compareFn) + "(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, switchOn)) + ", ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, condition)) + "):"));
@@ -74428,6 +74434,9 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.switchCaseStartCompareFn__T_
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
   this.outHeader$2 = x$1
 });
+$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  /*<skip>*/
+});
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.attrParseHybrid__F0__F0__V = (function(leProc, beProc) {
   this.out$2.puts__T__V((("switch " + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T($m_Lio_kaitai_struct_format_EndianIdentifier$())) + " {"));
   this.out$2.puts__T__V("case 0:");
@@ -74449,24 +74458,6 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.instanceHeader__sci_List__Li
   this.out$2.inc__V();
   this.translator$2.returnRes$2 = new $c_s_Some().init___O(((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$NumericType) ? "0" : ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$BooleanType) ? "false" : ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$StrType) ? "\"\"" : "nil"))))
 });
-$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = make([][]byte, 0);"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = make([][]byte, 0);"))
-  };
-  this.out$2.puts__T__V("for i := 1;; i++ {");
-  this.out$2.inc__V();
-  var eofVar = this.translator$2.allocateLocalVar__I();
-  this.out$2.puts__T__V((this.translator$2.localVarName__I__T(eofVar) + ", err := this._io.EOF()"));
-  this.translator$2.outAddErrCheck__V();
-  this.out$2.puts__T__V((("if " + this.translator$2.localVarName__I__T(eofVar)) + " {"));
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("break");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("}")
-});
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("this." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -74715,10 +74706,10 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.idToStr__Lio_kaitai_struct_f
     throw new $c_s_MatchError().init___O(id)
   }
 });
-$c_Lio_kaitai_struct_languages_GoCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_translators_TranslatorResult__V = (function(id, r) {
-  var name = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id);
-  var expr = this.translator$2.resToStr__Lio_kaitai_struct_translators_TranslatorResult__T(r);
-  this.out$2.puts__T__V(((name + "[i] = ") + expr))
+$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for i := 0; i < int(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "); i++ {"));
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("_ = i")
 });
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((io + ".AlignToByte()"))
@@ -74821,6 +74812,10 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.switchCaseStart__Lio_kaitai_
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.classConstructorFooter__V = (function() {
   /*<skip>*/
 });
+$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("for i := 1;; i++ {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignType) {
   $f_Lio_kaitai_struct_languages_components_GoReads__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignType)
 });
@@ -74871,17 +74866,6 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.readFooter__V = (function()
   this.out$2.puts__T__V("return err");
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = make([][]byte, ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = make([][]byte, ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"))
-  };
-  this.out$2.puts__T__V((((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = make(") + $m_Lio_kaitai_struct_languages_GoCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType))) + ", ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"));
-  this.out$2.puts__T__V((("for i := range " + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id)) + " {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   this.out$2.puts__T__V((("switch (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ") {"))
 });
@@ -75010,7 +74994,7 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.normalIO__T = (function() {
 });
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.handleAssignmentRepeatUntil__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_translators_TranslatorResult__Z__V = (function(id, r, isRaw) {
   var expr = this.translator$2.resToStr__Lio_kaitai_struct_translators_TranslatorResult__T(r);
-  var tempVar = this.translator$2.specialName__T__T($m_Lio_kaitai_struct_format_Identifier$().ITERATOR$1);
+  var tempVar = this.translator$2.specialName__T__T((isRaw ? $m_Lio_kaitai_struct_format_Identifier$().ITERATOR2$1 : $m_Lio_kaitai_struct_format_Identifier$().ITERATOR$1));
   this.out$2.puts__T__V(((tempVar + " := ") + expr));
   this.out$2.puts__T__V((((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = append(") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id)) + ", ") + tempVar) + ")"))
 });
@@ -75110,16 +75094,6 @@ $c_Lio_kaitai_struct_languages_GoCompiler.prototype.calculatedFlagForName__Lio_k
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_GoCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + " {"));
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("break");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("}");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("}")
-});
 $c_Lio_kaitai_struct_languages_GoCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
@@ -75274,6 +75248,12 @@ function $h_Lio_kaitai_struct_languages_JavaScriptCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype = $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype;
+$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V("i++;");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"))
+});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.switchEnd__V = (function() {
   this.out$2.puts__T__V("}")
 });
@@ -75292,19 +75272,9 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.classToString__Lio_k
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
 });
-$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"));
-  if (this.config$1.readStoresPos$1) {
-    this.out$2.puts__T__V((("this._debug." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id)) + ".arr = [];"))
-  };
+$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("var i = 0;");
-  this.out$2.puts__T__V("do {");
+  this.out$2.puts__T__V((("while (!" + io) + ".isEof()) {"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
@@ -75314,6 +75284,18 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.switchIfElseStart__V
   this.out$2.puts__T__V("else {");
   this.out$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"));
+  if (this.config$1.readStoresPos$1) {
+    this.out$2.puts__T__V((("this._debug." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id)) + ".arr = [];"))
+  }
+});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.attrParseHybrid__F0__F0__V = (function(leProc, beProc) {
   this.out$2.puts__T__V("if (this._is_le) {");
   this.out$2.inc__V();
@@ -75336,21 +75318,6 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.instanceHeader__sci_
   this.out$2.puts__T__V("get: function() {");
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"));
-  if (this.config$1.readStoresPos$1) {
-    this.out$2.puts__T__V((("this._debug." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id)) + ".arr = [];"))
-  };
-  this.out$2.puts__T__V("var i = 0;");
-  this.out$2.puts__T__V((("while (!" + io) + ".isEof()) {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("this." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -75821,6 +75788,10 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.idToStr__Lio_kaitai_
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for (var i = 0; i < " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "; i++) {"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.localTemporaryName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("_t_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -75866,7 +75837,7 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.handleAssignmentRepe
   this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".push(") + expr) + ");"))
 });
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "[i] = ") + expr) + ";"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.readHeader__s_Option__Z__V = (function(endian, isEmpty) {
   if ((endian instanceof $c_s_Some)) {
@@ -75921,6 +75892,11 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.classConstructorFoot
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
 });
+$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("var i = 0;");
+  this.out$2.puts__T__V("do {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -75963,20 +75939,6 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.readFooter__V = (fun
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
 });
-$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new Array(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ");"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new Array(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ");"))
-  };
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = new Array(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ");"));
-  if (this.config$1.readStoresPos$1) {
-    this.out$2.puts__T__V((((("this._debug." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id)) + ".arr = new Array(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ");"))
-  };
-  this.out$2.puts__T__V((("for (var i = 0; i < " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "; i++) {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   this.out$2.puts__T__V((("switch (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ") {"))
 });
@@ -76234,12 +76196,6 @@ $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.translator__Lio_kait
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V("i++;");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"))
-});
 $c_Lio_kaitai_struct_languages_JavaScriptCompiler.prototype.attrDebugName__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_format_RepeatSpec__Z__T = (function(attrId, rep, end) {
   var x = $m_Lio_kaitai_struct_format_NoRepeat$();
   if ((x === rep)) {
@@ -76350,19 +76306,18 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.classHeader__sci_List__s_Op
   jsx$1.puts__T__V(((("class " + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name$1)) + ext) + " {"));
   this.out$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V("$i++;");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"))
+});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.switchEnd__V = (function() {
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"));
+$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("$i = 0;");
-  this.out$2.puts__T__V("do {");
+  this.out$2.puts__T__V((("while (!" + io) + "->isEof()) {"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.paramName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
@@ -76426,6 +76381,15 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.kaitaiType2NativeType__Lio_
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
   this.outHeader$2 = x$1
 });
+$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"))
+});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.attrParseHybrid__F0__F0__V = (function(leProc, beProc) {
   this.out$2.puts__T__V("if ($this->_m__is_le) {");
   this.out$2.inc__V();
@@ -76441,18 +76405,6 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.instanceHeader__sci_List__L
   this.out$2.puts__T__V((("public function " + this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName)) + "() {"));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"));
-  this.out$2.puts__T__V("$i = 0;");
-  this.out$2.puts__T__V((("while (!" + io) + "->isEof()) {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   var x = $m_Lio_kaitai_struct_format_IoIdentifier$();
   if (x.equals__O__Z(id)) {
@@ -76761,6 +76713,11 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.idToStr__Lio_kaitai_struct_
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("$n = " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ";"));
+  this.out$2.puts__T__V("for ($i = 0; $i < $n; $i++) {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((io + "->alignToByte();"))
 });
@@ -76816,7 +76773,7 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.handleAssignmentRepeatEos__
   this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "[] = ") + expr) + ";"))
 });
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "[] = ") + expr) + ";"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.readHeader__s_Option__Z__V = (function(endian, isEmpty) {
   if ((endian instanceof $c_s_Some)) {
@@ -76854,6 +76811,11 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.switchCaseStart__Lio_kaitai
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.classConstructorFooter__V = (function() {
   this.universalFooter__V()
 });
+$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("$i = 0;");
+  this.out$2.puts__T__V("do {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -76895,18 +76857,6 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.io$kaitai$struct$languages$
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.readFooter__V = (function() {
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"));
-  this.out$2.puts__T__V((("$n = " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ";"));
-  this.out$2.puts__T__V("for ($i = 0; $i < $n; $i++) {");
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   this.translator$2.detectType__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType(on);
   this.out$2.puts__T__V((("switch (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ") {"));
@@ -77119,12 +77069,6 @@ $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.translator__Lio_kaitai_stru
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_PHPCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V("$i++;");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"))
-});
 $c_Lio_kaitai_struct_languages_PHPCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
@@ -77194,18 +77138,16 @@ function $h_Lio_kaitai_struct_languages_PerlCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_PerlCompiler.prototype = $c_Lio_kaitai_struct_languages_PerlCompiler.prototype;
+$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.dec__V();
+  this.out$2.puts__T__V((("} until (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + ");"))
+});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.switchEnd__V = (function() {
   /*<skip>*/
 });
-$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ();"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ();"));
-  this.out$2.puts__T__V("do {");
+$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
+  this.out$2.puts__T__V((("while (!" + io) + "->is_eof()) {"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
@@ -77215,6 +77157,15 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.switchIfElseStart__V = (fu
   this.out$2.puts__T__V("else {");
   this.out$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ();"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ();"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ();"))
+});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.attrParseHybrid__F0__F0__V = (function(leProc, beProc) {
   this.out$2.puts__T__V((("if (" + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T($m_Lio_kaitai_struct_format_EndianIdentifier$())) + ") {"));
   this.out$2.inc__V();
@@ -77236,17 +77187,6 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.instanceHeader__sci_List__
   this.out$2.inc__V();
   this.out$2.puts__T__V("my ($self) = @_;")
 });
-$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ();"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ();"));
-  this.out$2.puts__T__V((("while (!" + io) + "->is_eof()) {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.switchIfStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__V = (function(id, on, onType) {
   this.typeProvider$1.$$undcurrentSwitchType$1 = new $c_s_Some().init___O(this.translator$2.detectType__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType(on));
   this.out$2.puts__T__V((("my $_on = " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ";"))
@@ -77443,6 +77383,12 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.idToStr__Lio_kaitai_struct
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  var nVar = ("$n_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id));
+  this.out$2.puts__T__V((((("my " + nVar) + " = ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ";"));
+  this.out$2.puts__T__V((("for (my $i = 0; $i < " + nVar) + "; $i++) {"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((io + "->align_to_byte();"))
 });
@@ -77495,7 +77441,7 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.handleAssignmentRepeatEos_
   this.out$2.puts__T__V((((("push @{" + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id)) + "}, ") + expr) + ";"))
 });
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "[$i] = ") + expr) + ";"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.classHeader__sci_List__V = (function(name) {
   var this$1 = this.out$2;
@@ -77553,6 +77499,10 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.classConstructorFooter__V
   this.out$2.puts__T__V("return $self;");
   this.universalFooter__V()
 });
+$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("do {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.onComparisonExpr__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr$Compare = (function(condition) {
   return new $c_Lio_kaitai_struct_exprlang_Ast$expr$Compare().init___Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr(new $c_Lio_kaitai_struct_exprlang_Ast$expr$Name().init___Lio_kaitai_struct_exprlang_Ast$identifier(new $c_Lio_kaitai_struct_exprlang_Ast$identifier().init___T("_on")), $m_Lio_kaitai_struct_exprlang_Ast$cmpop$Eq$(), condition)
 });
@@ -77596,19 +77546,6 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.io$kaitai$struct$languages
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.readFooter__V = (function() {
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = ();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = ();"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ();"));
-  var nVar = ("$n_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id));
-  this.out$2.puts__T__V((((("my " + nVar) + " = ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ";"));
-  this.out$2.puts__T__V((("for (my $i = 0; $i < " + nVar) + "; $i++) {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   /*<skip>*/
 });
@@ -77756,11 +77693,6 @@ $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.translator__Lio_kaitai_str
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_PerlCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.dec__V();
-  this.out$2.puts__T__V((("} until (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + ");"))
-});
 $c_Lio_kaitai_struct_languages_PerlCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
@@ -77865,21 +77797,20 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.classHeader__sci_List__s_O
   this.out$2.puts__T__V("#[derive(Default)]");
   this.out$2.puts__T__V((("pub struct " + $m_Lio_kaitai_struct_languages_RustCompiler$().types2classRel__sci_List__T(name)) + " {"))
 });
+$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V((("!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + ")"));
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("} { }")
+});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.switchEnd__V = (function() {
   this.universalFooter__V()
 });
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.instanceDeclaration__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
   this.out$2.puts__T__V((((("    pub " + this.idToStr__Lio_kaitai_struct_format_Identifier__T(attrName)) + ": Option<") + this.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(attrType)) + ">,"))
 });
-$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = vec!();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = vec!();"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = vec!();"));
-  this.out$2.puts__T__V("while {");
+$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
+  this.out$2.puts__T__V((("while !" + io) + ".isEof() {"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.paramName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
@@ -78091,6 +78022,15 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.kaitaiType2NativeType__Lio
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
   this.outHeader$2 = x$1
 });
+$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = vec!();"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = vec!();"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = vec!();"))
+});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.attrParseHybrid__F0__F0__V = (function(leProc, beProc) {
   this.out$2.puts__T__V("if ($this->_m__is_le) {");
   this.out$2.inc__V();
@@ -78106,17 +78046,6 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.instanceHeader__sci_List__
   this.out$2.puts__T__V((((("fn " + this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName)) + "(&mut self) -> ") + this.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType)) + " {"));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [];"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [];"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [];"));
-  this.out$2.puts__T__V((("while !" + io) + ".isEof() {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   var x = $m_Lio_kaitai_struct_format_IoIdentifier$();
   if (x.equals__O__Z(id)) {
@@ -78371,6 +78300,10 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.idToStr__Lio_kaitai_struct
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for i in 0.." + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + " {"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((io + ".alignToByte();"))
 });
@@ -78395,7 +78328,7 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.switchCaseEnd__V = (functi
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.handleAssignmentRepeatUntil__Lio_kaitai_struct_format_Identifier__T__Z__V = (function(id, expr, isRaw) {
   var tempVar = (isRaw ? this.translator$2.doLocalName__T__T($m_Lio_kaitai_struct_format_Identifier$().ITERATOR2$1) : this.translator$2.doLocalName__T__T($m_Lio_kaitai_struct_format_Identifier$().ITERATOR$1));
   this.out$2.puts__T__V((((("let " + tempVar) + " = ") + expr) + ";"));
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".append(") + expr) + ");"))
+  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".append(") + tempVar) + ");"))
 });
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.opaqueClassDeclaration__Lio_kaitai_struct_format_ClassSpec__V = (function(classSpec) {
   var this$1 = classSpec.name$1;
@@ -78443,10 +78376,10 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.condIfHeader__Lio_kaitai_s
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".push(") + expr) + ");"))
+  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".append(") + expr) + ");"))
 });
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".push(") + expr) + ");"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.classHeader__sci_List__V = (function(name) {
   this.classHeader__sci_List__s_Option__V(name, new $c_s_Some().init___O("&Option<Box<KaitaiStruct>>"))
@@ -78480,6 +78413,10 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.switchCaseStart__Lio_kaita
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.classConstructorFooter__V = (function() {
   this.universalFooter__V()
 });
+$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("while {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -78519,17 +78456,6 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.readFooter__V = (function(
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
 });
-$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = vec!();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = vec!();"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = vec!();"));
-  this.out$2.puts__T__V((("for i in 0.." + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + " {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   var onType = this.translator$2.detectType__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType(on);
   this.switchIfs$2 = ((onType instanceof $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream) || (onType instanceof $c_Lio_kaitai_struct_datatype_DataType$BytesType));
@@ -78729,12 +78655,6 @@ $c_Lio_kaitai_struct_languages_RustCompiler.prototype.translator__Lio_kaitai_str
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_RustCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V((("!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + ")"));
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("} { }")
-});
 $c_Lio_kaitai_struct_languages_RustCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
@@ -78824,13 +78744,21 @@ function $h_Lio_kaitai_struct_languages_CSharpCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_CSharpCompiler.prototype = $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype;
-$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchEnd__V = (function() {
+$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V("i++;");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"));
+  this.out$2.dec__V();
   this.out$2.puts__T__V("}")
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceDeclaration__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
   this.out$2.puts__T__V((("private bool " + this.flagForInstName__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"));
   this.out$2.puts__T__V((((("private " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_datatype_DataType__Z__T(attrType, isNullable)) + " ") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"))
 });
+$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchEnd__V = (function() {
+  this.out$2.puts__T__V("}")
+});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceHeader__T__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(className, instName, dataType, isNullable) {
   this.out$2.puts__T__V(((("public " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_datatype_DataType__Z__T(dataType, isNullable)) + " ") + this.publicMemberName__Lio_kaitai_struct_format_Identifier__T(instName)));
   this.out$2.puts__T__V("{");
@@ -78839,21 +78767,11 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceHeader__T__Lio_k
   this.out$2.puts__T__V("{");
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  var this$1 = this.importList$2;
-  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "System.Collections.Generic");
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new List<byte[]>();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new List<byte[]>();"))
-  };
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = new ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType))) + "();"));
+$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("{");
   this.out$2.inc__V();
   this.out$2.puts__T__V("var i = 0;");
-  this.out$2.puts__T__V(((($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType) + " ") + this.translator$2.doName__T__T("_")) + ";"));
-  this.out$2.puts__T__V("do {");
+  this.out$2.puts__T__V((("while (!" + io) + ".IsEof) {"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.paramName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
@@ -78867,6 +78785,17 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchIfElseStart__V = (
   this.out$2.puts__T__V("{");
   this.out$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  var this$1 = this.importList$2;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "System.Collections.Generic");
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new List<byte[]>();"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new List<byte[]>();"))
+  };
+  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = new ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType))) + "();"))
+});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.classHeader__T__V = (function(name) {
   this.out$2.puts__T__V((("public partial class " + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name)) + " : KaitaiStruct"));
   this.out$2.puts__T__V("{");
@@ -78899,22 +78828,6 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchCasesUsingIf__Lio_
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceHeader__sci_List__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(className, instName, dataType, isNullable) {
   this.instanceHeader__T__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V($as_T($f_sc_LinearSeqOptimized__last__O(className)), instName, dataType, isNullable)
 });
-$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  var this$1 = this.importList$2;
-  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "System.Collections.Generic");
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new List<byte[]>();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new List<byte[]>();"))
-  };
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = new ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType))) + "();"));
-  this.out$2.puts__T__V("{");
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("var i = 0;");
-  this.out$2.puts__T__V((("while (!" + io) + ".IsEof) {"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   if ((id instanceof $c_Lio_kaitai_struct_format_SpecialIdentifier)) {
     var x2 = $as_Lio_kaitai_struct_format_SpecialIdentifier(id);
@@ -79196,6 +79109,11 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.idToStr__Lio_kaitai_stru
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for (var i = 0; i < " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "; i++)"));
+  this.out$2.puts__T__V("{");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.localTemporaryName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("_t_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -79245,7 +79163,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.handleAssignmentRepeatEo
   this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".Add(") + expr) + ");"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".Add(") + expr) + ");"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.readHeader__s_Option__Z__V = (function(endian, isEmpty) {
   var readAccessAndType = ((!this.config$1.autoRead$1) ? "public" : "private");
@@ -79279,6 +79197,14 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchCaseStart__Lio_kai
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.classConstructorFooter__V = (function() {
   this.fileFooter__T__V(null)
 });
+$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("{");
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("var i = 0;");
+  this.out$2.puts__T__V(((($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType) + " ") + this.translator$2.doName__T__T("_")) + ";"));
+  this.out$2.puts__T__V("do {");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -79324,20 +79250,6 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.io$kaitai$struct$languag
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.readFooter__V = (function() {
   this.fileFooter__T__V("")
 });
-$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  var this$1 = this.importList$2;
-  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "System.Collections.Generic");
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new List<byte[]>((int) (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "));"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new List<byte[]>((int) (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "));"))
-  };
-  this.out$2.puts__T__V((((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = new ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType))) + "((int) (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "));"));
-  this.out$2.puts__T__V((("for (var i = 0; i < " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "; i++)"));
-  this.out$2.puts__T__V("{");
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   this.out$2.puts__T__V((("switch (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ") {"))
 });
@@ -79666,14 +79578,6 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.classConstructorHeader__
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.flagForInstName__Lio_kaitai_struct_format_Identifier__T = (function(ksName) {
   return ("f_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(ksName))
 });
-$c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V("i++;");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"));
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("}")
-});
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceCalculate__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(instName, dataType, value) {
   this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V(instName, (((("(" + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType)) + ") (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, value)) + ")"))
 });
@@ -79752,19 +79656,24 @@ function $h_Lio_kaitai_struct_languages_LuaCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_LuaCompiler.prototype = $c_Lio_kaitai_struct_languages_LuaCompiler.prototype;
+$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + " then"));
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("break");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("end");
+  this.out$2.puts__T__V("i = i + 1");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("end");
+  this.out$2.dec__V()
+});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.switchEnd__V = (function() {
   /*<skip>*/
 });
-$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, datatype, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = {}"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = {}"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = {}"));
+$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("local i = 0");
-  this.out$2.puts__T__V("while true do");
+  this.out$2.puts__T__V((("while not " + io) + ":is_eof() do"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
@@ -79774,6 +79683,15 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.switchIfElseStart__V = (fun
   this.out$2.puts__T__V("else");
   this.out$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = {}"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = {}"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = {}"))
+});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.attrParseHybrid__F0__F0__V = (function(leProc, beProc) {
   this.out$2.puts__T__V("if self._is_le then");
   this.out$2.inc__V();
@@ -79793,18 +79711,6 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.instanceHeader__sci_List__L
   this.out$2.puts__T__V((((("function " + $m_Lio_kaitai_struct_languages_LuaCompiler$().types2class__sci_List__T(className)) + ".property.") + this.publicMemberName__Lio_kaitai_struct_format_Identifier__T(instName)) + ":get()"));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = {}"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = {}"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = {}"));
-  this.out$2.puts__T__V("local i = 0");
-  this.out$2.puts__T__V((("while not " + io) + ":is_eof() do"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("self." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -80095,6 +80001,10 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.idToStr__Lio_kaitai_struct_
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for i = 0, " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + " - 1 do"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((io + ":align_to_byte()"))
 });
@@ -80175,6 +80085,11 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.classConstructorFooter__V =
   var this$1 = this.out$2;
   this$1.sb$2.append__T__scm_StringBuilder("\n")
 });
+$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V("local i = 0");
+  this.out$2.puts__T__V("while true do");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -80219,17 +80134,6 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.readFooter__V = (function()
   var this$1 = this.out$2;
   this$1.sb$2.append__T__scm_StringBuilder("\n")
 });
-$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = {}"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = {}"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = {}"));
-  this.out$2.puts__T__V((("for i = 0, " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + " - 1 do"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   /*<skip>*/
 });
@@ -80520,18 +80424,6 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.translator__Lio_kaitai_stru
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + " then"));
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("break");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("end");
-  this.out$2.puts__T__V("i = i + 1");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("end");
-  this.out$2.dec__V()
-});
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.outHeader__Lio_kaitai_struct_StringLanguageOutputWriter = (function() {
   return this.outHeader$2
 });
@@ -80599,6 +80491,16 @@ function $h_Lio_kaitai_struct_languages_NimCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_NimCompiler.prototype = $c_Lio_kaitai_struct_languages_NimCompiler.prototype;
+$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ":"));
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("break");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("inc i");
+  this.out$2.dec__V();
+  this.out$2.dec__V()
+});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.instanceDeclaration__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
   this.out$2.puts__T__V(((("`" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(attrName)) + "`: ") + $m_Lio_kaitai_struct_languages_NimCompiler$().ksToNim__Lio_kaitai_struct_datatype_DataType__T(attrType)));
   this.out$2.puts__T__V((("`" + this.instanceFlagIdentifier__Lio_kaitai_struct_format_InstanceIdentifier__T(attrName)) + "`: bool"))
@@ -80606,11 +80508,11 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.instanceDeclaration__Lio_ka
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.switchEnd__V = (function() {
   /*<skip>*/
 });
-$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
+$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("block:");
   this.out$2.inc__V();
   this.out$2.puts__T__V("var i: int");
-  this.out$2.puts__T__V("while true:");
+  this.out$2.puts__T__V((("while not " + io) + ".isEof:"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.switchIfElseStart__V = (function() {
@@ -80620,6 +80522,9 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.switchIfElseStart__V = (fun
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
   this.outHeader$2 = x$1
 });
+$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  /*<skip>*/
+});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.instanceForwardDeclaration__sci_List__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__V = (function(className, instName, dataType) {
   var jsx$1 = this.out$2;
   var x = this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName);
@@ -80683,13 +80588,6 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.instanceHeader__sci_List__L
   jsx$1.puts__T__V((((((("proc " + $f_sc_IndexedSeqOptimized__dropRight__I__O(this$2, 4)) + "(this: ") + this.namespaced__sci_List__T(className)) + "): ") + $m_Lio_kaitai_struct_languages_NimCompiler$().ksToNim__Lio_kaitai_struct_datatype_DataType__T(dataType)) + " = "));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  this.out$2.puts__T__V("block:");
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("var i: int");
-  this.out$2.puts__T__V((("while not " + io) + ".isEof:"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.switchIfStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__V = (function(id, on, onType) {
   this.out$2.puts__T__V("block:");
   this.out$2.inc__V();
@@ -80971,6 +80869,10 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.classForwardDeclaration__sc
   var paramsArg = jsx$3.join__sc_TraversableOnce__T__T__T__T($as_sc_TraversableOnce(jsx$2), ", ", ", ", "");
   this.out$2.puts__T__V((((((("proc read*(_: typedesc[" + t) + "], io: KaitaiStream, root: KaitaiStruct, parent: ") + p) + paramsArg) + "): ") + t))
 });
+$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for i in 0 ..< int(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "):"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((("alignToByte(" + io) + ")"))
 });
@@ -81179,6 +81081,13 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.switchCaseStart__Lio_kaitai
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.classConstructorFooter__V = (function() {
   this.out$2.dec__V()
 });
+$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V("block:");
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("var i: int");
+  this.out$2.puts__T__V("while true:");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -81206,10 +81115,6 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.outFileName__T__T = (functi
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$importList$und$eq__Lio_kaitai_struct_ImportList__V = (function(x$1) {
   this.importList$2 = x$1
 });
-$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  this.out$2.puts__T__V((("for i in 0 ..< int(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "):"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.readFooter__V = (function() {
   this.out$2.dec__V();
   var this$1 = this.out$2;
@@ -81427,16 +81332,6 @@ $c_Lio_kaitai_struct_languages_NimCompiler.prototype.translator__Lio_kaitai_stru
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.translator__Lio_kaitai_struct_translators_AbstractTranslator = (function() {
   return this.translator$2
 });
-$c_Lio_kaitai_struct_languages_NimCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ":"));
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("break");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("inc i");
-  this.out$2.dec__V();
-  this.out$2.dec__V()
-});
 $c_Lio_kaitai_struct_languages_NimCompiler.prototype.outHeader__Lio_kaitai_struct_StringLanguageOutputWriter = (function() {
   return this.outHeader$2
 });
@@ -81516,6 +81411,12 @@ function $h_Lio_kaitai_struct_languages_RubyCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_RubyCompiler.prototype = $c_Lio_kaitai_struct_languages_RubyCompiler.prototype;
+$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V("i += 1");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V(("end until " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)))
+});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.switchEnd__V = (function() {
   this.out$2.puts__T__V("end")
 });
@@ -81573,16 +81474,9 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.instanceHeader__T__Lio_kai
   this.out$2.puts__T__V(("def " + instName.name$2));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = []"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"));
+$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("i = 0");
-  this.out$2.puts__T__V("begin");
+  this.out$2.puts__T__V((("while not " + io) + ".eof?"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.types2class__sci_List__T = (function(names) {
@@ -81628,6 +81522,15 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.types2class__sci_List__T =
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
   this.outHeader$2 = x$1
 });
+$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = []"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"))
+});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.classHeader__T__V = (function(name) {
   this.out$2.puts__T__V((("class " + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name)) + " < Kaitai::Struct::Struct"));
   this.out$2.inc__V();
@@ -81649,18 +81552,6 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.attrParseHybrid__F0__F0__V
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.instanceHeader__sci_List__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(className, instName, dataType, isNullable) {
   this.instanceHeader__T__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V($as_T($f_sc_LinearSeqOptimized__last__O(className)), instName, dataType, isNullable)
 });
-$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = []"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"));
-  this.out$2.puts__T__V("i = 0");
-  this.out$2.puts__T__V((("while not " + io) + ".eof?"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("@" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -81941,6 +81832,10 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.idToStr__Lio_kaitai_struct
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ").times { |i|"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.alignToByte__T__V = (function(io) {
   this.out$2.puts__T__V((io + ".align_to_byte"))
 });
@@ -81978,7 +81873,7 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.handleAssignmentRepeatEos_
   this.out$2.puts__T__V(((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " << ") + expr))
 });
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V(((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "[i] = ") + expr))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.readHeader__s_Option__Z__V = (function(endian, isEmpty) {
   if ((endian instanceof $c_s_Some)) {
@@ -82010,6 +81905,11 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.switchCaseStart__Lio_kaita
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.classConstructorFooter__V = (function() {
   this.universalFooter__V()
 });
+$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("i = 0");
+  this.out$2.puts__T__V("begin");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -82056,17 +81956,6 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.readFooter__V = (function(
   this.out$2.puts__T__V("self");
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = Array.new(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = Array.new(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"))
-  };
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = Array.new(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"));
-  this.out$2.puts__T__V((("(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ").times { |i|"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   this.out$2.puts__T__V(("case " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)))
 });
@@ -82363,12 +82252,6 @@ $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.classConstructorHeader__T_
     this.out$2.puts__T__V("@_debug = {}")
   }
 });
-$c_Lio_kaitai_struct_languages_RubyCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V("i += 1");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V(("end until " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)))
-});
 $c_Lio_kaitai_struct_languages_RubyCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   this.out$2.puts__T__V("end")
@@ -82613,6 +82496,14 @@ function $h_Lio_kaitai_struct_languages_JavaCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_JavaCompiler.prototype = $c_Lio_kaitai_struct_languages_JavaCompiler.prototype;
+$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V("i++;");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"));
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("}")
+});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.instanceDeclaration__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
   this.out$2.puts__T__V((((("private " + $m_Lio_kaitai_struct_languages_JavaCompiler$().kaitaiType2JavaTypeBoxed__Lio_kaitai_struct_datatype_DataType__T(attrType)) + " ") + this.idToStr__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"))
 });
@@ -82664,28 +82555,14 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.instanceHeader__T__Lio_kai
   this.out$2.puts__T__V((((("public " + $m_Lio_kaitai_struct_languages_JavaCompiler$().kaitaiType2JavaTypeBoxed__Lio_kaitai_struct_datatype_DataType__T(dataType)) + " ") + this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName)) + "() {"));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new ArrayList<byte[]>();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new ArrayList<byte[]>();"))
-  };
-  var jsx$2 = this.out$2;
-  var jsx$1 = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id);
-  var this$1 = $m_Lio_kaitai_struct_languages_JavaCompiler$();
-  var attrType = new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType);
-  jsx$2.puts__T__V((((jsx$1 + " = new ") + this$1.kaitaiType2JavaTypePrim__Lio_kaitai_struct_datatype_DataType__T(attrType)) + "();"));
+$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("{");
   this.out$2.inc__V();
-  var jsx$3 = this.out$2;
-  var this$2 = $m_Lio_kaitai_struct_languages_JavaCompiler$();
-  jsx$3.puts__T__V((((this$2.kaitaiType2JavaTypePrim__Lio_kaitai_struct_datatype_DataType__T(dataType) + " ") + this.translator$2.doName__T__T("_")) + ";"));
   this.out$2.puts__T__V("int i = 0;");
-  this.out$2.puts__T__V("do {");
+  this.out$2.puts__T__V((("while (!" + io) + ".isEof()) {"));
   this.out$2.inc__V();
-  var this$3 = this.importList$2;
-  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$3.list$1, "java.util.ArrayList")
+  var this$1 = this.importList$2;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "java.util.ArrayList")
 });
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.switchIfElseStart__V = (function() {
   this.out$2.puts__T__V("else {");
@@ -82694,6 +82571,19 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.switchIfElseStart__V = (fu
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
   this.outHeader$2 = x$1
 });
+$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new ArrayList<byte[]>();"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new ArrayList<byte[]>();"))
+  };
+  var jsx$2 = this.out$2;
+  var jsx$1 = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id);
+  var this$1 = $m_Lio_kaitai_struct_languages_JavaCompiler$();
+  var attrType = new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType);
+  jsx$2.puts__T__V((((jsx$1 + " = new ") + this$1.kaitaiType2JavaTypePrim__Lio_kaitai_struct_datatype_DataType__T(attrType)) + "();"))
+});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.classHeader__T__V = (function(name) {
   var staticStr = ((this.out$2.indentLevel$1 > 0) ? "static " : "");
   this.out$2.puts__T__V((((("public " + staticStr) + "class ") + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name)) + " extends KaitaiStruct {"));
@@ -82760,26 +82650,6 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.switchCasesUsingIf__Lio_ka
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.instanceHeader__sci_List__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(className, instName, dataType, isNullable) {
   this.instanceHeader__T__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V($as_T($f_sc_LinearSeqOptimized__last__O(className)), instName, dataType, isNullable)
 });
-$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new ArrayList<byte[]>();"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new ArrayList<byte[]>();"))
-  };
-  var jsx$2 = this.out$2;
-  var jsx$1 = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id);
-  var this$1 = $m_Lio_kaitai_struct_languages_JavaCompiler$();
-  var attrType = new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType);
-  jsx$2.puts__T__V((((jsx$1 + " = new ") + this$1.kaitaiType2JavaTypePrim__Lio_kaitai_struct_datatype_DataType__T(attrType)) + "();"));
-  this.out$2.puts__T__V("{");
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("int i = 0;");
-  this.out$2.puts__T__V((("while (!" + io) + ".isEof()) {"));
-  this.out$2.inc__V();
-  var this$2 = this.importList$2;
-  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$2.list$1, "java.util.ArrayList")
-});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("this." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -83130,6 +83000,12 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.idToStr__Lio_kaitai_struct
     throw new $c_s_MatchError().init___O(id)
   }
 });
+$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for (int i = 0; i < " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "; i++) {"));
+  this.out$2.inc__V();
+  var this$1 = this.importList$2;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "java.util.ArrayList")
+});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.localTemporaryName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("_t_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -83179,7 +83055,7 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.handleAssignmentRepeatEos_
   this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".add(") + expr) + ");"))
 });
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".add(") + expr) + ");"))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.classHeader__sci_List__V = (function(name) {
   this.classHeader__T__V($as_T($f_sc_LinearSeqOptimized__last__O(name)))
@@ -83220,6 +83096,18 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.switchCaseStart__Lio_kaita
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.classConstructorFooter__V = (function() {
   this.universalFooter__V()
 });
+$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("{");
+  this.out$2.inc__V();
+  var jsx$1 = this.out$2;
+  var this$1 = $m_Lio_kaitai_struct_languages_JavaCompiler$();
+  jsx$1.puts__T__V((((this$1.kaitaiType2JavaTypePrim__Lio_kaitai_struct_datatype_DataType__T(dataType) + " ") + this.translator$2.doName__T__T("_")) + ";"));
+  this.out$2.puts__T__V("int i = 0;");
+  this.out$2.puts__T__V("do {");
+  this.out$2.inc__V();
+  var this$2 = this.importList$2;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$2.list$1, "java.util.ArrayList")
+});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -83264,23 +83152,6 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.io$kaitai$struct$languages
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.readFooter__V = (function() {
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = new ArrayList<byte[]>(((Number) (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")).intValue());"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = new ArrayList<byte[]>(((Number) (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")).intValue());"))
-  };
-  var jsx$2 = this.out$2;
-  var jsx$1 = this.idToStr__Lio_kaitai_struct_format_Identifier__T(id);
-  var this$1 = $m_Lio_kaitai_struct_languages_JavaCompiler$();
-  var attrType = new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream().init___Lio_kaitai_struct_datatype_DataType(dataType);
-  jsx$2.puts__T__V((((((jsx$1 + " = new ") + this$1.kaitaiType2JavaTypePrim__Lio_kaitai_struct_datatype_DataType__T(attrType)) + "(((Number) (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")).intValue());"));
-  this.out$2.puts__T__V((("for (int i = 0; i < " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "; i++) {"));
-  this.out$2.inc__V();
-  var this$2 = this.importList$2;
-  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$2.list$1, "java.util.ArrayList")
-});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   this.out$2.puts__T__V((("switch (" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ") {"))
 });
@@ -83761,14 +83632,6 @@ $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.switchCasesRender__Lio_kai
     $f_Lio_kaitai_struct_languages_components_SwitchOps__switchCasesRender__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__sci_Map__F1__F1__V(this, id, on, cases, normalCaseProc, elseCaseProc)
   }
 });
-$c_Lio_kaitai_struct_languages_JavaCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V("i++;");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V((("} while (!(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + "));"));
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("}")
-});
 $c_Lio_kaitai_struct_languages_JavaCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   this.out$2.puts__T__V("}")
@@ -83856,6 +83719,15 @@ function $h_Lio_kaitai_struct_languages_PythonCompiler() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_languages_PythonCompiler.prototype = $c_Lio_kaitai_struct_languages_PythonCompiler.prototype;
+$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
+  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + ":"));
+  this.out$2.inc__V();
+  this.out$2.puts__T__V("break");
+  this.out$2.dec__V();
+  this.out$2.puts__T__V("i += 1");
+  this.out$2.dec__V()
+});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.switchEnd__V = (function() {
   /*<skip>*/
 });
@@ -83913,16 +83785,9 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.instanceHeader__T__Lio_k
   this.out$2.puts__T__V((("def " + this.publicMemberName__Lio_kaitai_struct_format_Identifier__T(instName)) + "(self):"));
   this.out$2.inc__V()
 });
-$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = []"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"));
+$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   this.out$2.puts__T__V("i = 0");
-  this.out$2.puts__T__V("while True:");
+  this.out$2.puts__T__V((("while not " + io) + ".is_eof():"));
   this.out$2.inc__V()
 });
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.io$kaitai$struct$languages$components$SingleOutputFile$$undsetter$und$outHeader$und$eq__Lio_kaitai_struct_StringLanguageOutputWriter__V = (function(x$1) {
@@ -83932,6 +83797,15 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.switchIfElseStart__V = (
   this.out$2.puts__T__V("else:");
   this.out$2.inc__V()
 });
+$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatCommonInit__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, dataType, needRaw) {
+  if ((needRaw.level__I() >= 1)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
+  };
+  if ((needRaw.level__I() >= 2)) {
+    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = []"))
+  };
+  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"))
+});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.classHeader__T__V = (function(name) {
   this.out$2.puts__T__V((("class " + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name)) + "(KaitaiStruct):"));
   this.out$2.inc__V()
@@ -83952,18 +83826,6 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.switchCasesUsingIf__Lio_
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.instanceHeader__sci_List__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(className, instName, dataType, isNullable) {
   this.instanceHeader__T__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V($as_T($f_sc_LinearSeqOptimized__last__O(className)), instName, dataType, isNullable)
 });
-$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__V = (function(id, io, dataType, needRaw) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = []"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = []"))
-  };
-  this.out$2.puts__T__V((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = []"));
-  this.out$2.puts__T__V("i = 0");
-  this.out$2.puts__T__V((("while not " + io) + ".is_eof():"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.privateMemberName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("self." + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -83974,7 +83836,7 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.seek__T__Lio_kaitai_stru
   this.out$2.puts__T__V((((io + ".seek(") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, pos)) + ")"))
 });
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.instanceReturn__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__V = (function(instName, attrType) {
-  this.out$2.puts__T__V((((("return " + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(instName)) + " if hasattr(self, '") + this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName)) + "') else None"))
+  this.out$2.puts__T__V((("return getattr(self, '" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName)) + "', None)"))
 });
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.bool2Py__Z__T = (function(b) {
   return (b ? "True" : "False")
@@ -84234,6 +84096,10 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.userType2class__Lio_kait
   var prefix = ((t.isOpaque__Z() && (firstName !== this.translator$2.provider$2.nowClass$1.name$1.head__O())) ? (firstName + ".") : "");
   return (prefix + $m_Lio_kaitai_struct_languages_PythonCompiler$().types2class__sci_List__T(name))
 });
+$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, repeatExpr) {
+  this.out$2.puts__T__V((("for i in range(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "):"));
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.localTemporaryName__Lio_kaitai_struct_format_Identifier__T = (function(id) {
   return ("_t_" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(id))
 });
@@ -84278,7 +84144,7 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.handleAssignmentRepeatEo
   this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + ".append(") + expr) + ")"))
 });
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.handleAssignmentRepeatExpr__Lio_kaitai_struct_format_Identifier__T__V = (function(id, expr) {
-  this.out$2.puts__T__V(((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + "[i] = ") + expr))
+  this.handleAssignmentRepeatEos__Lio_kaitai_struct_format_Identifier__T__V(id, expr)
 });
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.classHeader__sci_List__V = (function(name) {
   this.classHeader__T__V($as_T($f_sc_LinearSeqOptimized__last__O(name)))
@@ -84310,6 +84176,11 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.switchCaseStart__Lio_kai
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.classConstructorFooter__V = (function() {
   this.universalFooter__V()
 });
+$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatUntilHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, untilExpr) {
+  this.out$2.puts__T__V("i = 0");
+  this.out$2.puts__T__V("while True:");
+  this.out$2.inc__V()
+});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V = (function(id, dataType, io, rep, isRaw, defEndian, assignTypeOpt) {
   $f_Lio_kaitai_struct_languages_components_EveryReadIsExpression__attrParse2__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__T__Lio_kaitai_struct_format_RepeatSpec__Z__s_Option__s_Option__V(this, id, dataType, io, rep, isRaw, defEndian, assignTypeOpt)
 });
@@ -84352,17 +84223,6 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.io$kaitai$struct$languag
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.readFooter__V = (function() {
   this.universalFooter__V()
 });
-$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatExprHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, repeatExpr) {
-  if ((needRaw.level__I() >= 1)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id)) + " = [None] * (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"))
-  };
-  if ((needRaw.level__I() >= 2)) {
-    this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(new $c_Lio_kaitai_struct_format_RawIdentifier().init___Lio_kaitai_struct_format_Identifier(id))) + " = [None] * (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"))
-  };
-  this.out$2.puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = [None] * (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + ")"));
-  this.out$2.puts__T__V((("for i in range(" + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, repeatExpr)) + "):"));
-  this.out$2.inc__V()
-});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.switchStart__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, on) {
   /*<skip>*/
 });
@@ -84601,7 +84461,7 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.switchIfCaseFirstStart__
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.instanceCheckCacheAndReturn__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__V = (function(instName, dataType) {
   this.out$2.puts__T__V((("if hasattr(self, '" + this.idToStr__Lio_kaitai_struct_format_Identifier__T(instName)) + "'):"));
   this.out$2.inc__V();
-  this.instanceReturn__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__V(instName, dataType);
+  this.out$2.puts__T__V(("return " + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(instName)));
   this.out$2.dec__V();
   var this$1 = this.out$2;
   this$1.sb$2.append__T__scm_StringBuilder("\n")
@@ -84754,15 +84614,6 @@ $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.classConstructorHeader__
     this.out$2.puts__T__V("self._debug = collections.defaultdict(dict)")
   }
 });
-$c_Lio_kaitai_struct_languages_PythonCompiler.prototype.condRepeatUntilFooter__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_NeedRaw__Lio_kaitai_struct_exprlang_Ast$expr__V = (function(id, io, dataType, needRaw, untilExpr) {
-  this.typeProvider$1.$$undcurrentIteratorType$1 = new $c_s_Some().init___O(dataType);
-  this.out$2.puts__T__V((("if " + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, untilExpr)) + ":"));
-  this.out$2.inc__V();
-  this.out$2.puts__T__V("break");
-  this.out$2.dec__V();
-  this.out$2.puts__T__V("i += 1");
-  this.out$2.dec__V()
-});
 $c_Lio_kaitai_struct_languages_PythonCompiler.prototype.universalFooter__V = (function() {
   this.out$2.dec__V();
   var this$1 = this.out$2;