kaitai-struct-compiler 0.10.0-SNAPSHOT20220617.120542.c053fb7d → 0.10.0-SNAPSHOT20220621.211648.0a3dcbfb

package/kaitai-struct-compiler.js

@@ -4430,9 +4430,9 @@ function $h_Lio_kaitai_struct_Version$() {
 $h_Lio_kaitai_struct_Version$.prototype = $c_Lio_kaitai_struct_Version$.prototype;
 $c_Lio_kaitai_struct_Version$.prototype.init___ = (function() {
   this.name$1 = "kaitai-struct-compiler-js";
-  this.version$1 = "0.10-SNAPSHOT20220617.120542.c053fb7d";
-  this.gitCommit$1 = "c053fb7d";
-  this.gitTime$1 = "2022-06-17T12:05:42+00:00";
+  this.version$1 = "0.10-SNAPSHOT20220621.211648.0a3dcbfb";
+  this.gitCommit$1 = "0a3dcbfb";
+  this.gitTime$1 = "2022-06-21T21:16:48+00:00";
   return this
 });
 var $d_Lio_kaitai_struct_Version$ = new $TypeData().initClass({
@@ -28030,85 +28030,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 +28150,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 +28167,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 +28214,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 +28230,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 +28258,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 +28335,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) {
@@ -63129,9 +63070,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 +63323,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 +63334,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 +67358,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 +67379,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 +67401,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 +67480,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 +67500,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 +67542,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 +67561,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 +67575,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 +67620,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 +67661,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 +70913,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)
 });
@@ -79992,8 +79940,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 +80157,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;

package/package.json

@@ -35,5 +35,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "0.10.0-SNAPSHOT20220617.120542.c053fb7d"
+  "version": "0.10.0-SNAPSHOT20220621.211648.0a3dcbfb"
 }