kaitai-struct-compiler 0.11.0-SNAPSHOT20240401.112327.fda00d3 → 0.11.0-SNAPSHOT20240403.134844.751f059

package/kaitai-struct-compiler.js

@@ -3010,8 +3010,8 @@ function $m_Lio_kaitai_struct_Utils$() {
 function $c_Lio_kaitai_struct_Version$() {
   this.Lio_kaitai_struct_Version$__f_version = null;
   this.Lio_kaitai_struct_Version$__f_gitTime = null;
-  this.Lio_kaitai_struct_Version$__f_version = "0.11-SNAPSHOT20240401.112327.fda00d3";
-  this.Lio_kaitai_struct_Version$__f_gitTime = "2024-04-01T11:23:27+00:00"
+  this.Lio_kaitai_struct_Version$__f_version = "0.11-SNAPSHOT20240403.134844.751f059";
+  this.Lio_kaitai_struct_Version$__f_gitTime = "2024-04-03T13:48:44+00:00"
 }
 $c_Lio_kaitai_struct_Version$.prototype = new $h_O();
 $c_Lio_kaitai_struct_Version$.prototype.constructor = $c_Lio_kaitai_struct_Version$;
@@ -44365,16 +44365,11 @@ $c_Lio_kaitai_struct_languages_CppCompiler$.prototype.kaitaiType2NativeType__Lio
       if ((x$21 === x1$2)) {
         return (typeStr + "*")
       } else {
-        var x$23 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
+        var x$23 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
         if ((x$23 === x1$2)) {
-          return (("std::shared_ptr<" + typeStr) + ">")
+          return ($n(x60).isOwning__Z() ? (("std::unique_ptr<" + typeStr) + ">") : (typeStr + "*"))
         } else {
-          var x$25 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-          if ((x$25 === x1$2)) {
-            return ($n(x60).isOwning__Z() ? (("std::unique_ptr<" + typeStr) + ">") : (typeStr + "*"))
-          } else {
-            throw new $c_s_MatchError(x1$2)
-          }
+          throw new $c_s_MatchError(x1$2)
         }
       }
     };
@@ -44387,12 +44382,12 @@ $c_Lio_kaitai_struct_languages_CppCompiler$.prototype.kaitaiType2NativeType__Lio
       var this$1 = $n(x62);
       var inType = this$1.Lio_kaitai_struct_datatype_DataType$ArrayType__f_elType;
       var x1$3 = $n(config).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-      var x$27 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-      if ((x$27 === x1$3)) {
+      var x$25 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
+      if ((x$25 === x1$3)) {
         return (("std::vector<" + this.kaitaiType2NativeType__Lio_kaitai_struct_CppRuntimeConfig__Lio_kaitai_struct_datatype_DataType__Z__T(config, inType, absolute)) + ">*")
       } else {
-        var x$29 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-        if ((x$29 === x1$3)) {
+        var x$27 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
+        if ((x$27 === x1$3)) {
           return (("std::unique_ptr<std::vector<" + this.kaitaiType2NativeType__Lio_kaitai_struct_CppRuntimeConfig__Lio_kaitai_struct_datatype_DataType__Z__T(config, inType, absolute)) + ">>")
         } else {
           throw new $c_s_MatchError(x1$3)
@@ -44405,63 +44400,42 @@ $c_Lio_kaitai_struct_languages_CppCompiler$.prototype.kaitaiType2NativeType__Lio
       var inType$2 = this$2.Lio_kaitai_struct_datatype_DataType$ArrayType__f_elType;
       return (("std::vector<" + this.kaitaiType2NativeType__Lio_kaitai_struct_CppRuntimeConfig__Lio_kaitai_struct_datatype_DataType__Z__T(config, inType$2, absolute)) + ">*")
     };
-    var x$31 = $m_Lio_kaitai_struct_datatype_DataType$OwnedKaitaiStreamType$();
-    if ((x$31 === x1)) {
+    var x$29 = $m_Lio_kaitai_struct_datatype_DataType$OwnedKaitaiStreamType$();
+    if ((x$29 === x1)) {
       var x1$4 = $n(config).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-      var x$33 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-      if ((x$33 === x1$4)) {
+      var x$31 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
+      if ((x$31 === x1$4)) {
         return "kaitai::kstream*"
       } else {
-        var x$35 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-        if ((x$35 === x1$4)) {
+        var x$33 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
+        if ((x$33 === x1$4)) {
           return "std::unique_ptr<kaitai::kstream>"
         } else {
           throw new $c_s_MatchError(x1$4)
         }
       }
     };
-    var x$37 = $m_Lio_kaitai_struct_datatype_DataType$KaitaiStreamType$();
-    if ((x$37 === x1)) {
+    var x$35 = $m_Lio_kaitai_struct_datatype_DataType$KaitaiStreamType$();
+    if ((x$35 === x1)) {
       return "kaitai::kstream*"
     };
-    var x$39 = $m_Lio_kaitai_struct_datatype_DataType$KaitaiStructType$();
-    if ((x$39 === x1)) {
+    var x$37 = $m_Lio_kaitai_struct_datatype_DataType$KaitaiStructType$();
+    if ((x$37 === x1)) {
       var x1$5 = $n(config).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-      var x$41 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-      if ((x$41 === x1$5)) {
+      var x$39 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
+      if ((x$39 === x1$5)) {
         return "kaitai::kstruct*"
       } else {
-        var x$43 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-        if ((x$43 === x1$5)) {
-          return "std::shared_ptr<kaitai::kstruct>"
+        var x$41 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
+        if ((x$41 === x1$5)) {
+          return "std::unique_ptr<kaitai::kstruct>"
         } else {
-          var x$45 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-          if ((x$45 === x1$5)) {
-            return "std::unique_ptr<kaitai::kstruct>"
-          } else {
-            throw new $c_s_MatchError(x1$5)
-          }
+          throw new $c_s_MatchError(x1$5)
         }
       }
     };
     if ((x1 instanceof $c_Lio_kaitai_struct_datatype_DataType$CalcKaitaiStructType)) {
-      var x1$6 = $n(config).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-      var x$47 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-      if ((x$47 === x1$6)) {
-        return "kaitai::kstruct*"
-      } else {
-        var x$49 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-        if ((x$49 === x1$6)) {
-          return "std::shared_ptr<kaitai::kstruct>"
-        } else {
-          var x$51 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-          if ((x$51 === x1$6)) {
-            return "kaitai::kstruct*"
-          } else {
-            throw new $c_s_MatchError(x1$6)
-          }
-        }
-      }
+      return "kaitai::kstruct*"
     };
     if ((x1 instanceof $c_Lio_kaitai_struct_datatype_DataType$SwitchType)) {
       var x70 = $as_Lio_kaitai_struct_datatype_DataType$SwitchType(x1);
@@ -56313,53 +56287,6 @@ function $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$() {
   return $n_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$
 }
 /** @constructor */
-function $c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$() {
-  /*<skip>*/
-}
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype = new $h_O();
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.constructor = $c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$;
-/** @constructor */
-function $h_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$() {
-  /*<skip>*/
-}
-$h_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype = $c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype;
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.productPrefix__T = (function() {
-  return "SharedPointers"
-});
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.productArity__I = (function() {
-  return 0
-});
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.productElement__I__O = (function(x$1) {
-  return $m_sr_Statics$().ioobe__I__O(x$1)
-});
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.productIterator__sc_Iterator = (function() {
-  return new $c_sr_ScalaRunTime$$anon$1(this)
-});
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.hashCode__I = (function() {
-  return (-1012780677)
-});
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.toString__T = (function() {
-  return "SharedPointers"
-});
-var $d_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$ = new $TypeData().initClass({
-  Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$: 0
-}, false, "io.kaitai.struct.CppRuntimeConfig$SharedPointers$", {
-  Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$: 1,
-  O: 1,
-  Lio_kaitai_struct_CppRuntimeConfig$Pointers: 1,
-  s_Product: 1,
-  s_Equals: 1,
-  Ljava_io_Serializable: 1
-});
-$c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$.prototype.$classData = $d_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$;
-var $n_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$;
-function $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$() {
-  if ((!$n_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$)) {
-    $n_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$ = new $c_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$()
-  };
-  return $n_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$
-}
-/** @constructor */
 function $c_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$() {
   /*<skip>*/
 }
@@ -88396,31 +88323,6 @@ $c_Lio_kaitai_struct_translators_CppTranslator.prototype.doIfExp__Lio_kaitai_str
   return (((((("((" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(condition, 0)) + ") ? (") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(ifTrue, 0)) + ") : (") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(ifFalse, 0)) + "))")
 });
 $c_Lio_kaitai_struct_translators_CppTranslator.prototype.doCast__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__T = (function(value, typeName) {
-  var x1 = $n($n(this.Lio_kaitai_struct_translators_CppTranslator__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-  var x = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-  if ((x === x1)) {
-    var $$x1 = true
-  } else {
-    var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-    var $$x1 = (x$3 === x1)
-  };
-  if ($$x1) {
-    return this.cppStaticCast__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__T(value, typeName)
-  } else {
-    var x$5 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-    if ((x$5 === x1)) {
-      if ((typeName instanceof $c_Lio_kaitai_struct_datatype_DataType$UserType)) {
-        var x2 = $as_Lio_kaitai_struct_datatype_DataType$UserType(typeName);
-        return (((("std::static_pointer_cast<" + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n($as_Lio_kaitai_struct_format_ClassSpec($n($n(x2).Lio_kaitai_struct_datatype_DataType$UserType__f_classSpec).get__O())).Lio_kaitai_struct_format_ClassSpec__f_name)) + ">(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(value, 0)) + ")")
-      } else {
-        return this.cppStaticCast__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__T(value, typeName)
-      }
-    } else {
-      throw new $c_s_MatchError(x1)
-    }
-  }
-});
-$c_Lio_kaitai_struct_translators_CppTranslator.prototype.cppStaticCast__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType__T = (function(value, typeName) {
   return (((("static_cast<" + $m_Lio_kaitai_struct_languages_CppCompiler$().kaitaiType2NativeType__Lio_kaitai_struct_CppRuntimeConfig__Lio_kaitai_struct_datatype_DataType__Z__T($n(this.Lio_kaitai_struct_translators_CppTranslator__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig, typeName, false)) + ">(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__I__T(value, 0)) + ")")
 });
 $c_Lio_kaitai_struct_translators_CppTranslator.prototype.strToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(s, base) {
@@ -90247,18 +90149,12 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.fileHeader__T__V = (functio
   this$4.addLocal__T__V("kaitai/kaitaistruct.h");
   $n(this.Lio_kaitai_struct_languages_CppCompiler__f_importListHdr).addSystem__T__V("stdint.h");
   var x1 = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-  var x = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
+  var x = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
   if ((x === x1)) {
-    var $$x1 = true
-  } else {
-    var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-    var $$x1 = (x$3 === x1)
-  };
-  if ($$x1) {
     $n(this.Lio_kaitai_struct_languages_CppCompiler__f_importListHdr).addSystem__T__V("memory")
   } else {
-    var x$5 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-    if ((!(x$5 === x1))) {
+    var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
+    if ((!(x$3 === x1))) {
       throw new $c_s_MatchError(x1)
     }
   };
@@ -90308,26 +90204,9 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.classHeader__sci_List__V =
   var array = [$as_T($n(name).last__O())];
   var elems = $ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $c_sjsr_WrappedVarArgs(), array);
   var className = $n($$x1).types2class__sci_List__T($m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems));
-  var x1 = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-  var x = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-  if ((x === x1)) {
-    var $$x2 = true
-  } else {
-    var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-    var $$x2 = (x$3 === x1)
-  };
-  if ($$x2) {
-    var extraInherits = ""
-  } else {
-    var x$5 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-    if ((!(x$5 === x1))) {
-      throw new $c_s_MatchError(x1)
-    };
-    var extraInherits = ((", std::enable_shared_from_this<" + className) + ">")
-  };
   var this$5 = $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outHdr);
   $n(this$5.Lio_kaitai_struct_StringLanguageOutputWriter__f_sb).append__T__scm_StringBuilder("\n");
-  $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outHdr).puts__T__V((((("class " + className) + " : public kaitai::kstruct") + extraInherits) + " {"));
+  $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outHdr).puts__T__V((("class " + className) + " : public kaitai::kstruct {"));
   $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outHdr).inc__V();
   this.Lio_kaitai_struct_languages_CppCompiler__f_accessMode = this.PrivateAccess__Lio_kaitai_struct_languages_CppCompiler$PrivateAccess$();
   this.ensureMode__Lio_kaitai_struct_languages_CppCompiler$AccessMode__V(this.PublicAccess__Lio_kaitai_struct_languages_CppCompiler$PublicAccess$())
@@ -90401,70 +90280,37 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.classConstructorHeader__sci
   $n(this$9.Lio_kaitai_struct_StringLanguageOutputWriter__f_sb).append__T__scm_StringBuilder("\n");
   $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outSrc).puts__T__V((((((((((($m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T(name) + "::") + classNameBrief) + "(") + paramsArg) + ((tIo + " ") + pIo)) + ", ") + ((tParent + " ") + pParent)) + ", ") + (((((tRoot + " ") + pRoot) + endianSuffixSrc) + ") : kaitai::kstruct(") + pIo)) + ") {"));
   $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outSrc).inc__V();
-  var x = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-  var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-  if ((x !== null)) {
-    var this$10 = $n(x);
-    var $$x4 = (this$10 === x$3)
-  } else {
-    var $$x4 = false
-  };
-  if ($$x4) {
-    $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outSrc).puts__T__V((((("const auto weakPtrTrick = std::shared_ptr<" + classNameBrief) + ">(this, [](") + classNameBrief) + "*){});"))
-  };
   this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V($m_Lio_kaitai_struct_format_ParentIdentifier$(), pParent);
-  var $$x7 = $m_Lio_kaitai_struct_format_RootIdentifier$();
-  if (((name === null) ? (rootClassName === null) : $n(name).equals__O__Z(rootClassName))) {
-    var x1$2 = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-    var x$6 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-    if ((x$6 === x1$2)) {
-      var $$x6 = true
-    } else {
-      var x$8 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-      var $$x6 = (x$8 === x1$2)
-    };
-    if ($$x6) {
-      var $$x5 = "this"
-    } else {
-      var x$10 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-      if ((!(x$10 === x1$2))) {
-        throw new $c_s_MatchError(x1$2)
-      };
-      var $$x5 = "shared_from_this()"
-    }
-  } else {
-    var $$x5 = pRoot
-  };
-  this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V($$x7, $$x5);
-  var x1$3 = $n($n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_typeProvider).Lio_kaitai_struct_ClassTypeProvider__f_nowClass).Lio_kaitai_struct_format_ClassSpec__f_meta).Lio_kaitai_struct_format_MetaSpec__f_endian;
+  this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V($m_Lio_kaitai_struct_format_RootIdentifier$(), (((name === null) ? (rootClassName === null) : $n(name).equals__O__Z(rootClassName)) ? "this" : pRoot));
+  var x1$2 = $n($n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_typeProvider).Lio_kaitai_struct_ClassTypeProvider__f_nowClass).Lio_kaitai_struct_format_ClassSpec__f_meta).Lio_kaitai_struct_format_MetaSpec__f_endian;
   matchEnd12: {
-    var $$x8;
-    if ((x1$3 instanceof $c_s_Some)) {
-      var x2 = $as_s_Some(x1$3);
+    var $$x4;
+    if ((x1$2 instanceof $c_s_Some)) {
+      var x2 = $as_s_Some(x1$2);
       if (($n(x2).s_Some__f_value instanceof $c_Lio_kaitai_struct_datatype_CalcEndian)) {
-        var $$x8 = true;
+        var $$x4 = true;
         break matchEnd12
       }
     };
-    if ((x1$3 instanceof $c_s_Some)) {
-      var x4 = $as_s_Some(x1$3);
+    if ((x1$2 instanceof $c_s_Some)) {
+      var x4 = $as_s_Some(x1$2);
       var p5 = $as_Lio_kaitai_struct_datatype_Endianness($n(x4).s_Some__f_value);
-      var x$12 = $m_Lio_kaitai_struct_datatype_InheritedEndian$();
-      if ((x$12 === p5)) {
-        var $$x8 = true;
+      var x$4 = $m_Lio_kaitai_struct_datatype_InheritedEndian$();
+      if ((x$4 === p5)) {
+        var $$x4 = true;
         break matchEnd12
       }
     };
-    var $$x8 = false
+    var $$x4 = false
   };
-  if ($$x8) {
+  if ($$x4) {
     this.ensureMode__Lio_kaitai_struct_languages_CppCompiler$AccessMode__V(this.PrivateAccess__Lio_kaitai_struct_languages_CppCompiler$PrivateAccess$());
     $n(this.Lio_kaitai_struct_languages_CppCompiler__f_outHdr).puts__T__V("int m__is_le;");
     this.handleAssignmentSimple__Lio_kaitai_struct_format_Identifier__T__V($m_Lio_kaitai_struct_format_EndianIdentifier$(), (isHybrid ? "p_is_le" : "-1"));
     this.ensureMode__Lio_kaitai_struct_languages_CppCompiler$AccessMode__V(this.PublicAccess__Lio_kaitai_struct_languages_CppCompiler$PublicAccess$())
   };
-  var this$11 = $n(params);
-  var these = this$11;
+  var this$10 = $n(params);
+  var these = this$10;
   while ((!$n(these).isEmpty__Z())) {
     var arg1$2 = $n(these).head__O();
     var p = $as_Lio_kaitai_struct_format_ParamDefSpec(arg1$2);
@@ -91136,59 +90982,37 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.parseExpr__Lio_kaitai_struc
         };
         var x$3 = $m_s_None$();
         if ((x$3 === x1$2)) {
-          var x1$3 = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-          var x$5 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-          if ((x$5 === x1$3)) {
-            var $$x1 = true
-          } else {
-            var x$7 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-            var $$x1 = (x$7 === x1$3)
-          };
-          if ($$x1) {
-            var parent = "this";
-            break matchEnd9
-          } else {
-            var x$9 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-            if ((!(x$9 === x1$3))) {
-              throw new $c_s_MatchError(x1$3)
-            };
-            var parent = "shared_from_this()";
-            break matchEnd9
-          }
+          var parent = "this";
+          break matchEnd9
         };
         throw new $c_s_MatchError(x1$2)
       };
-      var x1$4 = $n($n($as_Lio_kaitai_struct_format_ClassSpec($n($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_classSpec).get__O())).Lio_kaitai_struct_format_ClassSpec__f_meta).Lio_kaitai_struct_format_MetaSpec__f_endian;
-      matchEnd6$2: {
+      var x1$3 = $n($n($as_Lio_kaitai_struct_format_ClassSpec($n($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_classSpec).get__O())).Lio_kaitai_struct_format_ClassSpec__f_meta).Lio_kaitai_struct_format_MetaSpec__f_endian;
+      matchEnd6: {
         var addEndian;
-        if ((x1$4 instanceof $c_s_Some)) {
-          var x2$3 = $as_s_Some(x1$4);
+        if ((x1$3 instanceof $c_s_Some)) {
+          var x2$3 = $as_s_Some(x1$3);
           var p3$2 = $as_Lio_kaitai_struct_datatype_Endianness($n(x2$3).s_Some__f_value);
-          var x$11 = $m_Lio_kaitai_struct_datatype_InheritedEndian$();
-          if ((x$11 === p3$2)) {
+          var x$5 = $m_Lio_kaitai_struct_datatype_InheritedEndian$();
+          if ((x$5 === p3$2)) {
             var addEndian = ", m__is_le";
-            break matchEnd6$2
+            break matchEnd6
           }
         };
         var addEndian = ""
       };
       var addArgs = ((((", " + parent) + ", ") + this.privateMemberName__Lio_kaitai_struct_format_Identifier__T($m_Lio_kaitai_struct_format_RootIdentifier$())) + addEndian)
     };
-    var x1$5 = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
-    var x$13 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
-    if ((x$13 === x1$5)) {
+    var x1$4 = $n($n(this.Lio_kaitai_struct_languages_components_LanguageCompiler__f_config).Lio_kaitai_struct_RuntimeConfig__f_cppConfig).Lio_kaitai_struct_CppRuntimeConfig__f_pointers;
+    var x$7 = $m_Lio_kaitai_struct_CppRuntimeConfig$RawPointers$();
+    if ((x$7 === x1$4)) {
       return (((((("new " + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_name)) + "(") + addParams) + io) + addArgs) + ")")
     } else {
-      var x$15 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
-      if ((x$15 === x1$5)) {
-        return (((((("std::make_shared<" + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_name)) + ">(") + addParams) + io) + addArgs) + ")")
+      var x$9 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
+      if ((x$9 === x1$4)) {
+        return (((((((("std::unique_ptr<" + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_name)) + ">(new ") + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_name)) + "(") + addParams) + io) + addArgs) + "))")
       } else {
-        var x$17 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-        if ((x$17 === x1$5)) {
-          return (((((((("std::unique_ptr<" + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_name)) + ">(new ") + $m_Lio_kaitai_struct_languages_CppCompiler$().types2class__sci_List__T($n(x10).Lio_kaitai_struct_datatype_DataType$UserType__f_name)) + "(") + addParams) + io) + addArgs) + "))")
-        } else {
-          throw new $c_s_MatchError(x1$5)
-        }
+        throw new $c_s_MatchError(x1$4)
       }
     }
   } else {
@@ -91471,14 +91295,8 @@ $c_Lio_kaitai_struct_languages_CppCompiler.prototype.nullPtr__T = (function() {
   if ((x === x1)) {
     return "0"
   } else {
-    var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$SharedPointers$();
+    var x$3 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
     if ((x$3 === x1)) {
-      var $$x1 = true
-    } else {
-      var x$5 = $m_Lio_kaitai_struct_CppRuntimeConfig$UniqueAndRawPointers$();
-      var $$x1 = (x$5 === x1)
-    };
-    if ($$x1) {
       return "nullptr"
     } else {
       throw new $c_s_MatchError(x1)

package/package.json

@@ -35,5 +35,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "0.11.0-SNAPSHOT20240401.112327.fda00d3"
+  "version": "0.11.0-SNAPSHOT20240403.134844.751f059"
 }