Skip to content

Commit 3c8a6b8

Browse files
kaitai-botkaitai-bot
committed
1 parent cf59e0f commit 3c8a6b8

63 files changed

Lines changed: 821 additions & 407 deletions

Some content is hidden

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

‎compiled/construct/expr_bytes_ops.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
'one_mid' / Computed(lambda this: KaitaiStream.byte_array_index(this.one, 1)),
1010
'one_min' / Computed(lambda this: KaitaiStream.byte_array_min(this.one)),
1111
'one_size' / Computed(lambda this: len(this.one)),
12-
'one_to_s' / Computed(lambda this: (this.one).decode(u"IBM866")),
1312
'two' / Computed(lambda this: b"\x41\xFF\x4B"),
1413
'two_first' / Computed(lambda this: KaitaiStream.byte_array_index(this.two, 0)),
1514
'two_last' / Computed(lambda this: KaitaiStream.byte_array_index(this.two, -1)),
1615
'two_max' / Computed(lambda this: KaitaiStream.byte_array_max(this.two)),
1716
'two_mid' / Computed(lambda this: KaitaiStream.byte_array_index(this.two, 1)),
1817
'two_min' / Computed(lambda this: KaitaiStream.byte_array_min(this.two)),
1918
'two_size' / Computed(lambda this: len(this.two)),
20-
'two_to_s' / Computed(lambda this: (this.two).decode(u"IBM866")),
2119
)
2220

2321
_schema = expr_bytes_ops

‎compiled/construct/str_literals_latin1.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from construct import *
2+
from construct.lib import *
3+
4+
str_literals_latin1 = Struct(
5+
'len_parsed' / Int16ul,
6+
'parsed' / FixedSized(this.len_parsed, GreedyString(encoding='UTF-8')),
7+
'parsed_eq_literal' / Computed(lambda this: this.parsed == u"\243"),
8+
)
9+
10+
_schema = str_literals_latin1

‎compiled/cpp_stl_11/expr_bytes_ops.cpp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ expr_bytes_ops_t::expr_bytes_ops_t(kaitai::kstream* p__io, kaitai::kstruct* p__p
1111
f_one_mid = false;
1212
f_one_min = false;
1313
f_one_size = false;
14-
f_one_to_s = false;
1514
f_two = false;
1615
f_two_first = false;
1716
f_two_last = false;
1817
f_two_max = false;
1918
f_two_mid = false;
2019
f_two_min = false;
2120
f_two_size = false;
22-
f_two_to_s = false;
2321
_read();
2422
}
2523

@@ -82,14 +80,6 @@ int32_t expr_bytes_ops_t::one_size() {
8280
return m_one_size;
8381
}
8482

85-
std::string expr_bytes_ops_t::one_to_s() {
86-
if (f_one_to_s)
87-
return m_one_to_s;
88-
f_one_to_s = true;
89-
m_one_to_s = kaitai::kstream::bytes_to_str(one(), "IBM866");
90-
return m_one_to_s;
91-
}
92-
9383
std::string expr_bytes_ops_t::two() {
9484
if (f_two)
9585
return m_two;
@@ -145,11 +135,3 @@ int32_t expr_bytes_ops_t::two_size() {
145135
m_two_size = two().length();
146136
return m_two_size;
147137
}
148-
149-
std::string expr_bytes_ops_t::two_to_s() {
150-
if (f_two_to_s)
151-
return m_two_to_s;
152-
f_two_to_s = true;
153-
m_two_to_s = kaitai::kstream::bytes_to_str(two(), "IBM866");
154-
return m_two_to_s;
155-
}

‎compiled/cpp_stl_11/expr_bytes_ops.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ class expr_bytes_ops_t : public kaitai::kstruct {
6767
public:
6868
int32_t one_size();
6969

70-
private:
71-
bool f_one_to_s;
72-
std::string m_one_to_s;
73-
74-
public:
75-
std::string one_to_s();
76-
7770
private:
7871
bool f_two;
7972
std::string m_two;
@@ -123,13 +116,6 @@ class expr_bytes_ops_t : public kaitai::kstruct {
123116
public:
124117
int32_t two_size();
125118

126-
private:
127-
bool f_two_to_s;
128-
std::string m_two_to_s;
129-
130-
public:
131-
std::string two_to_s();
132-
133119
private:
134120
std::string m_one;
135121
expr_bytes_ops_t* m__root;

‎compiled/cpp_stl_11/str_literals_latin1.cpp‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
2+
3+
#include "str_literals_latin1.h"
4+
5+
str_literals_latin1_t::str_literals_latin1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, str_literals_latin1_t* p__root) : kaitai::kstruct(p__io) {
6+
m__parent = p__parent;
7+
m__root = p__root ? p__root : this;
8+
f_parsed_eq_literal = false;
9+
_read();
10+
}
11+
12+
void str_literals_latin1_t::_read() {
13+
m_len_parsed = m__io->read_u2le();
14+
m_parsed = kaitai::kstream::bytes_to_str(m__io->read_bytes(len_parsed()), "UTF-8");
15+
}
16+
17+
str_literals_latin1_t::~str_literals_latin1_t() {
18+
_clean_up();
19+
}
20+
21+
void str_literals_latin1_t::_clean_up() {
22+
}
23+
24+
bool str_literals_latin1_t::parsed_eq_literal() {
25+
if (f_parsed_eq_literal)
26+
return m_parsed_eq_literal;
27+
f_parsed_eq_literal = true;
28+
m_parsed_eq_literal = parsed() == (std::string("\243"));
29+
return m_parsed_eq_literal;
30+
}

‎compiled/cpp_stl_11/str_literals_latin1.h‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#pragma once
2+
3+
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
4+
5+
class str_literals_latin1_t;
6+
7+
#include "kaitai/kaitaistruct.h"
8+
#include <stdint.h>
9+
#include <memory>
10+
11+
#if KAITAI_STRUCT_VERSION < 11000L
12+
#error "Incompatible Kaitai Struct C++/STL API: version 0.11 or later is required"
13+
#endif
14+
15+
class str_literals_latin1_t : public kaitai::kstruct {
16+
17+
public:
18+
19+
str_literals_latin1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = nullptr, str_literals_latin1_t* p__root = nullptr);
20+
21+
private:
22+
void _read();
23+
void _clean_up();
24+
25+
public:
26+
~str_literals_latin1_t();
27+
28+
private:
29+
bool f_parsed_eq_literal;
30+
bool m_parsed_eq_literal;
31+
32+
public:
33+
bool parsed_eq_literal();
34+
35+
private:
36+
uint16_t m_len_parsed;
37+
std::string m_parsed;
38+
str_literals_latin1_t* m__root;
39+
kaitai::kstruct* m__parent;
40+
41+
public:
42+
uint16_t len_parsed() const { return m_len_parsed; }
43+
std::string parsed() const { return m_parsed; }
44+
str_literals_latin1_t* _root() const { return m__root; }
45+
kaitai::kstruct* _parent() const { return m__parent; }
46+
};

‎compiled/cpp_stl_98/expr_bytes_ops.cpp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ expr_bytes_ops_t::expr_bytes_ops_t(kaitai::kstream* p__io, kaitai::kstruct* p__p
1111
f_one_mid = false;
1212
f_one_min = false;
1313
f_one_size = false;
14-
f_one_to_s = false;
1514
f_two = false;
1615
f_two_first = false;
1716
f_two_last = false;
1817
f_two_max = false;
1918
f_two_mid = false;
2019
f_two_min = false;
2120
f_two_size = false;
22-
f_two_to_s = false;
2321

2422
try {
2523
_read();
@@ -88,14 +86,6 @@ int32_t expr_bytes_ops_t::one_size() {
8886
return m_one_size;
8987
}
9088

91-
std::string expr_bytes_ops_t::one_to_s() {
92-
if (f_one_to_s)
93-
return m_one_to_s;
94-
f_one_to_s = true;
95-
m_one_to_s = kaitai::kstream::bytes_to_str(one(), "IBM866");
96-
return m_one_to_s;
97-
}
98-
9989
std::string expr_bytes_ops_t::two() {
10090
if (f_two)
10191
return m_two;
@@ -151,11 +141,3 @@ int32_t expr_bytes_ops_t::two_size() {
151141
m_two_size = two().length();
152142
return m_two_size;
153143
}
154-
155-
std::string expr_bytes_ops_t::two_to_s() {
156-
if (f_two_to_s)
157-
return m_two_to_s;
158-
f_two_to_s = true;
159-
m_two_to_s = kaitai::kstream::bytes_to_str(two(), "IBM866");
160-
return m_two_to_s;
161-
}

‎compiled/cpp_stl_98/expr_bytes_ops.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ class expr_bytes_ops_t : public kaitai::kstruct {
6767
public:
6868
int32_t one_size();
6969

70-
private:
71-
bool f_one_to_s;
72-
std::string m_one_to_s;
73-
74-
public:
75-
std::string one_to_s();
76-
7770
private:
7871
bool f_two;
7972
std::string m_two;
@@ -123,13 +116,6 @@ class expr_bytes_ops_t : public kaitai::kstruct {
123116
public:
124117
int32_t two_size();
125118

126-
private:
127-
bool f_two_to_s;
128-
std::string m_two_to_s;
129-
130-
public:
131-
std::string two_to_s();
132-
133119
private:
134120
std::string m_one;
135121
expr_bytes_ops_t* m__root;

‎compiled/cpp_stl_98/str_literals_latin1.cpp‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
2+
3+
#include "str_literals_latin1.h"
4+
5+
str_literals_latin1_t::str_literals_latin1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, str_literals_latin1_t* p__root) : kaitai::kstruct(p__io) {
6+
m__parent = p__parent;
7+
m__root = p__root ? p__root : this;
8+
f_parsed_eq_literal = false;
9+
10+
try {
11+
_read();
12+
} catch(...) {
13+
_clean_up();
14+
throw;
15+
}
16+
}
17+
18+
void str_literals_latin1_t::_read() {
19+
m_len_parsed = m__io->read_u2le();
20+
m_parsed = kaitai::kstream::bytes_to_str(m__io->read_bytes(len_parsed()), "UTF-8");
21+
}
22+
23+
str_literals_latin1_t::~str_literals_latin1_t() {
24+
_clean_up();
25+
}
26+
27+
void str_literals_latin1_t::_clean_up() {
28+
}
29+
30+
bool str_literals_latin1_t::parsed_eq_literal() {
31+
if (f_parsed_eq_literal)
32+
return m_parsed_eq_literal;
33+
f_parsed_eq_literal = true;
34+
m_parsed_eq_literal = parsed() == (std::string("\243"));
35+
return m_parsed_eq_literal;
36+
}

‎compiled/cpp_stl_98/str_literals_latin1.h‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#ifndef STR_LITERALS_LATIN1_H_
2+
#define STR_LITERALS_LATIN1_H_
3+
4+
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
5+
6+
class str_literals_latin1_t;
7+
8+
#include "kaitai/kaitaistruct.h"
9+
#include <stdint.h>
10+
11+
#if KAITAI_STRUCT_VERSION < 11000L
12+
#error "Incompatible Kaitai Struct C++/STL API: version 0.11 or later is required"
13+
#endif
14+
15+
class str_literals_latin1_t : public kaitai::kstruct {
16+
17+
public:
18+
19+
str_literals_latin1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, str_literals_latin1_t* p__root = 0);
20+
21+
private:
22+
void _read();
23+
void _clean_up();
24+
25+
public:
26+
~str_literals_latin1_t();
27+
28+
private:
29+
bool f_parsed_eq_literal;
30+
bool m_parsed_eq_literal;
31+
32+
public:
33+
bool parsed_eq_literal();
34+
35+
private:
36+
uint16_t m_len_parsed;
37+
std::string m_parsed;
38+
str_literals_latin1_t* m__root;
39+
kaitai::kstruct* m__parent;
40+
41+
public:
42+
uint16_t len_parsed() const { return m_len_parsed; }
43+
std::string parsed() const { return m_parsed; }
44+
str_literals_latin1_t* _root() const { return m__root; }
45+
kaitai::kstruct* _parent() const { return m__parent; }
46+
};
47+
48+
#endif // STR_LITERALS_LATIN1_H_

0 commit comments

Comments
 (0)