kaitai-struct-compiler 0.11.0-SNAPSHOT20240415.175433.32227fc → 0.11.0-SNAPSHOT20240610.172038.27d5020

package/kaitai-struct-compiler.js

@@ -2364,42 +2364,10 @@ $c_Lio_kaitai_struct_Main$.prototype.precompile__Lio_kaitai_struct_format_ClassS
   var typeValidatorProblems = new $c_Lio_kaitai_struct_precompile_TypeValidator(specs).run__sc_Iterable();
   var styleWarnings = new $c_Lio_kaitai_struct_precompile_StyleCheckIds(specs).run__sc_Iterable();
   var encodingProblems = new $c_Lio_kaitai_struct_precompile_CanonicalizeEncodingNames(specs).run__sc_Iterable();
-  var this$4 = $n(specs);
-  var len = $n(this$4.scm_HashMap__f_scala$collection$mutable$HashMap$$table).u.length;
-  var i = 0;
-  while ((i < len)) {
-    var n = $n(this$4.scm_HashMap__f_scala$collection$mutable$HashMap$$table).get(i);
-    if ((n !== null)) {
-      var this$5 = $n(n);
-      var _$this = this$5;
-      while (true) {
-        var _1 = $n(_$this).scm_HashMap$Node__f__key;
-        var _2 = $n(_$this).scm_HashMap$Node__f__value;
-        $as_T(_1);
-        var typeSpec = $as_Lio_kaitai_struct_format_ClassSpec(_2);
-        try {
-          $n(typeSpec).Lio_kaitai_struct_format_ClassSpec__f_parentClass = $m_Lio_kaitai_struct_format_GenericStructClassSpec$()
-        } catch (e) {
-          if ((e instanceof $c_Lio_kaitai_struct_problems_CompilationProblemException)) {
-            var cpe = $as_Lio_kaitai_struct_problems_CompilationProblemException(e);
-            throw $n($n(cpe).localizedInType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_problems_CompilationProblemException(typeSpec))
-          } else {
-            throw e
-          }
-        };
-        if (($n(_$this).scm_HashMap$Node__f__next !== null)) {
-          _$this = $n(_$this).scm_HashMap$Node__f__next;
-          continue
-        };
-        break
-      }
-    };
-    i = ((1 + i) | 0)
-  };
-  var this$6 = $n(resolveTypeProblems);
-  var this$7 = $n($as_sc_IterableOps(this$6.concat__sc_IterableOnce__O(typeValidatorProblems)));
-  var this$8 = $n($as_sc_IterableOps(this$7.concat__sc_IterableOnce__O(styleWarnings)));
-  return $as_sc_Iterable(this$8.concat__sc_IterableOnce__O(encodingProblems))
+  var this$4 = $n(resolveTypeProblems);
+  var this$5 = $n($as_sc_IterableOps(this$4.concat__sc_IterableOnce__O(typeValidatorProblems)));
+  var this$6 = $n($as_sc_IterableOps(this$5.concat__sc_IterableOnce__O(styleWarnings)));
+  return $as_sc_Iterable(this$6.concat__sc_IterableOnce__O(encodingProblems))
 });
 $c_Lio_kaitai_struct_Main$.prototype.compile__Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_languages_components_LanguageCompilerStatic__Lio_kaitai_struct_RuntimeConfig__Lio_kaitai_struct_CompileLog$SpecSuccess = (function(specs, spec, lang, conf) {
   var config = $p_Lio_kaitai_struct_Main$__updateConfigFromMeta__Lio_kaitai_struct_RuntimeConfig__Lio_kaitai_struct_format_MetaSpec__Lio_kaitai_struct_RuntimeConfig(this, conf, $n(spec).Lio_kaitai_struct_format_ClassSpec__f_meta);
@@ -3044,8 +3012,8 @@ function $m_Lio_kaitai_struct_Utils$() {
 function $c_Lio_kaitai_struct_Version$() {
   this.Lio_kaitai_struct_Version$__f_version = null;
   this.Lio_kaitai_struct_Version$__f_gitTime = null;
-  this.Lio_kaitai_struct_Version$__f_version = "0.11-SNAPSHOT20240415.175433.32227fc";
-  this.Lio_kaitai_struct_Version$__f_gitTime = "2024-04-15T17:54:33+00:00"
+  this.Lio_kaitai_struct_Version$__f_version = "0.11-SNAPSHOT20240610.172038.27d5020";
+  this.Lio_kaitai_struct_Version$__f_gitTime = "2024-06-10T17:20:38Z"
 }
 $c_Lio_kaitai_struct_Version$.prototype = new $h_O();
 $c_Lio_kaitai_struct_Version$.prototype.constructor = $c_Lio_kaitai_struct_Version$;
@@ -19207,10 +19175,9 @@ function $p_Lio_kaitai_struct_precompile_ParentTypes__markupParentTypesAdd__Lio_
       var x3 = null;
       var x1$2 = $n(x2).Lio_kaitai_struct_datatype_DataType$UserType__f_forcedParent;
       matchEnd9: {
-        var this$1;
         var x = $m_s_None$();
         if ((x === x1$2)) {
-          var this$1 = new $c_s_Some(curClass);
+          $thiz.markupParentAs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType$UserType__V(curClass, x2);
           break matchEnd9
         };
         if ((x1$2 instanceof $c_s_Some)) {
@@ -19220,7 +19187,6 @@ function $p_Lio_kaitai_struct_precompile_ParentTypes__markupParentTypesAdd__Lio_
           var x$3 = $m_Lio_kaitai_struct_datatype_DataType$().Lio_kaitai_struct_datatype_DataType$__f_USER_TYPE_NO_PARENT;
           if (((x$3 === null) ? (p4 === null) : $n(x$3).equals__O__Z(p4))) {
             $n($m_Lio_kaitai_struct_Log$().Lio_kaitai_struct_Log$__f_typeProcParent);
-            var this$1 = $m_s_None$();
             break matchEnd9
           }
         };
@@ -19230,23 +19196,19 @@ function $p_Lio_kaitai_struct_precompile_ParentTypes__markupParentTypesAdd__Lio_
           var detector = $ct_Lio_kaitai_struct_translators_TypeDetector__Lio_kaitai_struct_translators_TypeProvider__(new $c_Lio_kaitai_struct_translators_TypeDetector(), provider);
           var parentType = detector.detectType__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType(parent);
           $n($m_Lio_kaitai_struct_Log$().Lio_kaitai_struct_Log$__f_typeProcParent);
-          if ((!(parentType instanceof $c_Lio_kaitai_struct_datatype_DataType$UserType))) {
+          if ((parentType instanceof $c_Lio_kaitai_struct_datatype_DataType$UserType)) {
+            var x2$2 = $as_Lio_kaitai_struct_datatype_DataType$UserType(parentType);
+            $thiz.markupParentAs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType$UserType__V($as_Lio_kaitai_struct_format_ClassSpec($n($n(x2$2).Lio_kaitai_struct_datatype_DataType$UserType__f_classSpec).get__O()), x2)
+          } else {
             throw new $c_Lio_kaitai_struct_precompile_TypeMismatchError((((("parent=" + parent) + " is expected to be either of user type or `false`, but ") + parentType) + " found"))
           };
-          var x2$2 = $as_Lio_kaitai_struct_datatype_DataType$UserType(parentType);
-          var this$1 = new $c_s_Some($n($n(x2$2).Lio_kaitai_struct_datatype_DataType$UserType__f_classSpec).get__O());
           break matchEnd9
         };
         throw new $c_s_MatchError(x1$2)
-      };
-      if ((!this$1.isEmpty__Z())) {
-        var arg1 = this$1.get__O();
-        var parentClass = $as_Lio_kaitai_struct_format_ClassSpec(arg1);
-        $thiz.markupParentAs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType$UserType__V(parentClass, x2)
       }
     } else if ((x1 instanceof $c_Lio_kaitai_struct_datatype_DataType$SwitchType)) {
       var x3$2 = $as_Lio_kaitai_struct_datatype_DataType$SwitchType(x1);
-      var this$2 = $n($n(x3$2).Lio_kaitai_struct_datatype_DataType$SwitchType__f_cases);
+      var this$1 = $n($n(x3$2).Lio_kaitai_struct_datatype_DataType$SwitchType__f_cases);
       var f = new $c_sjsr_AnonFunction1(((curClass) => ((x0$1$2) => {
         var x0$1 = $as_T2(x0$1$2);
         matchEnd7: {
@@ -19264,11 +19226,11 @@ function $p_Lio_kaitai_struct_precompile_ParentTypes__markupParentTypesAdd__Lio_
           throw new $c_s_MatchError(x0$1)
         }
       }))(curClass));
-      $m_sci_RedBlackTree$().foreach__sci_RedBlackTree$Tree__F1__V(this$2.sci_TreeMap__f_tree, f)
+      $m_sci_RedBlackTree$().foreach__sci_RedBlackTree$Tree__F1__V(this$1.sci_TreeMap__f_tree, f)
     } else if ((x1 instanceof $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream)) {
       var x4 = $as_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream(x1);
-      var this$3 = $n(x4);
-      var innerType = this$3.Lio_kaitai_struct_datatype_DataType$ArrayType__f_elType;
+      var this$2 = $n(x4);
+      var innerType = this$2.Lio_kaitai_struct_datatype_DataType$ArrayType__f_elType;
       dt = innerType;
       continue
     };
@@ -19309,6 +19271,38 @@ $c_Lio_kaitai_struct_precompile_ParentTypes.prototype.run__V = (function() {
       }
     };
     i = ((1 + i) | 0)
+  };
+  var this$3 = $n(this.Lio_kaitai_struct_precompile_ParentTypes__f_classSpecs);
+  var len$1 = $n(this$3.scm_HashMap__f_scala$collection$mutable$HashMap$$table).u.length;
+  var i$1 = 0;
+  while ((i$1 < len$1)) {
+    var n$1 = $n(this$3.scm_HashMap__f_scala$collection$mutable$HashMap$$table).get(i$1);
+    if ((n$1 !== null)) {
+      var this$4 = $n(n$1);
+      var _$this$1 = this$4;
+      while (true) {
+        var _1$1 = $n(_$this$1).scm_HashMap$Node__f__key;
+        var _2$1 = $n(_$this$1).scm_HashMap$Node__f__value;
+        $as_T(_1$1);
+        var typeSpec = $as_Lio_kaitai_struct_format_ClassSpec(_2$1);
+        try {
+          $n(typeSpec).Lio_kaitai_struct_format_ClassSpec__f_parentClass = $m_Lio_kaitai_struct_format_GenericStructClassSpec$()
+        } catch (e) {
+          if ((e instanceof $c_Lio_kaitai_struct_problems_CompilationProblemException)) {
+            var cpe = $as_Lio_kaitai_struct_problems_CompilationProblemException(e);
+            throw $n($n(cpe).localizedInType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_problems_CompilationProblemException(typeSpec))
+          } else {
+            throw e
+          }
+        };
+        if (($n(_$this$1).scm_HashMap$Node__f__next !== null)) {
+          _$this$1 = $n(_$this$1).scm_HashMap$Node__f__next;
+          continue
+        };
+        break
+      }
+    };
+    i$1 = ((1 + i$1) | 0)
   }
 });
 $c_Lio_kaitai_struct_precompile_ParentTypes.prototype.markup__Lio_kaitai_struct_format_ClassSpec__V = (function(curClass) {
@@ -19345,7 +19339,26 @@ $c_Lio_kaitai_struct_precompile_ParentTypes.prototype.markup__Lio_kaitai_struct_
       throw new $c_s_MatchError(x0$1)
     }
   }));
-  $m_sci_RedBlackTree$().foreach__sci_RedBlackTree$Tree__F1__V(this$6.sci_TreeMap__f_tree, f)
+  $m_sci_RedBlackTree$().foreach__sci_RedBlackTree$Tree__F1__V(this$6.sci_TreeMap__f_tree, f);
+  var this$7 = $n($n(curClass).Lio_kaitai_struct_format_ClassSpec__f_types);
+  if ((!this$7.isEmpty__Z())) {
+    $n($m_Lio_kaitai_struct_Log$().Lio_kaitai_struct_Log$__f_typeProcParent)
+  };
+  var this$8 = $n($n(curClass).Lio_kaitai_struct_format_ClassSpec__f_types);
+  var f$1 = new $c_sjsr_AnonFunction1(((x0$2$2) => {
+    var x0$2 = $as_T2(x0$2$2);
+    if ((x0$2 !== null)) {
+      var ty = $as_Lio_kaitai_struct_format_ClassSpec($n(x0$2).T2__f__2);
+      var x = $n(ty).Lio_kaitai_struct_format_ClassSpec__f_parentClass;
+      var x$2 = $m_Lio_kaitai_struct_format_UnknownClassSpec$();
+      if (((x !== null) && $n(x).equals__O__Z(x$2))) {
+        this.markup__Lio_kaitai_struct_format_ClassSpec__V(ty)
+      }
+    } else {
+      throw new $c_s_MatchError(x0$2)
+    }
+  }));
+  $m_sci_RedBlackTree$().foreach__sci_RedBlackTree$Tree__F1__V(this$8.sci_TreeMap__f_tree, f$1)
 });
 $c_Lio_kaitai_struct_precompile_ParentTypes.prototype.markupParentAs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType$UserType__V = (function(curClass, ut) {
   var x1 = $n(ut).Lio_kaitai_struct_datatype_DataType$UserType__f_classSpec;
@@ -62550,7 +62563,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.publicMemberName__Lio_k
     throw new $c_s_MatchError(id)
   }
 });
-$c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T = (function(attrType) {
+$c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T = (function(importList, attrType) {
   while (true) {
     var rc72 = false;
     var x2 = null;
@@ -62718,7 +62731,9 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.kaitaiType2NativeType__
     };
     if ((x1 instanceof $c_Lio_kaitai_struct_datatype_DataType$ArrayType)) {
       var x69 = $as_Lio_kaitai_struct_datatype_DataType$ArrayType(x1);
-      return (("List<" + this.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T($n(x69).Lio_kaitai_struct_datatype_DataType$ArrayType__f_elType)) + ">")
+      var this$1 = $n(importList);
+      $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.Lio_kaitai_struct_ImportList__f_list, "System.Collections.Generic");
+      return (("List<" + this.kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(importList, $n(x69).Lio_kaitai_struct_datatype_DataType$ArrayType__f_elType)) + ">")
     };
     if ((x1 instanceof $c_Lio_kaitai_struct_datatype_DataType$SwitchType)) {
       var x70 = $as_Lio_kaitai_struct_datatype_DataType$SwitchType(x1);
@@ -62728,8 +62743,8 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.kaitaiType2NativeType__
     throw new $c_s_MatchError(x1)
   }
 });
-$c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.kaitaiType2NativeTypeNullable__Lio_kaitai_struct_datatype_DataType__Z__T = (function(t, isNullable) {
-  var r = this.kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(t);
+$c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.kaitaiType2NativeTypeNullable__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__Z__T = (function(importList, t, isNullable) {
+  var r = this.kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(importList, t);
   return (isNullable ? (((t instanceof $c_Lio_kaitai_struct_datatype_DataType$NumericType) || (t instanceof $c_Lio_kaitai_struct_datatype_DataType$BooleanType)) ? (r + "?") : r) : r)
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler$.prototype.types2class__sc_Iterable__T = (function(names) {
@@ -85454,7 +85469,7 @@ function $h_Lio_kaitai_struct_translators_CSharpTranslator() {
 }
 $h_Lio_kaitai_struct_translators_CSharpTranslator.prototype = $c_Lio_kaitai_struct_translators_CSharpTranslator.prototype;
 $c_Lio_kaitai_struct_translators_CSharpTranslator.prototype.doArrayLiteral__Lio_kaitai_struct_datatype_DataType__sci_Seq__T = (function(t, value) {
-  var nativeType = $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(t);
+  var nativeType = $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_translators_CSharpTranslator__f_importList, t);
   var this$2 = $n($as_sc_IterableOnceOps($n(value).map__F1__O(new $c_sjsr_AnonFunction1(((v$2) => {
     var v = $as_Lio_kaitai_struct_exprlang_Ast$expr(v$2);
     return this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(v, 0)
@@ -85559,7 +85574,7 @@ $c_Lio_kaitai_struct_translators_CSharpTranslator.prototype.doIfExp__Lio_kaitai_
   return (((((("(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(condition, 0)) + " ? ") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(ifTrue, 0)) + " : ") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(ifFalse, 0)) + ")")
 });
 $c_Lio_kaitai_struct_translators_CSharpTranslator.prototype.doCast__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__T = (function(value, typeName) {
-  return (((("((" + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(typeName)) + ") (") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(value, 0)) + "))")
+  return (((("((" + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_translators_CSharpTranslator__f_importList, typeName)) + ") (") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(value, 0)) + "))")
 });
 $c_Lio_kaitai_struct_translators_CSharpTranslator.prototype.strToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(s, base) {
   var this$1 = $n(this.Lio_kaitai_struct_translators_CSharpTranslator__f_importList);
@@ -96716,7 +96731,8 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.classConstructorHeader__
   var this$2 = $n(params);
   var f = ((p$2) => {
     var p = $as_Lio_kaitai_struct_format_ParamDefSpec(p$2);
-    return (($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T($n(p).Lio_kaitai_struct_format_ParamDefSpec__f_dataType) + " ") + this.paramName__Lio_kaitai_struct_format_Identifier__T($n(p).Lio_kaitai_struct_format_ParamDefSpec__f_id))
+    var attrType = $n(p).Lio_kaitai_struct_format_ParamDefSpec__f_dataType;
+    return (($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, attrType) + " ") + this.paramName__Lio_kaitai_struct_format_Identifier__T($n(p).Lio_kaitai_struct_format_ParamDefSpec__f_id))
   });
   if ((this$2 === $m_sci_Nil$())) {
     var $$x2 = $m_sci_Nil$()
@@ -96735,7 +96751,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.classConstructorHeader__
     var $$x2 = h
   };
   var paramsArg = $n($$x3).join__sc_IterableOnce__T__T__T__T($$x2, "", ", ", ", ");
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((((((((("public " + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name)) + "(") + paramsArg) + ("KaitaiStream " + pIo)) + ", ") + (($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(parentType) + " ") + pParent)) + " = null, ") + (((((($m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(rootClassName) + " ") + pRoot) + " = null") + addEndian) + ") : base(") + pIo)) + ")"));
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((((((((("public " + $m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(name)) + "(") + paramsArg) + ("KaitaiStream " + pIo)) + ", ") + (($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, parentType) + " ") + pParent)) + " = null, ") + (((((($m_Lio_kaitai_struct_Utils$().upperCamelCase__T__T(rootClassName) + " ") + pRoot) + " = null") + addEndian) + ") : base(") + pIo)) + ")"));
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("{");
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).inc__V();
   this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V($m_Lio_kaitai_struct_format_ParentIdentifier$(), pParent);
@@ -96803,10 +96819,10 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.readFooter__V = (functio
   this.fileFooter__T__V("")
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.attributeDeclaration__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).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)) + ";"))
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((((("private " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__Z__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, attrType, isNullable)) + " ") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.attributeReader__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((((((("public " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_datatype_DataType__Z__T(attrType, isNullable)) + " ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().publicMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + " { get { return ") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + "; } }"))
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((((((("public " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__Z__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, attrType, isNullable)) + " ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().publicMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + " { get { return ") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + "; } }"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.universalDoc__Lio_kaitai_struct_format_DocSpec__V = (function(doc) {
   var this$1 = $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out);
@@ -96938,7 +96954,10 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condIfFooter__Lio_kaitai
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatInitAttr__Lio_kaitai_struct_format_Identifier__Lio_kaitai_struct_datatype_DataType__V = (function(id, dataType) {
   var this$1 = $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList);
   $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.Lio_kaitai_struct_ImportList__f_list, "System.Collections.Generic");
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).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(dataType))) + "();"))
+  var $$x2 = $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out);
+  var $$x1 = this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id);
+  var attrType = new $c_Lio_kaitai_struct_datatype_DataType$ArrayTypeInStream(dataType);
+  $n($$x2).puts__T__V(((($$x1 + " = new ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, attrType)) + "();"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatEosHeader__Lio_kaitai_struct_format_Identifier__T__Lio_kaitai_struct_datatype_DataType__V = (function(id, io, dataType) {
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("{");
@@ -96972,7 +96991,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.condRepeatUntilHeader__L
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("{");
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).inc__V();
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("var i = 0;");
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType) + " ") + $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_translator).doName__T__T("_")) + ";"));
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, dataType) + " ") + $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_translator).doName__T__T("_")) + ";"));
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("do {");
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).inc__V()
 });
@@ -97003,7 +97022,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.handleAssignmentSimple__
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((((this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(id) + " = ") + expr) + ";"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.handleAssignmentTempVar__Lio_kaitai_struct_datatype_DataType__T__T__V = (function(dataType, id, expr) {
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((((($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType) + " ") + id) + " = ") + expr) + ";"))
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((((($m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, dataType) + " ") + id) + " = ") + expr) + ";"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.blockScopeHeader__V = (function() {
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("{");
@@ -97124,7 +97143,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.bytesPadTermExpr__T__s_O
   return expr2
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.userTypeDebugRead__T__Lio_kaitai_struct_datatype_DataType__Lio_kaitai_struct_datatype_DataType__V = (function(id, dataType, assignType) {
-  var expr = ((!((assignType === null) ? (dataType === null) : $n(assignType).equals__O__Z(dataType))) ? (((("((" + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(dataType)) + ") (") + id) + "))") : id);
+  var expr = ((!((assignType === null) ? (dataType === null) : $n(assignType).equals__O__Z(dataType))) ? (((("((" + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, dataType)) + ") (") + id) + "))") : id);
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((expr + "._read();"))
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchRequiresIfs__Lio_kaitai_struct_datatype_DataType__Z = (function(onType) {
@@ -97156,7 +97175,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchIfStart__Lio_kaita
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("{");
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).inc__V();
   var $$x2 = $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out);
-  var $$x1 = $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_datatype_DataType__T(onType);
+  var $$x1 = $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, onType);
   var e = this.Lio_kaitai_struct_languages_CSharpCompiler__f_NAME_SWITCH_ON;
   $n($$x2).puts__T__V(((((($$x1 + " ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, e)) + " = ") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, on)) + ";"))
 });
@@ -97189,10 +97208,10 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.switchIfEnd__V = (functi
 });
 $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceDeclaration__Lio_kaitai_struct_format_InstanceIdentifier__Lio_kaitai_struct_datatype_DataType__Z__V = (function(attrName, attrType, isNullable) {
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((("private bool " + this.flagForInstName__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"));
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).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)) + ";"))
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((((("private " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__Z__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, attrType, isNullable)) + " ") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(attrName)) + ";"))
 });
 $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) {
-  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((("public " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_datatype_DataType__Z__T(dataType, isNullable)) + " ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().publicMemberName__Lio_kaitai_struct_format_Identifier__T(instName)));
+  $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V(((("public " + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeTypeNullable__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__Z__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, dataType, isNullable)) + " ") + $m_Lio_kaitai_struct_languages_CSharpCompiler$().publicMemberName__Lio_kaitai_struct_format_Identifier__T(instName)));
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("{");
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).inc__V();
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V("get");
@@ -97215,7 +97234,7 @@ $c_Lio_kaitai_struct_languages_CSharpCompiler.prototype.instanceReturn__Lio_kait
   $n(this.Lio_kaitai_struct_languages_CSharpCompiler__f_out).puts__T__V((("return " + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T(instName)) + ";"))
 });
 $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)) + ")"))
+  this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V(instName, (((("(" + $m_Lio_kaitai_struct_languages_CSharpCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_ImportList__Lio_kaitai_struct_datatype_DataType__T(this.Lio_kaitai_struct_languages_CSharpCompiler__f_importList, dataType)) + ") (") + $f_Lio_kaitai_struct_languages_components_ObjectOrientedLanguage__expression__Lio_kaitai_struct_exprlang_Ast$expr__T(this, value)) + ")"))
 });
 $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))

package/package.json

@@ -35,5 +35,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "0.11.0-SNAPSHOT20240415.175433.32227fc"
+  "version": "0.11.0-SNAPSHOT20240610.172038.27d5020"
 }