Skip to content

Commit 27d5f3b

Browse files
committed
Regen
1 parent 4ffb42c commit 27d5f3b

File tree

108 files changed

+495
-978
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+495
-978
lines changed

compiled/construct/default_big_bit_endian_implicit.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

compiled/cpp_stl_11/bits_byte_aligned.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ bits_byte_aligned_t::bits_byte_aligned_t(kaitai::kstream* p__io, kaitai::kstruct
1010
}
1111

1212
void bits_byte_aligned_t::_read() {
13-
m_one = m__io->read_bits_int(6);
13+
m_one = m__io->read_bits_int_be(6);
1414
m__io->align_to_byte();
1515
m_byte_1 = m__io->read_u1();
16-
m_two = m__io->read_bits_int(3);
17-
m_three = m__io->read_bits_int(1);
16+
m_two = m__io->read_bits_int_be(3);
17+
m_three = m__io->read_bits_int_be(1);
1818
m__io->align_to_byte();
1919
m_byte_2 = m__io->read_u1();
20-
m_four = m__io->read_bits_int(14);
20+
m_four = m__io->read_bits_int_be(14);
2121
m__io->align_to_byte();
2222
m_byte_3 = m__io->read_bytes(1);
23-
m_full_byte = m__io->read_bits_int(8);
23+
m_full_byte = m__io->read_bits_int_be(8);
2424
m__io->align_to_byte();
2525
m_byte_4 = m__io->read_u1();
2626
}

compiled/cpp_stl_11/bits_enum.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ bits_enum_t::bits_enum_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, bit
1010
}
1111

1212
void bits_enum_t::_read() {
13-
m_one = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int(4));
14-
m_two = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int(8));
15-
m_three = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int(1));
13+
m_one = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int_be(4));
14+
m_two = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int_be(8));
15+
m_three = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int_be(1));
1616
}
1717

1818
bits_enum_t::~bits_enum_t() {

compiled/cpp_stl_11/bits_seq_endian_combo.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ bits_seq_endian_combo_t::bits_seq_endian_combo_t(kaitai::kstream* p__io, kaitai:
1010
}
1111

1212
void bits_seq_endian_combo_t::_read() {
13-
m_be1 = m__io->read_bits_int(6);
14-
m_be2 = m__io->read_bits_int(10);
15-
m_le3 = m__io->read_bits_int(8);
16-
m_be4 = m__io->read_bits_int(8);
17-
m_le5 = m__io->read_bits_int(5);
18-
m_le6 = m__io->read_bits_int(6);
19-
m_le7 = m__io->read_bits_int(5);
20-
m_be8 = m__io->read_bits_int(1);
13+
m_be1 = m__io->read_bits_int_be(6);
14+
m_be2 = m__io->read_bits_int_be(10);
15+
m_le3 = m__io->read_bits_int_le(8);
16+
m_be4 = m__io->read_bits_int_be(8);
17+
m_le5 = m__io->read_bits_int_le(5);
18+
m_le6 = m__io->read_bits_int_le(6);
19+
m_le7 = m__io->read_bits_int_le(5);
20+
m_be8 = m__io->read_bits_int_be(1);
2121
}
2222

2323
bits_seq_endian_combo_t::~bits_seq_endian_combo_t() {

compiled/cpp_stl_11/bits_simple.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ bits_simple_t::bits_simple_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent,
1111
}
1212

1313
void bits_simple_t::_read() {
14-
m_byte_1 = m__io->read_bits_int(8);
15-
m_byte_2 = m__io->read_bits_int(8);
16-
m_bits_a = m__io->read_bits_int(1);
17-
m_bits_b = m__io->read_bits_int(3);
18-
m_bits_c = m__io->read_bits_int(4);
19-
m_large_bits_1 = m__io->read_bits_int(10);
20-
m_spacer = m__io->read_bits_int(3);
21-
m_large_bits_2 = m__io->read_bits_int(11);
14+
m_byte_1 = m__io->read_bits_int_be(8);
15+
m_byte_2 = m__io->read_bits_int_be(8);
16+
m_bits_a = m__io->read_bits_int_be(1);
17+
m_bits_b = m__io->read_bits_int_be(3);
18+
m_bits_c = m__io->read_bits_int_be(4);
19+
m_large_bits_1 = m__io->read_bits_int_be(10);
20+
m_spacer = m__io->read_bits_int_be(3);
21+
m_large_bits_2 = m__io->read_bits_int_be(11);
2222
m__io->align_to_byte();
2323
m_normal_s2 = m__io->read_s2be();
24-
m_byte_8_9_10 = m__io->read_bits_int(24);
25-
m_byte_11_to_14 = m__io->read_bits_int(32);
26-
m_byte_15_to_19 = m__io->read_bits_int(40);
27-
m_byte_20_to_27 = m__io->read_bits_int(64);
24+
m_byte_8_9_10 = m__io->read_bits_int_be(24);
25+
m_byte_11_to_14 = m__io->read_bits_int_be(32);
26+
m_byte_15_to_19 = m__io->read_bits_int_be(40);
27+
m_byte_20_to_27 = m__io->read_bits_int_be(64);
2828
}
2929

3030
bits_simple_t::~bits_simple_t() {

compiled/cpp_stl_11/bits_simple_le.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ bits_simple_le_t::bits_simple_le_t(kaitai::kstream* p__io, kaitai::kstruct* p__p
1111
}
1212

1313
void bits_simple_le_t::_read() {
14-
m_byte_1 = m__io->read_bits_int(8);
15-
m_byte_2 = m__io->read_bits_int(8);
16-
m_bits_a = m__io->read_bits_int(1);
17-
m_bits_b = m__io->read_bits_int(3);
18-
m_bits_c = m__io->read_bits_int(4);
19-
m_large_bits_1 = m__io->read_bits_int(10);
20-
m_spacer = m__io->read_bits_int(3);
21-
m_large_bits_2 = m__io->read_bits_int(11);
14+
m_byte_1 = m__io->read_bits_int_le(8);
15+
m_byte_2 = m__io->read_bits_int_le(8);
16+
m_bits_a = m__io->read_bits_int_le(1);
17+
m_bits_b = m__io->read_bits_int_le(3);
18+
m_bits_c = m__io->read_bits_int_le(4);
19+
m_large_bits_1 = m__io->read_bits_int_le(10);
20+
m_spacer = m__io->read_bits_int_le(3);
21+
m_large_bits_2 = m__io->read_bits_int_le(11);
2222
m__io->align_to_byte();
2323
m_normal_s2 = m__io->read_s2be();
24-
m_byte_8_9_10 = m__io->read_bits_int(24);
25-
m_byte_11_to_14 = m__io->read_bits_int(32);
26-
m_byte_15_to_19 = m__io->read_bits_int(40);
27-
m_byte_20_to_27 = m__io->read_bits_int(64);
24+
m_byte_8_9_10 = m__io->read_bits_int_le(24);
25+
m_byte_11_to_14 = m__io->read_bits_int_le(32);
26+
m_byte_15_to_19 = m__io->read_bits_int_le(40);
27+
m_byte_20_to_27 = m__io->read_bits_int_le(64);
2828
}
2929

3030
bits_simple_le_t::~bits_simple_le_t() {

compiled/cpp_stl_11/combine_bool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ combine_bool_t::combine_bool_t(kaitai::kstream* p__io, kaitai::kstruct* p__paren
1212
}
1313

1414
void combine_bool_t::_read() {
15-
m_bool_bit = m__io->read_bits_int(1);
15+
m_bool_bit = m__io->read_bits_int_be(1);
1616
}
1717

1818
combine_bool_t::~combine_bool_t() {

compiled/cpp_stl_11/default_big_bit_endian_implicit.cpp

Lines changed: 0 additions & 17 deletions
This file was deleted.

compiled/cpp_stl_11/default_big_bit_endian_implicit.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

compiled/cpp_stl_11/default_bit_endian_mod.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ default_bit_endian_mod_t::main_obj_t::main_obj_t(kaitai::kstream* p__io, default
2626
}
2727

2828
void default_bit_endian_mod_t::main_obj_t::_read() {
29-
m_one = m__io->read_bits_int(9);
30-
m_two = m__io->read_bits_int(15);
29+
m_one = m__io->read_bits_int_le(9);
30+
m_two = m__io->read_bits_int_le(15);
3131
m__io->align_to_byte();
3232
m_nest = std::unique_ptr<subnest_t>(new subnest_t(m__io, this, m__root));
3333
m_nest_be = std::unique_ptr<subnest_be_t>(new subnest_be_t(m__io, this, m__root));
@@ -43,7 +43,7 @@ default_bit_endian_mod_t::main_obj_t::subnest_t::subnest_t(kaitai::kstream* p__i
4343
}
4444

4545
void default_bit_endian_mod_t::main_obj_t::subnest_t::_read() {
46-
m_two = m__io->read_bits_int(16);
46+
m_two = m__io->read_bits_int_le(16);
4747
}
4848

4949
default_bit_endian_mod_t::main_obj_t::subnest_t::~subnest_t() {
@@ -56,7 +56,7 @@ default_bit_endian_mod_t::main_obj_t::subnest_be_t::subnest_be_t(kaitai::kstream
5656
}
5757

5858
void default_bit_endian_mod_t::main_obj_t::subnest_be_t::_read() {
59-
m_two = m__io->read_bits_int(16);
59+
m_two = m__io->read_bits_int_be(16);
6060
}
6161

6262
default_bit_endian_mod_t::main_obj_t::subnest_be_t::~subnest_be_t() {

compiled/cpp_stl_11/expr_bits.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ expr_bits_t::expr_bits_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, exp
1515
}
1616

1717
void expr_bits_t::_read() {
18-
m_enum_seq = static_cast<expr_bits_t::items_t>(m__io->read_bits_int(2));
19-
m_a = m__io->read_bits_int(3);
18+
m_enum_seq = static_cast<expr_bits_t::items_t>(m__io->read_bits_int_be(2));
19+
m_a = m__io->read_bits_int_be(3);
2020
m__io->align_to_byte();
2121
m_byte_size = m__io->read_bytes(a());
2222
int l_repeat_expr = a();

compiled/cpp_stl_11/repeat_eos_bit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void repeat_eos_bit_t::_read() {
1515
{
1616
int i = 0;
1717
while (!m__io->is_eof()) {
18-
m_nibbles->push_back(std::move(m__io->read_bits_int(4)));
18+
m_nibbles->push_back(std::move(m__io->read_bits_int_be(4)));
1919
i++;
2020
}
2121
}

compiled/cpp_stl_11/ts_packet_header.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ ts_packet_header_t::ts_packet_header_t(kaitai::kstream* p__io, kaitai::kstruct*
1111

1212
void ts_packet_header_t::_read() {
1313
m_sync_byte = m__io->read_u1();
14-
m_transport_error_indicator = m__io->read_bits_int(1);
15-
m_payload_unit_start_indicator = m__io->read_bits_int(1);
16-
m_transport_priority = m__io->read_bits_int(1);
17-
m_pid = m__io->read_bits_int(13);
18-
m_transport_scrambling_control = m__io->read_bits_int(2);
19-
m_adaptation_field_control = static_cast<ts_packet_header_t::adaptation_field_control_enum_t>(m__io->read_bits_int(2));
20-
m_continuity_counter = m__io->read_bits_int(4);
14+
m_transport_error_indicator = m__io->read_bits_int_be(1);
15+
m_payload_unit_start_indicator = m__io->read_bits_int_be(1);
16+
m_transport_priority = m__io->read_bits_int_be(1);
17+
m_pid = m__io->read_bits_int_be(13);
18+
m_transport_scrambling_control = m__io->read_bits_int_be(2);
19+
m_adaptation_field_control = static_cast<ts_packet_header_t::adaptation_field_control_enum_t>(m__io->read_bits_int_be(2));
20+
m_continuity_counter = m__io->read_bits_int_be(4);
2121
m__io->align_to_byte();
2222
m_ts_packet_remain = m__io->read_bytes(184);
2323
}

compiled/cpp_stl_98/bits_byte_aligned.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ bits_byte_aligned_t::bits_byte_aligned_t(kaitai::kstream* p__io, kaitai::kstruct
1010
}
1111

1212
void bits_byte_aligned_t::_read() {
13-
m_one = m__io->read_bits_int(6);
13+
m_one = m__io->read_bits_int_be(6);
1414
m__io->align_to_byte();
1515
m_byte_1 = m__io->read_u1();
16-
m_two = m__io->read_bits_int(3);
17-
m_three = m__io->read_bits_int(1);
16+
m_two = m__io->read_bits_int_be(3);
17+
m_three = m__io->read_bits_int_be(1);
1818
m__io->align_to_byte();
1919
m_byte_2 = m__io->read_u1();
20-
m_four = m__io->read_bits_int(14);
20+
m_four = m__io->read_bits_int_be(14);
2121
m__io->align_to_byte();
2222
m_byte_3 = m__io->read_bytes(1);
23-
m_full_byte = m__io->read_bits_int(8);
23+
m_full_byte = m__io->read_bits_int_be(8);
2424
m__io->align_to_byte();
2525
m_byte_4 = m__io->read_u1();
2626
}

compiled/cpp_stl_98/bits_enum.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ bits_enum_t::bits_enum_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, bit
1010
}
1111

1212
void bits_enum_t::_read() {
13-
m_one = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int(4));
14-
m_two = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int(8));
15-
m_three = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int(1));
13+
m_one = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int_be(4));
14+
m_two = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int_be(8));
15+
m_three = static_cast<bits_enum_t::animal_t>(m__io->read_bits_int_be(1));
1616
}
1717

1818
bits_enum_t::~bits_enum_t() {

compiled/cpp_stl_98/bits_seq_endian_combo.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ bits_seq_endian_combo_t::bits_seq_endian_combo_t(kaitai::kstream* p__io, kaitai:
1010
}
1111

1212
void bits_seq_endian_combo_t::_read() {
13-
m_be1 = m__io->read_bits_int(6);
14-
m_be2 = m__io->read_bits_int(10);
15-
m_le3 = m__io->read_bits_int(8);
16-
m_be4 = m__io->read_bits_int(8);
17-
m_le5 = m__io->read_bits_int(5);
18-
m_le6 = m__io->read_bits_int(6);
19-
m_le7 = m__io->read_bits_int(5);
20-
m_be8 = m__io->read_bits_int(1);
13+
m_be1 = m__io->read_bits_int_be(6);
14+
m_be2 = m__io->read_bits_int_be(10);
15+
m_le3 = m__io->read_bits_int_le(8);
16+
m_be4 = m__io->read_bits_int_be(8);
17+
m_le5 = m__io->read_bits_int_le(5);
18+
m_le6 = m__io->read_bits_int_le(6);
19+
m_le7 = m__io->read_bits_int_le(5);
20+
m_be8 = m__io->read_bits_int_be(1);
2121
}
2222

2323
bits_seq_endian_combo_t::~bits_seq_endian_combo_t() {

compiled/cpp_stl_98/bits_simple.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ bits_simple_t::bits_simple_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent,
1111
}
1212

1313
void bits_simple_t::_read() {
14-
m_byte_1 = m__io->read_bits_int(8);
15-
m_byte_2 = m__io->read_bits_int(8);
16-
m_bits_a = m__io->read_bits_int(1);
17-
m_bits_b = m__io->read_bits_int(3);
18-
m_bits_c = m__io->read_bits_int(4);
19-
m_large_bits_1 = m__io->read_bits_int(10);
20-
m_spacer = m__io->read_bits_int(3);
21-
m_large_bits_2 = m__io->read_bits_int(11);
14+
m_byte_1 = m__io->read_bits_int_be(8);
15+
m_byte_2 = m__io->read_bits_int_be(8);
16+
m_bits_a = m__io->read_bits_int_be(1);
17+
m_bits_b = m__io->read_bits_int_be(3);
18+
m_bits_c = m__io->read_bits_int_be(4);
19+
m_large_bits_1 = m__io->read_bits_int_be(10);
20+
m_spacer = m__io->read_bits_int_be(3);
21+
m_large_bits_2 = m__io->read_bits_int_be(11);
2222
m__io->align_to_byte();
2323
m_normal_s2 = m__io->read_s2be();
24-
m_byte_8_9_10 = m__io->read_bits_int(24);
25-
m_byte_11_to_14 = m__io->read_bits_int(32);
26-
m_byte_15_to_19 = m__io->read_bits_int(40);
27-
m_byte_20_to_27 = m__io->read_bits_int(64);
24+
m_byte_8_9_10 = m__io->read_bits_int_be(24);
25+
m_byte_11_to_14 = m__io->read_bits_int_be(32);
26+
m_byte_15_to_19 = m__io->read_bits_int_be(40);
27+
m_byte_20_to_27 = m__io->read_bits_int_be(64);
2828
}
2929

3030
bits_simple_t::~bits_simple_t() {

compiled/cpp_stl_98/bits_simple_le.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ bits_simple_le_t::bits_simple_le_t(kaitai::kstream* p__io, kaitai::kstruct* p__p
1111
}
1212

1313
void bits_simple_le_t::_read() {
14-
m_byte_1 = m__io->read_bits_int(8);
15-
m_byte_2 = m__io->read_bits_int(8);
16-
m_bits_a = m__io->read_bits_int(1);
17-
m_bits_b = m__io->read_bits_int(3);
18-
m_bits_c = m__io->read_bits_int(4);
19-
m_large_bits_1 = m__io->read_bits_int(10);
20-
m_spacer = m__io->read_bits_int(3);
21-
m_large_bits_2 = m__io->read_bits_int(11);
14+
m_byte_1 = m__io->read_bits_int_le(8);
15+
m_byte_2 = m__io->read_bits_int_le(8);
16+
m_bits_a = m__io->read_bits_int_le(1);
17+
m_bits_b = m__io->read_bits_int_le(3);
18+
m_bits_c = m__io->read_bits_int_le(4);
19+
m_large_bits_1 = m__io->read_bits_int_le(10);
20+
m_spacer = m__io->read_bits_int_le(3);
21+
m_large_bits_2 = m__io->read_bits_int_le(11);
2222
m__io->align_to_byte();
2323
m_normal_s2 = m__io->read_s2be();
24-
m_byte_8_9_10 = m__io->read_bits_int(24);
25-
m_byte_11_to_14 = m__io->read_bits_int(32);
26-
m_byte_15_to_19 = m__io->read_bits_int(40);
27-
m_byte_20_to_27 = m__io->read_bits_int(64);
24+
m_byte_8_9_10 = m__io->read_bits_int_le(24);
25+
m_byte_11_to_14 = m__io->read_bits_int_le(32);
26+
m_byte_15_to_19 = m__io->read_bits_int_le(40);
27+
m_byte_20_to_27 = m__io->read_bits_int_le(64);
2828
}
2929

3030
bits_simple_le_t::~bits_simple_le_t() {

compiled/cpp_stl_98/combine_bool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ combine_bool_t::combine_bool_t(kaitai::kstream* p__io, kaitai::kstruct* p__paren
1212
}
1313

1414
void combine_bool_t::_read() {
15-
m_bool_bit = m__io->read_bits_int(1);
15+
m_bool_bit = m__io->read_bits_int_be(1);
1616
}
1717

1818
combine_bool_t::~combine_bool_t() {

0 commit comments

Comments
 (0)