kaitai-struct-compiler 0.10.0-SNAPSHOT20220801.113415.690af1b3 → 0.10.0-SNAPSHOT20220813.105458.a4435936

package/kaitai-struct-compiler.js

@@ -1290,6 +1290,16 @@ function $isArrayOf_Lio_kaitai_struct_exprlang_Ast$cmpop(obj, depth) {
 function $asArrayOf_Lio_kaitai_struct_exprlang_Ast$cmpop(obj, depth) {
   return (($isArrayOf_Lio_kaitai_struct_exprlang_Ast$cmpop(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.exprlang.Ast$cmpop;", depth))
 }
+function $f_Lio_kaitai_struct_exprlang_Ast$expr__evaluateStrConst__s_Option($thiz) {
+  var x1 = $m_Lio_kaitai_struct_exprlang_ConstEvaluator$().evaluate__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_ConstEvaluator$value($thiz);
+  if ((x1 instanceof $c_Lio_kaitai_struct_exprlang_ConstEvaluator$value$Str)) {
+    var x2 = $as_Lio_kaitai_struct_exprlang_ConstEvaluator$value$Str(x1);
+    var x = x2.value$1;
+    return new $c_s_Some().init___O(x)
+  } else {
+    return $m_s_None$()
+  }
+}
 function $is_Lio_kaitai_struct_exprlang_Ast$expr(obj) {
   return (!(!((obj && obj.$classData) && obj.$classData.ancestors.Lio_kaitai_struct_exprlang_Ast$expr)))
 }
@@ -3709,7 +3719,30 @@ $c_Lio_kaitai_struct_Main$.prototype.updateConfigFromMeta__p1__Lio_kaitai_struct
     };
     var config2 = config1
   };
-  return config2
+  var x1$2 = meta.opaqueTypes$1;
+  if ((x1$2 instanceof $c_s_Some)) {
+    var x2$2 = $as_s_Some(x1$2);
+    var value$2 = $uZ(x2$2.value$2);
+    var x$14 = config2.autoRead$1;
+    var x$15 = config2.readStoresPos$1;
+    var x$16 = config2.zeroCopySubstream$1;
+    var x$17 = config2.cppConfig$1;
+    var x$18 = config2.goPackage$1;
+    var x$19 = config2.java$1;
+    var x$20 = config2.dotNetNamespace$1;
+    var x$21 = config2.phpNamespace$1;
+    var x$22 = config2.pythonPackage$1;
+    var x$23 = config2.nimModule$1;
+    var x$24 = config2.nimOpaque$1;
+    var config3 = new $c_Lio_kaitai_struct_RuntimeConfig().init___Z__Z__Z__Z__Lio_kaitai_struct_CppRuntimeConfig__T__Lio_kaitai_struct_JavaRuntimeConfig__T__T__T__T__T(x$14, x$15, value$2, x$16, x$17, x$18, x$19, x$20, x$21, x$22, x$23, x$24)
+  } else {
+    var x$25 = $m_s_None$();
+    if ((!(x$25 === x1$2))) {
+      throw new $c_s_MatchError().init___O(x1$2)
+    };
+    var config3 = config2
+  };
+  return config3
 });
 $c_Lio_kaitai_struct_Main$.prototype.importAndPrecompile__Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_RuntimeConfig__s_concurrent_Future = (function(specs, config) {
   return new $c_Lio_kaitai_struct_precompile_LoadImports().init___Lio_kaitai_struct_format_ClassSpecs(specs).processClass__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_precompile_LoadImports$ImportPath__s_concurrent_Future(specs.firstSpec$6, $m_Lio_kaitai_struct_precompile_LoadImports$().BasePath$1).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, specs$1, config$1) {
@@ -3720,35 +3753,23 @@ $c_Lio_kaitai_struct_Main$.prototype.importAndPrecompile__Lio_kaitai_struct_form
     })
   })(this, specs, config)), $m_s_concurrent_ExecutionContext$Implicits$().global__s_concurrent_ExecutionContext())
 });
-$c_Lio_kaitai_struct_Main$.prototype.precompile__Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_RuntimeConfig__sc_Iterable = (function(classSpecs, topClass, config) {
-  var iterTable = classSpecs.table$5;
-  var idx = $f_scm_HashTable__scala$collection$mutable$HashTable$$lastPopulatedIndex__I(classSpecs);
-  var es = iterTable.get(idx);
-  while ((es !== null)) {
-    var this$1 = es;
-    var next = this$1.next$1;
-    var arg1 = es;
-    var e = $as_scm_DefaultEntry(arg1);
-    var _2 = e.value$1;
-    var curClass = $as_Lio_kaitai_struct_format_ClassSpec(_2);
-    $m_Lio_kaitai_struct_precompile_MarkupClassNames$().markupClassNames__Lio_kaitai_struct_format_ClassSpec__V(curClass);
-    es = next;
-    while (((es === null) && (idx > 0))) {
-      idx = (((-1) + idx) | 0);
-      es = iterTable.get(idx)
-    }
+$c_Lio_kaitai_struct_Main$.prototype.precompile__Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_RuntimeConfig__sc_Iterable = (function(classSpecs, topClass, conf) {
+  var config = this.updateConfigFromMeta__p1__Lio_kaitai_struct_RuntimeConfig__Lio_kaitai_struct_format_MetaSpec__Lio_kaitai_struct_RuntimeConfig(conf, topClass.meta$1);
+  new $c_Lio_kaitai_struct_precompile_MarkupClassNames().init___Lio_kaitai_struct_format_ClassSpecs(classSpecs).run__sc_Iterable();
+  var resolveTypeProblems = new $c_Lio_kaitai_struct_precompile_ResolveTypes().init___Lio_kaitai_struct_format_ClassSpecs__Z(classSpecs, config.opaqueTypes$1).run__sc_Iterable();
+  if (resolveTypeProblems.nonEmpty__Z()) {
+    return resolveTypeProblems
   };
-  var this$2 = topClass.meta$1.opaqueTypes$1;
-  var opaqueTypes = $uZ((this$2.isEmpty__Z() ? config.opaqueTypes$1 : this$2.get__O()));
-  new $c_Lio_kaitai_struct_precompile_ResolveTypes().init___Lio_kaitai_struct_format_ClassSpecs__Z(classSpecs, opaqueTypes).run__V();
   new $c_Lio_kaitai_struct_precompile_ParentTypes().init___Lio_kaitai_struct_format_ClassSpecs(classSpecs).run__V();
   new $c_Lio_kaitai_struct_precompile_SpecsValueTypeDerive().init___Lio_kaitai_struct_format_ClassSpecs(classSpecs).run__V();
   new $c_Lio_kaitai_struct_precompile_CalculateSeqSizes().init___Lio_kaitai_struct_format_ClassSpecs(classSpecs).run__V();
   var typeValidatorProblems = new $c_Lio_kaitai_struct_precompile_TypeValidator().init___Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_format_ClassSpec(classSpecs, topClass).run__sc_Iterable();
   var styleWarnings = new $c_Lio_kaitai_struct_precompile_StyleCheckIds().init___Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_format_ClassSpec(classSpecs, topClass).run__sc_Iterable();
   topClass.parentClass$1 = $m_Lio_kaitai_struct_format_GenericStructClassSpec$();
-  var this$3 = $m_sc_Iterable$();
-  return $as_sc_Iterable(typeValidatorProblems.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(styleWarnings, this$3.ReusableCBFInstance$2))
+  var this$1 = $m_sc_Iterable$();
+  var jsx$1 = $as_sc_TraversableLike(resolveTypeProblems.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(typeValidatorProblems, this$1.ReusableCBFInstance$2));
+  var this$2 = $m_sc_Iterable$();
+  return $as_sc_Iterable(jsx$1.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(styleWarnings, this$2.ReusableCBFInstance$2))
 });
 $c_Lio_kaitai_struct_Main$.prototype.precompile__Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_RuntimeConfig__sc_Iterable = (function(specs, config) {
   $m_scm_Iterable$();
@@ -4494,9 +4515,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-SNAPSHOT20220801.113415.690af1b3";
-  this.gitCommit$1 = "690af1b3";
-  this.gitTime$1 = "2022-08-01T11:34:15+00:00";
+  this.version$1 = "0.10-SNAPSHOT20220813.105458.a4435936";
+  this.gitCommit$1 = "a4435936";
+  this.gitTime$1 = "2022-08-13T10:54:58+00:00";
   return this
 });
 var $d_Lio_kaitai_struct_Version$ = new $TypeData().initClass({
@@ -10052,90 +10073,6 @@ function $m_Lio_kaitai_struct_precompile_LoadImports$ImportPath$() {
   return $n_Lio_kaitai_struct_precompile_LoadImports$ImportPath$
 }
 /** @constructor */
-function $c_Lio_kaitai_struct_precompile_MarkupClassNames$() {
-  $c_O.call(this)
-}
-$c_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype = new $h_O();
-$c_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype.constructor = $c_Lio_kaitai_struct_precompile_MarkupClassNames$;
-/** @constructor */
-function $h_Lio_kaitai_struct_precompile_MarkupClassNames$() {
-  /*<skip>*/
-}
-$h_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype = $c_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype;
-$c_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype.init___ = (function() {
-  return this
-});
-$c_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype.markupClassNames__Lio_kaitai_struct_format_ClassSpec__V = (function(curClass) {
-  curClass.enums$1.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, curClass$1) {
-    return (function(x0$1$2) {
-      var x0$1 = $as_T2(x0$1$2);
-      if ((x0$1 !== null)) {
-        var enumName = $as_T(x0$1.$$und1__O());
-        var enumSpec = $as_Lio_kaitai_struct_format_EnumSpec(x0$1.$$und2__O());
-        var x$1 = curClass$1.name$1;
-        $m_sci_List$();
-        var array = [enumName];
-        var i = (((-1) + $uI(array.length)) | 0);
-        var result = $m_sci_Nil$();
-        while ((i >= 0)) {
-          var this$4 = result;
-          var index = i;
-          var x = array[index];
-          result = new $c_sci_$colon$colon().init___O__sci_List(x, this$4);
-          i = (((-1) + i) | 0)
-        };
-        enumSpec.name$1 = result.$$colon$colon$colon__sci_List__sci_List(x$1)
-      } else {
-        throw new $c_s_MatchError().init___O(x0$1)
-      }
-    })
-  })(this, curClass)));
-  curClass.types$1.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2$1, curClass$2) {
-    return (function(x0$2$2) {
-      var x0$2 = $as_T2(x0$2$2);
-      matchEnd4: {
-        if ((x0$2 !== null)) {
-          var nestedName = $as_T(x0$2.$$und1__O());
-          var nestedClass = $as_Lio_kaitai_struct_format_ClassSpec(x0$2.$$und2__O());
-          if ((nestedName !== null)) {
-            var x$2 = curClass$2.name$1;
-            $m_sci_List$();
-            var array$1 = [nestedName];
-            var i$1 = (((-1) + $uI(array$1.length)) | 0);
-            var result$1 = $m_sci_Nil$();
-            while ((i$1 >= 0)) {
-              var this$8 = result$1;
-              var index$1 = i$1;
-              var x$3 = array$1[index$1];
-              result$1 = new $c_sci_$colon$colon().init___O__sci_List(x$3, this$8);
-              i$1 = (((-1) + i$1) | 0)
-            };
-            nestedClass.name$1 = result$1.$$colon$colon$colon__sci_List__sci_List(x$2);
-            nestedClass.upClass$1 = new $c_s_Some().init___O(curClass$2);
-            $m_Lio_kaitai_struct_precompile_MarkupClassNames$().markupClassNames__Lio_kaitai_struct_format_ClassSpec__V(nestedClass);
-            break matchEnd4
-          }
-        };
-        throw new $c_s_MatchError().init___O(x0$2)
-      }
-    })
-  })(this, curClass)))
-});
-var $d_Lio_kaitai_struct_precompile_MarkupClassNames$ = new $TypeData().initClass({
-  Lio_kaitai_struct_precompile_MarkupClassNames$: 0
-}, false, "io.kaitai.struct.precompile.MarkupClassNames$", {
-  Lio_kaitai_struct_precompile_MarkupClassNames$: 1,
-  O: 1
-});
-$c_Lio_kaitai_struct_precompile_MarkupClassNames$.prototype.$classData = $d_Lio_kaitai_struct_precompile_MarkupClassNames$;
-var $n_Lio_kaitai_struct_precompile_MarkupClassNames$ = (void 0);
-function $m_Lio_kaitai_struct_precompile_MarkupClassNames$() {
-  if ((!$n_Lio_kaitai_struct_precompile_MarkupClassNames$)) {
-    $n_Lio_kaitai_struct_precompile_MarkupClassNames$ = new $c_Lio_kaitai_struct_precompile_MarkupClassNames$().init___()
-  };
-  return $n_Lio_kaitai_struct_precompile_MarkupClassNames$
-}
-/** @constructor */
 function $c_Lio_kaitai_struct_precompile_ParentTypes() {
   $c_O.call(this);
   this.classSpecs$1 = null
@@ -10330,266 +10267,6 @@ var $d_Lio_kaitai_struct_precompile_ParentTypes = new $TypeData().initClass({
 });
 $c_Lio_kaitai_struct_precompile_ParentTypes.prototype.$classData = $d_Lio_kaitai_struct_precompile_ParentTypes;
 /** @constructor */
-function $c_Lio_kaitai_struct_precompile_ResolveTypes() {
-  $c_O.call(this);
-  this.specs$1 = null;
-  this.opaqueTypes$1 = false
-}
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype = new $h_O();
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.constructor = $c_Lio_kaitai_struct_precompile_ResolveTypes;
-/** @constructor */
-function $h_Lio_kaitai_struct_precompile_ResolveTypes() {
-  /*<skip>*/
-}
-$h_Lio_kaitai_struct_precompile_ResolveTypes.prototype = $c_Lio_kaitai_struct_precompile_ResolveTypes.prototype;
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.realResolveUserType__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option = (function(curClass, typeName, path) {
-  if ((!(typeName instanceof $c_sci_$colon$colon))) {
-    throw new $c_s_MatchError().init___O(typeName)
-  };
-  var x2 = $as_sci_$colon$colon(typeName);
-  var firstName = $as_T(x2.head$5);
-  var restNames = x2.tl$5;
-  var this$1 = curClass.types$1.get__O__s_Option(firstName);
-  if (this$1.isEmpty__Z()) {
-    var resolvedHere = $m_s_None$()
-  } else {
-    var arg1 = this$1.get__O();
-    var nestedClass = $as_Lio_kaitai_struct_format_ClassSpec(arg1);
-    var resolvedHere = (restNames.isEmpty__Z() ? new $c_s_Some().init___O(nestedClass) : this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(nestedClass, restNames, path))
-  };
-  if ((resolvedHere instanceof $c_s_Some)) {
-    return resolvedHere
-  } else {
-    var x = $m_s_None$();
-    if ((x === resolvedHere)) {
-      var x1$3 = curClass.upClass$1;
-      if ((x1$3 instanceof $c_s_Some)) {
-        var x2$2 = $as_s_Some(x1$3);
-        var upClass = $as_Lio_kaitai_struct_format_ClassSpec(x2$2.value$2);
-        return this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(upClass, typeName, path)
-      } else {
-        var x$3 = $m_s_None$();
-        if ((x$3 === x1$3)) {
-          var x$5 = curClass.name$1.head__O();
-          if (((x$5 === null) ? (firstName === null) : $objectEquals(x$5, firstName))) {
-            return new $c_s_Some().init___O(curClass)
-          } else {
-            var resolvedTop = this.specs$1.get__O__s_Option(firstName);
-            var x$7 = $m_s_None$();
-            if ((x$7 === resolvedTop)) {
-              return $m_s_None$()
-            } else if ((resolvedTop instanceof $c_s_Some)) {
-              var x2$3 = $as_s_Some(resolvedTop);
-              var classSpec = $as_Lio_kaitai_struct_format_ClassSpec(x2$3.value$2);
-              return (restNames.isEmpty__Z() ? resolvedTop : this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(classSpec, restNames, path))
-            } else {
-              throw new $c_s_MatchError().init___O(resolvedTop)
-            }
-          }
-        } else {
-          throw new $c_s_MatchError().init___O(x1$3)
-        }
-      }
-    } else {
-      throw new $c_s_MatchError().init___O(resolvedHere)
-    }
-  }
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.run__V = (function() {
-  this.specs$1.forEachRec__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
-    return (function(curClass$2) {
-      var curClass = $as_Lio_kaitai_struct_format_ClassSpec(curClass$2);
-      $this.resolveUserTypes__Lio_kaitai_struct_format_ClassSpec__V(curClass)
-    })
-  })(this)))
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option = (function(curClass, typeName, path) {
-  $m_Lio_kaitai_struct_Log$();
-  var res = this.realResolveUserType__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(curClass, typeName, path);
-  var x = $m_s_None$();
-  if ((x === res)) {
-    if (this.opaqueTypes$1) {
-      $m_Lio_kaitai_struct_Log$();
-      return new $c_s_Some().init___O($m_Lio_kaitai_struct_format_ClassSpec$().opaquePlaceholder__sci_List__Lio_kaitai_struct_format_ClassSpec(typeName))
-    } else {
-      var err = new $c_Lio_kaitai_struct_precompile_TypeNotFoundError().init___T__Lio_kaitai_struct_format_ClassSpec($f_sc_TraversableOnce__mkString__T__T__T__T(typeName, "", "::", ""), curClass);
-      throw $m_Lio_kaitai_struct_problems_KSYParseError$().withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException(err.s$1, path)
-    }
-  } else if ((res instanceof $c_s_Some)) {
-    var x2 = $as_s_Some(res);
-    $as_Lio_kaitai_struct_format_ClassSpec(x2.value$2);
-    $m_Lio_kaitai_struct_Log$();
-    return res
-  } else {
-    throw new $c_s_MatchError().init___O(res)
-  }
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.realResolveEnumSpec__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option = (function(curClass, typeName) {
-  if ((!(typeName instanceof $c_sci_$colon$colon))) {
-    throw new $c_s_MatchError().init___O(typeName)
-  };
-  var x2 = $as_sci_$colon$colon(typeName);
-  var firstName = $as_T(x2.head$5);
-  var restNames = x2.tl$5;
-  if (restNames.isEmpty__Z()) {
-    var resolvedHere = curClass.enums$1.get__O__s_Option(firstName)
-  } else {
-    var this$1 = curClass.types$1.get__O__s_Option(firstName);
-    if (this$1.isEmpty__Z()) {
-      var resolvedHere = $m_s_None$()
-    } else {
-      var arg1 = this$1.get__O();
-      var nestedClass = $as_Lio_kaitai_struct_format_ClassSpec(arg1);
-      var resolvedHere = this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(nestedClass, restNames)
-    }
-  };
-  if ((resolvedHere instanceof $c_s_Some)) {
-    return resolvedHere
-  } else {
-    var x = $m_s_None$();
-    if ((x === resolvedHere)) {
-      var x1$3 = curClass.upClass$1;
-      if ((x1$3 instanceof $c_s_Some)) {
-        var x2$2 = $as_s_Some(x1$3);
-        var upClass = $as_Lio_kaitai_struct_format_ClassSpec(x2$2.value$2);
-        return this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(upClass, typeName)
-      } else {
-        var x$4 = $m_s_None$();
-        if ((x$4 === x1$3)) {
-          var x$6 = curClass.name$1.head__O();
-          if (((x$6 === null) ? (firstName === null) : $objectEquals(x$6, firstName))) {
-            return this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(curClass, restNames)
-          } else {
-            var resolvedTop = this.specs$1.get__O__s_Option(firstName);
-            var x$8 = $m_s_None$();
-            if ((x$8 === resolvedTop)) {
-              return $m_s_None$()
-            } else if ((resolvedTop instanceof $c_s_Some)) {
-              var x2$3 = $as_s_Some(resolvedTop);
-              var classSpec = $as_Lio_kaitai_struct_format_ClassSpec(x2$3.value$2);
-              return (restNames.isEmpty__Z() ? $m_s_None$() : this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(classSpec, restNames))
-            } else {
-              throw new $c_s_MatchError().init___O(resolvedTop)
-            }
-          }
-        } else {
-          throw new $c_s_MatchError().init___O(x1$3)
-        }
-      }
-    } else {
-      throw new $c_s_MatchError().init___O(resolvedHere)
-    }
-  }
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveUserTypes__Lio_kaitai_struct_format_ClassSpec__V = (function(curClass) {
-  var this$1 = curClass.seq$1;
-  var these = this$1;
-  while ((!these.isEmpty__Z())) {
-    var arg1 = these.head__O();
-    var attr = $as_Lio_kaitai_struct_format_AttrSpec(arg1);
-    this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__V(curClass, attr.dataType$1, attr.path$1);
-    var this$2 = these;
-    these = this$2.tail__sci_List()
-  };
-  curClass.instances$1.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2$1, curClass$1) {
-    return (function(x0$1$2) {
-      var x0$1 = $as_T2(x0$1$2);
-      if ((x0$1 !== null)) {
-        var instSpec = $as_Lio_kaitai_struct_format_InstanceSpec(x0$1.$$und2__O());
-        if ((instSpec instanceof $c_Lio_kaitai_struct_format_ParseInstanceSpec)) {
-          var x2 = $as_Lio_kaitai_struct_format_ParseInstanceSpec(instSpec);
-          this$2$1.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__V(curClass$1, x2.dataType$2, x2.path$2)
-        } else if ((!(instSpec instanceof $c_Lio_kaitai_struct_format_ValueInstanceSpec))) {
-          throw new $c_s_MatchError().init___O(instSpec)
-        }
-      } else {
-        throw new $c_s_MatchError().init___O(x0$1)
-      }
-    })
-  })(this, curClass)));
-  var this$3 = curClass.params$1;
-  var these$1 = this$3;
-  while ((!these$1.isEmpty__Z())) {
-    var arg1$1 = these$1.head__O();
-    var paramDef = $as_Lio_kaitai_struct_format_ParamDefSpec(arg1$1);
-    this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__V(curClass, paramDef.dataType$1, paramDef.path$1);
-    var this$4 = these$1;
-    these$1 = this$4.tail__sci_List()
-  }
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__V = (function(curClass, dataType, path) {
-  if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$UserType)) {
-    var x2 = $as_Lio_kaitai_struct_datatype_DataType$UserType(dataType);
-    x2.classSpec$3 = this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(curClass, x2.name$3, path)
-  } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$EnumType)) {
-    var x3 = $as_Lio_kaitai_struct_datatype_DataType$EnumType(dataType);
-    x3.enumSpec$1 = this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(curClass, x3.name$1);
-    if (x3.enumSpec$1.isEmpty__Z()) {
-      var this$1 = x3.name$1;
-      var err = new $c_Lio_kaitai_struct_precompile_EnumNotFoundError().init___T__Lio_kaitai_struct_format_ClassSpec($f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "::", ""), curClass);
-      throw $m_Lio_kaitai_struct_problems_KSYParseError$().withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException(err.s$1, path)
-    }
-  } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$SwitchType)) {
-    var x4 = $as_Lio_kaitai_struct_datatype_DataType$SwitchType(dataType);
-    x4.cases$2.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, curClass$1, path$1) {
-      return (function(x0$1$2) {
-        var x0$1 = $as_T2(x0$1$2);
-        if ((x0$1 !== null)) {
-          var caseName = $as_Lio_kaitai_struct_exprlang_Ast$expr(x0$1.$$und1__O());
-          var ut = $as_Lio_kaitai_struct_datatype_DataType(x0$1.$$und2__O());
-          $m_sci_List$();
-          var array = ["type", "cases", caseName.toString__T()];
-          var i = (((-1) + $uI(array.length)) | 0);
-          var result = $m_sci_Nil$();
-          while ((i >= 0)) {
-            var this$5 = result;
-            var index = i;
-            var x = array[index];
-            result = new $c_sci_$colon$colon().init___O__sci_List(x, this$5);
-            i = (((-1) + i) | 0)
-          };
-          var jsx$1 = result;
-          var this$6 = $m_sci_List$();
-          $this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__V(curClass$1, ut, $as_sci_List(path$1.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$1, this$6.ReusableCBFInstance$2)))
-        } else {
-          throw new $c_s_MatchError().init___O(x0$1)
-        }
-      })
-    })(this, curClass, path)))
-  } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$ArrayType)) {
-    var x5 = $as_Lio_kaitai_struct_datatype_DataType$ArrayType(dataType);
-    this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__V(curClass, x5.elType$2, path)
-  }
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.init___Lio_kaitai_struct_format_ClassSpecs__Z = (function(specs, opaqueTypes) {
-  this.specs$1 = specs;
-  this.opaqueTypes$1 = opaqueTypes;
-  return this
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option = (function(curClass, typeName) {
-  $m_Lio_kaitai_struct_Log$();
-  var res = this.realResolveEnumSpec__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(curClass, typeName);
-  var x = $m_s_None$();
-  if ((x === res)) {
-    $m_Lio_kaitai_struct_Log$();
-    return res
-  } else if ((res instanceof $c_s_Some)) {
-    var x2 = $as_s_Some(res);
-    $as_Lio_kaitai_struct_format_EnumSpec(x2.value$2);
-    $m_Lio_kaitai_struct_Log$();
-    return res
-  } else {
-    throw new $c_s_MatchError().init___O(res)
-  }
-});
-var $d_Lio_kaitai_struct_precompile_ResolveTypes = new $TypeData().initClass({
-  Lio_kaitai_struct_precompile_ResolveTypes: 0
-}, false, "io.kaitai.struct.precompile.ResolveTypes", {
-  Lio_kaitai_struct_precompile_ResolveTypes: 1,
-  O: 1
-});
-$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.$classData = $d_Lio_kaitai_struct_precompile_ResolveTypes;
-/** @constructor */
 function $c_Lio_kaitai_struct_precompile_SpecsValueTypeDerive() {
   $c_O.call(this);
   this.specs$1 = null
@@ -22459,6 +22136,484 @@ function $asArrayOf_Lio_kaitai_struct_format_AttrLikeSpec(obj, depth) {
   return (($isArrayOf_Lio_kaitai_struct_format_AttrLikeSpec(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.format.AttrLikeSpec;", depth))
 }
 /** @constructor */
+function $c_Lio_kaitai_struct_precompile_MarkupClassNames() {
+  $c_O.call(this);
+  this.classSpecs$1 = null
+}
+$c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype = new $h_O();
+$c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype.constructor = $c_Lio_kaitai_struct_precompile_MarkupClassNames;
+/** @constructor */
+function $h_Lio_kaitai_struct_precompile_MarkupClassNames() {
+  /*<skip>*/
+}
+$h_Lio_kaitai_struct_precompile_MarkupClassNames.prototype = $c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype;
+$c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype.markupClassNames__Lio_kaitai_struct_format_ClassSpec__V = (function(curClass) {
+  curClass.enums$1.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, curClass$1) {
+    return (function(x0$1$2) {
+      var x0$1 = $as_T2(x0$1$2);
+      if ((x0$1 !== null)) {
+        var enumName = $as_T(x0$1.$$und1__O());
+        var enumSpec = $as_Lio_kaitai_struct_format_EnumSpec(x0$1.$$und2__O());
+        var x$1 = curClass$1.name$1;
+        $m_sci_List$();
+        var array = [enumName];
+        var i = (((-1) + $uI(array.length)) | 0);
+        var result = $m_sci_Nil$();
+        while ((i >= 0)) {
+          var this$4 = result;
+          var index = i;
+          var x = array[index];
+          result = new $c_sci_$colon$colon().init___O__sci_List(x, this$4);
+          i = (((-1) + i) | 0)
+        };
+        enumSpec.name$1 = result.$$colon$colon$colon__sci_List__sci_List(x$1)
+      } else {
+        throw new $c_s_MatchError().init___O(x0$1)
+      }
+    })
+  })(this, curClass)));
+  curClass.types$1.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2$1, curClass$2) {
+    return (function(x0$2$2) {
+      var x0$2 = $as_T2(x0$2$2);
+      matchEnd4: {
+        if ((x0$2 !== null)) {
+          var nestedName = $as_T(x0$2.$$und1__O());
+          var nestedClass = $as_Lio_kaitai_struct_format_ClassSpec(x0$2.$$und2__O());
+          if ((nestedName !== null)) {
+            var x$2 = curClass$2.name$1;
+            $m_sci_List$();
+            var array$1 = [nestedName];
+            var i$1 = (((-1) + $uI(array$1.length)) | 0);
+            var result$1 = $m_sci_Nil$();
+            while ((i$1 >= 0)) {
+              var this$8 = result$1;
+              var index$1 = i$1;
+              var x$3 = array$1[index$1];
+              result$1 = new $c_sci_$colon$colon().init___O__sci_List(x$3, this$8);
+              i$1 = (((-1) + i$1) | 0)
+            };
+            nestedClass.name$1 = result$1.$$colon$colon$colon__sci_List__sci_List(x$2);
+            nestedClass.upClass$1 = new $c_s_Some().init___O(curClass$2);
+            this$2$1.markupClassNames__Lio_kaitai_struct_format_ClassSpec__V(nestedClass);
+            break matchEnd4
+          }
+        };
+        throw new $c_s_MatchError().init___O(x0$2)
+      }
+    })
+  })(this, curClass)))
+});
+$c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype.init___Lio_kaitai_struct_format_ClassSpecs = (function(classSpecs) {
+  this.classSpecs$1 = classSpecs;
+  return this
+});
+$c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype.run__sc_Iterable = (function() {
+  var this$1 = this.classSpecs$1;
+  var iterTable = this$1.table$5;
+  var idx = $f_scm_HashTable__scala$collection$mutable$HashTable$$lastPopulatedIndex__I(this$1);
+  var es = iterTable.get(idx);
+  while ((es !== null)) {
+    var this$2 = es;
+    var next = this$2.next$1;
+    var arg1 = es;
+    var e = $as_scm_DefaultEntry(arg1);
+    var _2 = e.value$1;
+    var curClass = $as_Lio_kaitai_struct_format_ClassSpec(_2);
+    this.markupClassNames__Lio_kaitai_struct_format_ClassSpec__V(curClass);
+    es = next;
+    while (((es === null) && (idx > 0))) {
+      idx = (((-1) + idx) | 0);
+      es = iterTable.get(idx)
+    }
+  };
+  var xo = $m_s_None$();
+  return xo.toList__sci_List()
+});
+var $d_Lio_kaitai_struct_precompile_MarkupClassNames = new $TypeData().initClass({
+  Lio_kaitai_struct_precompile_MarkupClassNames: 0
+}, false, "io.kaitai.struct.precompile.MarkupClassNames", {
+  Lio_kaitai_struct_precompile_MarkupClassNames: 1,
+  O: 1,
+  Lio_kaitai_struct_precompile_PrecompileStep: 1
+});
+$c_Lio_kaitai_struct_precompile_MarkupClassNames.prototype.$classData = $d_Lio_kaitai_struct_precompile_MarkupClassNames;
+/** @constructor */
+function $c_Lio_kaitai_struct_precompile_ResolveTypes() {
+  $c_O.call(this);
+  this.specs$1 = null;
+  this.opaqueTypes$1 = false
+}
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype = new $h_O();
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.constructor = $c_Lio_kaitai_struct_precompile_ResolveTypes;
+/** @constructor */
+function $h_Lio_kaitai_struct_precompile_ResolveTypes() {
+  /*<skip>*/
+}
+$h_Lio_kaitai_struct_precompile_ResolveTypes.prototype = $c_Lio_kaitai_struct_precompile_ResolveTypes.prototype;
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__T2 = (function(curClass, typeName, path) {
+  var res = this.realResolveUserType__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(curClass, typeName, path);
+  var x = $m_s_None$();
+  if ((x === res)) {
+    return (this.opaqueTypes$1 ? ($m_Lio_kaitai_struct_Log$(), new $c_T2().init___O__O(new $c_s_Some().init___O($m_Lio_kaitai_struct_format_ClassSpec$().opaquePlaceholder__sci_List__Lio_kaitai_struct_format_ClassSpec(typeName)), $m_s_None$())) : new $c_T2().init___O__O($m_s_None$(), new $c_s_Some().init___O(new $c_Lio_kaitai_struct_problems_TypeNotFoundErr().init___sci_List__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(typeName, curClass, path, $m_s_None$()))))
+  } else if ((res instanceof $c_s_Some)) {
+    var x2 = $as_s_Some(res);
+    $as_Lio_kaitai_struct_format_ClassSpec(x2.value$2);
+    $m_Lio_kaitai_struct_Log$();
+    return new $c_T2().init___O__O(res, $m_s_None$())
+  } else {
+    throw new $c_s_MatchError().init___O(res)
+  }
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__sc_Iterable = (function(curClass, dataType, path) {
+  if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$UserType)) {
+    var x2 = $as_Lio_kaitai_struct_datatype_DataType$UserType(dataType);
+    var x1$2 = this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__T2(curClass, x2.name$3, path);
+    if ((x1$2 === null)) {
+      throw new $c_s_MatchError().init___O(x1$2)
+    };
+    var resClassSpec = $as_s_Option(x1$2.$$und1__O());
+    var problems = $as_s_Option(x1$2.$$und2__O());
+    x2.classSpec$3 = resClassSpec;
+    return problems.toList__sci_List()
+  } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$EnumType)) {
+    var x3 = $as_Lio_kaitai_struct_datatype_DataType$EnumType(dataType);
+    x3.enumSpec$1 = this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(curClass, x3.name$1);
+    if (x3.enumSpec$1.isEmpty__Z()) {
+      var xo = new $c_s_Some().init___O(new $c_Lio_kaitai_struct_problems_EnumNotFoundErr().init___sci_List__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(x3.name$1, curClass, path, $m_s_None$()));
+      return xo.toList__sci_List()
+    } else {
+      var xo$1 = $m_s_None$();
+      return xo$1.toList__sci_List()
+    }
+  } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$SwitchType)) {
+    var x4 = $as_Lio_kaitai_struct_datatype_DataType$SwitchType(dataType);
+    var this$11 = x4.cases$2;
+    var f = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, curClass$1, path$1) {
+      return (function(x0$1$2) {
+        var x0$1 = $as_T2(x0$1$2);
+        if ((x0$1 !== null)) {
+          var caseName = $as_Lio_kaitai_struct_exprlang_Ast$expr(x0$1.$$und1__O());
+          var ut = $as_Lio_kaitai_struct_datatype_DataType(x0$1.$$und2__O());
+          $m_sci_List$();
+          var array = ["type", "cases", caseName.toString__T()];
+          var i = (((-1) + $uI(array.length)) | 0);
+          var result = $m_sci_Nil$();
+          while ((i >= 0)) {
+            var this$8 = result;
+            var index = i;
+            var x = array[index];
+            result = new $c_sci_$colon$colon().init___O__sci_List(x, this$8);
+            i = (((-1) + i) | 0)
+          };
+          var jsx$1 = result;
+          var this$9 = $m_sci_List$();
+          return $this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__sc_Iterable(curClass$1, ut, $as_sci_List(path$1.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$1, this$9.ReusableCBFInstance$2)))
+        } else {
+          throw new $c_s_MatchError().init___O(x0$1)
+        }
+      })
+    })(this, curClass, path));
+    var this$10 = $m_sci_Iterable$();
+    var bf = this$10.ReusableCBFInstance$2;
+    return $as_sc_Iterable($f_sc_TraversableLike__flatMap__F1__scg_CanBuildFrom__O(this$11, f, bf))
+  } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$ArrayType)) {
+    var x5 = $as_Lio_kaitai_struct_datatype_DataType$ArrayType(dataType);
+    return this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__sc_Iterable(curClass, x5.elType$2, path)
+  } else {
+    var xo$2 = $m_s_None$();
+    return xo$2.toList__sci_List()
+  }
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.realResolveUserType__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option = (function(curClass, typeName, path) {
+  _realResolveUserType: while (true) {
+    $m_Lio_kaitai_struct_Log$();
+    var x1 = typeName;
+    if ((!(x1 instanceof $c_sci_$colon$colon))) {
+      throw new $c_s_MatchError().init___O(x1)
+    };
+    var x2 = $as_sci_$colon$colon(x1);
+    var firstName = $as_T(x2.head$5);
+    var restNames = x2.tl$5;
+    var this$1 = curClass.types$1.get__O__s_Option(firstName);
+    if (this$1.isEmpty__Z()) {
+      var resolvedHere = $m_s_None$()
+    } else {
+      var arg1 = this$1.get__O();
+      var nestedClass = $as_Lio_kaitai_struct_format_ClassSpec(arg1);
+      var resolvedHere = (restNames.isEmpty__Z() ? new $c_s_Some().init___O(nestedClass) : this.realResolveUserType__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__sci_List__s_Option(nestedClass, restNames, path))
+    };
+    if ((resolvedHere instanceof $c_s_Some)) {
+      return resolvedHere
+    } else {
+      var x$3 = $m_s_None$();
+      if ((x$3 === resolvedHere)) {
+        var x1$3 = curClass.upClass$1;
+        if ((x1$3 instanceof $c_s_Some)) {
+          var x2$2 = $as_s_Some(x1$3);
+          var upClass = $as_Lio_kaitai_struct_format_ClassSpec(x2$2.value$2);
+          curClass = upClass;
+          continue _realResolveUserType
+        } else {
+          var x$5 = $m_s_None$();
+          if ((x$5 === x1$3)) {
+            var x$7 = curClass.name$1.head__O();
+            if (((x$7 === null) ? (firstName === null) : $objectEquals(x$7, firstName))) {
+              return new $c_s_Some().init___O(curClass)
+            } else {
+              var resolvedTop = this.specs$1.get__O__s_Option(firstName);
+              var x$9 = $m_s_None$();
+              if ((x$9 === resolvedTop)) {
+                return $m_s_None$()
+              } else if ((resolvedTop instanceof $c_s_Some)) {
+                var x2$3 = $as_s_Some(resolvedTop);
+                var classSpec = $as_Lio_kaitai_struct_format_ClassSpec(x2$3.value$2);
+                if (restNames.isEmpty__Z()) {
+                  return resolvedTop
+                } else {
+                  curClass = classSpec;
+                  typeName = restNames;
+                  continue _realResolveUserType
+                }
+              } else {
+                throw new $c_s_MatchError().init___O(resolvedTop)
+              }
+            }
+          } else {
+            throw new $c_s_MatchError().init___O(x1$3)
+          }
+        }
+      } else {
+        throw new $c_s_MatchError().init___O(resolvedHere)
+      }
+    }
+  }
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveUserTypes__Lio_kaitai_struct_format_ClassSpec__sc_Iterable = (function(curClass) {
+  var this$2 = curClass.seq$1;
+  var f = (function($this, curClass$1) {
+    return (function(attr$2) {
+      var attr = $as_Lio_kaitai_struct_format_AttrSpec(attr$2);
+      return $this.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__sc_Iterable(curClass$1, attr.dataType$1, attr.path$1)
+    })
+  })(this, curClass);
+  var this$1 = $m_sci_List$();
+  var bf = this$1.ReusableCBFInstance$2;
+  if ((bf === $m_sci_List$().ReusableCBFInstance$2)) {
+    if ((this$2 === $m_sci_Nil$())) {
+      var jsx$1 = $m_sci_Nil$()
+    } else {
+      var rest = this$2;
+      var found = new $c_sr_BooleanRef().init___Z(false);
+      var h = new $c_sr_ObjectRef().init___O(null);
+      var t = new $c_sr_ObjectRef().init___O(null);
+      while ((rest !== $m_sci_Nil$())) {
+        var arg1 = rest.head__O();
+        $as_sc_GenTraversableOnce(f(arg1)).seq__sc_TraversableOnce().foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this$1, found$1, h$1, t$1) {
+          return (function(b$2) {
+            if ((!found$1.elem$1)) {
+              h$1.elem$1 = new $c_sci_$colon$colon().init___O__sci_List(b$2, $m_sci_Nil$());
+              t$1.elem$1 = $as_sci_$colon$colon(h$1.elem$1);
+              found$1.elem$1 = true
+            } else {
+              var nx = new $c_sci_$colon$colon().init___O__sci_List(b$2, $m_sci_Nil$());
+              $as_sci_$colon$colon(t$1.elem$1).tl$5 = nx;
+              t$1.elem$1 = nx
+            }
+          })
+        })(this$2, found, h, t)));
+        var this$6 = rest;
+        rest = this$6.tail__sci_List()
+      };
+      var jsx$1 = ((!found.elem$1) ? $m_sci_Nil$() : $as_sci_$colon$colon(h.elem$1))
+    }
+  } else {
+    $m_sci_List$();
+    var b = new $c_scm_ListBuffer().init___();
+    var these = this$2;
+    while ((!these.isEmpty__Z())) {
+      var arg1$1 = these.head__O();
+      var xs = $as_sc_GenTraversableOnce(f(arg1$1)).seq__sc_TraversableOnce();
+      b.$$plus$plus$eq__sc_TraversableOnce__scm_ListBuffer(xs);
+      var this$8 = these;
+      these = this$8.tail__sci_List()
+    };
+    var jsx$1 = b.toList__sci_List()
+  };
+  var seqProblems = $as_sc_Iterable(jsx$1);
+  var this$11 = curClass.instances$1;
+  var f$1 = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2$1, curClass$2) {
+    return (function(x0$1$2) {
+      var x0$1 = $as_T2(x0$1$2);
+      if ((x0$1 !== null)) {
+        var instSpec = $as_Lio_kaitai_struct_format_InstanceSpec(x0$1.$$und2__O());
+        if ((instSpec instanceof $c_Lio_kaitai_struct_format_ParseInstanceSpec)) {
+          var x2 = $as_Lio_kaitai_struct_format_ParseInstanceSpec(instSpec);
+          return this$2$1.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__sc_Iterable(curClass$2, x2.dataType$2, x2.path$2)
+        } else if ((instSpec instanceof $c_Lio_kaitai_struct_format_ValueInstanceSpec)) {
+          var xo = $m_s_None$();
+          return xo.toList__sci_List()
+        } else {
+          throw new $c_s_MatchError().init___O(instSpec)
+        }
+      } else {
+        throw new $c_s_MatchError().init___O(x0$1)
+      }
+    })
+  })(this, curClass));
+  var this$10 = $m_sci_Iterable$();
+  var bf$1 = this$10.ReusableCBFInstance$2;
+  var instancesProblems = $as_sc_Iterable($f_sc_TraversableLike__flatMap__F1__scg_CanBuildFrom__O(this$11, f$1, bf$1));
+  var this$13 = curClass.params$1;
+  var f$2 = (function(this$3$1, curClass$3) {
+    return (function(paramDef$2) {
+      var paramDef = $as_Lio_kaitai_struct_format_ParamDefSpec(paramDef$2);
+      return this$3$1.resolveUserType__Lio_kaitai_struct_format_ClassSpec__Lio_kaitai_struct_datatype_DataType__sci_List__sc_Iterable(curClass$3, paramDef.dataType$1, paramDef.path$1)
+    })
+  })(this, curClass);
+  var this$12 = $m_sci_List$();
+  var bf$2 = this$12.ReusableCBFInstance$2;
+  if ((bf$2 === $m_sci_List$().ReusableCBFInstance$2)) {
+    if ((this$13 === $m_sci_Nil$())) {
+      var jsx$2 = $m_sci_Nil$()
+    } else {
+      var rest$1 = this$13;
+      var found$2 = new $c_sr_BooleanRef().init___Z(false);
+      var h$2 = new $c_sr_ObjectRef().init___O(null);
+      var t$2 = new $c_sr_ObjectRef().init___O(null);
+      while ((rest$1 !== $m_sci_Nil$())) {
+        var arg1$2 = rest$1.head__O();
+        $as_sc_GenTraversableOnce(f$2(arg1$2)).seq__sc_TraversableOnce().foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this$2, found$3, h$3, t$3) {
+          return (function(b$2$1) {
+            if ((!found$3.elem$1)) {
+              h$3.elem$1 = new $c_sci_$colon$colon().init___O__sci_List(b$2$1, $m_sci_Nil$());
+              t$3.elem$1 = $as_sci_$colon$colon(h$3.elem$1);
+              found$3.elem$1 = true
+            } else {
+              var nx$1 = new $c_sci_$colon$colon().init___O__sci_List(b$2$1, $m_sci_Nil$());
+              $as_sci_$colon$colon(t$3.elem$1).tl$5 = nx$1;
+              t$3.elem$1 = nx$1
+            }
+          })
+        })(this$13, found$2, h$2, t$2)));
+        var this$17 = rest$1;
+        rest$1 = this$17.tail__sci_List()
+      };
+      var jsx$2 = ((!found$2.elem$1) ? $m_sci_Nil$() : $as_sci_$colon$colon(h$2.elem$1))
+    }
+  } else {
+    $m_sci_List$();
+    var b$1 = new $c_scm_ListBuffer().init___();
+    var these$1 = this$13;
+    while ((!these$1.isEmpty__Z())) {
+      var arg1$3 = these$1.head__O();
+      var xs$1 = $as_sc_GenTraversableOnce(f$2(arg1$3)).seq__sc_TraversableOnce();
+      b$1.$$plus$plus$eq__sc_TraversableOnce__scm_ListBuffer(xs$1);
+      var this$19 = these$1;
+      these$1 = this$19.tail__sci_List()
+    };
+    var jsx$2 = b$1.toList__sci_List()
+  };
+  var paramsProblems = $as_sc_Iterable(jsx$2);
+  var this$20 = $m_sc_Iterable$();
+  var jsx$3 = $as_sc_TraversableLike(seqProblems.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(instancesProblems, this$20.ReusableCBFInstance$2));
+  var this$21 = $m_sc_Iterable$();
+  return $as_sc_Iterable(jsx$3.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(paramsProblems, this$21.ReusableCBFInstance$2))
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.realResolveEnumSpec__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option = (function(curClass, typeName) {
+  if ((!(typeName instanceof $c_sci_$colon$colon))) {
+    throw new $c_s_MatchError().init___O(typeName)
+  };
+  var x2 = $as_sci_$colon$colon(typeName);
+  var firstName = $as_T(x2.head$5);
+  var restNames = x2.tl$5;
+  if (restNames.isEmpty__Z()) {
+    var resolvedHere = curClass.enums$1.get__O__s_Option(firstName)
+  } else {
+    var this$1 = curClass.types$1.get__O__s_Option(firstName);
+    if (this$1.isEmpty__Z()) {
+      var resolvedHere = $m_s_None$()
+    } else {
+      var arg1 = this$1.get__O();
+      var nestedClass = $as_Lio_kaitai_struct_format_ClassSpec(arg1);
+      var resolvedHere = this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(nestedClass, restNames)
+    }
+  };
+  if ((resolvedHere instanceof $c_s_Some)) {
+    return resolvedHere
+  } else {
+    var x = $m_s_None$();
+    if ((x === resolvedHere)) {
+      var x1$3 = curClass.upClass$1;
+      if ((x1$3 instanceof $c_s_Some)) {
+        var x2$2 = $as_s_Some(x1$3);
+        var upClass = $as_Lio_kaitai_struct_format_ClassSpec(x2$2.value$2);
+        return this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(upClass, typeName)
+      } else {
+        var x$4 = $m_s_None$();
+        if ((x$4 === x1$3)) {
+          var x$6 = curClass.name$1.head__O();
+          if (((x$6 === null) ? (firstName === null) : $objectEquals(x$6, firstName))) {
+            return this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(curClass, restNames)
+          } else {
+            var resolvedTop = this.specs$1.get__O__s_Option(firstName);
+            var x$8 = $m_s_None$();
+            if ((x$8 === resolvedTop)) {
+              return $m_s_None$()
+            } else if ((resolvedTop instanceof $c_s_Some)) {
+              var x2$3 = $as_s_Some(resolvedTop);
+              var classSpec = $as_Lio_kaitai_struct_format_ClassSpec(x2$3.value$2);
+              return (restNames.isEmpty__Z() ? $m_s_None$() : this.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(classSpec, restNames))
+            } else {
+              throw new $c_s_MatchError().init___O(resolvedTop)
+            }
+          }
+        } else {
+          throw new $c_s_MatchError().init___O(x1$3)
+        }
+      }
+    } else {
+      throw new $c_s_MatchError().init___O(resolvedHere)
+    }
+  }
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.init___Lio_kaitai_struct_format_ClassSpecs__Z = (function(specs, opaqueTypes) {
+  this.specs$1 = specs;
+  this.opaqueTypes$1 = opaqueTypes;
+  return this
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.run__sc_Iterable = (function() {
+  return this.specs$1.mapRec__F1__sc_Iterable(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
+    return (function(curClass$2) {
+      var curClass = $as_Lio_kaitai_struct_format_ClassSpec(curClass$2);
+      return $this.resolveUserTypes__Lio_kaitai_struct_format_ClassSpec__sc_Iterable(curClass)
+    })
+  })(this)))
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.resolveEnumSpec__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option = (function(curClass, typeName) {
+  $m_Lio_kaitai_struct_Log$();
+  var res = this.realResolveEnumSpec__p1__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(curClass, typeName);
+  var x = $m_s_None$();
+  if ((x === res)) {
+    $m_Lio_kaitai_struct_Log$();
+    return res
+  } else if ((res instanceof $c_s_Some)) {
+    var x2 = $as_s_Some(res);
+    $as_Lio_kaitai_struct_format_EnumSpec(x2.value$2);
+    $m_Lio_kaitai_struct_Log$();
+    return res
+  } else {
+    throw new $c_s_MatchError().init___O(res)
+  }
+});
+var $d_Lio_kaitai_struct_precompile_ResolveTypes = new $TypeData().initClass({
+  Lio_kaitai_struct_precompile_ResolveTypes: 0
+}, false, "io.kaitai.struct.precompile.ResolveTypes", {
+  Lio_kaitai_struct_precompile_ResolveTypes: 1,
+  O: 1,
+  Lio_kaitai_struct_precompile_PrecompileStep: 1
+});
+$c_Lio_kaitai_struct_precompile_ResolveTypes.prototype.$classData = $d_Lio_kaitai_struct_precompile_ResolveTypes;
+/** @constructor */
 function $c_Lio_kaitai_struct_precompile_StyleCheckIds() {
   $c_O.call(this);
   this.specs$1 = null;
@@ -47912,6 +48067,12 @@ $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.productPrefix__T = (fu
 $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.productArity__I = (function() {
   return 3
 });
+$c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.init___Lio_kaitai_struct_exprlang_Ast$identifier__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$typeId = (function(enumName, id, inType) {
+  this.enumName$1 = enumName;
+  this.id$1 = id;
+  this.inType$1 = inType;
+  return this
+});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.equals__O__Z = (function(x$1) {
   if ((this === x$1)) {
     return true
@@ -47937,12 +48098,6 @@ $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.equals__O__Z = (functi
     return false
   }
 });
-$c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.init___Lio_kaitai_struct_exprlang_Ast$identifier__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$typeId = (function(enumName, id, inType) {
-  this.enumName$1 = enumName;
-  this.id$1 = id;
-  this.inType$1 = inType;
-  return this
-});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.productElement__I__O = (function(x$1) {
   switch (x$1) {
     case 0: {
@@ -48753,14 +48908,14 @@ $h_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype = $c_Lio_kaitai_struct_
 $c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.productPrefix__T = (function() {
   return "UnaryOp"
 });
+$c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.productArity__I = (function() {
+  return 2
+});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.init___Lio_kaitai_struct_exprlang_Ast$unaryop__Lio_kaitai_struct_exprlang_Ast$expr = (function(op, operand) {
   this.op$1 = op;
   this.operand$1 = operand;
   return this
 });
-$c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.productArity__I = (function() {
-  return 2
-});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.equals__O__Z = (function(x$1) {
   if ((this === x$1)) {
     return true
@@ -57384,6 +57539,143 @@ var $d_Lio_kaitai_struct_precompile_TypeNotFoundError = new $TypeData().initClas
 });
 $c_Lio_kaitai_struct_precompile_TypeNotFoundError.prototype.$classData = $d_Lio_kaitai_struct_precompile_TypeNotFoundError;
 /** @constructor */
+function $c_Lio_kaitai_struct_problems_EnumNotFoundErr() {
+  $c_Lio_kaitai_struct_problems_CompilationProblem.call(this);
+  this.name$2 = null;
+  this.curClass$2 = null;
+  this.path$2 = null;
+  this.fileName$2 = null;
+  this.coords$2 = null
+}
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype = new $h_Lio_kaitai_struct_problems_CompilationProblem();
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.constructor = $c_Lio_kaitai_struct_problems_EnumNotFoundErr;
+/** @constructor */
+function $h_Lio_kaitai_struct_problems_EnumNotFoundErr() {
+  /*<skip>*/
+}
+$h_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype = $c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype;
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.productPrefix__T = (function() {
+  return "EnumNotFoundErr"
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.productArity__I = (function() {
+  return 4
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.equals__O__Z = (function(x$1) {
+  if ((this === x$1)) {
+    return true
+  } else if ((x$1 instanceof $c_Lio_kaitai_struct_problems_EnumNotFoundErr)) {
+    var EnumNotFoundErr$1 = $as_Lio_kaitai_struct_problems_EnumNotFoundErr(x$1);
+    var x = this.name$2;
+    var x$2 = EnumNotFoundErr$1.name$2;
+    if (((x === null) ? (x$2 === null) : x.equals__O__Z(x$2))) {
+      var x$3 = this.curClass$2;
+      var x$4 = EnumNotFoundErr$1.curClass$2;
+      var jsx$2 = ((x$3 === null) ? (x$4 === null) : x$3.equals__O__Z(x$4))
+    } else {
+      var jsx$2 = false
+    };
+    if (jsx$2) {
+      var x$5 = this.path$2;
+      var x$6 = EnumNotFoundErr$1.path$2;
+      var jsx$1 = ((x$5 === null) ? (x$6 === null) : x$5.equals__O__Z(x$6))
+    } else {
+      var jsx$1 = false
+    };
+    if (jsx$1) {
+      var x$7 = this.fileName$2;
+      var x$8 = EnumNotFoundErr$1.fileName$2;
+      return ((x$7 === null) ? (x$8 === null) : x$7.equals__O__Z(x$8))
+    } else {
+      return false
+    }
+  } else {
+    return false
+  }
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.severity__Lio_kaitai_struct_problems_ProblemSeverity = (function() {
+  return $m_Lio_kaitai_struct_problems_ProblemSeverity$Error$()
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.productElement__I__O = (function(x$1) {
+  switch (x$1) {
+    case 0: {
+      return this.name$2;
+      break
+    }
+    case 1: {
+      return this.curClass$2;
+      break
+    }
+    case 2: {
+      return this.path$2;
+      break
+    }
+    case 3: {
+      return this.fileName$2;
+      break
+    }
+    default: {
+      throw new $c_jl_IndexOutOfBoundsException().init___T(("" + x$1))
+    }
+  }
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$().$$undtoString__s_Product__T(this)
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.coords__Lio_kaitai_struct_problems_ProblemCoords = (function() {
+  return this.coords$2
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.localizedInFile__T__Lio_kaitai_struct_problems_CompilationProblem = (function(fileName) {
+  var x$1 = new $c_s_Some().init___O(fileName);
+  var x$2 = this.name$2;
+  var x$3 = this.curClass$2;
+  var x$4 = this.path$2;
+  return new $c_Lio_kaitai_struct_problems_EnumNotFoundErr().init___sci_List__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(x$2, x$3, x$4, x$1)
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.text__T = (function() {
+  var this$1 = this.name$2;
+  var jsx$1 = $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "::", "");
+  var this$2 = this.curClass$2;
+  var this$3 = this$2.name$1;
+  return ((("unable to find enum '" + jsx$1) + "', searching from ") + $f_sc_TraversableOnce__mkString__T__T__T__T(this$3, "", "::", ""))
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.hashCode__I = (function() {
+  var this$2 = $m_s_util_hashing_MurmurHash3$();
+  return this$2.productHash__s_Product__I__I(this, (-889275714))
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_sr_ScalaRunTime$$anon$1().init___s_Product(this)
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.init___sci_List__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option = (function(name, curClass, path, fileName) {
+  this.name$2 = name;
+  this.curClass$2 = curClass;
+  this.path$2 = path;
+  this.fileName$2 = fileName;
+  this.coords$2 = new $c_Lio_kaitai_struct_problems_ProblemCoords().init___s_Option__s_Option__s_Option__s_Option(fileName, new $c_s_Some().init___O(path), $m_s_None$(), $m_s_None$());
+  return this
+});
+function $as_Lio_kaitai_struct_problems_EnumNotFoundErr(obj) {
+  return (((obj instanceof $c_Lio_kaitai_struct_problems_EnumNotFoundErr) || (obj === null)) ? obj : $throwClassCastException(obj, "io.kaitai.struct.problems.EnumNotFoundErr"))
+}
+function $isArrayOf_Lio_kaitai_struct_problems_EnumNotFoundErr(obj, depth) {
+  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lio_kaitai_struct_problems_EnumNotFoundErr)))
+}
+function $asArrayOf_Lio_kaitai_struct_problems_EnumNotFoundErr(obj, depth) {
+  return (($isArrayOf_Lio_kaitai_struct_problems_EnumNotFoundErr(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.problems.EnumNotFoundErr;", depth))
+}
+var $d_Lio_kaitai_struct_problems_EnumNotFoundErr = new $TypeData().initClass({
+  Lio_kaitai_struct_problems_EnumNotFoundErr: 0
+}, false, "io.kaitai.struct.problems.EnumNotFoundErr", {
+  Lio_kaitai_struct_problems_EnumNotFoundErr: 1,
+  Lio_kaitai_struct_problems_CompilationProblem: 1,
+  O: 1,
+  Lio_kaitai_struct_Jsonable: 1,
+  s_Product: 1,
+  s_Equals: 1,
+  s_Serializable: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lio_kaitai_struct_problems_EnumNotFoundErr.prototype.$classData = $d_Lio_kaitai_struct_problems_EnumNotFoundErr;
+/** @constructor */
 function $c_Lio_kaitai_struct_problems_ErrorInInput() {
   $c_Lio_kaitai_struct_problems_CompilationProblem.call(this);
   this.err$2 = null;
@@ -57910,6 +58202,143 @@ var $d_Lio_kaitai_struct_problems_ParamMismatchError = new $TypeData().initClass
 });
 $c_Lio_kaitai_struct_problems_ParamMismatchError.prototype.$classData = $d_Lio_kaitai_struct_problems_ParamMismatchError;
 /** @constructor */
+function $c_Lio_kaitai_struct_problems_TypeNotFoundErr() {
+  $c_Lio_kaitai_struct_problems_CompilationProblem.call(this);
+  this.name$2 = null;
+  this.curClass$2 = null;
+  this.path$2 = null;
+  this.fileName$2 = null;
+  this.coords$2 = null
+}
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype = new $h_Lio_kaitai_struct_problems_CompilationProblem();
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.constructor = $c_Lio_kaitai_struct_problems_TypeNotFoundErr;
+/** @constructor */
+function $h_Lio_kaitai_struct_problems_TypeNotFoundErr() {
+  /*<skip>*/
+}
+$h_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype = $c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype;
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.productPrefix__T = (function() {
+  return "TypeNotFoundErr"
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.productArity__I = (function() {
+  return 4
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.equals__O__Z = (function(x$1) {
+  if ((this === x$1)) {
+    return true
+  } else if ((x$1 instanceof $c_Lio_kaitai_struct_problems_TypeNotFoundErr)) {
+    var TypeNotFoundErr$1 = $as_Lio_kaitai_struct_problems_TypeNotFoundErr(x$1);
+    var x = this.name$2;
+    var x$2 = TypeNotFoundErr$1.name$2;
+    if (((x === null) ? (x$2 === null) : x.equals__O__Z(x$2))) {
+      var x$3 = this.curClass$2;
+      var x$4 = TypeNotFoundErr$1.curClass$2;
+      var jsx$2 = ((x$3 === null) ? (x$4 === null) : x$3.equals__O__Z(x$4))
+    } else {
+      var jsx$2 = false
+    };
+    if (jsx$2) {
+      var x$5 = this.path$2;
+      var x$6 = TypeNotFoundErr$1.path$2;
+      var jsx$1 = ((x$5 === null) ? (x$6 === null) : x$5.equals__O__Z(x$6))
+    } else {
+      var jsx$1 = false
+    };
+    if (jsx$1) {
+      var x$7 = this.fileName$2;
+      var x$8 = TypeNotFoundErr$1.fileName$2;
+      return ((x$7 === null) ? (x$8 === null) : x$7.equals__O__Z(x$8))
+    } else {
+      return false
+    }
+  } else {
+    return false
+  }
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.severity__Lio_kaitai_struct_problems_ProblemSeverity = (function() {
+  return $m_Lio_kaitai_struct_problems_ProblemSeverity$Error$()
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.productElement__I__O = (function(x$1) {
+  switch (x$1) {
+    case 0: {
+      return this.name$2;
+      break
+    }
+    case 1: {
+      return this.curClass$2;
+      break
+    }
+    case 2: {
+      return this.path$2;
+      break
+    }
+    case 3: {
+      return this.fileName$2;
+      break
+    }
+    default: {
+      throw new $c_jl_IndexOutOfBoundsException().init___T(("" + x$1))
+    }
+  }
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$().$$undtoString__s_Product__T(this)
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.coords__Lio_kaitai_struct_problems_ProblemCoords = (function() {
+  return this.coords$2
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.localizedInFile__T__Lio_kaitai_struct_problems_CompilationProblem = (function(fileName) {
+  var x$1 = new $c_s_Some().init___O(fileName);
+  var x$2 = this.name$2;
+  var x$3 = this.curClass$2;
+  var x$4 = this.path$2;
+  return new $c_Lio_kaitai_struct_problems_TypeNotFoundErr().init___sci_List__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option(x$2, x$3, x$4, x$1)
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.text__T = (function() {
+  var this$1 = this.name$2;
+  var jsx$1 = $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "::", "");
+  var this$2 = this.curClass$2;
+  var this$3 = this$2.name$1;
+  return ((("unable to find type '" + jsx$1) + "', searching from ") + $f_sc_TraversableOnce__mkString__T__T__T__T(this$3, "", "::", ""))
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.hashCode__I = (function() {
+  var this$2 = $m_s_util_hashing_MurmurHash3$();
+  return this$2.productHash__s_Product__I__I(this, (-889275714))
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_sr_ScalaRunTime$$anon$1().init___s_Product(this)
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.init___sci_List__Lio_kaitai_struct_format_ClassSpec__sci_List__s_Option = (function(name, curClass, path, fileName) {
+  this.name$2 = name;
+  this.curClass$2 = curClass;
+  this.path$2 = path;
+  this.fileName$2 = fileName;
+  this.coords$2 = new $c_Lio_kaitai_struct_problems_ProblemCoords().init___s_Option__s_Option__s_Option__s_Option(fileName, new $c_s_Some().init___O(path), $m_s_None$(), $m_s_None$());
+  return this
+});
+function $as_Lio_kaitai_struct_problems_TypeNotFoundErr(obj) {
+  return (((obj instanceof $c_Lio_kaitai_struct_problems_TypeNotFoundErr) || (obj === null)) ? obj : $throwClassCastException(obj, "io.kaitai.struct.problems.TypeNotFoundErr"))
+}
+function $isArrayOf_Lio_kaitai_struct_problems_TypeNotFoundErr(obj, depth) {
+  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lio_kaitai_struct_problems_TypeNotFoundErr)))
+}
+function $asArrayOf_Lio_kaitai_struct_problems_TypeNotFoundErr(obj, depth) {
+  return (($isArrayOf_Lio_kaitai_struct_problems_TypeNotFoundErr(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.problems.TypeNotFoundErr;", depth))
+}
+var $d_Lio_kaitai_struct_problems_TypeNotFoundErr = new $TypeData().initClass({
+  Lio_kaitai_struct_problems_TypeNotFoundErr: 0
+}, false, "io.kaitai.struct.problems.TypeNotFoundErr", {
+  Lio_kaitai_struct_problems_TypeNotFoundErr: 1,
+  Lio_kaitai_struct_problems_CompilationProblem: 1,
+  O: 1,
+  Lio_kaitai_struct_Jsonable: 1,
+  s_Product: 1,
+  s_Equals: 1,
+  s_Serializable: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lio_kaitai_struct_problems_TypeNotFoundErr.prototype.$classData = $d_Lio_kaitai_struct_problems_TypeNotFoundErr;
+/** @constructor */
 function $c_Ljava_io_PrintStream() {
   $c_Ljava_io_FilterOutputStream.call(this);
   this.encoder$3 = null;
@@ -66702,12 +67131,12 @@ $c_Lio_kaitai_struct_translators_JavaTranslator.prototype.arraySize__Lio_kaitai_
   return this.arraySize__Lio_kaitai_struct_exprlang_Ast$expr__T(a)
 });
 $c_Lio_kaitai_struct_translators_JavaTranslator.prototype.doStrCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(left, op, right) {
-  var x$2 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$Eq$();
-  if (((op !== null) && (op === x$2))) {
+  var x = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$Eq$();
+  if ((x === op)) {
     return (((this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left) + ".equals(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right)) + ")")
   } else {
-    var x$4 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$NotEq$();
-    if (((op !== null) && (op === x$4))) {
+    var x$3 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$NotEq$();
+    if ((x$3 === op)) {
       return (((("!(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left)) + ").equals(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right)) + ")")
     } else {
       return (((((("(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left)) + ".compareTo(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right)) + ") ") + $f_Lio_kaitai_struct_translators_CommonOps__cmpOp__Lio_kaitai_struct_exprlang_Ast$cmpop__T(this, op)) + " 0)")
@@ -68055,7 +68484,20 @@ $c_Lio_kaitai_struct_translators_RubyTranslator.prototype.strToInt__Lio_kaitai_s
   return this.strToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T(s, base)
 });
 $c_Lio_kaitai_struct_translators_RubyTranslator.prototype.bytesToStr__T__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(bytesExpr, encoding) {
-  return (((("(" + bytesExpr) + ").force_encoding(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(encoding)) + ")")
+  var encodingOpt = $f_Lio_kaitai_struct_exprlang_Ast$expr__evaluateStrConst__s_Option(encoding);
+  if ((encodingOpt instanceof $c_s_Some)) {
+    var x2 = $as_s_Some(encodingOpt);
+    var encodingConst = $as_T(x2.value$2);
+    var encodingConstLower = $as_T(encodingConst.toLowerCase());
+    var needEncode = ((encodingConstLower !== "utf8") && (encodingConstLower !== "utf-8"))
+  } else {
+    var x = $m_s_None$();
+    if ((!(x === encodingOpt))) {
+      throw new $c_s_MatchError().init___O(encodingOpt)
+    };
+    var needEncode = true
+  };
+  return ((((("(" + bytesExpr) + ").force_encoding(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(encoding)) + ")") + (needEncode ? ".encode('UTF-8')" : ""))
 });
 $c_Lio_kaitai_struct_translators_RubyTranslator.prototype.enumToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType$EnumType__O = (function(value, et) {
   return this.enumToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType$EnumType__T(value, et)
@@ -72284,6 +72726,9 @@ $c_sc_AbstractTraversable.prototype.map__F1__scg_CanBuildFrom__O = (function(f,
 $c_sc_AbstractTraversable.prototype.toArray__s_reflect_ClassTag__O = (function(evidence$1) {
   return $f_sc_TraversableOnce__toArray__s_reflect_ClassTag__O(this, evidence$1)
 });
+$c_sc_AbstractTraversable.prototype.nonEmpty__Z = (function() {
+  return $f_sc_TraversableOnce__nonEmpty__Z(this)
+});
 $c_sc_AbstractTraversable.prototype.collect__s_PartialFunction__scg_CanBuildFrom__O = (function(pf, bf) {
   return $f_sc_TraversableLike__collect__s_PartialFunction__scg_CanBuildFrom__O(this, pf, bf)
 });
@@ -84881,6 +85326,9 @@ $c_sci_StringOps.prototype.mkString__T = (function() {
   var $$this = this.repr$1;
   return $$this
 });
+$c_sci_StringOps.prototype.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O = (function(that, bf) {
+  return $f_sc_TraversableLike__$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(this, that, bf)
+});
 $c_sci_StringOps.prototype.length__I = (function() {
   var $$this = this.repr$1;
   return $uI($$this.length)
@@ -85172,6 +85620,9 @@ $c_scm_ArrayOps$ofRef.prototype.iterator__sc_Iterator = (function() {
   var $$this = this.repr$1;
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(this, 0, $$this.u.length)
 });
+$c_scm_ArrayOps$ofRef.prototype.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O = (function(that, bf) {
+  return $f_sc_TraversableLike__$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(this, that, bf)
+});
 $c_scm_ArrayOps$ofRef.prototype.mkString__T = (function() {
   return $f_sc_TraversableOnce__mkString__T__T__T__T(this, "", "", "")
 });
@@ -85208,13 +85659,13 @@ $c_scm_ArrayOps$ofRef.prototype.$$div$colon__O__F2__O = (function(z, op) {
 $c_scm_ArrayOps$ofRef.prototype.copyToArray__O__I__I__V = (function(xs, start, len) {
   $f_scm_ArrayOps__copyToArray__O__I__I__V(this, xs, start, len)
 });
-$c_scm_ArrayOps$ofRef.prototype.isTraversableAgain__Z = (function() {
-  return true
-});
 $c_scm_ArrayOps$ofRef.prototype.hashCode__I = (function() {
   var $$this = this.repr$1;
   return $$this.hashCode__I()
 });
+$c_scm_ArrayOps$ofRef.prototype.isTraversableAgain__Z = (function() {
+  return true
+});
 $c_scm_ArrayOps$ofRef.prototype.toMap__s_Predef$$less$colon$less__sci_Map = (function(ev) {
   $m_sci_Map$();
   var b = new $c_scm_MapBuilder().init___sc_GenMap($m_sci_Map$EmptyMap$());
@@ -95258,6 +95709,9 @@ $c_scm_ListBuffer.prototype.$$plus$plus$eq__sc_TraversableOnce__scm_ListBuffer =
     return $as_scm_ListBuffer($f_scg_Growable__$$plus$plus$eq__sc_TraversableOnce__scg_Growable(this, xs))
   }
 });
+$c_scm_ListBuffer.prototype.nonEmpty__Z = (function() {
+  return (this.len$6 > 0)
+});
 $c_scm_ListBuffer.prototype.reduceLeft__F2__O = (function(op) {
   var this$1 = this.scala$collection$mutable$ListBuffer$$start$6;
   return $f_sc_LinearSeqOptimized__reduceLeft__F2__O(this$1, op)