Regen master kaitai-io/kaitai_struct@28dd0dd

compiled/construct/bcd_user_type_be.py

@@ -6,50 +6,50 @@
 	'b2' / Int8ub,
 	'b3' / Int8ub,
 	'b4' / Int8ub,
-	'as_int' / Computed(lambda this: ((((((((this.digit8 * 1) + (this.digit7 * 10)) + (this.digit6 * 100)) + (this.digit5 * 1000)) + (this.digit4 * 10000)) + (this.digit3 * 100000)) + (this.digit2 * 1000000)) + (this.digit1 * 10000000))),
-	'as_str' / Computed(lambda this: str(this.digit1) + str(this.digit2) + str(this.digit3) + str(this.digit4) + str(this.digit5) + str(this.digit6) + str(this.digit7) + str(this.digit8)),
-	'digit1' / Computed(lambda this: ((this.b1 & 240) >> 4)),
-	'digit2' / Computed(lambda this: (this.b1 & 15)),
-	'digit3' / Computed(lambda this: ((this.b2 & 240) >> 4)),
-	'digit4' / Computed(lambda this: (this.b2 & 15)),
-	'digit5' / Computed(lambda this: ((this.b3 & 240) >> 4)),
-	'digit6' / Computed(lambda this: (this.b3 & 15)),
-	'digit7' / Computed(lambda this: ((this.b4 & 240) >> 4)),
-	'digit8' / Computed(lambda this: (this.b4 & 15)),
+	'as_int' / Computed(lambda this: ((((((this.digit8 * 1 + this.digit7 * 10) + this.digit6 * 100) + this.digit5 * 1000) + this.digit4 * 10000) + this.digit3 * 100000) + this.digit2 * 1000000) + this.digit1 * 10000000),
+	'as_str' / Computed(lambda this: ((((((str(this.digit1) + str(this.digit2)) + str(this.digit3)) + str(this.digit4)) + str(this.digit5)) + str(this.digit6)) + str(this.digit7)) + str(this.digit8)),
+	'digit1' / Computed(lambda this: (this.b1 & 240) >> 4),
+	'digit2' / Computed(lambda this: this.b1 & 15),
+	'digit3' / Computed(lambda this: (this.b2 & 240) >> 4),
+	'digit4' / Computed(lambda this: this.b2 & 15),
+	'digit5' / Computed(lambda this: (this.b3 & 240) >> 4),
+	'digit6' / Computed(lambda this: this.b3 & 15),
+	'digit7' / Computed(lambda this: (this.b4 & 240) >> 4),
+	'digit8' / Computed(lambda this: this.b4 & 15),
 )
 
 bcd_user_type_be__ltr_obj = Struct(
 	'b1' / Int8ub,
 	'b2' / Int8ub,
 	'b3' / Int8ub,
 	'b4' / Int8ub,
-	'as_int' / Computed(lambda this: ((((((((this.digit8 * 1) + (this.digit7 * 10)) + (this.digit6 * 100)) + (this.digit5 * 1000)) + (this.digit4 * 10000)) + (this.digit3 * 100000)) + (this.digit2 * 1000000)) + (this.digit1 * 10000000))),
-	'as_str' / Computed(lambda this: str(this.digit1) + str(this.digit2) + str(this.digit3) + str(this.digit4) + str(this.digit5) + str(this.digit6) + str(this.digit7) + str(this.digit8)),
-	'digit1' / Computed(lambda this: ((this.b1 & 240) >> 4)),
-	'digit2' / Computed(lambda this: (this.b1 & 15)),
-	'digit3' / Computed(lambda this: ((this.b2 & 240) >> 4)),
-	'digit4' / Computed(lambda this: (this.b2 & 15)),
-	'digit5' / Computed(lambda this: ((this.b3 & 240) >> 4)),
-	'digit6' / Computed(lambda this: (this.b3 & 15)),
-	'digit7' / Computed(lambda this: ((this.b4 & 240) >> 4)),
-	'digit8' / Computed(lambda this: (this.b4 & 15)),
+	'as_int' / Computed(lambda this: ((((((this.digit8 * 1 + this.digit7 * 10) + this.digit6 * 100) + this.digit5 * 1000) + this.digit4 * 10000) + this.digit3 * 100000) + this.digit2 * 1000000) + this.digit1 * 10000000),
+	'as_str' / Computed(lambda this: ((((((str(this.digit1) + str(this.digit2)) + str(this.digit3)) + str(this.digit4)) + str(this.digit5)) + str(this.digit6)) + str(this.digit7)) + str(this.digit8)),
+	'digit1' / Computed(lambda this: (this.b1 & 240) >> 4),
+	'digit2' / Computed(lambda this: this.b1 & 15),
+	'digit3' / Computed(lambda this: (this.b2 & 240) >> 4),
+	'digit4' / Computed(lambda this: this.b2 & 15),
+	'digit5' / Computed(lambda this: (this.b3 & 240) >> 4),
+	'digit6' / Computed(lambda this: this.b3 & 15),
+	'digit7' / Computed(lambda this: (this.b4 & 240) >> 4),
+	'digit8' / Computed(lambda this: this.b4 & 15),
 )
 
 bcd_user_type_be__rtl_obj = Struct(
 	'b1' / Int8ub,
 	'b2' / Int8ub,
 	'b3' / Int8ub,
 	'b4' / Int8ub,
-	'as_int' / Computed(lambda this: ((((((((this.digit1 * 1) + (this.digit2 * 10)) + (this.digit3 * 100)) + (this.digit4 * 1000)) + (this.digit5 * 10000)) + (this.digit6 * 100000)) + (this.digit7 * 1000000)) + (this.digit8 * 10000000))),
-	'as_str' / Computed(lambda this: str(this.digit8) + str(this.digit7) + str(this.digit6) + str(this.digit5) + str(this.digit4) + str(this.digit3) + str(this.digit2) + str(this.digit1)),
-	'digit1' / Computed(lambda this: ((this.b1 & 240) >> 4)),
-	'digit2' / Computed(lambda this: (this.b1 & 15)),
-	'digit3' / Computed(lambda this: ((this.b2 & 240) >> 4)),
-	'digit4' / Computed(lambda this: (this.b2 & 15)),
-	'digit5' / Computed(lambda this: ((this.b3 & 240) >> 4)),
-	'digit6' / Computed(lambda this: (this.b3 & 15)),
-	'digit7' / Computed(lambda this: ((this.b4 & 240) >> 4)),
-	'digit8' / Computed(lambda this: (this.b4 & 15)),
+	'as_int' / Computed(lambda this: ((((((this.digit1 * 1 + this.digit2 * 10) + this.digit3 * 100) + this.digit4 * 1000) + this.digit5 * 10000) + this.digit6 * 100000) + this.digit7 * 1000000) + this.digit8 * 10000000),
+	'as_str' / Computed(lambda this: ((((((str(this.digit8) + str(this.digit7)) + str(this.digit6)) + str(this.digit5)) + str(this.digit4)) + str(this.digit3)) + str(this.digit2)) + str(this.digit1)),
+	'digit1' / Computed(lambda this: (this.b1 & 240) >> 4),
+	'digit2' / Computed(lambda this: this.b1 & 15),
+	'digit3' / Computed(lambda this: (this.b2 & 240) >> 4),
+	'digit4' / Computed(lambda this: this.b2 & 15),
+	'digit5' / Computed(lambda this: (this.b3 & 240) >> 4),
+	'digit6' / Computed(lambda this: this.b3 & 15),
+	'digit7' / Computed(lambda this: (this.b4 & 240) >> 4),
+	'digit8' / Computed(lambda this: this.b4 & 15),
 )
 
 bcd_user_type_be = Struct(

compiled/construct/bcd_user_type_le.py

@@ -6,50 +6,50 @@
 	'b2' / Int8ub,
 	'b3' / Int8ub,
 	'b4' / Int8ub,
-	'as_int' / Computed(lambda this: ((((((((this.digit8 * 1) + (this.digit7 * 10)) + (this.digit6 * 100)) + (this.digit5 * 1000)) + (this.digit4 * 10000)) + (this.digit3 * 100000)) + (this.digit2 * 1000000)) + (this.digit1 * 10000000))),
-	'as_str' / Computed(lambda this: str(this.digit1) + str(this.digit2) + str(this.digit3) + str(this.digit4) + str(this.digit5) + str(this.digit6) + str(this.digit7) + str(this.digit8)),
-	'digit1' / Computed(lambda this: ((this.b4 & 240) >> 4)),
-	'digit2' / Computed(lambda this: (this.b4 & 15)),
-	'digit3' / Computed(lambda this: ((this.b3 & 240) >> 4)),
-	'digit4' / Computed(lambda this: (this.b3 & 15)),
-	'digit5' / Computed(lambda this: ((this.b2 & 240) >> 4)),
-	'digit6' / Computed(lambda this: (this.b2 & 15)),
-	'digit7' / Computed(lambda this: ((this.b1 & 240) >> 4)),
-	'digit8' / Computed(lambda this: (this.b1 & 15)),
+	'as_int' / Computed(lambda this: ((((((this.digit8 * 1 + this.digit7 * 10) + this.digit6 * 100) + this.digit5 * 1000) + this.digit4 * 10000) + this.digit3 * 100000) + this.digit2 * 1000000) + this.digit1 * 10000000),
+	'as_str' / Computed(lambda this: ((((((str(this.digit1) + str(this.digit2)) + str(this.digit3)) + str(this.digit4)) + str(this.digit5)) + str(this.digit6)) + str(this.digit7)) + str(this.digit8)),
+	'digit1' / Computed(lambda this: (this.b4 & 240) >> 4),
+	'digit2' / Computed(lambda this: this.b4 & 15),
+	'digit3' / Computed(lambda this: (this.b3 & 240) >> 4),
+	'digit4' / Computed(lambda this: this.b3 & 15),
+	'digit5' / Computed(lambda this: (this.b2 & 240) >> 4),
+	'digit6' / Computed(lambda this: this.b2 & 15),
+	'digit7' / Computed(lambda this: (this.b1 & 240) >> 4),
+	'digit8' / Computed(lambda this: this.b1 & 15),
 )
 
 bcd_user_type_le__ltr_obj = Struct(
 	'b1' / Int8ub,
 	'b2' / Int8ub,
 	'b3' / Int8ub,
 	'b4' / Int8ub,
-	'as_int' / Computed(lambda this: ((((((((this.digit8 * 1) + (this.digit7 * 10)) + (this.digit6 * 100)) + (this.digit5 * 1000)) + (this.digit4 * 10000)) + (this.digit3 * 100000)) + (this.digit2 * 1000000)) + (this.digit1 * 10000000))),
-	'as_str' / Computed(lambda this: str(this.digit1) + str(this.digit2) + str(this.digit3) + str(this.digit4) + str(this.digit5) + str(this.digit6) + str(this.digit7) + str(this.digit8)),
-	'digit1' / Computed(lambda this: ((this.b4 & 240) >> 4)),
-	'digit2' / Computed(lambda this: (this.b4 & 15)),
-	'digit3' / Computed(lambda this: ((this.b3 & 240) >> 4)),
-	'digit4' / Computed(lambda this: (this.b3 & 15)),
-	'digit5' / Computed(lambda this: ((this.b2 & 240) >> 4)),
-	'digit6' / Computed(lambda this: (this.b2 & 15)),
-	'digit7' / Computed(lambda this: ((this.b1 & 240) >> 4)),
-	'digit8' / Computed(lambda this: (this.b1 & 15)),
+	'as_int' / Computed(lambda this: ((((((this.digit8 * 1 + this.digit7 * 10) + this.digit6 * 100) + this.digit5 * 1000) + this.digit4 * 10000) + this.digit3 * 100000) + this.digit2 * 1000000) + this.digit1 * 10000000),
+	'as_str' / Computed(lambda this: ((((((str(this.digit1) + str(this.digit2)) + str(this.digit3)) + str(this.digit4)) + str(this.digit5)) + str(this.digit6)) + str(this.digit7)) + str(this.digit8)),
+	'digit1' / Computed(lambda this: (this.b4 & 240) >> 4),
+	'digit2' / Computed(lambda this: this.b4 & 15),
+	'digit3' / Computed(lambda this: (this.b3 & 240) >> 4),
+	'digit4' / Computed(lambda this: this.b3 & 15),
+	'digit5' / Computed(lambda this: (this.b2 & 240) >> 4),
+	'digit6' / Computed(lambda this: this.b2 & 15),
+	'digit7' / Computed(lambda this: (this.b1 & 240) >> 4),
+	'digit8' / Computed(lambda this: this.b1 & 15),
 )
 
 bcd_user_type_le__rtl_obj = Struct(
 	'b1' / Int8ub,
 	'b2' / Int8ub,
 	'b3' / Int8ub,
 	'b4' / Int8ub,
-	'as_int' / Computed(lambda this: ((((((((this.digit1 * 1) + (this.digit2 * 10)) + (this.digit3 * 100)) + (this.digit4 * 1000)) + (this.digit5 * 10000)) + (this.digit6 * 100000)) + (this.digit7 * 1000000)) + (this.digit8 * 10000000))),
-	'as_str' / Computed(lambda this: str(this.digit8) + str(this.digit7) + str(this.digit6) + str(this.digit5) + str(this.digit4) + str(this.digit3) + str(this.digit2) + str(this.digit1)),
-	'digit1' / Computed(lambda this: ((this.b4 & 240) >> 4)),
-	'digit2' / Computed(lambda this: (this.b4 & 15)),
-	'digit3' / Computed(lambda this: ((this.b3 & 240) >> 4)),
-	'digit4' / Computed(lambda this: (this.b3 & 15)),
-	'digit5' / Computed(lambda this: ((this.b2 & 240) >> 4)),
-	'digit6' / Computed(lambda this: (this.b2 & 15)),
-	'digit7' / Computed(lambda this: ((this.b1 & 240) >> 4)),
-	'digit8' / Computed(lambda this: (this.b1 & 15)),
+	'as_int' / Computed(lambda this: ((((((this.digit1 * 1 + this.digit2 * 10) + this.digit3 * 100) + this.digit4 * 1000) + this.digit5 * 10000) + this.digit6 * 100000) + this.digit7 * 1000000) + this.digit8 * 10000000),
+	'as_str' / Computed(lambda this: ((((((str(this.digit8) + str(this.digit7)) + str(this.digit6)) + str(this.digit5)) + str(this.digit4)) + str(this.digit3)) + str(this.digit2)) + str(this.digit1)),
+	'digit1' / Computed(lambda this: (this.b4 & 240) >> 4),
+	'digit2' / Computed(lambda this: this.b4 & 15),
+	'digit3' / Computed(lambda this: (this.b3 & 240) >> 4),
+	'digit4' / Computed(lambda this: this.b3 & 15),
+	'digit5' / Computed(lambda this: (this.b2 & 240) >> 4),
+	'digit6' / Computed(lambda this: this.b2 & 15),
+	'digit7' / Computed(lambda this: (this.b1 & 240) >> 4),
+	'digit8' / Computed(lambda this: this.b1 & 15),
 )
 
 bcd_user_type_le = Struct(

compiled/construct/debug_enum_name.py

@@ -17,7 +17,7 @@ class debug_enum_name__test_subtype__inner_enum2(enum.IntEnum):
 debug_enum_name__test_subtype = Struct(
 	'field1' / Enum(Int8ub, debug_enum_name__test_subtype__inner_enum1),
 	'field2' / Int8ub,
-	'instance_field' / Computed(lambda this: KaitaiStream.resolve_enum(DebugEnumName.TestSubtype.InnerEnum2, (this.field2 & 15))),
+	'instance_field' / Computed(lambda this: KaitaiStream.resolve_enum(DebugEnumName.TestSubtype.InnerEnum2, this.field2 & 15)),
 )
 
 debug_enum_name = Struct(

compiled/construct/enum_to_i.py

@@ -14,7 +14,7 @@ class enum_to_i__animal(enum.IntEnum):
 	'pet_1_eq_int' / Computed(lambda this: int(this.pet_1) == 7),
 	'pet_1_i' / Computed(lambda this: int(this.pet_1)),
 	'pet_1_i_to_s' / Computed(lambda this: str(int(this.pet_1))),
-	'pet_1_mod' / Computed(lambda this: (int(this.pet_1) + 32768)),
+	'pet_1_mod' / Computed(lambda this: int(this.pet_1) + 32768),
 	'pet_2_eq_int' / Computed(lambda this: int(this.pet_2) == 5),
 )
 

compiled/construct/enum_to_i_invalid.py

@@ -14,7 +14,7 @@ class enum_to_i_invalid__animal(enum.IntEnum):
 	'pet_2_eq_int_t' / Computed(lambda this: int(this.pet_2) == 111),
 	'pet_2_i' / Computed(lambda this: int(this.pet_2)),
 	'pet_2_i_to_s' / Computed(lambda this: str(int(this.pet_2))),
-	'pet_2_mod' / Computed(lambda this: (int(this.pet_2) + 32768)),
+	'pet_2_mod' / Computed(lambda this: int(this.pet_2) + 32768),
 )
 
 _schema = enum_to_i_invalid

compiled/construct/expr_0.py

@@ -4,7 +4,7 @@
 expr_0 = Struct(
 	'len_of_1' / Int16ul,
 	'must_be_abc123' / Computed(lambda this: u"abc" + u"123"),
-	'must_be_f7' / Computed(lambda this: (7 + 240)),
+	'must_be_f7' / Computed(lambda this: 7 + 240),
 )
 
 _schema = expr_0

compiled/construct/expr_1.py

@@ -4,7 +4,7 @@
 expr_1 = Struct(
 	'len_of_1' / Int16ul,
 	'str1' / FixedSized(this.len_of_1_mod, GreedyString(encoding='ASCII')),
-	'len_of_1_mod' / Computed(lambda this: (this.len_of_1 - 2)),
+	'len_of_1_mod' / Computed(lambda this: this.len_of_1 - 2),
 	'str1_len' / Computed(lambda this: len(this.str1)),
 )
 

compiled/construct/expr_2.py

@@ -6,7 +6,7 @@
 	'str' / FixedSized(this.len_mod, GreedyString(encoding='UTF-8')),
 	'rest' / FixedSized(3, LazyBound(lambda: expr_2__tuple)),
 	'char5' / Pointer(5, FixedSized(1, GreedyString(encoding='ASCII'))),
-	'len_mod' / Computed(lambda this: (this.len_orig - 3)),
+	'len_mod' / Computed(lambda this: this.len_orig - 3),
 	'tuple5' / Pointer(5, LazyBound(lambda: expr_2__tuple)),
 )
 

compiled/construct/expr_3.py

@@ -4,7 +4,7 @@
 expr_3 = Struct(
 	'one' / Int8ub,
 	'two' / FixedSized(3, GreedyString(encoding='ASCII')),
-	'four' / Computed(lambda this: u"_" + this.two + u"_"),
+	'four' / Computed(lambda this: (u"_" + this.two) + u"_"),
 	'is_str_eq' / Computed(lambda this: this.two == u"ACK"),
 	'is_str_ge' / Computed(lambda this: this.two >= u"ACK2"),
 	'is_str_gt' / Computed(lambda this: this.two > u"ACK2"),

compiled/construct/expr_bytes_non_literal.py

@@ -5,7 +5,7 @@
 expr_bytes_non_literal = Struct(
 	'one' / Int8ub,
 	'two' / Int8ub,
-	'calc_bytes' / Computed(lambda this: struct.pack('2b', this.one, this.two)),
+	'calc_bytes' / Computed(lambda this: struct.pack('2B', this.one, this.two)),
 )
 
 _schema = expr_bytes_non_literal

compiled/construct/expr_enum.py

@@ -12,7 +12,7 @@ class expr_enum__animal(enum.IntEnum):
 	'one' / Int8ub,
 	'const_dog' / Computed(lambda this: KaitaiStream.resolve_enum(ExprEnum.Animal, 4)),
 	'derived_boom' / Computed(lambda this: KaitaiStream.resolve_enum(ExprEnum.Animal, this.one)),
-	'derived_dog' / Computed(lambda this: KaitaiStream.resolve_enum(ExprEnum.Animal, (this.one - 98))),
+	'derived_dog' / Computed(lambda this: KaitaiStream.resolve_enum(ExprEnum.Animal, this.one - 98)),
 )
 
 _schema = expr_enum

compiled/construct/expr_io_pos.py

@@ -3,7 +3,7 @@
 
 expr_io_pos__all_plus_number = Struct(
 	'my_str' / NullTerminated(GreedyString(encoding='UTF-8'), term=b'\x00', include=False, consume=True),
-	'body' / FixedSized(((stream_size(_io) - stream_tell(_io)) - 2), GreedyBytes),
+	'body' / FixedSized((stream_size(_io) - stream_tell(_io)) - 2, GreedyBytes),
 	'number' / Int16ul,
 )
 

compiled/construct/expr_mod.py

@@ -4,10 +4,10 @@
 expr_mod = Struct(
 	'int_u' / Int32ul,
 	'int_s' / Int32sl,
-	'mod_neg_const' / Computed(lambda this: (-9837 % 13)),
-	'mod_neg_seq' / Computed(lambda this: (this.int_s % 13)),
-	'mod_pos_const' / Computed(lambda this: (9837 % 13)),
-	'mod_pos_seq' / Computed(lambda this: (this.int_u % 13)),
+	'mod_neg_const' / Computed(lambda this: -9837 % 13),
+	'mod_neg_seq' / Computed(lambda this: this.int_s % 13),
+	'mod_pos_const' / Computed(lambda this: 9837 % 13),
+	'mod_pos_seq' / Computed(lambda this: this.int_u % 13),
 )
 
 _schema = expr_mod

compiled/construct/expr_ops_parens.py

@@ -7,10 +7,10 @@
 	'bool_or' / Computed(lambda this: int( ((not (False)) or (False)) )),
 	'f_2pi' / Computed(lambda this: 6.28),
 	'f_e' / Computed(lambda this: 2.72),
-	'f_sum_to_int' / Computed(lambda this: int((this.f_2pi + this.f_e))),
+	'f_sum_to_int' / Computed(lambda this: int(this.f_2pi + this.f_e)),
 	'i_42' / Computed(lambda this: 42),
 	'i_m13' / Computed(lambda this: -13),
-	'i_sum_to_str' / Computed(lambda this: str((this.i_42 + this.i_m13))),
+	'i_sum_to_str' / Computed(lambda this: str(this.i_42 + this.i_m13)),
 	'str_0_to_4' / Computed(lambda this: u"01234"),
 	'str_5_to_9' / Computed(lambda this: u"56789"),
 	'str_concat_len' / Computed(lambda this: len(this.str_0_to_4 + this.str_5_to_9)),

compiled/construct/expr_str_ops.py

@@ -5,9 +5,9 @@
 	'one' / FixedSized(5, GreedyString(encoding='ASCII')),
 	'one_len' / Computed(lambda this: len(this.one)),
 	'one_rev' / Computed(lambda this: (this.one)[::-1]),
-	'one_substr_0_to_3' / Computed(lambda this: (this.one)[0:3]),
-	'one_substr_2_to_5' / Computed(lambda this: (this.one)[2:5]),
-	'one_substr_3_to_3' / Computed(lambda this: (this.one)[3:3]),
+	'one_substr_0_to_3' / Computed(lambda this: this.one[0:3]),
+	'one_substr_2_to_5' / Computed(lambda this: this.one[2:5]),
+	'one_substr_3_to_3' / Computed(lambda this: this.one[3:3]),
 	'to_i_attr' / Computed(lambda this: int(u"9173")),
 	'to_i_r10' / Computed(lambda this: int(u"-072")),
 	'to_i_r16' / Computed(lambda this: int(u"47cf", 16)),
@@ -16,9 +16,9 @@
 	'two' / Computed(lambda this: u"0123456789"),
 	'two_len' / Computed(lambda this: len(this.two)),
 	'two_rev' / Computed(lambda this: (this.two)[::-1]),
-	'two_substr_0_to_10' / Computed(lambda this: (this.two)[0:10]),
-	'two_substr_0_to_7' / Computed(lambda this: (this.two)[0:7]),
-	'two_substr_4_to_10' / Computed(lambda this: (this.two)[4:10]),
+	'two_substr_0_to_10' / Computed(lambda this: this.two[0:10]),
+	'two_substr_0_to_7' / Computed(lambda this: this.two[0:7]),
+	'two_substr_4_to_10' / Computed(lambda this: this.two[4:10]),
 )
 
 _schema = expr_str_ops

compiled/construct/floating_points.py

@@ -7,9 +7,9 @@
 	'single_value_be' / Float32b,
 	'double_value_be' / Float64b,
 	'approximate_value' / Float32l,
-	'double_value_plus_float' / Computed(lambda this: (this.double_value + 0.05)),
-	'single_value_plus_float' / Computed(lambda this: (this.single_value + 0.5)),
-	'single_value_plus_int' / Computed(lambda this: (this.single_value + 1)),
+	'double_value_plus_float' / Computed(lambda this: this.double_value + 0.05),
+	'single_value_plus_float' / Computed(lambda this: this.single_value + 0.5),
+	'single_value_plus_int' / Computed(lambda this: this.single_value + 1),
 )
 
 _schema = floating_points

compiled/construct/if_values.py

@@ -3,7 +3,7 @@
 
 if_values__code = Struct(
 	'opcode' / Int8ub,
-	'half_opcode' / If((this.opcode % 2) == 0, Computed(lambda this: this.opcode // 2)),
+	'half_opcode' / If(this.opcode % 2 == 0, Computed(lambda this: this.opcode // 2)),
 )
 
 if_values = Struct(

compiled/construct/js_signed_right_shift.py

@@ -2,8 +2,8 @@
 from construct.lib import *
 
 js_signed_right_shift = Struct(
-	'should_be_40000000' / Computed(lambda this: (2147483648 >> 1)),
-	'should_be_a00000' / Computed(lambda this: (2684354560 >> 8)),
+	'should_be_40000000' / Computed(lambda this: 2147483648 >> 1),
+	'should_be_a00000' / Computed(lambda this: 2684354560 >> 8),
 )
 
 _schema = js_signed_right_shift

compiled/construct/nested_same_name.py

@@ -8,7 +8,7 @@
 )
 
 nested_same_name__main__foo_obj = Struct(
-	'data' / FixedSized((this._.main_size * 2), GreedyBytes),
+	'data' / FixedSized(this._.main_size * 2, GreedyBytes),
 )
 
 nested_same_name__main = Struct(

compiled/construct/nested_same_name2.py

@@ -2,7 +2,7 @@
 from construct.lib import *
 
 nested_same_name2__dummy_obj__foo_obj = Struct(
-	'data2' / FixedSized((this._.dummy_size * 2), GreedyBytes),
+	'data2' / FixedSized(this._.dummy_size * 2, GreedyBytes),
 )
 
 nested_same_name2__dummy_obj = Struct(
@@ -11,7 +11,7 @@
 )
 
 nested_same_name2__main__foo_obj = Struct(
-	'data1' / FixedSized((this._.main_size * 2), GreedyBytes),
+	'data1' / FixedSized(this._.main_size * 2, GreedyBytes),
 )
 
 nested_same_name2__main = Struct(