kaitai-struct-compiler 0.10.0-SNAPSHOT20220617.120542.c053fb7d → 0.10.0-SNAPSHOT20220706.122302.50f80d7e

package/kaitai-struct-compiler.js

@@ -1864,7 +1864,7 @@ function $f_Lio_kaitai_struct_translators_CommonLiterals__strLiteralAsciiChar__C
   } else {
     var x = $m_s_None$();
     if ((x === x1)) {
-      return (((code >= 32) && (code < 128)) ? $as_T($g.String.fromCharCode(code)) : $thiz.strLiteralGenericCC__C__T(code))
+      return (((code >= 32) && (code < 127)) ? $as_T($g.String.fromCharCode(code)) : $thiz.strLiteralGenericCC__C__T(code))
     } else {
       throw new $c_s_MatchError().init___O(x1)
     }
@@ -2192,30 +2192,6 @@ function $isArrayOf_ju_Formattable(obj, depth) {
 function $asArrayOf_ju_Formattable(obj, depth) {
   return (($isArrayOf_ju_Formattable(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Ljava.util.Formattable;", depth))
 }
-function $is_ju_Map(obj) {
-  return (!(!((obj && obj.$classData) && obj.$classData.ancestors.ju_Map)))
-}
-function $as_ju_Map(obj) {
-  return (($is_ju_Map(obj) || (obj === null)) ? obj : $throwClassCastException(obj, "java.util.Map"))
-}
-function $isArrayOf_ju_Map(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.ju_Map)))
-}
-function $asArrayOf_ju_Map(obj, depth) {
-  return (($isArrayOf_ju_Map(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Ljava.util.Map;", depth))
-}
-function $is_ju_Map$Entry(obj) {
-  return (!(!((obj && obj.$classData) && obj.$classData.ancestors.ju_Map$Entry)))
-}
-function $as_ju_Map$Entry(obj) {
-  return (($is_ju_Map$Entry(obj) || (obj === null)) ? obj : $throwClassCastException(obj, "java.util.Map$Entry"))
-}
-function $isArrayOf_ju_Map$Entry(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.ju_Map$Entry)))
-}
-function $asArrayOf_ju_Map$Entry(obj, depth) {
-  return (($isArrayOf_ju_Map$Entry(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Ljava.util.Map$Entry;", depth))
-}
 function $f_s_Proxy__equals__O__Z($thiz, that) {
   return ((that !== null) && (((that === $thiz) || (that === $thiz.self__O())) || $objectEquals(that, $thiz.self__O())))
 }
@@ -2352,17 +2328,6 @@ function $isArrayOf_sc_GenTraversableOnce(obj, depth) {
 function $asArrayOf_sc_GenTraversableOnce(obj, depth) {
   return (($isArrayOf_sc_GenTraversableOnce(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lscala.collection.GenTraversableOnce;", depth))
 }
-function $f_sc_convert_LowPriorityWrapAsJava__mapAsJavaMap__sc_Map__ju_Map($thiz, m) {
-  if ((m === null)) {
-    return null
-  } else if (((m instanceof $c_sc_convert_Wrappers$JMapWrapper) && ($as_sc_convert_Wrappers$JMapWrapper(m).scala$collection$convert$Wrappers$JMapWrapper$$$outer__sc_convert_Wrappers() === $m_sc_convert_Wrappers$()))) {
-    var x2 = $as_sc_convert_Wrappers$JMapWrapper(m);
-    var wrapped = x2.underlying__ju_Map();
-    return wrapped
-  } else {
-    return new $c_sc_convert_Wrappers$MapWrapper().init___sc_convert_Wrappers__sc_Map($m_sc_convert_Wrappers$(), m)
-  }
-}
 function $f_sci_VectorPointer__copyOf__AO__AO($thiz, a) {
   var copy = $newArrayObject($d_O.getArrayOf(), [a.u.length]);
   $systemArraycopy(a, 0, copy, 0, a.u.length);
@@ -4430,9 +4395,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-SNAPSHOT20220617.120542.c053fb7d";
-  this.gitCommit$1 = "c053fb7d";
-  this.gitTime$1 = "2022-06-17T12:05:42+00:00";
+  this.version$1 = "0.10-SNAPSHOT20220706.122302.50f80d7e";
+  this.gitCommit$1 = "50f80d7e";
+  this.gitTime$1 = "2022-07-06T12:23:02+00:00";
   return this
 });
 var $d_Lio_kaitai_struct_Version$ = new $TypeData().initClass({
@@ -7883,9 +7848,28 @@ $c_Lio_kaitai_struct_format_JavaScriptKSYParser$.prototype.yamlToSpecs__O__Lio_k
   var firstSpec = this$1.fromYaml__O__s_Option__sci_List__Lio_kaitai_struct_format_MetaSpec__Lio_kaitai_struct_format_ClassSpec(yamlScala, fileName, $m_sci_Nil$(), $m_Lio_kaitai_struct_format_MetaSpec$().OPAQUE$1);
   var specs = new $c_Lio_kaitai_struct_format_JavaScriptClassSpecs().init___Lio_kaitai_struct_JavaScriptImporter__Lio_kaitai_struct_format_ClassSpec(importer, firstSpec);
   return $m_Lio_kaitai_struct_Main$().importAndPrecompile__Lio_kaitai_struct_format_ClassSpecs__Lio_kaitai_struct_RuntimeConfig__s_concurrent_Future(specs, config).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, specs$1) {
-    return (function(x$1$2) {
-      $as_sc_Iterable(x$1$2);
-      return specs$1
+    return (function(problems$2) {
+      var problems = $as_sc_Iterable(problems$2);
+      var x1 = problems.find__F1__s_Option(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this$1) {
+        return (function(p$2) {
+          var p = $as_Lio_kaitai_struct_problems_CompilationProblem(p$2);
+          var x = p.severity__Lio_kaitai_struct_problems_ProblemSeverity();
+          var x$2 = $m_Lio_kaitai_struct_problems_ProblemSeverity$Warning$();
+          return (!((x !== null) && (x === x$2)))
+        })
+      })($this)));
+      if ((x1 instanceof $c_s_Some)) {
+        var x2 = $as_s_Some(x1);
+        var problem = $as_Lio_kaitai_struct_problems_CompilationProblem(x2.value$2);
+        throw new $c_Lio_kaitai_struct_problems_CompilationProblemException().init___Lio_kaitai_struct_problems_CompilationProblem(problem)
+      } else {
+        var x$1 = $m_s_None$();
+        if ((x$1 === x1)) {
+          return specs$1
+        } else {
+          throw new $c_s_MatchError().init___O(x1)
+        }
+      }
     })
   })(this, specs)), $m_s_concurrent_ExecutionContext$Implicits$().global__s_concurrent_ExecutionContext())
 });
@@ -15227,18 +15211,6 @@ function $m_ju_Arrays$() {
   };
   return $n_ju_Arrays$
 }
-function $is_ju_Collection(obj) {
-  return (!(!((obj && obj.$classData) && obj.$classData.ancestors.ju_Collection)))
-}
-function $as_ju_Collection(obj) {
-  return (($is_ju_Collection(obj) || (obj === null)) ? obj : $throwClassCastException(obj, "java.util.Collection"))
-}
-function $isArrayOf_ju_Collection(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.ju_Collection)))
-}
-function $asArrayOf_ju_Collection(obj, depth) {
-  return (($isArrayOf_ju_Collection(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Ljava.util.Collection;", depth))
-}
 /** @constructor */
 function $c_ju_Formatter$() {
   $c_O.call(this);
@@ -23802,7 +23774,7 @@ $c_Lio_kaitai_struct_problems_CompilationProblem.prototype.localizedInType__Lio_
   }
 });
 $c_Lio_kaitai_struct_problems_CompilationProblem.prototype.message__T = (function() {
-  return ((((this.coords__Lio_kaitai_struct_problems_ProblemCoords().message__T() + ": ") + this.severity__Lio_kaitai_struct_problems_ProblemSeverity().message__T()) + ": ") + this.text__T())
+  return (((((this.coords__Lio_kaitai_struct_problems_ProblemCoords().message__T() + ":\n\t") + this.severity__Lio_kaitai_struct_problems_ProblemSeverity().message__T()) + ": ") + this.text__T()) + "\n")
 });
 function $as_Lio_kaitai_struct_problems_CompilationProblem(obj) {
   return (((obj instanceof $c_Lio_kaitai_struct_problems_CompilationProblem) || (obj === null)) ? obj : $throwClassCastException(obj, "io.kaitai.struct.problems.CompilationProblem"))
@@ -24498,73 +24470,6 @@ function $asArrayOf_jl_Throwable(obj, depth) {
   return (($isArrayOf_jl_Throwable(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Ljava.lang.Throwable;", depth))
 }
 /** @constructor */
-function $c_ju_AbstractMap() {
-  $c_O.call(this)
-}
-$c_ju_AbstractMap.prototype = new $h_O();
-$c_ju_AbstractMap.prototype.constructor = $c_ju_AbstractMap;
-/** @constructor */
-function $h_ju_AbstractMap() {
-  /*<skip>*/
-}
-$h_ju_AbstractMap.prototype = $c_ju_AbstractMap.prototype;
-$c_ju_AbstractMap.prototype.equals__O__Z = (function(o) {
-  if ((o === this)) {
-    return true
-  } else if ($is_ju_Map(o)) {
-    var x2 = $as_ju_Map(o);
-    if ((this.size__I() === x2.size__I())) {
-      var __self = new $c_sc_convert_Wrappers$MapWrapper$$anon$2().init___sc_convert_Wrappers$MapWrapper(this);
-      var __self$1 = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(__self);
-      inlinereturn$8: {
-        while (__self$1.ui$1.hasNext__Z()) {
-          var arg1 = __self$1.next__ju_Map$Entry();
-          var a = x2.get__O__O(arg1.k$1$1);
-          var b = arg1.v$1$1;
-          if ((!((a === null) ? (b === null) : $objectEquals(a, b)))) {
-            var jsx$1 = true;
-            break inlinereturn$8
-          }
-        };
-        var jsx$1 = false
-      };
-      return (!jsx$1)
-    } else {
-      return false
-    }
-  } else {
-    return false
-  }
-});
-$c_ju_AbstractMap.prototype.toString__T = (function() {
-  var result = "{";
-  var first = true;
-  var this$1 = new $c_sc_convert_Wrappers$MapWrapper$$anon$2().init___sc_convert_Wrappers$MapWrapper(this);
-  var iter = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(this$1);
-  while (iter.ui$1.hasNext__Z()) {
-    var entry = iter.next__ju_Map$Entry();
-    if (first) {
-      first = false
-    } else {
-      result = (result + ", ")
-    };
-    result = (((("" + result) + entry.k$1$1) + "=") + entry.v$1$1)
-  };
-  return (result + "}")
-});
-$c_ju_AbstractMap.prototype.hashCode__I = (function() {
-  var __self = new $c_sc_convert_Wrappers$MapWrapper$$anon$2().init___sc_convert_Wrappers$MapWrapper(this);
-  var __self$1 = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(__self);
-  var result = 0;
-  while (__self$1.ui$1.hasNext__Z()) {
-    var arg1 = result;
-    var arg2 = __self$1.next__ju_Map$Entry();
-    var prev = $uI(arg1);
-    result = ((arg2.hashCode__I() + prev) | 0)
-  };
-  return $uI(result)
-});
-/** @constructor */
 function $c_ju_regex_Matcher() {
   $c_O.call(this);
   this.pattern0$1 = null;
@@ -25132,6 +25037,15 @@ function $f_sc_Iterator__foreach__F1__V($thiz, f) {
     f.apply__O__O($thiz.next__O())
   }
 }
+function $f_sc_Iterator__find__F1__s_Option($thiz, p) {
+  while ($thiz.hasNext__Z()) {
+    var a = $thiz.next__O();
+    if ($uZ(p.apply__O__O(a))) {
+      return new $c_s_Some().init___O(a)
+    }
+  };
+  return $m_s_None$()
+}
 function $f_sc_Iterator__toStream__sci_Stream($thiz) {
   if ($thiz.hasNext__Z()) {
     var hd = $thiz.next__O();
@@ -25399,91 +25313,6 @@ var $d_sc_TraversableOnce$reducer$1$ = new $TypeData().initClass({
 });
 $c_sc_TraversableOnce$reducer$1$.prototype.$classData = $d_sc_TraversableOnce$reducer$1$;
 /** @constructor */
-function $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3() {
-  $c_O.call(this);
-  this.ui$1 = null;
-  this.prev$1 = null;
-  this.$$outer$1 = null
-}
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype = new $h_O();
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype.constructor = $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3;
-/** @constructor */
-function $h_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3() {
-  /*<skip>*/
-}
-$h_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype = $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype;
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype.next__ju_Map$Entry = (function() {
-  var x1 = $as_T2(this.ui$1.next__O());
-  if ((x1 === null)) {
-    throw new $c_s_MatchError().init___O(x1)
-  };
-  var k = x1.$$und1__O();
-  var v = x1.$$und2__O();
-  this.prev$1 = new $c_s_Some().init___O(k);
-  return new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4().init___sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3__O__O(this, k, v)
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype.init___sc_convert_Wrappers$MapWrapper$$anon$2 = (function($$outer) {
-  if (($$outer === null)) {
-    throw $m_sjsr_package$().unwrapJavaScriptException__jl_Throwable__O(null)
-  } else {
-    this.$$outer$1 = $$outer
-  };
-  this.ui$1 = $$outer.$$outer$3.scala$collection$convert$Wrappers$MapWrapper$$underlying$f.iterator__sc_Iterator();
-  this.prev$1 = $m_s_None$();
-  return this
-});
-var $d_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3 = new $TypeData().initClass({
-  sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3: 0
-}, false, "scala.collection.convert.Wrappers$MapWrapper$$anon$2$$anon$3", {
-  sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3: 1,
-  O: 1,
-  ju_Iterator: 1
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3.prototype.$classData = $d_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3;
-/** @constructor */
-function $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4() {
-  $c_O.call(this);
-  this.$$outer$1 = null;
-  this.k$1$1 = null;
-  this.v$1$1 = null
-}
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype = new $h_O();
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype.constructor = $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4;
-/** @constructor */
-function $h_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4() {
-  /*<skip>*/
-}
-$h_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype = $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype;
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype.equals__O__Z = (function(other) {
-  if ($is_ju_Map$Entry(other)) {
-    var x2 = $as_ju_Map$Entry(other);
-    return ($m_sr_BoxesRunTime$().equals__O__O__Z(this.k$1$1, x2.k$1$1) && $m_sr_BoxesRunTime$().equals__O__O__Z(this.v$1$1, x2.v$1$1))
-  } else {
-    return false
-  }
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype.hashCode__I = (function() {
-  return (((this.k$1$1 === null) ? 0 : $objectHashCode(this.k$1$1)) ^ ((this.v$1$1 === null) ? 0 : $objectHashCode(this.v$1$1)))
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype.init___sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3__O__O = (function($$outer, k$1, v$1) {
-  if (($$outer === null)) {
-    throw $m_sjsr_package$().unwrapJavaScriptException__jl_Throwable__O(null)
-  } else {
-    this.$$outer$1 = $$outer
-  };
-  this.k$1$1 = k$1;
-  this.v$1$1 = v$1;
-  return this
-});
-var $d_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4 = new $TypeData().initClass({
-  sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4: 0
-}, false, "scala.collection.convert.Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4", {
-  sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4: 1,
-  O: 1,
-  ju_Map$Entry: 1
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4.prototype.$classData = $d_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3$$anon$4;
-/** @constructor */
 function $c_sc_package$WrappedCanBuildFrom() {
   /*<skip>*/
 }
@@ -27838,8 +27667,7 @@ $c_Lio_kaitai_struct_format_AttrSpec$.prototype.parseSwitch__p1__sci_Map__sci_Li
   })(this, path, metaDef, arg));
   var bf = $m_sci_Map$().ReusableCBF$4;
   var cases = $as_sci_Map($f_sc_TraversableLike__map__F1__scg_CanBuildFrom__O(_cases, f, bf));
-  var this$10 = $m_sc_JavaConversions$();
-  if ($f_sc_convert_LowPriorityWrapAsJava__mapAsJavaMap__sc_Map__ju_Map(this$10, cases).containsKey__O__Z($m_Lio_kaitai_struct_datatype_DataType$SwitchType$().ELSE$undCONST$1)) {
+  if (cases.contains__O__Z($m_Lio_kaitai_struct_datatype_DataType$SwitchType$().ELSE$undCONST$1)) {
     var addCases = $as_sci_Map($m_s_Predef$().Map$2.apply__sc_Seq__sc_GenMap($m_sci_Nil$()))
   } else {
     var x1 = new $c_T2().init___O__O(arg.size$1, arg.sizeEos$1);
@@ -27854,16 +27682,16 @@ $c_Lio_kaitai_struct_format_AttrSpec$.prototype.parseSwitch__p1__sci_Map__sci_Li
           var self$1 = $m_Lio_kaitai_struct_datatype_DataType$SwitchType$().ELSE$undCONST$1;
           var y = new $c_Lio_kaitai_struct_datatype_DataType$BytesLimitType().init___Lio_kaitai_struct_exprlang_Ast$expr__s_Option__Z__s_Option__s_Option(sizeValue, $m_s_None$(), false, $m_s_None$(), arg.process$1);
           var array$1 = [new $c_T2().init___O__O(self$1, y)];
-          var this$16 = new $c_scm_MapBuilder().init___sc_GenMap($m_sci_Map$EmptyMap$());
+          var this$15 = new $c_scm_MapBuilder().init___sc_GenMap($m_sci_Map$EmptyMap$());
           var i$1 = 0;
           var len = $uI(array$1.length);
           while ((i$1 < len)) {
             var index$1 = i$1;
             var arg1 = array$1[index$1];
-            this$16.$$plus$eq__T2__scm_MapBuilder($as_T2(arg1));
+            this$15.$$plus$eq__T2__scm_MapBuilder($as_T2(arg1));
             i$1 = ((1 + i$1) | 0)
           };
-          var addCases = $as_sci_Map(this$16.elems$1);
+          var addCases = $as_sci_Map(this$15.elems$1);
           break matchEnd20
         }
       };
@@ -27874,16 +27702,16 @@ $c_Lio_kaitai_struct_format_AttrSpec$.prototype.parseSwitch__p1__sci_Map__sci_Li
         var self$2 = $m_Lio_kaitai_struct_datatype_DataType$SwitchType$().ELSE$undCONST$1;
         var y$1 = new $c_Lio_kaitai_struct_datatype_DataType$BytesEosType().init___s_Option__Z__s_Option__s_Option($m_s_None$(), false, $m_s_None$(), arg.process$1);
         var array$2 = [new $c_T2().init___O__O(self$2, y$1)];
-        var this$22 = new $c_scm_MapBuilder().init___sc_GenMap($m_sci_Map$EmptyMap$());
+        var this$21 = new $c_scm_MapBuilder().init___sc_GenMap($m_sci_Map$EmptyMap$());
         var i$2 = 0;
         var len$1 = $uI(array$2.length);
         while ((i$2 < len$1)) {
           var index$2 = i$2;
           var arg1$1 = array$2[index$2];
-          this$22.$$plus$eq__T2__scm_MapBuilder($as_T2(arg1$1));
+          this$21.$$plus$eq__T2__scm_MapBuilder($as_T2(arg1$1));
           i$2 = ((1 + i$2) | 0)
         };
-        var addCases = $as_sci_Map(this$22.elems$1);
+        var addCases = $as_sci_Map(this$21.elems$1);
         break matchEnd20
       };
       var p7 = $as_s_Option(x1.$$und1$f);
@@ -28030,85 +27858,40 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.opaquePlaceholder__sci_List__Li
   placeholder.name$1 = typeName;
   return placeholder
 });
-$c_Lio_kaitai_struct_format_ClassSpec$.prototype.checkDupSeqInstIds__sci_List__sci_Map__V = (function(seq, instances) {
-  var f = (function($this) {
-    return (function(attr$2) {
-      var attr = $as_Lio_kaitai_struct_format_AttrSpec(attr$2);
-      var x1 = attr.id$1;
-      if ((x1 instanceof $c_Lio_kaitai_struct_format_NamedIdentifier)) {
-        var x2 = $as_Lio_kaitai_struct_format_NamedIdentifier(x1);
-        var id = x2.name$2;
-        var xo = new $c_s_Some().init___O(new $c_T2().init___O__O(id, attr));
-        return xo.toList__sci_List()
-      } else {
-        var xo$1 = $m_s_None$();
-        return xo$1.toList__sci_List()
-      }
-    })
-  })(this);
-  var this$5 = $m_sci_List$();
-  var bf = this$5.ReusableCBFInstance$2;
-  if ((bf === $m_sci_List$().ReusableCBFInstance$2)) {
-    if ((seq === $m_sci_Nil$())) {
-      var jsx$1 = $m_sci_Nil$()
+$c_Lio_kaitai_struct_format_ClassSpec$.prototype.checkDupMemberIds__sci_List__V = (function(attrs) {
+  var attrIds = $as_scm_Map($m_scm_Map$().apply__sc_Seq__sc_GenMap($m_sci_Nil$()));
+  var these = attrs;
+  while ((!these.isEmpty__Z())) {
+    var arg1 = these.head__O();
+    var attr = $as_Lio_kaitai_struct_format_MemberSpec(arg1);
+    var x1 = attr.id__Lio_kaitai_struct_format_Identifier();
+    if ((x1 instanceof $c_Lio_kaitai_struct_format_NamedIdentifier)) {
+      var x2 = $as_Lio_kaitai_struct_format_NamedIdentifier(x1);
+      var name = x2.name$2;
+      var idOpt = new $c_s_Some().init___O(name)
+    } else if ((x1 instanceof $c_Lio_kaitai_struct_format_InstanceIdentifier)) {
+      var x3 = $as_Lio_kaitai_struct_format_InstanceIdentifier(x1);
+      var name$2 = x3.name$2;
+      var idOpt = new $c_s_Some().init___O(name$2)
     } else {
-      var rest = seq;
-      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
-            }
-          })
-        })(seq, found, h, t)));
-        var this$9 = rest;
-        rest = this$9.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 = seq;
-    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$11 = these;
-      these = this$11.tail__sci_List()
+      var idOpt = $m_s_None$()
     };
-    var jsx$1 = b.toList__sci_List()
-  };
-  var attrIds = $as_sc_TraversableOnce(jsx$1).toMap__s_Predef$$less$colon$less__sci_Map($m_s_Predef$().singleton$und$less$colon$less$2);
-  instances.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2$1, attrIds$1) {
-    return (function(x0$1$2) {
-      var x0$1 = $as_T2(x0$1$2);
-      if ((x0$1 !== null)) {
-        var id$1 = $as_Lio_kaitai_struct_format_InstanceIdentifier(x0$1.$$und1__O());
-        var instSpec = $as_Lio_kaitai_struct_format_InstanceSpec(x0$1.$$und2__O());
-        $m_Lio_kaitai_struct_format_ClassSpec$().checkDupId__p1__s_Option__T__Lio_kaitai_struct_format_YAMLPath__V(attrIds$1.get__O__s_Option(id$1.name$2), id$1.name$2, instSpec)
-      } else {
-        throw new $c_s_MatchError().init___O(x0$1)
-      }
-    })
-  })(this, attrIds)))
+    if ((!idOpt.isEmpty__Z())) {
+      var arg1$1 = idOpt.get__O();
+      var id = $as_T(arg1$1);
+      $m_Lio_kaitai_struct_format_ClassSpec$().checkDupId__p1__s_Option__T__Lio_kaitai_struct_format_YAMLPath__V(attrIds.get__O__s_Option(id), id, attr);
+      attrIds.put__O__O__s_Option(id, attr)
+    };
+    var this$1 = these;
+    these = this$1.tail__sci_List()
+  }
 });
 $c_Lio_kaitai_struct_format_ClassSpec$.prototype.checkDupId__p1__s_Option__T__Lio_kaitai_struct_format_YAMLPath__V = (function(prevAttrOpt, id, nowAttr) {
   if ((prevAttrOpt instanceof $c_s_Some)) {
     var x2 = $as_s_Some(prevAttrOpt);
-    var prevAttr = $as_Lio_kaitai_struct_format_AttrSpec(x2.value$2);
+    var prevAttr = $as_Lio_kaitai_struct_format_MemberSpec(x2.value$2);
     var jsx$1 = $m_Lio_kaitai_struct_problems_KSYParseError$();
-    var this$1 = prevAttr.path$1;
+    var this$1 = prevAttr.path__sci_List();
     throw jsx$1.withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException(((("duplicate attribute ID '" + id) + "', previously defined at /") + $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "/", "")), nowAttr.path__sci_List())
   } else {
     var x = $m_s_None$();
@@ -28195,12 +27978,12 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.fromYaml__O__s_Option__sci_List
     };
     var seq = $m_sci_Nil$()
   };
-  var x1$3 = srcMap.get__O__s_Option("types");
+  var x1$3 = srcMap.get__O__s_Option("instances");
   if ((x1$3 instanceof $c_s_Some)) {
     var x2$3 = $as_s_Some(x1$3);
     var value$3 = x2$3.value$2;
     $m_sci_List$();
-    var array$3 = ["types"];
+    var array$3 = ["instances"];
     var i$3 = (((-1) + $uI(array$3.length)) | 0);
     var result$3 = $m_sci_Nil$();
     while ((i$3 >= 0)) {
@@ -28212,38 +27995,43 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.fromYaml__O__s_Option__sci_List
     };
     var jsx$4 = result$3;
     var this$23 = $m_sci_List$();
-    var types = this.typesFromYaml__O__s_Option__sci_List__Lio_kaitai_struct_format_MetaSpec__sci_Map(value$3, fileName, $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$4, this$23.ReusableCBFInstance$2)), meta)
+    var instances = this.instancesFromYaml__O__sci_List__Lio_kaitai_struct_format_MetaSpec__sci_Map(value$3, $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$4, this$23.ReusableCBFInstance$2)), meta)
   } else {
     var x$5 = $m_s_None$();
     if ((!(x$5 === x1$3))) {
       throw new $c_s_MatchError().init___O(x1$3)
     };
-    var types = $as_sci_Map($m_s_Predef$().Map$2.apply__sc_Seq__sc_GenMap($m_sci_Nil$()))
+    var instances = $as_sci_Map($m_s_Predef$().Map$2.apply__sc_Seq__sc_GenMap($m_sci_Nil$()))
   };
-  var x1$4 = srcMap.get__O__s_Option("instances");
+  var this$24 = $m_sci_List$();
+  var jsx$6 = $as_sci_List(params.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(seq, this$24.ReusableCBFInstance$2));
+  var jsx$5 = instances.values__sc_Iterable();
+  var this$25 = $m_sci_List$();
+  this.checkDupMemberIds__sci_List__V($as_sci_List(jsx$6.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$5, this$25.ReusableCBFInstance$2)));
+  var x1$4 = srcMap.get__O__s_Option("types");
   if ((x1$4 instanceof $c_s_Some)) {
     var x2$4 = $as_s_Some(x1$4);
     var value$4 = x2$4.value$2;
     $m_sci_List$();
-    var array$4 = ["instances"];
+    var array$4 = ["types"];
     var i$4 = (((-1) + $uI(array$4.length)) | 0);
     var result$4 = $m_sci_Nil$();
     while ((i$4 >= 0)) {
-      var this$27 = result$4;
+      var this$29 = result$4;
       var index$4 = i$4;
       var x$6 = array$4[index$4];
-      result$4 = new $c_sci_$colon$colon().init___O__sci_List(x$6, this$27);
+      result$4 = new $c_sci_$colon$colon().init___O__sci_List(x$6, this$29);
       i$4 = (((-1) + i$4) | 0)
     };
-    var jsx$5 = result$4;
-    var this$28 = $m_sci_List$();
-    var instances = this.instancesFromYaml__O__sci_List__Lio_kaitai_struct_format_MetaSpec__sci_Map(value$4, $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$5, this$28.ReusableCBFInstance$2)), meta)
+    var jsx$7 = result$4;
+    var this$30 = $m_sci_List$();
+    var types = this.typesFromYaml__O__s_Option__sci_List__Lio_kaitai_struct_format_MetaSpec__sci_Map(value$4, fileName, $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$7, this$30.ReusableCBFInstance$2)), meta)
   } else {
     var x$7 = $m_s_None$();
     if ((!(x$7 === x1$4))) {
       throw new $c_s_MatchError().init___O(x1$4)
     };
-    var instances = $as_sci_Map($m_s_Predef$().Map$2.apply__sc_Seq__sc_GenMap($m_sci_Nil$()))
+    var types = $as_sci_Map($m_s_Predef$().Map$2.apply__sc_Seq__sc_GenMap($m_sci_Nil$()))
   };
   var x1$5 = srcMap.get__O__s_Option("enums");
   if ((x1$5 instanceof $c_s_Some)) {
@@ -28254,15 +28042,15 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.fromYaml__O__s_Option__sci_List
     var i$5 = (((-1) + $uI(array$5.length)) | 0);
     var result$5 = $m_sci_Nil$();
     while ((i$5 >= 0)) {
-      var this$32 = result$5;
+      var this$34 = result$5;
       var index$5 = i$5;
       var x$8 = array$5[index$5];
-      result$5 = new $c_sci_$colon$colon().init___O__sci_List(x$8, this$32);
+      result$5 = new $c_sci_$colon$colon().init___O__sci_List(x$8, this$34);
       i$5 = (((-1) + i$5) | 0)
     };
-    var jsx$6 = result$5;
-    var this$33 = $m_sci_List$();
-    var enums = this.enumsFromYaml__O__sci_List__sci_Map(value$5, $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$6, this$33.ReusableCBFInstance$2)))
+    var jsx$8 = result$5;
+    var this$35 = $m_sci_List$();
+    var enums = this.enumsFromYaml__O__sci_List__sci_Map(value$5, $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$8, this$35.ReusableCBFInstance$2)))
   } else {
     var x$9 = $m_s_None$();
     if ((!(x$9 === x1$5))) {
@@ -28270,27 +28058,26 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.fromYaml__O__s_Option__sci_List
     };
     var enums = $as_sci_Map($m_s_Predef$().Map$2.apply__sc_Seq__sc_GenMap($m_sci_Nil$()))
   };
-  this.checkDupSeqInstIds__sci_List__sci_Map__V(seq, instances);
   var cs = new $c_Lio_kaitai_struct_format_ClassSpec().init___s_Option__sci_List__Z__Lio_kaitai_struct_format_MetaSpec__Lio_kaitai_struct_format_DocSpec__s_Option__sci_List__sci_List__sci_Map__sci_Map__sci_Map(fileName, path, path.isEmpty__Z(), meta, doc, toStringExpr, params, seq, types, instances, enums);
   if (path.isEmpty__Z()) {
     var x1$6 = explicitMeta.id$1;
     var x$11 = $m_s_None$();
     if ((x$11 === x1$6)) {
-      var jsx$8 = $m_Lio_kaitai_struct_problems_KSYParseError$();
+      var jsx$10 = $m_Lio_kaitai_struct_problems_KSYParseError$();
       $m_sci_List$();
       var array$6 = ["meta", "id"];
       var i$6 = (((-1) + $uI(array$6.length)) | 0);
       var result$6 = $m_sci_Nil$();
       while ((i$6 >= 0)) {
-        var this$37 = result$6;
+        var this$39 = result$6;
         var index$6 = i$6;
         var x$10 = array$6[index$6];
-        result$6 = new $c_sci_$colon$colon().init___O__sci_List(x$10, this$37);
+        result$6 = new $c_sci_$colon$colon().init___O__sci_List(x$10, this$39);
         i$6 = (((-1) + i$6) | 0)
       };
-      var jsx$7 = result$6;
-      var this$38 = $m_sci_List$();
-      throw jsx$8.withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException("no `meta/id` encountered in top-level class spec", $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$7, this$38.ReusableCBFInstance$2)))
+      var jsx$9 = result$6;
+      var this$40 = $m_sci_List$();
+      throw jsx$10.withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException("no `meta/id` encountered in top-level class spec", $as_sci_List(path.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$9, this$40.ReusableCBFInstance$2)))
     } else if ((x1$6 instanceof $c_s_Some)) {
       var x2$6 = $as_s_Some(x1$6);
       var id = $as_T(x2$6.value$2);
@@ -28299,10 +28086,10 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.fromYaml__O__s_Option__sci_List
       var i$7 = (((-1) + $uI(array$7.length)) | 0);
       var result$7 = $m_sci_Nil$();
       while ((i$7 >= 0)) {
-        var this$42 = result$7;
+        var this$44 = result$7;
         var index$7 = i$7;
         var x$12 = array$7[index$7];
-        result$7 = new $c_sci_$colon$colon().init___O__sci_List(x$12, this$42);
+        result$7 = new $c_sci_$colon$colon().init___O__sci_List(x$12, this$44);
         i$7 = (((-1) + i$7) | 0)
       };
       cs.name$1 = result$7
@@ -28376,29 +28163,11 @@ $c_Lio_kaitai_struct_format_ClassSpec$.prototype.seqFromYaml__O__sci_List__Lio_k
       var jsx$3 = b.result__O()
     };
     var seq = $as_sci_List(jsx$3);
-    this.checkDupSeqIds__sci_List__V(seq);
     return seq
   } else {
     throw $m_Lio_kaitai_struct_problems_KSYParseError$().withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException(("expected array, found " + src), path)
   }
 });
-$c_Lio_kaitai_struct_format_ClassSpec$.prototype.checkDupSeqIds__sci_List__V = (function(seq) {
-  var attrIds = $as_scm_Map($m_scm_Map$().apply__sc_Seq__sc_GenMap($m_sci_Nil$()));
-  var these = seq;
-  while ((!these.isEmpty__Z())) {
-    var arg1 = these.head__O();
-    var attr = $as_Lio_kaitai_struct_format_AttrSpec(arg1);
-    var x1 = attr.id$1;
-    if ((x1 instanceof $c_Lio_kaitai_struct_format_NamedIdentifier)) {
-      var x2 = $as_Lio_kaitai_struct_format_NamedIdentifier(x1);
-      var id = x2.name$2;
-      $m_Lio_kaitai_struct_format_ClassSpec$().checkDupId__p1__s_Option__T__Lio_kaitai_struct_format_YAMLPath__V(attrIds.get__O__s_Option(id), id, attr);
-      attrIds.put__O__O__s_Option(id, attr)
-    };
-    var this$1 = these;
-    these = this$1.tail__sci_List()
-  }
-});
 $c_Lio_kaitai_struct_format_ClassSpec$.prototype.instancesFromYaml__O__sci_List__Lio_kaitai_struct_format_MetaSpec__sci_Map = (function(src, path, metaDef) {
   var srcMap = $m_Lio_kaitai_struct_format_ParseUtils$().asMap__O__sci_List__sci_Map(src, path);
   var f = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, path$1, metaDef$1) {
@@ -28737,7 +28506,8 @@ $c_Lio_kaitai_struct_format_EnumSpec$.prototype.init___ = (function() {
 });
 $c_Lio_kaitai_struct_format_EnumSpec$.prototype.fromYaml__O__sci_List__Lio_kaitai_struct_format_EnumSpec = (function(src, path) {
   var srcMap = $m_Lio_kaitai_struct_format_ParseUtils$().asMap__O__sci_List__sci_Map(src, path);
-  var f = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, path$1) {
+  var memberNameMap = $as_scm_Map($m_scm_Map$().apply__sc_Seq__sc_GenMap($m_sci_Nil$()));
+  var f = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, path$1, memberNameMap$1) {
     return (function(x0$1$2) {
       var x0$1 = $as_T2(x0$1$2);
       if ((x0$1 !== null)) {
@@ -28761,14 +28531,52 @@ $c_Lio_kaitai_struct_format_EnumSpec$.prototype.fromYaml__O__sci_List__Lio_kaita
         var jsx$1 = result;
         var this$5 = $m_sci_List$();
         var value = jsx$2.fromYaml__O__sci_List__Lio_kaitai_struct_format_EnumValueSpec(desc, $as_sci_List(path$1.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$1, this$5.ReusableCBFInstance$2)));
+        var this$6 = memberNameMap$1.get__O__s_Option(value.name$1);
+        if ((!this$6.isEmpty__Z())) {
+          var arg1 = this$6.get__O();
+          var t$1 = $uJ(arg1);
+          var lo$1 = t$1.lo$2;
+          var hi$1 = t$1.hi$2;
+          var jsx$7 = $m_Lio_kaitai_struct_problems_KSYParseError$();
+          var jsx$6 = value.name$1;
+          $m_sci_List$();
+          var array$1 = [$m_sjsr_RuntimeLong$().scala$scalajs$runtime$RuntimeLong$$toString__I__I__T(lo$1, hi$1)];
+          var i$1 = (((-1) + $uI(array$1.length)) | 0);
+          var result$1 = $m_sci_Nil$();
+          while ((i$1 >= 0)) {
+            var this$10 = result$1;
+            var index$1 = i$1;
+            var x$1 = array$1[index$1];
+            result$1 = new $c_sci_$colon$colon().init___O__sci_List(x$1, this$10);
+            i$1 = (((-1) + i$1) | 0)
+          };
+          var jsx$5 = result$1;
+          var this$11 = $m_sci_List$();
+          var jsx$4 = $as_sc_TraversableOnce(path$1.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$5, this$11.ReusableCBFInstance$2)).mkString__T__T("/");
+          $m_sci_List$();
+          var array$2 = [$m_sjsr_RuntimeLong$().scala$scalajs$runtime$RuntimeLong$$toString__I__I__T(lo, hi)];
+          var i$2 = (((-1) + $uI(array$2.length)) | 0);
+          var result$2 = $m_sci_Nil$();
+          while ((i$2 >= 0)) {
+            var this$15 = result$2;
+            var index$2 = i$2;
+            var x$2 = array$2[index$2];
+            result$2 = new $c_sci_$colon$colon().init___O__sci_List(x$2, this$15);
+            i$2 = (((-1) + i$2) | 0)
+          };
+          var jsx$3 = result$2;
+          var this$16 = $m_sci_List$();
+          throw jsx$7.withText__T__sci_List__Lio_kaitai_struct_problems_CompilationProblemException(((("duplicate enum member ID: '" + jsx$6) + "', previously defined at /") + jsx$4), $as_sci_List(path$1.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(jsx$3, this$16.ReusableCBFInstance$2)))
+        };
+        memberNameMap$1.put__O__O__s_Option(value.name$1, new $c_sjsr_RuntimeLong().init___I__I(lo, hi));
         return new $c_T2().init___O__O(new $c_sjsr_RuntimeLong().init___I__I(lo, hi), value)
       } else {
         throw new $c_s_MatchError().init___O(x0$1)
       }
     })
-  })(this, path));
+  })(this, path, memberNameMap));
   var bf = $m_sci_Map$().ReusableCBF$4;
-  return new $c_Lio_kaitai_struct_format_EnumSpec().init___sci_Map($as_sci_Map($f_sc_TraversableLike__map__F1__scg_CanBuildFrom__O(srcMap, f, bf)))
+  return new $c_Lio_kaitai_struct_format_EnumSpec().init___sci_List__sci_Map(path, $as_sci_Map($f_sc_TraversableLike__map__F1__scg_CanBuildFrom__O(srcMap, f, bf)))
 });
 var $d_Lio_kaitai_struct_format_EnumSpec$ = new $TypeData().initClass({
   Lio_kaitai_struct_format_EnumSpec$: 0
@@ -31449,55 +31257,6 @@ function $m_jl_Long$() {
   return $n_jl_Long$
 }
 /** @constructor */
-function $c_ju_AbstractCollection() {
-  $c_O.call(this)
-}
-$c_ju_AbstractCollection.prototype = new $h_O();
-$c_ju_AbstractCollection.prototype.constructor = $c_ju_AbstractCollection;
-/** @constructor */
-function $h_ju_AbstractCollection() {
-  /*<skip>*/
-}
-$h_ju_AbstractCollection.prototype = $c_ju_AbstractCollection.prototype;
-$c_ju_AbstractCollection.prototype.containsAll__ju_Collection__Z = (function(c) {
-  var __self = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(c);
-  inlinereturn$7: {
-    while (__self.ui$1.hasNext__Z()) {
-      var arg1 = __self.next__ju_Map$Entry();
-      if ((!this.contains__O__Z(arg1))) {
-        var jsx$1 = true;
-        break inlinereturn$7
-      }
-    };
-    var jsx$1 = false
-  };
-  return (!jsx$1)
-});
-$c_ju_AbstractCollection.prototype.toString__T = (function() {
-  var __self = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(this);
-  var result = "[";
-  var first = true;
-  while (__self.ui$1.hasNext__Z()) {
-    if (first) {
-      first = false
-    } else {
-      result = (result + ", ")
-    };
-    result = (("" + result) + __self.next__ju_Map$Entry())
-  };
-  return (result + "]")
-});
-$c_ju_AbstractCollection.prototype.contains__O__Z = (function(o) {
-  var __self = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(this);
-  while (__self.ui$1.hasNext__Z()) {
-    var arg1 = __self.next__ju_Map$Entry();
-    if (((o === null) ? (arg1 === null) : $objectEquals(o, arg1))) {
-      return true
-    }
-  };
-  return false
-});
-/** @constructor */
 function $c_ju_concurrent_atomic_AtomicReference() {
   $c_O.call(this);
   this.value$1 = null
@@ -34824,9 +34583,22 @@ $c_Lio_kaitai_struct_translators_ExpressionValidator.prototype.validate__Lio_kai
     if ((v instanceof $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumByLabel)) {
       var x3 = $as_Lio_kaitai_struct_exprlang_Ast$expr$EnumByLabel(v);
       var enumType$2 = x3.enumName$1;
+      var label = x3.label$1;
       var inType$2 = x3.inType$1;
-      this.provider$2.resolveEnum__Lio_kaitai_struct_exprlang_Ast$typeId__T__Lio_kaitai_struct_format_EnumSpec(inType$2, enumType$2.name$1);
-      break matchEnd36
+      var enumSpec = this.provider$2.resolveEnum__Lio_kaitai_struct_exprlang_Ast$typeId__T__Lio_kaitai_struct_format_EnumSpec(inType$2, enumType$2.name$1);
+      if ((!enumSpec.map$1.values__sc_Iterable().exists__F1__Z(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this, label$1) {
+        return (function(x$1$2) {
+          var x$1 = $as_Lio_kaitai_struct_format_EnumValueSpec(x$1$2);
+          return (x$1.name$1 === label$1.name$1)
+        })
+      })(this, label))))) {
+        var jsx$2 = label.name$1;
+        var jsx$1 = enumType$2.name$1;
+        var this$1 = enumSpec.path$1;
+        throw new $c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError().init___T__T__T(jsx$2, jsx$1, $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "/", ""))
+      } else {
+        break matchEnd36
+      }
     };
     if ((v instanceof $c_Lio_kaitai_struct_exprlang_Ast$expr$Name)) {
       var x4 = $as_Lio_kaitai_struct_exprlang_Ast$expr$Name(v);
@@ -34881,10 +34653,10 @@ $c_Lio_kaitai_struct_translators_ExpressionValidator.prototype.validate__Lio_kai
       var op$4 = x8.op$1;
       var values = x8.values$1;
       if (((op$4 !== null) && (values !== null))) {
-        values.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
+        values.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2) {
           return (function(v$2$2) {
             var v$2 = $as_Lio_kaitai_struct_exprlang_Ast$expr(v$2$2);
-            $this.validate__Lio_kaitai_struct_exprlang_Ast$expr__V(v$2)
+            this$2.validate__Lio_kaitai_struct_exprlang_Ast$expr__V(v$2)
           })
         })(this)));
         break matchEnd36
@@ -34926,10 +34698,10 @@ $c_Lio_kaitai_struct_translators_ExpressionValidator.prototype.validate__Lio_kai
       var x11 = $as_Lio_kaitai_struct_exprlang_Ast$expr$List(v);
       var values$2 = x11.elts$1;
       if ((values$2 !== null)) {
-        values$2.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$2) {
+        values$2.foreach__F1__V(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(this$3) {
           return (function(v$3$2) {
             var v$3 = $as_Lio_kaitai_struct_exprlang_Ast$expr(v$3$2);
-            this$2.validate__Lio_kaitai_struct_exprlang_Ast$expr__V(v$3)
+            this$3.validate__Lio_kaitai_struct_exprlang_Ast$expr__V(v$3)
           })
         })(this)));
         break matchEnd36
@@ -38277,55 +38049,6 @@ $c_sc_AbstractIterator.prototype.reduceLeft__F2__O = (function(op) {
   return $f_sc_TraversableOnce__reduceLeft__F2__O(this, op)
 });
 /** @constructor */
-function $c_sc_convert_Wrappers$() {
-  $c_O.call(this);
-  this.IteratorWrapper$module$1 = null;
-  this.JIteratorWrapper$module$1 = null;
-  this.JEnumerationWrapper$module$1 = null;
-  this.IterableWrapper$module$1 = null;
-  this.JIterableWrapper$module$1 = null;
-  this.JCollectionWrapper$module$1 = null;
-  this.SeqWrapper$module$1 = null;
-  this.MutableSeqWrapper$module$1 = null;
-  this.MutableBufferWrapper$module$1 = null;
-  this.JListWrapper$module$1 = null;
-  this.MutableSetWrapper$module$1 = null;
-  this.JSetWrapper$module$1 = null;
-  this.MutableMapWrapper$module$1 = null;
-  this.JMapWrapper$module$1 = null;
-  this.JConcurrentMapWrapper$module$1 = null;
-  this.DictionaryWrapper$module$1 = null;
-  this.JDictionaryWrapper$module$1 = null;
-  this.JPropertiesWrapper$module$1 = null
-}
-$c_sc_convert_Wrappers$.prototype = new $h_O();
-$c_sc_convert_Wrappers$.prototype.constructor = $c_sc_convert_Wrappers$;
-/** @constructor */
-function $h_sc_convert_Wrappers$() {
-  /*<skip>*/
-}
-$h_sc_convert_Wrappers$.prototype = $c_sc_convert_Wrappers$.prototype;
-$c_sc_convert_Wrappers$.prototype.init___ = (function() {
-  return this
-});
-var $d_sc_convert_Wrappers$ = new $TypeData().initClass({
-  sc_convert_Wrappers$: 0
-}, false, "scala.collection.convert.Wrappers$", {
-  sc_convert_Wrappers$: 1,
-  O: 1,
-  sc_convert_Wrappers: 1,
-  s_Serializable: 1,
-  Ljava_io_Serializable: 1
-});
-$c_sc_convert_Wrappers$.prototype.$classData = $d_sc_convert_Wrappers$;
-var $n_sc_convert_Wrappers$ = (void 0);
-function $m_sc_convert_Wrappers$() {
-  if ((!$n_sc_convert_Wrappers$)) {
-    $n_sc_convert_Wrappers$ = new $c_sc_convert_Wrappers$().init___()
-  };
-  return $n_sc_convert_Wrappers$
-}
-/** @constructor */
 function $c_scg_SetFactory() {
   $c_scg_GenSetFactory.call(this)
 }
@@ -40510,104 +40233,6 @@ var $d_Lio_kaitai_struct_format_DocSpec = new $TypeData().initClass({
 });
 $c_Lio_kaitai_struct_format_DocSpec.prototype.$classData = $d_Lio_kaitai_struct_format_DocSpec;
 /** @constructor */
-function $c_Lio_kaitai_struct_format_EnumSpec() {
-  $c_O.call(this);
-  this.sortedSeq$1 = null;
-  this.map$1 = null;
-  this.name$1 = null;
-  this.bitmap$0$1 = false
-}
-$c_Lio_kaitai_struct_format_EnumSpec.prototype = new $h_O();
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.constructor = $c_Lio_kaitai_struct_format_EnumSpec;
-/** @constructor */
-function $h_Lio_kaitai_struct_format_EnumSpec() {
-  /*<skip>*/
-}
-$h_Lio_kaitai_struct_format_EnumSpec.prototype = $c_Lio_kaitai_struct_format_EnumSpec.prototype;
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.productPrefix__T = (function() {
-  return "EnumSpec"
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.sortedSeq__sc_Seq = (function() {
-  return ((!this.bitmap$0$1) ? this.sortedSeq$lzycompute__p1__sc_Seq() : this.sortedSeq$1)
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.productArity__I = (function() {
-  return 1
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.equals__O__Z = (function(x$1) {
-  if ((this === x$1)) {
-    return true
-  } else if ((x$1 instanceof $c_Lio_kaitai_struct_format_EnumSpec)) {
-    var EnumSpec$1 = $as_Lio_kaitai_struct_format_EnumSpec(x$1);
-    var x = this.map$1;
-    var x$2 = EnumSpec$1.map$1;
-    return ((x === null) ? (x$2 === null) : x.equals__O__Z(x$2))
-  } else {
-    return false
-  }
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.productElement__I__O = (function(x$1) {
-  switch (x$1) {
-    case 0: {
-      return this.map$1;
-      break
-    }
-    default: {
-      throw new $c_jl_IndexOutOfBoundsException().init___T(("" + x$1))
-    }
-  }
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.init___sci_Map = (function(map) {
-  this.map$1 = map;
-  this.name$1 = $m_sci_Nil$();
-  return this
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.toString__T = (function() {
-  return $m_sr_ScalaRunTime$().$$undtoString__s_Product__T(this)
-});
-$c_Lio_kaitai_struct_format_EnumSpec.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_format_EnumSpec.prototype.productIterator__sc_Iterator = (function() {
-  return new $c_sr_ScalaRunTime$$anon$1().init___s_Product(this)
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.sortedSeq$lzycompute__p1__sc_Seq = (function() {
-  if ((!this.bitmap$0$1)) {
-    var this$1 = this.map$1;
-    var this$2 = $f_sc_MapLike__toSeq__sc_Seq(this$1);
-    var f = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
-      return (function(x$1$2) {
-        var x$1 = $as_T2(x$1$2);
-        return x$1.$$und1$mcJ$sp__J()
-      })
-    })(this));
-    var ord = $m_s_math_Ordering$Long$();
-    this.sortedSeq$1 = $as_sc_Seq($f_sc_SeqLike__sortBy__F1__s_math_Ordering__O(this$2, f, ord));
-    this.bitmap$0$1 = true
-  };
-  return this.sortedSeq$1
-});
-function $as_Lio_kaitai_struct_format_EnumSpec(obj) {
-  return (((obj instanceof $c_Lio_kaitai_struct_format_EnumSpec) || (obj === null)) ? obj : $throwClassCastException(obj, "io.kaitai.struct.format.EnumSpec"))
-}
-function $isArrayOf_Lio_kaitai_struct_format_EnumSpec(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lio_kaitai_struct_format_EnumSpec)))
-}
-function $asArrayOf_Lio_kaitai_struct_format_EnumSpec(obj, depth) {
-  return (($isArrayOf_Lio_kaitai_struct_format_EnumSpec(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.format.EnumSpec;", depth))
-}
-var $d_Lio_kaitai_struct_format_EnumSpec = new $TypeData().initClass({
-  Lio_kaitai_struct_format_EnumSpec: 0
-}, false, "io.kaitai.struct.format.EnumSpec", {
-  Lio_kaitai_struct_format_EnumSpec: 1,
-  O: 1,
-  s_Product: 1,
-  s_Equals: 1,
-  s_Serializable: 1,
-  Ljava_io_Serializable: 1
-});
-$c_Lio_kaitai_struct_format_EnumSpec.prototype.$classData = $d_Lio_kaitai_struct_format_EnumSpec;
-/** @constructor */
 function $c_Lio_kaitai_struct_format_EnumValueSpec() {
   $c_O.call(this);
   this.name$1 = null;
@@ -43211,38 +42836,6 @@ var $d_jl_UnsupportedOperationException = new $TypeData().initClass({
 });
 $c_jl_UnsupportedOperationException.prototype.$classData = $d_jl_UnsupportedOperationException;
 /** @constructor */
-function $c_ju_AbstractSet() {
-  $c_ju_AbstractCollection.call(this)
-}
-$c_ju_AbstractSet.prototype = new $h_ju_AbstractCollection();
-$c_ju_AbstractSet.prototype.constructor = $c_ju_AbstractSet;
-/** @constructor */
-function $h_ju_AbstractSet() {
-  /*<skip>*/
-}
-$h_ju_AbstractSet.prototype = $c_ju_AbstractSet.prototype;
-$c_ju_AbstractSet.prototype.equals__O__Z = (function(that) {
-  if ((that === this)) {
-    return true
-  } else if ($is_ju_Collection(that)) {
-    var x2 = $as_ju_Collection(that);
-    return ((x2.size__I() === this.size__I()) && this.containsAll__ju_Collection__Z(x2))
-  } else {
-    return false
-  }
-});
-$c_ju_AbstractSet.prototype.hashCode__I = (function() {
-  var __self = new $c_sc_convert_Wrappers$MapWrapper$$anon$2$$anon$3().init___sc_convert_Wrappers$MapWrapper$$anon$2(this);
-  var result = 0;
-  while (__self.ui$1.hasNext__Z()) {
-    var arg1 = result;
-    var arg2 = __self.next__ju_Map$Entry();
-    var prev = $uI(arg1);
-    result = ((arg2.hashCode__I() + prev) | 0)
-  };
-  return $uI(result)
-});
-/** @constructor */
 function $c_ju_NoSuchElementException() {
   $c_jl_RuntimeException.call(this)
 }
@@ -43950,38 +43543,6 @@ var $d_sc_Iterator$$anon$2 = new $TypeData().initClass({
 });
 $c_sc_Iterator$$anon$2.prototype.$classData = $d_sc_Iterator$$anon$2;
 /** @constructor */
-function $c_sc_JavaConversions$() {
-  $c_O.call(this)
-}
-$c_sc_JavaConversions$.prototype = new $h_O();
-$c_sc_JavaConversions$.prototype.constructor = $c_sc_JavaConversions$;
-/** @constructor */
-function $h_sc_JavaConversions$() {
-  /*<skip>*/
-}
-$h_sc_JavaConversions$.prototype = $c_sc_JavaConversions$.prototype;
-$c_sc_JavaConversions$.prototype.init___ = (function() {
-  return this
-});
-var $d_sc_JavaConversions$ = new $TypeData().initClass({
-  sc_JavaConversions$: 0
-}, false, "scala.collection.JavaConversions$", {
-  sc_JavaConversions$: 1,
-  O: 1,
-  sc_convert_WrapAsScala: 1,
-  sc_convert_LowPriorityWrapAsScala: 1,
-  sc_convert_WrapAsJava: 1,
-  sc_convert_LowPriorityWrapAsJava: 1
-});
-$c_sc_JavaConversions$.prototype.$classData = $d_sc_JavaConversions$;
-var $n_sc_JavaConversions$ = (void 0);
-function $m_sc_JavaConversions$() {
-  if ((!$n_sc_JavaConversions$)) {
-    $n_sc_JavaConversions$ = new $c_sc_JavaConversions$().init___()
-  };
-  return $n_sc_JavaConversions$
-}
-/** @constructor */
 function $c_sc_LinearSeqLike$$anon$1() {
   $c_sc_AbstractIterator.call(this);
   this.these$2 = null
@@ -44176,76 +43737,6 @@ var $d_sc_TraversableOnce$FlattenOps$$anon$2 = new $TypeData().initClass({
 });
 $c_sc_TraversableOnce$FlattenOps$$anon$2.prototype.$classData = $d_sc_TraversableOnce$FlattenOps$$anon$2;
 /** @constructor */
-function $c_sc_convert_Wrappers$MapWrapper() {
-  $c_ju_AbstractMap.call(this);
-  this.scala$collection$convert$Wrappers$MapWrapper$$underlying$f = null;
-  this.$$outer$2 = null
-}
-$c_sc_convert_Wrappers$MapWrapper.prototype = new $h_ju_AbstractMap();
-$c_sc_convert_Wrappers$MapWrapper.prototype.constructor = $c_sc_convert_Wrappers$MapWrapper;
-/** @constructor */
-function $h_sc_convert_Wrappers$MapWrapper() {
-  /*<skip>*/
-}
-$h_sc_convert_Wrappers$MapWrapper.prototype = $c_sc_convert_Wrappers$MapWrapper.prototype;
-$c_sc_convert_Wrappers$MapWrapper.prototype.containsKey__O__Z = (function(key) {
-  try {
-    return this.scala$collection$convert$Wrappers$MapWrapper$$underlying$f.contains__O__Z(key)
-  } catch (e) {
-    if ((e instanceof $c_jl_ClassCastException)) {
-      $as_jl_ClassCastException(e);
-      return false
-    } else {
-      throw e
-    }
-  }
-});
-$c_sc_convert_Wrappers$MapWrapper.prototype.get__O__O = (function(key) {
-  try {
-    var x1 = this.scala$collection$convert$Wrappers$MapWrapper$$underlying$f.get__O__s_Option(key);
-    var x = $m_s_None$();
-    if ((x === x1)) {
-      return null
-    } else if ((x1 instanceof $c_s_Some)) {
-      var x2 = $as_s_Some(x1);
-      var v = x2.value$2;
-      return v
-    } else {
-      throw new $c_s_MatchError().init___O(x1)
-    }
-  } catch (e) {
-    if ((e instanceof $c_jl_ClassCastException)) {
-      $as_jl_ClassCastException(e);
-      return null
-    } else {
-      throw e
-    }
-  }
-});
-$c_sc_convert_Wrappers$MapWrapper.prototype.init___sc_convert_Wrappers__sc_Map = (function($$outer, underlying) {
-  this.scala$collection$convert$Wrappers$MapWrapper$$underlying$f = underlying;
-  if (($$outer === null)) {
-    throw $m_sjsr_package$().unwrapJavaScriptException__jl_Throwable__O(null)
-  } else {
-    this.$$outer$2 = $$outer
-  };
-  return this
-});
-$c_sc_convert_Wrappers$MapWrapper.prototype.size__I = (function() {
-  return this.scala$collection$convert$Wrappers$MapWrapper$$underlying$f.size__I()
-});
-var $d_sc_convert_Wrappers$MapWrapper = new $TypeData().initClass({
-  sc_convert_Wrappers$MapWrapper: 0
-}, false, "scala.collection.convert.Wrappers$MapWrapper", {
-  sc_convert_Wrappers$MapWrapper: 1,
-  ju_AbstractMap: 1,
-  O: 1,
-  ju_Map: 1,
-  s_Serializable: 1,
-  Ljava_io_Serializable: 1
-});
-$c_sc_convert_Wrappers$MapWrapper.prototype.$classData = $d_sc_convert_Wrappers$MapWrapper;
-/** @constructor */
 function $c_scg_ImmutableSetFactory() {
   $c_scg_SetFactory.call(this)
 }
@@ -50315,6 +49806,120 @@ function $m_Lio_kaitai_struct_format_DynamicSized$() {
   return $n_Lio_kaitai_struct_format_DynamicSized$
 }
 /** @constructor */
+function $c_Lio_kaitai_struct_format_EnumSpec() {
+  $c_O.call(this);
+  this.sortedSeq$1 = null;
+  this.path$1 = null;
+  this.map$1 = null;
+  this.name$1 = null;
+  this.bitmap$0$1 = false
+}
+$c_Lio_kaitai_struct_format_EnumSpec.prototype = new $h_O();
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.constructor = $c_Lio_kaitai_struct_format_EnumSpec;
+/** @constructor */
+function $h_Lio_kaitai_struct_format_EnumSpec() {
+  /*<skip>*/
+}
+$h_Lio_kaitai_struct_format_EnumSpec.prototype = $c_Lio_kaitai_struct_format_EnumSpec.prototype;
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.productPrefix__T = (function() {
+  return "EnumSpec"
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.sortedSeq__sc_Seq = (function() {
+  return ((!this.bitmap$0$1) ? this.sortedSeq$lzycompute__p1__sc_Seq() : this.sortedSeq$1)
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.productArity__I = (function() {
+  return 2
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.equals__O__Z = (function(x$1) {
+  if ((this === x$1)) {
+    return true
+  } else if ((x$1 instanceof $c_Lio_kaitai_struct_format_EnumSpec)) {
+    var EnumSpec$1 = $as_Lio_kaitai_struct_format_EnumSpec(x$1);
+    var x = this.path$1;
+    var x$2 = EnumSpec$1.path$1;
+    if (((x === null) ? (x$2 === null) : x.equals__O__Z(x$2))) {
+      var x$3 = this.map$1;
+      var x$4 = EnumSpec$1.map$1;
+      return ((x$3 === null) ? (x$4 === null) : x$3.equals__O__Z(x$4))
+    } else {
+      return false
+    }
+  } else {
+    return false
+  }
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.productElement__I__O = (function(x$1) {
+  switch (x$1) {
+    case 0: {
+      return this.path$1;
+      break
+    }
+    case 1: {
+      return this.map$1;
+      break
+    }
+    default: {
+      throw new $c_jl_IndexOutOfBoundsException().init___T(("" + x$1))
+    }
+  }
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$().$$undtoString__s_Product__T(this)
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.init___sci_List__sci_Map = (function(path, map) {
+  this.path$1 = path;
+  this.map$1 = map;
+  this.name$1 = $m_sci_Nil$();
+  return this
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.path__sci_List = (function() {
+  return this.path$1
+});
+$c_Lio_kaitai_struct_format_EnumSpec.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_format_EnumSpec.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_sr_ScalaRunTime$$anon$1().init___s_Product(this)
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.sortedSeq$lzycompute__p1__sc_Seq = (function() {
+  if ((!this.bitmap$0$1)) {
+    var this$1 = this.map$1;
+    var this$2 = $f_sc_MapLike__toSeq__sc_Seq(this$1);
+    var f = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
+      return (function(x$1$2) {
+        var x$1 = $as_T2(x$1$2);
+        return x$1.$$und1$mcJ$sp__J()
+      })
+    })(this));
+    var ord = $m_s_math_Ordering$Long$();
+    this.sortedSeq$1 = $as_sc_Seq($f_sc_SeqLike__sortBy__F1__s_math_Ordering__O(this$2, f, ord));
+    this.bitmap$0$1 = true
+  };
+  return this.sortedSeq$1
+});
+function $as_Lio_kaitai_struct_format_EnumSpec(obj) {
+  return (((obj instanceof $c_Lio_kaitai_struct_format_EnumSpec) || (obj === null)) ? obj : $throwClassCastException(obj, "io.kaitai.struct.format.EnumSpec"))
+}
+function $isArrayOf_Lio_kaitai_struct_format_EnumSpec(obj, depth) {
+  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lio_kaitai_struct_format_EnumSpec)))
+}
+function $asArrayOf_Lio_kaitai_struct_format_EnumSpec(obj, depth) {
+  return (($isArrayOf_Lio_kaitai_struct_format_EnumSpec(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.format.EnumSpec;", depth))
+}
+var $d_Lio_kaitai_struct_format_EnumSpec = new $TypeData().initClass({
+  Lio_kaitai_struct_format_EnumSpec: 0
+}, false, "io.kaitai.struct.format.EnumSpec", {
+  Lio_kaitai_struct_format_EnumSpec: 1,
+  O: 1,
+  Lio_kaitai_struct_format_YAMLPath: 1,
+  s_Product: 1,
+  s_Equals: 1,
+  s_Serializable: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lio_kaitai_struct_format_EnumSpec.prototype.$classData = $d_Lio_kaitai_struct_format_EnumSpec;
+/** @constructor */
 function $c_Lio_kaitai_struct_format_FixedSized() {
   $c_O.call(this);
   this.n$1 = 0
@@ -54743,41 +54348,6 @@ function $asArrayOf_sc_TraversableLike(obj, depth) {
   return (($isArrayOf_sc_TraversableLike(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lscala.collection.TraversableLike;", depth))
 }
 /** @constructor */
-function $c_sc_convert_Wrappers$MapWrapper$$anon$2() {
-  $c_ju_AbstractSet.call(this);
-  this.$$outer$3 = null
-}
-$c_sc_convert_Wrappers$MapWrapper$$anon$2.prototype = new $h_ju_AbstractSet();
-$c_sc_convert_Wrappers$MapWrapper$$anon$2.prototype.constructor = $c_sc_convert_Wrappers$MapWrapper$$anon$2;
-/** @constructor */
-function $h_sc_convert_Wrappers$MapWrapper$$anon$2() {
-  /*<skip>*/
-}
-$h_sc_convert_Wrappers$MapWrapper$$anon$2.prototype = $c_sc_convert_Wrappers$MapWrapper$$anon$2.prototype;
-$c_sc_convert_Wrappers$MapWrapper$$anon$2.prototype.init___sc_convert_Wrappers$MapWrapper = (function($$outer) {
-  if (($$outer === null)) {
-    throw $m_sjsr_package$().unwrapJavaScriptException__jl_Throwable__O(null)
-  } else {
-    this.$$outer$3 = $$outer
-  };
-  return this
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2.prototype.size__I = (function() {
-  return this.$$outer$3.size__I()
-});
-var $d_sc_convert_Wrappers$MapWrapper$$anon$2 = new $TypeData().initClass({
-  sc_convert_Wrappers$MapWrapper$$anon$2: 0
-}, false, "scala.collection.convert.Wrappers$MapWrapper$$anon$2", {
-  sc_convert_Wrappers$MapWrapper$$anon$2: 1,
-  ju_AbstractSet: 1,
-  ju_AbstractCollection: 1,
-  O: 1,
-  ju_Collection: 1,
-  jl_Iterable: 1,
-  ju_Set: 1
-});
-$c_sc_convert_Wrappers$MapWrapper$$anon$2.prototype.$classData = $d_sc_convert_Wrappers$MapWrapper$$anon$2;
-/** @constructor */
 function $c_scg_SeqFactory() {
   $c_scg_GenSeqFactory.call(this)
 }
@@ -57531,6 +57101,41 @@ function $m_Lio_kaitai_struct_format_RootIdentifier$() {
   return $n_Lio_kaitai_struct_format_RootIdentifier$
 }
 /** @constructor */
+function $c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError() {
+  $c_Lio_kaitai_struct_precompile_NotFoundError.call(this);
+  this.label$6 = null;
+  this.enum$6 = null;
+  this.enumDefPath$6 = null
+}
+$c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError.prototype = new $h_Lio_kaitai_struct_precompile_NotFoundError();
+$c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError.prototype.constructor = $c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError;
+/** @constructor */
+function $h_Lio_kaitai_struct_precompile_EnumMemberNotFoundError() {
+  /*<skip>*/
+}
+$h_Lio_kaitai_struct_precompile_EnumMemberNotFoundError.prototype = $c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError.prototype;
+$c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError.prototype.init___T__T__T = (function(label, $enum, enumDefPath) {
+  this.label$6 = label;
+  this.enum$6 = $enum;
+  this.enumDefPath$6 = enumDefPath;
+  var msg = (((((((("unable to find enum member '" + $enum) + "::") + label) + "' (enum '") + $enum) + "' defined at /") + enumDefPath) + ")");
+  $c_jl_Throwable.prototype.init___T__jl_Throwable__Z__Z.call(this, msg, null, true, true);
+  return this
+});
+var $d_Lio_kaitai_struct_precompile_EnumMemberNotFoundError = new $TypeData().initClass({
+  Lio_kaitai_struct_precompile_EnumMemberNotFoundError: 0
+}, false, "io.kaitai.struct.precompile.EnumMemberNotFoundError", {
+  Lio_kaitai_struct_precompile_EnumMemberNotFoundError: 1,
+  Lio_kaitai_struct_precompile_NotFoundError: 1,
+  Lio_kaitai_struct_precompile_ExpressionError: 1,
+  jl_RuntimeException: 1,
+  jl_Exception: 1,
+  jl_Throwable: 1,
+  O: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lio_kaitai_struct_precompile_EnumMemberNotFoundError.prototype.$classData = $d_Lio_kaitai_struct_precompile_EnumMemberNotFoundError;
+/** @constructor */
 function $c_Lio_kaitai_struct_precompile_EnumNotFoundError() {
   $c_Lio_kaitai_struct_precompile_NotFoundError.call(this);
   this.name$6 = null;
@@ -63129,9 +62734,6 @@ function $h_Lio_kaitai_struct_translators_BaseTranslator() {
   /*<skip>*/
 }
 $h_Lio_kaitai_struct_translators_BaseTranslator.prototype = $c_Lio_kaitai_struct_translators_BaseTranslator.prototype;
-$c_Lio_kaitai_struct_translators_BaseTranslator.prototype.doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(left, op, right) {
-  return $f_Lio_kaitai_struct_translators_CommonOps__doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(this, left, op, right)
-});
 $c_Lio_kaitai_struct_translators_BaseTranslator.prototype.boolToInt__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(value) {
   return this.boolToInt__Lio_kaitai_struct_exprlang_Ast$expr__T(value)
 });
@@ -63385,7 +62987,7 @@ $c_Lio_kaitai_struct_translators_BaseTranslator.prototype.translate__Lio_kaitai_
           var _1 = this.detectType__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType(left);
           var _2 = this.detectType__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType(right);
           if (((_1 instanceof $c_Lio_kaitai_struct_datatype_DataType$NumericType) && (_2 instanceof $c_Lio_kaitai_struct_datatype_DataType$NumericType))) {
-            return this.doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(left, op$2, right)
+            return $f_Lio_kaitai_struct_translators_CommonOps__doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(this, left, op$2, right)
           };
           if (((_1 instanceof $c_Lio_kaitai_struct_datatype_DataType$BooleanType) && (_2 instanceof $c_Lio_kaitai_struct_datatype_DataType$BooleanType))) {
             var x$3 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$Eq$();
@@ -63396,7 +62998,7 @@ $c_Lio_kaitai_struct_translators_BaseTranslator.prototype.translate__Lio_kaitai_
               var jsx$1 = (x$5 === op$2)
             };
             if (jsx$1) {
-              return this.doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(left, op$2, right)
+              return $f_Lio_kaitai_struct_translators_CommonOps__doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(this, left, op$2, right)
             } else {
               throw new $c_Lio_kaitai_struct_precompile_TypeMismatchError().init___T((("can't compare booleans using " + op$2) + " operator"))
             }
@@ -67420,10 +67022,12 @@ function $h_Lio_kaitai_struct_translators_PerlTranslator() {
 $h_Lio_kaitai_struct_translators_PerlTranslator.prototype = $c_Lio_kaitai_struct_translators_PerlTranslator.prototype;
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.strToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(s, base) {
   var baseStr = this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(base);
-  if ((baseStr === "8")) {
+  if ((baseStr === "2")) {
+    return (("oct('0b' . " + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s)) + ")")
+  } else if ((baseStr === "8")) {
     return (("oct(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s)) + ")")
   } else if ((baseStr === "10")) {
-    return this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s)
+    return (this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s) + " + 0")
   } else if ((baseStr === "16")) {
     return (("hex(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s)) + ")")
   } else {
@@ -67439,6 +67043,12 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arraySize__Lio_kaitai_
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.strSubstring__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(s, from, to) {
   return this.strSubstring__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T(s, from, to)
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesMax__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(b) {
+  return this.bytesMax__Lio_kaitai_struct_exprlang_Ast$expr__T(b)
+});
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesLast__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(b) {
+  return this.bytesLast__Lio_kaitai_struct_exprlang_Ast$expr__T(b)
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.strReverse__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(value) {
   return (("scalar(reverse(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(value)) + "))")
 });
@@ -67455,12 +67065,15 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.strLength__Lio_kaitai_
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.floatToInt__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(value) {
   return this.floatToInt__Lio_kaitai_struct_exprlang_Ast$expr__T(value)
 });
-$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arrayLast__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(a) {
-  return (("@{" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(a)) + "}[-1]")
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesFirst__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(b) {
+  return (("unpack('C', substr(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(b)) + ", 0, 1))")
 });
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesLength__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(b) {
   return this.strLength__Lio_kaitai_struct_exprlang_Ast$expr__T(b)
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arrayLast__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(a) {
+  return (("@{" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(a)) + "}[-1]")
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arrayMax__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(a) {
   return this.arrayMax__Lio_kaitai_struct_exprlang_Ast$expr__T(a)
 });
@@ -67531,6 +67144,9 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doIfExp__Lio_kaitai_st
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.asciiCharQuoteMap__sci_Map = (function() {
   return this.asciiCharQuoteMap$3
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesSubscript__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(container, idx) {
+  return this.bytesSubscript__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T(container, idx)
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doArrayLiteral__Lio_kaitai_struct_datatype_DataType__sc_Seq__T = (function(t, value) {
   var jsx$1 = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
     return (function(v$2) {
@@ -67548,7 +67164,15 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arraySubscript__Lio_ka
   return (((("@{" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(container)) + "}[") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(idx)) + "]")
 });
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.strSubstring__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(s, from, to) {
-  return (((((this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s) + "[") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(from)) + ":") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(to)) + "]")
+  return (((((((("substr(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s)) + ", ") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(from)) + ", (") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(to)) + ") - (") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(from)) + "))")
+});
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesLast__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(b) {
+  return (("unpack('C', substr(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(b)) + ", -1, 1))")
+});
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesMax__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(b) {
+  var this$1 = this.importList$3;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "List::Util");
+  return (("List::Util::max(unpack('C*', " + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(b)) + "))")
 });
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doByteArrayNonLiteral__sc_Seq__T = (function(elts) {
   var jsx$1 = new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function($this) {
@@ -67582,9 +67206,14 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arrayMax__Lio_kaitai_s
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.kaitaiStreamSize__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(value) {
   return (this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(value) + "->size()")
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesMin__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(b) {
+  return this.bytesMin__Lio_kaitai_struct_exprlang_Ast$expr__T(b)
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.intToStr__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(i, base) {
   var baseStr = this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(base);
-  if ((baseStr === "8")) {
+  if ((baseStr === "2")) {
+    var format = "%b"
+  } else if ((baseStr === "8")) {
     var format = "%o"
   } else if ((baseStr === "10")) {
     var format = "%d"
@@ -67596,6 +67225,9 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.intToStr__Lio_kaitai_s
   };
   return (((("sprintf('" + format) + "', ") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(i)) + ")")
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesSubscript__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(container, idx) {
+  return (((("unpack('C', substr(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(container)) + ", ") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(idx)) + ", 1))")
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doName__T__T = (function(s) {
   return (($m_Lio_kaitai_struct_format_Identifier$().ITERATOR$1 === s) ? "$_" : (($m_Lio_kaitai_struct_format_Identifier$().ITERATOR2$1 === s) ? "$_buf" : (($m_Lio_kaitai_struct_format_Identifier$().INDEX$1 === s) ? "$i" : (s + "()"))))
 });
@@ -67607,12 +67239,12 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesToStr__T__Lio_kai
   $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "Encode");
   return (((("Encode::decode(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(encoding)) + ", ") + bytesExpr) + ")")
 });
-$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.anyField__Lio_kaitai_struct_exprlang_Ast$expr__T__T = (function(value, attrName) {
-  return ((this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(value) + "->") + this.doName__T__T(attrName))
-});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.enumToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType$EnumType__O = (function(value, et) {
   return this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(value)
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.anyField__Lio_kaitai_struct_exprlang_Ast$expr__T__T = (function(value, attrName) {
+  return ((this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(value) + "->") + this.doName__T__T(attrName))
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arraySize__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(a) {
   return this.arraySize__Lio_kaitai_struct_exprlang_Ast$expr__T(a)
 });
@@ -67652,6 +67284,9 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doStrCompareOp__Lio_ka
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.strReverse__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(s) {
   return this.strReverse__Lio_kaitai_struct_exprlang_Ast$expr__T(s)
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesFirst__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(b) {
+  return this.bytesFirst__Lio_kaitai_struct_exprlang_Ast$expr__T(b)
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doBytesCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(left, op, right) {
   return this.doStrCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(left, op, right)
 });
@@ -67690,6 +67325,11 @@ $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.doArrayLiteral__Lio_ka
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arrayLast__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(a) {
   return this.arrayLast__Lio_kaitai_struct_exprlang_Ast$expr__T(a)
 });
+$c_Lio_kaitai_struct_translators_PerlTranslator.prototype.bytesMin__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(b) {
+  var this$1 = this.importList$3;
+  $m_Lio_kaitai_struct_Utils$().addUniqueAttr__scm_ListBuffer__O__V(this$1.list$1, "List::Util");
+  return (("List::Util::min(unpack('C*', " + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(b)) + "))")
+});
 $c_Lio_kaitai_struct_translators_PerlTranslator.prototype.arrayMin__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(a) {
   return this.arrayMin__Lio_kaitai_struct_exprlang_Ast$expr__T(a)
 });
@@ -70937,34 +70577,6 @@ $c_Lio_kaitai_struct_translators_LuaTranslator.prototype.strToInt__Lio_kaitai_st
   var add = ((baseStr === "10") ? "" : (", " + baseStr));
   return ((("tonumber(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(s)) + add) + ")")
 });
-$c_Lio_kaitai_struct_translators_LuaTranslator.prototype.doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(left, op, right) {
-  var f = (function($this) {
-    return (function(n$2) {
-      var n = $uZ(n$2);
-      return (n ? "1" : "0")
-    })
-  })(this);
-  if ((left instanceof $c_Lio_kaitai_struct_exprlang_Ast$expr$Bool)) {
-    var x4 = $as_Lio_kaitai_struct_exprlang_Ast$expr$Bool(left);
-    var l = x4.n$1;
-    if ((right instanceof $c_Lio_kaitai_struct_exprlang_Ast$expr$Bool)) {
-      var x5 = $as_Lio_kaitai_struct_exprlang_Ast$expr$Bool(right);
-      var r = x5.n$1;
-      return ((((f(l) + " ") + this.cmpOp__Lio_kaitai_struct_exprlang_Ast$cmpop__T(op)) + " ") + f(r))
-    }
-  };
-  if ((left instanceof $c_Lio_kaitai_struct_exprlang_Ast$expr$Bool)) {
-    var x7 = $as_Lio_kaitai_struct_exprlang_Ast$expr$Bool(left);
-    var l$2 = x7.n$1;
-    return ((((f(l$2) + " ") + this.cmpOp__Lio_kaitai_struct_exprlang_Ast$cmpop__T(op)) + " ") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right))
-  };
-  if ((right instanceof $c_Lio_kaitai_struct_exprlang_Ast$expr$Bool)) {
-    var x9 = $as_Lio_kaitai_struct_exprlang_Ast$expr$Bool(right);
-    var r$3 = x9.n$1;
-    return ((((this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left) + " ") + this.cmpOp__Lio_kaitai_struct_exprlang_Ast$cmpop__T(op)) + " ") + f(r$3))
-  };
-  return $f_Lio_kaitai_struct_translators_CommonOps__doNumericCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T(this, left, op, right)
-});
 $c_Lio_kaitai_struct_translators_LuaTranslator.prototype.boolToInt__Lio_kaitai_struct_exprlang_Ast$expr__O = (function(value) {
   return this.boolToInt__Lio_kaitai_struct_exprlang_Ast$expr__T(value)
 });
@@ -74479,6 +74091,25 @@ function $f_sc_IndexedSeqOptimized__reverse__O($thiz) {
   };
   return b.result__O()
 }
+function $f_sc_IndexedSeqOptimized__find__F1__s_Option($thiz, p) {
+  var len = $thiz.length__I();
+  var i = 0;
+  while (true) {
+    if ((i < len)) {
+      var arg1 = $thiz.apply__I__O(i);
+      var jsx$1 = (!$uZ(p.apply__O__O(arg1)))
+    } else {
+      var jsx$1 = false
+    };
+    if (jsx$1) {
+      i = ((1 + i) | 0)
+    } else {
+      break
+    }
+  };
+  var i$1 = i;
+  return ((i$1 < $thiz.length__I()) ? new $c_s_Some().init___O($thiz.apply__I__O(i$1)) : $m_s_None$())
+}
 function $f_sc_IndexedSeqOptimized__last__O($thiz) {
   return (($thiz.length__I() > 0) ? $thiz.apply__I__O((((-1) + $thiz.length__I()) | 0)) : $f_sc_TraversableLike__last__O($thiz))
 }
@@ -74508,12 +74139,12 @@ function $f_sc_IndexedSeqOptimized__copyToArray__O__I__I__V($thiz, xs, start, le
     j = ((1 + j) | 0)
   }
 }
-function $f_sc_IndexedSeqOptimized__takeRight__I__O($thiz, n) {
-  return $thiz.slice__I__I__O((($thiz.length__I() - ((n > 0) ? n : 0)) | 0), $thiz.length__I())
-}
 function $f_sc_IndexedSeqOptimized__dropRight__I__O($thiz, n) {
   return $thiz.slice__I__I__O(0, (($thiz.length__I() - ((n > 0) ? n : 0)) | 0))
 }
+function $f_sc_IndexedSeqOptimized__takeRight__I__O($thiz, n) {
+  return $thiz.slice__I__I__O((($thiz.length__I() - ((n > 0) ? n : 0)) | 0), $thiz.length__I())
+}
 function $f_sc_IndexedSeqOptimized__reduceLeft__F2__O($thiz, op) {
   if (($thiz.length__I() > 0)) {
     var start = 1;
@@ -74588,6 +74219,16 @@ function $f_sc_LinearSeqOptimized__foldLeft__O__F2__O($thiz, z, op) {
   };
   return acc
 }
+function $f_sc_LinearSeqOptimized__find__F1__s_Option($thiz, p) {
+  var these = $thiz;
+  while ((!these.isEmpty__Z())) {
+    if ($uZ(p.apply__O__O(these.head__O()))) {
+      return new $c_s_Some().init___O(these.head__O())
+    };
+    these = $as_sc_LinearSeqOptimized(these.tail__O())
+  };
+  return $m_s_None$()
+}
 function $f_sc_LinearSeqOptimized__length__I($thiz) {
   var these = $thiz;
   var len = 0;
@@ -74622,13 +74263,6 @@ function $f_sc_LinearSeqOptimized__contains__O__Z($thiz, elem) {
 function $f_sc_LinearSeqOptimized__isDefinedAt__I__Z($thiz, x) {
   return ((x >= 0) && ($f_sc_LinearSeqOptimized__lengthCompare__I__I($thiz, x) > 0))
 }
-function $f_sc_LinearSeqOptimized__reduceLeft__F2__O($thiz, op) {
-  if ($thiz.isEmpty__Z()) {
-    throw new $c_jl_UnsupportedOperationException().init___T("empty.reduceLeft")
-  } else {
-    return $as_sc_LinearSeqOptimized($thiz.tail__O()).foldLeft__O__F2__O($thiz.head__O(), op)
-  }
-}
 function $f_sc_LinearSeqOptimized__loop$1__psc_LinearSeqOptimized__I__sc_LinearSeqOptimized__I__I($thiz, i, xs, len$1) {
   _loop: while (true) {
     if ((i === len$1)) {
@@ -74644,6 +74278,13 @@ function $f_sc_LinearSeqOptimized__loop$1__psc_LinearSeqOptimized__I__sc_LinearS
     }
   }
 }
+function $f_sc_LinearSeqOptimized__reduceLeft__F2__O($thiz, op) {
+  if ($thiz.isEmpty__Z()) {
+    throw new $c_jl_UnsupportedOperationException().init___T("empty.reduceLeft")
+  } else {
+    return $as_sc_LinearSeqOptimized($thiz.tail__O()).foldLeft__O__F2__O($thiz.head__O(), op)
+  }
+}
 function $is_sc_LinearSeqOptimized(obj) {
   return (!(!((obj && obj.$classData) && obj.$classData.ancestors.sc_LinearSeqOptimized)))
 }
@@ -79992,8 +79633,7 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.condRepeatUntilFooter__Lio_
   this.out$2.puts__T__V("end");
   this.out$2.puts__T__V("i = i + 1");
   this.out$2.dec__V();
-  this.out$2.puts__T__V("end");
-  this.out$2.dec__V()
+  this.out$2.puts__T__V("end")
 });
 $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.switchEnd__V = (function() {
   /*<skip>*/
@@ -80210,7 +79850,7 @@ $c_Lio_kaitai_struct_languages_LuaCompiler.prototype.parseExpr__Lio_kaitai_struc
   } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$BitsType1)) {
     var x4 = $as_Lio_kaitai_struct_datatype_DataType$BitsType1(dataType);
     var bitEndian = x4.bitEndian$2;
-    return (((io + ":read_bits_int_") + bitEndian.toSuffix__T()) + "(1)")
+    return (((io + ":read_bits_int_") + bitEndian.toSuffix__T()) + "(1) ~= 0")
   } else if ((dataType instanceof $c_Lio_kaitai_struct_datatype_DataType$BitsType)) {
     var x5 = $as_Lio_kaitai_struct_datatype_DataType$BitsType(dataType);
     var width = x5.width$3;
@@ -84918,6 +84558,10 @@ $c_sc_AbstractIterable.prototype.foreach__F1__V = (function(f) {
   var this$1 = this.iterator__sc_Iterator();
   $f_sc_Iterator__foreach__F1__V(this$1, f)
 });
+$c_sc_AbstractIterable.prototype.find__F1__s_Option = (function(p) {
+  var this$1 = this.iterator__sc_Iterator();
+  return $f_sc_Iterator__find__F1__s_Option(this$1, p)
+});
 $c_sc_AbstractIterable.prototype.toStream__sci_Stream = (function() {
   return this.iterator__sc_Iterator().toStream__sci_Stream()
 });
@@ -85278,13 +84922,13 @@ function $h_scm_ArrayOps$ofRef() {
   /*<skip>*/
 }
 $h_scm_ArrayOps$ofRef.prototype = $c_scm_ArrayOps$ofRef.prototype;
-$c_scm_ArrayOps$ofRef.prototype.copyToArray__O__I__V = (function(xs, start) {
-  $f_sc_TraversableOnce__copyToArray__O__I__V(this, xs, start)
-});
 $c_scm_ArrayOps$ofRef.prototype.seq__sc_TraversableOnce = (function() {
   var $$this = this.repr$1;
   return new $c_scm_WrappedArray$ofRef().init___AO($$this)
 });
+$c_scm_ArrayOps$ofRef.prototype.copyToArray__O__I__V = (function(xs, start) {
+  $f_sc_TraversableOnce__copyToArray__O__I__V(this, xs, start)
+});
 $c_scm_ArrayOps$ofRef.prototype.head__O = (function() {
   return $f_sc_IndexedSeqOptimized__head__O(this)
 });
@@ -85345,13 +84989,13 @@ $c_scm_ArrayOps$ofRef.prototype.toVector__sci_Vector = (function() {
   var cbf = $m_sc_IndexedSeq$().ReusableCBF$6;
   return $as_sci_Vector($f_sc_TraversableLike__to__scg_CanBuildFrom__O(this, cbf))
 });
+$c_scm_ArrayOps$ofRef.prototype.toBuffer__scm_Buffer = (function() {
+  return $f_sc_IndexedSeqLike__toBuffer__scm_Buffer(this)
+});
 $c_scm_ArrayOps$ofRef.prototype.size__I = (function() {
   var $$this = this.repr$1;
   return $$this.u.length
 });
-$c_scm_ArrayOps$ofRef.prototype.toBuffer__scm_Buffer = (function() {
-  return $f_sc_IndexedSeqLike__toBuffer__scm_Buffer(this)
-});
 $c_scm_ArrayOps$ofRef.prototype.init___AO = (function(repr) {
   this.repr$1 = repr;
   return this
@@ -85670,33 +85314,33 @@ $c_sc_AbstractSeq.prototype.lengthCompare__I__I = (function(len) {
 $c_sc_AbstractSeq.prototype.indices__sci_Range = (function() {
   return $f_sc_SeqLike__indices__sci_Range(this)
 });
-$c_sc_AbstractSeq.prototype.runWith__F1__F1 = (function(action) {
-  return $f_s_PartialFunction__runWith__F1__F1(this, action)
-});
 $c_sc_AbstractSeq.prototype.isEmpty__Z = (function() {
   return $f_sc_SeqLike__isEmpty__Z(this)
 });
+$c_sc_AbstractSeq.prototype.runWith__F1__F1 = (function(action) {
+  return $f_s_PartialFunction__runWith__F1__F1(this, action)
+});
 $c_sc_AbstractSeq.prototype.equals__O__Z = (function(that) {
   return $f_sc_GenSeqLike__equals__O__Z(this, that)
 });
-$c_sc_AbstractSeq.prototype.toString__T = (function() {
-  return $f_sc_TraversableLike__toString__T(this)
-});
 $c_sc_AbstractSeq.prototype.$$colon$plus__O__scg_CanBuildFrom__O = (function(elem, bf) {
   return $f_sc_SeqLike__$$colon$plus__O__scg_CanBuildFrom__O(this, elem, bf)
 });
+$c_sc_AbstractSeq.prototype.toString__T = (function() {
+  return $f_sc_TraversableLike__toString__T(this)
+});
 $c_sc_AbstractSeq.prototype.size__I = (function() {
   return this.length__I()
 });
 $c_sc_AbstractSeq.prototype.thisCollection__sc_Seq = (function() {
   return this
 });
-$c_sc_AbstractSeq.prototype.applyOrElse__O__F1__O = (function(x, $default) {
-  return $f_s_PartialFunction__applyOrElse__O__F1__O(this, x, $default)
-});
 $c_sc_AbstractSeq.prototype.hashCode__I = (function() {
   return $m_s_util_hashing_MurmurHash3$().seqHash__sc_Seq__I(this.seq__sc_Seq())
 });
+$c_sc_AbstractSeq.prototype.applyOrElse__O__F1__O = (function(x, $default) {
+  return $f_s_PartialFunction__applyOrElse__O__F1__O(this, x, $default)
+});
 function $is_sci_Seq(obj) {
   return (!(!((obj && obj.$classData) && obj.$classData.ancestors.sci_Seq)))
 }
@@ -86425,6 +86069,9 @@ $c_sci_Set$Set1.prototype.iterator__sc_Iterator = (function() {
   var elems = new $c_sjs_js_WrappedArray().init___sjs_js_Array(array);
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(elems, 0, $uI(elems.array$6.length))
 });
+$c_sci_Set$Set1.prototype.find__F1__s_Option = (function(p) {
+  return ($uZ(p.apply__O__O(this.elem1$4)) ? new $c_s_Some().init___O(this.elem1$4) : $m_s_None$())
+});
 $c_sci_Set$Set1.prototype.empty__sc_Set = (function() {
   $m_sci_Set$();
   return $m_sci_Set$EmptySet$()
@@ -86546,6 +86193,9 @@ $c_sci_Set$Set2.prototype.iterator__sc_Iterator = (function() {
   var elems = new $c_sjs_js_WrappedArray().init___sjs_js_Array(array);
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(elems, 0, $uI(elems.array$6.length))
 });
+$c_sci_Set$Set2.prototype.find__F1__s_Option = (function(p) {
+  return ($uZ(p.apply__O__O(this.elem1$4)) ? new $c_s_Some().init___O(this.elem1$4) : ($uZ(p.apply__O__O(this.elem2$4)) ? new $c_s_Some().init___O(this.elem2$4) : $m_s_None$()))
+});
 $c_sci_Set$Set2.prototype.empty__sc_Set = (function() {
   $m_sci_Set$();
   return $m_sci_Set$EmptySet$()
@@ -86670,6 +86320,9 @@ $c_sci_Set$Set3.prototype.iterator__sc_Iterator = (function() {
   var elems = new $c_sjs_js_WrappedArray().init___sjs_js_Array(array);
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(elems, 0, $uI(elems.array$6.length))
 });
+$c_sci_Set$Set3.prototype.find__F1__s_Option = (function(p) {
+  return ($uZ(p.apply__O__O(this.elem1$4)) ? new $c_s_Some().init___O(this.elem1$4) : ($uZ(p.apply__O__O(this.elem2$4)) ? new $c_s_Some().init___O(this.elem2$4) : ($uZ(p.apply__O__O(this.elem3$4)) ? new $c_s_Some().init___O(this.elem3$4) : $m_s_None$())))
+});
 $c_sci_Set$Set3.prototype.empty__sc_Set = (function() {
   $m_sci_Set$();
   return $m_sci_Set$EmptySet$()
@@ -86790,6 +86443,9 @@ $c_sci_Set$Set4.prototype.iterator__sc_Iterator = (function() {
   var elems = new $c_sjs_js_WrappedArray().init___sjs_js_Array(array);
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(elems, 0, $uI(elems.array$6.length))
 });
+$c_sci_Set$Set4.prototype.find__F1__s_Option = (function(p) {
+  return ($uZ(p.apply__O__O(this.elem1$4)) ? new $c_s_Some().init___O(this.elem1$4) : ($uZ(p.apply__O__O(this.elem2$4)) ? new $c_s_Some().init___O(this.elem2$4) : ($uZ(p.apply__O__O(this.elem3$4)) ? new $c_s_Some().init___O(this.elem3$4) : ($uZ(p.apply__O__O(this.elem4$4)) ? new $c_s_Some().init___O(this.elem4$4) : $m_s_None$()))))
+});
 $c_sci_Set$Set4.prototype.empty__sc_Set = (function() {
   $m_sci_Set$();
   return $m_sci_Set$EmptySet$()
@@ -89876,6 +89532,9 @@ $c_sci_Stream.prototype.filterImpl__F1__Z__O = (function(p, isFlipped) {
 $c_sci_Stream.prototype.iterator__sc_Iterator = (function() {
   return new $c_sci_StreamIterator().init___sci_Stream(this)
 });
+$c_sci_Stream.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_LinearSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_sci_Stream.prototype.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O = (function(that, bf) {
   if ((bf.apply__O__scm_Builder(this) instanceof $c_sci_Stream$StreamBuilder)) {
     if (this.isEmpty__Z()) {
@@ -90648,6 +90307,9 @@ $c_sci_List.prototype.slice__I__I__sci_List = (function(from, until) {
   var lo = ((from > 0) ? from : 0);
   return (((until <= lo) || this.isEmpty__Z()) ? $m_sci_Nil$() : this.drop__I__sci_List(lo).take__I__sci_List(((until - lo) | 0)))
 });
+$c_sci_List.prototype.iterator__sc_Iterator = (function() {
+  return new $c_sc_LinearSeqLike$$anon$1().init___sc_LinearSeqLike(this)
+});
 $c_sci_List.prototype.drop__I__sci_List = (function(n) {
   var these = this;
   var count = n;
@@ -90658,8 +90320,8 @@ $c_sci_List.prototype.drop__I__sci_List = (function(n) {
   };
   return these
 });
-$c_sci_List.prototype.iterator__sc_Iterator = (function() {
-  return new $c_sc_LinearSeqLike$$anon$1().init___sc_LinearSeqLike(this)
+$c_sci_List.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_LinearSeqOptimized__find__F1__s_Option(this, p)
 });
 $c_sci_List.prototype.$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O = (function(that, bf) {
   return ((bf === $m_sci_List$().ReusableCBFInstance$2) ? that.seq__sc_TraversableOnce().toList__sci_List().$$colon$colon$colon__sci_List__sci_List(this) : $f_sc_TraversableLike__$$plus$plus__sc_GenTraversableOnce__scg_CanBuildFrom__O(this, that, bf))
@@ -91989,12 +91651,12 @@ $c_sci_WrappedString.prototype.apply__O__O = (function(v1) {
 $c_sci_WrappedString.prototype.exists__F1__Z = (function(p) {
   return $f_sc_IndexedSeqOptimized__exists__F1__Z(this, p)
 });
-$c_sci_WrappedString.prototype.isEmpty__Z = (function() {
-  return $f_sc_IndexedSeqOptimized__isEmpty__Z(this)
-});
 $c_sci_WrappedString.prototype.toList__sci_List = (function() {
   return $f_sc_IndexedSeqOptimized__toList__sci_List(this)
 });
+$c_sci_WrappedString.prototype.isEmpty__Z = (function() {
+  return $f_sc_IndexedSeqOptimized__isEmpty__Z(this)
+});
 $c_sci_WrappedString.prototype.seq__sc_Iterable = (function() {
   return this
 });
@@ -92005,12 +91667,12 @@ $c_sci_WrappedString.prototype.apply__I__C = (function(n) {
   var thiz = this.self$4;
   return (65535 & $uI(thiz.charCodeAt(n)))
 });
-$c_sci_WrappedString.prototype.companion__scg_GenericCompanion = (function() {
-  return $m_sci_IndexedSeq$()
-});
 $c_sci_WrappedString.prototype.toString__T = (function() {
   return this.self$4
 });
+$c_sci_WrappedString.prototype.companion__scg_GenericCompanion = (function() {
+  return $m_sci_IndexedSeq$()
+});
 $c_sci_WrappedString.prototype.foreach__F1__V = (function(f) {
   $f_sc_IndexedSeqOptimized__foreach__F1__V(this, f)
 });
@@ -92039,6 +91701,9 @@ $c_sci_WrappedString.prototype.iterator__sc_Iterator = (function() {
   var thiz = this.self$4;
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(this, 0, $uI(thiz.length))
 });
+$c_sci_WrappedString.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_IndexedSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_sci_WrappedString.prototype.mkString__T = (function() {
   return this.self$4
 });
@@ -92073,14 +91738,11 @@ $c_sci_WrappedString.prototype.init___T = (function(self) {
   this.self$4 = self;
   return this
 });
-$c_sci_WrappedString.prototype.dropRight__I__O = (function(n) {
-  return $f_sc_IndexedSeqOptimized__dropRight__I__O(this, n)
-});
 $c_sci_WrappedString.prototype.takeRight__I__O = (function(n) {
   return $f_sc_IndexedSeqOptimized__takeRight__I__O(this, n)
 });
-$c_sci_WrappedString.prototype.toArray__s_reflect_ClassTag__O = (function(evidence$1) {
-  return $m_sjsr_RuntimeString$().toCharArray__T__AC(this.self$4)
+$c_sci_WrappedString.prototype.dropRight__I__O = (function(n) {
+  return $f_sc_IndexedSeqOptimized__dropRight__I__O(this, n)
 });
 $c_sci_WrappedString.prototype.slice__I__I__sci_WrappedString = (function(from, until) {
   var start = ((from < 0) ? 0 : from);
@@ -92103,6 +91765,9 @@ $c_sci_WrappedString.prototype.slice__I__I__sci_WrappedString = (function(from,
   var thiz$3 = $m_s_Predef$().unwrapString__sci_WrappedString__T(this);
   return new $c_sci_WrappedString().init___T($as_T(thiz$3.substring(start, end)))
 });
+$c_sci_WrappedString.prototype.toArray__s_reflect_ClassTag__O = (function(evidence$1) {
+  return $m_sjsr_RuntimeString$().toCharArray__T__AC(this.self$4)
+});
 $c_sci_WrappedString.prototype.reduceLeft__F2__O = (function(op) {
   return $f_sc_IndexedSeqOptimized__reduceLeft__F2__O(this, op)
 });
@@ -93306,6 +92971,9 @@ $c_scm_WrappedArray.prototype.seq__scm_Seq = (function() {
 $c_scm_WrappedArray.prototype.iterator__sc_Iterator = (function() {
   return new $c_sc_IndexedSeqLike$Elements().init___sc_IndexedSeqLike__I__I(this, 0, this.length__I())
 });
+$c_scm_WrappedArray.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_IndexedSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_scm_WrappedArray.prototype.seq__sc_Seq = (function() {
   return this
 });
@@ -93349,19 +93017,6 @@ $c_scm_WrappedArray.prototype.stringPrefix__T = (function() {
   return "WrappedArray"
 });
 /** @constructor */
-function $c_sc_convert_Wrappers$JMapWrapper() {
-  /*<skip>*/
-}
-function $as_sc_convert_Wrappers$JMapWrapper(obj) {
-  return (((obj instanceof $c_sc_convert_Wrappers$JMapWrapper) || (obj === null)) ? obj : $throwClassCastException(obj, "scala.collection.convert.Wrappers$JMapWrapper"))
-}
-function $isArrayOf_sc_convert_Wrappers$JMapWrapper(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.sc_convert_Wrappers$JMapWrapper)))
-}
-function $asArrayOf_sc_convert_Wrappers$JMapWrapper(obj, depth) {
-  return (($isArrayOf_sc_convert_Wrappers$JMapWrapper(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lscala.collection.convert.Wrappers$JMapWrapper;", depth))
-}
-/** @constructor */
 function $c_scm_ArraySeq() {
   $c_scm_AbstractSeq.call(this);
   this.length$5 = 0;
@@ -93441,6 +93096,9 @@ $c_scm_ArraySeq.prototype.iterator__sc_Iterator = (function() {
 $c_scm_ArraySeq.prototype.seq__scm_Seq = (function() {
   return this
 });
+$c_scm_ArraySeq.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_IndexedSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_scm_ArraySeq.prototype.init___I = (function(length) {
   this.length$5 = length;
   this.array$5 = $newArrayObject($d_O.getArrayOf(), [length]);
@@ -93477,12 +93135,12 @@ $c_scm_ArraySeq.prototype.copyToArray__O__I__I__V = (function(xs, start, len) {
 $c_scm_ArraySeq.prototype.hashCode__I = (function() {
   return $m_s_util_hashing_MurmurHash3$().seqHash__sc_Seq__I(this)
 });
-$c_scm_ArraySeq.prototype.takeRight__I__O = (function(n) {
-  return $f_sc_IndexedSeqOptimized__takeRight__I__O(this, n)
-});
 $c_scm_ArraySeq.prototype.dropRight__I__O = (function(n) {
   return $f_sc_IndexedSeqOptimized__dropRight__I__O(this, n)
 });
+$c_scm_ArraySeq.prototype.takeRight__I__O = (function(n) {
+  return $f_sc_IndexedSeqOptimized__takeRight__I__O(this, n)
+});
 $c_scm_ArraySeq.prototype.reduceLeft__F2__O = (function(op) {
   return $f_sc_IndexedSeqOptimized__reduceLeft__F2__O(this, op)
 });
@@ -95194,6 +94852,10 @@ function $h_scm_ListBuffer() {
   /*<skip>*/
 }
 $h_scm_ListBuffer.prototype = $c_scm_ListBuffer.prototype;
+$c_scm_ListBuffer.prototype.copyToArray__O__I__V = (function(xs, start) {
+  var this$1 = this.scala$collection$mutable$ListBuffer$$start$6;
+  $f_sc_TraversableOnce__copyToArray__O__I__V(this$1, xs, start)
+});
 $c_scm_ListBuffer.prototype.copy__p6__V = (function() {
   if (this.isEmpty__Z()) {
     return (void 0)
@@ -95208,10 +94870,6 @@ $c_scm_ListBuffer.prototype.copy__p6__V = (function() {
     cursor = this$2.tail__sci_List()
   }
 });
-$c_scm_ListBuffer.prototype.copyToArray__O__I__V = (function(xs, start) {
-  var this$1 = this.scala$collection$mutable$ListBuffer$$start$6;
-  $f_sc_TraversableOnce__copyToArray__O__I__V(this$1, xs, start)
-});
 $c_scm_ListBuffer.prototype.head__O = (function() {
   return this.scala$collection$mutable$ListBuffer$$start$6.head__O()
 });
@@ -95323,6 +94981,10 @@ $c_scm_ListBuffer.prototype.iterator__sc_Iterator = (function() {
 $c_scm_ListBuffer.prototype.sizeHintBounded__I__sc_TraversableLike__V = (function(size, boundingColl) {
   $f_scm_Builder__sizeHintBounded__I__sc_TraversableLike__V(this, size, boundingColl)
 });
+$c_scm_ListBuffer.prototype.find__F1__s_Option = (function(p) {
+  var this$1 = this.scala$collection$mutable$ListBuffer$$start$6;
+  return $f_sc_LinearSeqOptimized__find__F1__s_Option(this$1, p)
+});
 $c_scm_ListBuffer.prototype.mkString__T = (function() {
   var this$1 = this.scala$collection$mutable$ListBuffer$$start$6;
   return $f_sc_TraversableOnce__mkString__T__T__T__T(this$1, "", "", "")
@@ -95619,6 +95281,9 @@ $c_scm_StringBuilder.prototype.seq__scm_Seq = (function() {
 $c_scm_StringBuilder.prototype.sizeHintBounded__I__sc_TraversableLike__V = (function(size, boundingColl) {
   $f_scm_Builder__sizeHintBounded__I__sc_TraversableLike__V(this, size, boundingColl)
 });
+$c_scm_StringBuilder.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_IndexedSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_scm_StringBuilder.prototype.init___I__T = (function(initCapacity, initValue) {
   var this$2 = new $c_jl_StringBuilder().init___I((($uI(initValue.length) + initCapacity) | 0));
   this$2.java$lang$StringBuilder$$content$f = (("" + this$2.java$lang$StringBuilder$$content$f) + initValue);
@@ -95675,12 +95340,12 @@ $c_scm_StringBuilder.prototype.copyToArray__O__I__I__V = (function(xs, start, le
 $c_scm_StringBuilder.prototype.hashCode__I = (function() {
   return $m_s_util_hashing_MurmurHash3$().seqHash__sc_Seq__I(this)
 });
-$c_scm_StringBuilder.prototype.takeRight__I__O = (function(n) {
-  return $f_sc_IndexedSeqOptimized__takeRight__I__O(this, n)
-});
 $c_scm_StringBuilder.prototype.dropRight__I__O = (function(n) {
   return $f_sc_IndexedSeqOptimized__dropRight__I__O(this, n)
 });
+$c_scm_StringBuilder.prototype.takeRight__I__O = (function(n) {
+  return $f_sc_IndexedSeqOptimized__takeRight__I__O(this, n)
+});
 $c_scm_StringBuilder.prototype.toArray__s_reflect_ClassTag__O = (function(evidence$1) {
   return $m_sjsr_RuntimeString$().toCharArray__T__AC(this.underlying$5.java$lang$StringBuilder$$content$f)
 });
@@ -95846,6 +95511,9 @@ $c_sjs_js_WrappedArray.prototype.seq__scm_Seq = (function() {
 $c_sjs_js_WrappedArray.prototype.sizeHintBounded__I__sc_TraversableLike__V = (function(size, boundingColl) {
   $f_scm_Builder__sizeHintBounded__I__sc_TraversableLike__V(this, size, boundingColl)
 });
+$c_sjs_js_WrappedArray.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_IndexedSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_sjs_js_WrappedArray.prototype.length__I = (function() {
   return $uI(this.array$6.length)
 });
@@ -96060,6 +95728,9 @@ $c_scm_ArrayBuffer.prototype.seq__scm_Seq = (function() {
 $c_scm_ArrayBuffer.prototype.sizeHintBounded__I__sc_TraversableLike__V = (function(size, boundingColl) {
   $f_scm_Builder__sizeHintBounded__I__sc_TraversableLike__V(this, size, boundingColl)
 });
+$c_scm_ArrayBuffer.prototype.find__F1__s_Option = (function(p) {
+  return $f_sc_IndexedSeqOptimized__find__F1__s_Option(this, p)
+});
 $c_scm_ArrayBuffer.prototype.init___I = (function(initialSize) {
   this.initialSize$6 = initialSize;
   $f_scm_ResizableArray__$$init$__V(this);