Regen master kaitai-io/kaitai_struct@a8afea8

kaitai-io · Aug 7, 2024 · 3245b96 · 3245b96
1 parent bd5f309
commit 3245b96
Show file tree

Hide file tree

Showing 440 changed files with 9,865 additions and 893 deletions.
diff --git a/compiled/construct/bytes_pad_term.py b/compiled/construct/bytes_pad_term.py
@@ -3,9 +3,9 @@
 
 bytes_pad_term = Struct(
 	'str_pad' / FixedSized(20, NullStripped(GreedyBytes, pad=b'\x40')),
-	'str_term' / FixedSized(20, NullTerminated(GreedyBytes, term=b'\x40', include=False)),
-	'str_term_and_pad' / FixedSized(20, NullStripped(NullTerminated(GreedyBytes, term=b'\x40', include=False), pad=b'\x2B')),
-	'str_term_include' / FixedSized(20, NullTerminated(GreedyBytes, term=b'\x40', include=True)),
+	'str_term' / FixedSized(20, NullTerminated(GreedyBytes, term=b"\x40", include=False)),
+	'str_term_and_pad' / FixedSized(20, NullStripped(NullTerminated(GreedyBytes, term=b"\x40", include=False), pad=b'\x2B')),
+	'str_term_include' / FixedSized(20, NullTerminated(GreedyBytes, term=b"\x40", include=True)),
 )
 
 _schema = bytes_pad_term
diff --git a/compiled/construct/cast_nested.py b/compiled/construct/cast_nested.py
@@ -6,7 +6,7 @@
 )
 
 cast_nested__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 cast_nested__opcode = Struct(

diff --git a/compiled/construct/combine_bytes.py b/compiled/construct/combine_bytes.py
@@ -2,7 +2,7 @@
 from construct.lib import *
 
 combine_bytes = Struct(
-	'bytes_term' / NullTerminated(GreedyBytes, term=b'\x7C', include=False, consume=True),
+	'bytes_term' / NullTerminated(GreedyBytes, term=b"\x7C", include=False, consume=True),
 	'bytes_limit' / FixedSized(4, GreedyBytes),
 	'bytes_eos' / GreedyBytes,
 	'bytes_calc' / Computed(lambda this: b"\x52\x6E\x44"),

diff --git a/compiled/construct/combine_str.py b/compiled/construct/combine_str.py
@@ -2,7 +2,7 @@
 from construct.lib import *
 
 combine_str = Struct(
-	'str_term' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x7C', include=False, consume=True),
+	'str_term' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x7C", include=False, consume=True),
 	'str_limit' / FixedSized(4, GreedyString(encoding='ASCII')),
 	'str_eos' / GreedyString(encoding='ASCII'),
 	'calc_bytes' / Computed(lambda this: b"\x62\x61\x7A"),

diff --git a/compiled/construct/expr_array.py b/compiled/construct/expr_array.py
@@ -4,7 +4,7 @@
 expr_array = Struct(
 	'aint' / Array(4, Int32ul),
 	'afloat' / Array(3, Float64l),
-	'astr' / Array(3, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True)),
+	'astr' / Array(3, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True)),
 	'afloat_first' / Computed(lambda this: this.afloat[0]),
 	'afloat_last' / Computed(lambda this: this.afloat[-1]),
 	'afloat_max' / Computed(lambda this: max(this.afloat)),

diff --git a/compiled/construct/expr_io_pos.py b/compiled/construct/expr_io_pos.py
@@ -2,7 +2,7 @@
 from construct.lib import *
 
 expr_io_pos__all_plus_number = Struct(
-	'my_str' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
+	'my_str' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
 	'body' / FixedSized((stream_size(_io) - stream_tell(_io)) - 2, GreedyBytes),
 	'number' / Int16ul,
 )

diff --git a/compiled/construct/instance_io_user.py b/compiled/construct/instance_io_user.py
@@ -4,11 +4,11 @@
 instance_io_user__entry = Struct(
 	'name_ofs' / Int32ul,
 	'value' / Int32ul,
-	'name' / Pointer(this.name_ofs, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True)),
+	'name' / Pointer(this.name_ofs, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True)),
 )
 
 instance_io_user__strings_obj = Struct(
-	'str' / GreedyRange(NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True)),
+	'str' / GreedyRange(NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True)),
 )
 
 instance_io_user = Struct(

diff --git a/compiled/construct/nav_parent_vs_value_inst.py b/compiled/construct/nav_parent_vs_value_inst.py
@@ -6,7 +6,7 @@
 )
 
 nav_parent_vs_value_inst = Struct(
-	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=True),
+	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=True),
 	'child' / LazyBound(lambda: nav_parent_vs_value_inst__child_obj),
 )
 

diff --git a/compiled/construct/opaque_external_type_02_child.py b/compiled/construct/opaque_external_type_02_child.py
@@ -2,12 +2,12 @@
 from construct.lib import *
 
 opaque_external_type_02_child__opaque_external_type_02_child_child = Struct(
-	's3' / If(this._root.some_method, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=True, consume=True)),
+	's3' / If(this._root.some_method, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=True, consume=True)),
 )
 
 opaque_external_type_02_child = Struct(
-	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=True),
-	's2' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=False),
+	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=True),
+	's2' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=False),
 	's3' / LazyBound(lambda: opaque_external_type_02_child__opaque_external_type_02_child_child),
 	'some_method' / Computed(lambda this: True),
 )

diff --git a/compiled/construct/position_abs.py b/compiled/construct/position_abs.py
@@ -2,7 +2,7 @@
 from construct.lib import *
 
 position_abs__index_obj = Struct(
-	'entry' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
+	'entry' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
 )
 
 position_abs = Struct(

diff --git a/compiled/construct/repeat_n_strz.py b/compiled/construct/repeat_n_strz.py
@@ -3,7 +3,7 @@
 
 repeat_n_strz = Struct(
 	'qty' / Int32ul,
-	'lines' / Array(this.qty, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True)),
+	'lines' / Array(this.qty, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True)),
 )
 
 _schema = repeat_n_strz
diff --git a/compiled/construct/repeat_n_strz_double.py b/compiled/construct/repeat_n_strz_double.py
@@ -3,8 +3,8 @@
 
 repeat_n_strz_double = Struct(
 	'qty' / Int32ul,
-	'lines1' / Array(this.qty // 2, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True)),
-	'lines2' / Array(this.qty // 2, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True)),
+	'lines1' / Array(this.qty // 2, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True)),
+	'lines2' / Array(this.qty // 2, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True)),
 )
 
 _schema = repeat_n_strz_double
diff --git a/compiled/construct/repeat_until_s4.py b/compiled/construct/repeat_until_s4.py
@@ -3,7 +3,7 @@
 
 repeat_until_s4 = Struct(
 	'entries' / RepeatUntil(lambda obj_, list_, this: obj_ == -1, Int32sl),
-	'afterall' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'afterall' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 _schema = repeat_until_s4
diff --git a/compiled/construct/str_pad_term.py b/compiled/construct/str_pad_term.py
@@ -3,9 +3,9 @@
 
 str_pad_term = Struct(
 	'str_pad' / FixedSized(20, NullStripped(GreedyString(encoding='UTF-8'), pad=b'\x40')),
-	'str_term' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=False)),
-	'str_term_and_pad' / FixedSized(20, NullStripped(NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=False), pad=b'\x2B')),
-	'str_term_include' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=True)),
+	'str_term' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=False)),
+	'str_term_and_pad' / FixedSized(20, NullStripped(NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=False), pad=b'\x2B')),
+	'str_term_include' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=True)),
 )
 
 _schema = str_pad_term
diff --git a/compiled/construct/str_pad_term_empty.py b/compiled/construct/str_pad_term_empty.py
@@ -3,9 +3,9 @@
 
 str_pad_term_empty = Struct(
 	'str_pad' / FixedSized(20, NullStripped(GreedyString(encoding='UTF-8'), pad=b'\x40')),
-	'str_term' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=False)),
-	'str_term_and_pad' / FixedSized(20, NullStripped(NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=False), pad=b'\x2B')),
-	'str_term_include' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=True)),
+	'str_term' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=False)),
+	'str_term_and_pad' / FixedSized(20, NullStripped(NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=False), pad=b'\x2B')),
+	'str_term_include' / FixedSized(20, NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=True)),
 )
 
 _schema = str_pad_term_empty
diff --git a/compiled/construct/str_pad_term_utf16.py b/compiled/construct/str_pad_term_utf16.py
@@ -0,0 +1,10 @@
+from construct import *
+from construct.lib import *
+
+str_pad_term_utf16 = Struct(
+	'str_term' / FixedSized(10, NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False)),
+	'str_term_include' / FixedSized(10, NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=True)),
+	'str_term_and_pad' / FixedSized(9, NullStripped(NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False), pad=b'\x2B')),
+)
+
+_schema = str_pad_term_utf16
diff --git a/compiled/construct/switch_bytearray.py b/compiled/construct/switch_bytearray.py
@@ -6,7 +6,7 @@
 )
 
 switch_bytearray__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_bytearray__opcode = Struct(

diff --git a/compiled/construct/switch_cast.py b/compiled/construct/switch_cast.py
@@ -11,7 +11,7 @@
 )
 
 switch_cast__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_cast = Struct(

diff --git a/compiled/construct/switch_manual_enum.py b/compiled/construct/switch_manual_enum.py
@@ -11,7 +11,7 @@ class switch_manual_enum__opcode__code_enum(enum.IntEnum):
 )
 
 switch_manual_enum__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_enum__opcode = Struct(

diff --git a/compiled/construct/switch_manual_enum_invalid.py b/compiled/construct/switch_manual_enum_invalid.py
@@ -11,7 +11,7 @@ class switch_manual_enum_invalid__opcode__code_enum(enum.IntEnum):
 )
 
 switch_manual_enum_invalid__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_enum_invalid__opcode = Struct(

diff --git a/compiled/construct/switch_manual_enum_invalid_else.py b/compiled/construct/switch_manual_enum_invalid_else.py
@@ -15,7 +15,7 @@ class switch_manual_enum_invalid_else__opcode__code_enum(enum.IntEnum):
 )
 
 switch_manual_enum_invalid_else__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_enum_invalid_else__opcode = Struct(

diff --git a/compiled/construct/switch_manual_int.py b/compiled/construct/switch_manual_int.py
@@ -6,7 +6,7 @@
 )
 
 switch_manual_int__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_int__opcode = Struct(

diff --git a/compiled/construct/switch_manual_int_else.py b/compiled/construct/switch_manual_int_else.py
@@ -10,7 +10,7 @@
 )
 
 switch_manual_int_else__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_int_else__opcode = Struct(

diff --git a/compiled/construct/switch_manual_int_size.py b/compiled/construct/switch_manual_int_size.py
@@ -6,8 +6,8 @@
 )
 
 switch_manual_int_size__chunk__chunk_meta = Struct(
-	'title' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
-	'author' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
+	'title' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
+	'author' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_int_size__chunk = Struct(

diff --git a/compiled/construct/switch_manual_int_size_else.py b/compiled/construct/switch_manual_int_size_else.py
@@ -6,8 +6,8 @@
 )
 
 switch_manual_int_size_else__chunk__chunk_meta = Struct(
-	'title' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
-	'author' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
+	'title' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
+	'author' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_int_size_else__chunk__dummy = Struct(

diff --git a/compiled/construct/switch_manual_int_size_eos.py b/compiled/construct/switch_manual_int_size_eos.py
@@ -12,8 +12,8 @@
 )
 
 switch_manual_int_size_eos__chunk_body__chunk_meta = Struct(
-	'title' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
-	'author' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
+	'title' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
+	'author' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_int_size_eos__chunk_body = Struct(

diff --git a/compiled/construct/switch_manual_str.py b/compiled/construct/switch_manual_str.py
@@ -6,7 +6,7 @@
 )
 
 switch_manual_str__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_str__opcode = Struct(

diff --git a/compiled/construct/switch_manual_str_else.py b/compiled/construct/switch_manual_str_else.py
@@ -10,7 +10,7 @@
 )
 
 switch_manual_str_else__opcode__strval = Struct(
-	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b'\x00', include=False, consume=True),
+	'value' / NullTerminated(GreedyString(encoding='ASCII'), term=b"\x00", include=False, consume=True),
 )
 
 switch_manual_str_else__opcode = Struct(

diff --git a/compiled/construct/term_bytes.py b/compiled/construct/term_bytes.py
@@ -2,9 +2,9 @@
 from construct.lib import *
 
 term_bytes = Struct(
-	's1' / NullTerminated(GreedyBytes, term=b'\x7C', include=False, consume=True),
-	's2' / NullTerminated(GreedyBytes, term=b'\x7C', include=False, consume=False),
-	's3' / NullTerminated(GreedyBytes, term=b'\x40', include=True, consume=True),
+	's1' / NullTerminated(GreedyBytes, term=b"\x7C", include=False, consume=True),
+	's2' / NullTerminated(GreedyBytes, term=b"\x7C", include=False, consume=False),
+	's3' / NullTerminated(GreedyBytes, term=b"\x40", include=True, consume=True),
 )
 
 _schema = term_bytes
diff --git a/compiled/construct/term_strz.py b/compiled/construct/term_strz.py
@@ -2,9 +2,9 @@
 from construct.lib import *
 
 term_strz = Struct(
-	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=True),
-	's2' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=False),
-	's3' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x40', include=True, consume=True),
+	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=True),
+	's2' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=False),
+	's3' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x40", include=True, consume=True),
 )
 
 _schema = term_strz
diff --git a/compiled/construct/term_strz_utf16_v1.py b/compiled/construct/term_strz_utf16_v1.py
@@ -0,0 +1,11 @@
+from construct import *
+from construct.lib import *
+
+term_strz_utf16_v1 = Struct(
+	's1' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=True),
+	's2' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=False),
+	'term' / Int16ul,
+	's3' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=True, consume=True),
+)
+
+_schema = term_strz_utf16_v1
diff --git a/compiled/construct/term_strz_utf16_v2.py b/compiled/construct/term_strz_utf16_v2.py
@@ -0,0 +1,10 @@
+from construct import *
+from construct.lib import *
+
+term_strz_utf16_v2 = Struct(
+	's1' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=True),
+	's2' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=True, consume=True),
+	's3' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=False),
+)
+
+_schema = term_strz_utf16_v2
diff --git a/compiled/construct/term_strz_utf16_v3.py b/compiled/construct/term_strz_utf16_v3.py
@@ -0,0 +1,11 @@
+from construct import *
+from construct.lib import *
+
+term_strz_utf16_v3 = Struct(
+	's1' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=False),
+	'term' / Int16ul,
+	's2' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=False),
+	's3' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=True),
+)
+
+_schema = term_strz_utf16_v3
diff --git a/compiled/construct/term_strz_utf16_v4.py b/compiled/construct/term_strz_utf16_v4.py
@@ -0,0 +1,24 @@
+from construct import *
+from construct.lib import *
+
+term_strz_utf16_v4__s1_type = Struct(
+	'value' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=True),
+)
+
+term_strz_utf16_v4__s2_type = Struct(
+	'value' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=False, consume=False),
+)
+
+term_strz_utf16_v4__s3_type = Struct(
+	'value' / NullTerminated(GreedyString(encoding='UTF-16LE'), term=b"\x00\x00", include=True, consume=True),
+)
+
+term_strz_utf16_v4 = Struct(
+	's1' / FixedSized(6, LazyBound(lambda: term_strz_utf16_v4__s1_type)),
+	'skip_term1' / FixedSized(2, GreedyBytes),
+	's2' / FixedSized(6, LazyBound(lambda: term_strz_utf16_v4__s2_type)),
+	'skip_term2' / FixedSized(2, GreedyBytes),
+	's3' / FixedSized(6, LazyBound(lambda: term_strz_utf16_v4__s3_type)),
+)
+
+_schema = term_strz_utf16_v4
diff --git a/compiled/construct/term_u1_val.py b/compiled/construct/term_u1_val.py
@@ -2,8 +2,8 @@
 from construct.lib import *
 
 term_u1_val = Struct(
-	'foo' / NullTerminated(GreedyBytes, term=b'\xE3', include=False, consume=False),
-	'bar' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\xAB', include=True, consume=True),
+	'foo' / NullTerminated(GreedyBytes, term=b"\xE3", include=False, consume=False),
+	'bar' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\xAB", include=True, consume=True),
 )
 
 _schema = term_u1_val
diff --git a/compiled/construct/to_string_custom.py b/compiled/construct/to_string_custom.py
@@ -2,8 +2,8 @@
 from construct.lib import *
 
 to_string_custom = Struct(
-	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=True),
-	's2' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x7C', include=False, consume=True),
+	's1' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=True),
+	's2' / NullTerminated(GreedyString(encoding='UTF-8'), term=b"\x7C", include=False, consume=True),
 )
 
 _schema = to_string_custom