Skip to content

Commit

Permalink
bytes patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@christoph2
christoph2 committed Jul 21, 2024
1 parent 33ece60 commit 1ade193
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 27 deletions.
2 changes: 1 addition & 1 deletion pya2l/aml/klasses.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ template<>
inline std::string to_binary<std::string>(const std::string& value) {
std::string result;

auto ptr = reinterpret_cast<const std::string::value_type*>(value.c_str());
auto ptr = reinterpret_cast<const std::string::value_type*>(value.c_str());
const std::size_t length = std::size(value);

// We are using Pascal strings as serialization format.
Expand Down
34 changes: 17 additions & 17 deletions pya2l/aml/marshal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void dumps(std::stringstream& ss, const AMLPredefinedType& pdt) {

// Member.
void dumps(std::stringstream& ss, const Member& mem) {
const auto& arr_spec = mem.get_array_spec();
const auto& arr_spec = mem.get_array_spec();
const std::size_t array_size = std::size(arr_spec);
ss << to_binary(array_size);
for (const auto arr : arr_spec) {
Expand Down Expand Up @@ -84,10 +84,10 @@ void dumps(std::stringstream& ss, const TaggedStructOrReferrer& sr) {
ss << to_binary<std::string>("TS");
if (std::holds_alternative<TaggedStruct>(sr)) {
ss << to_binary<std::string>("S");
const auto& ts = std::get<TaggedStruct>(sr);
const auto& members = ts.get_members();
const auto& name = ts.get_name();
const auto& tags = ts.get_tags();
const auto& ts = std::get<TaggedStruct>(sr);
const auto& members = ts.get_members();
const auto& name = ts.get_name();
const auto& tags = ts.get_tags();
const std::size_t tags_count = std::size(tags);
ss << to_binary(name);
ss << to_binary(tags_count);
Expand Down Expand Up @@ -119,10 +119,10 @@ void dumps(std::stringstream& ss, const TaggedUnionOrReferrer& tr) {
ss << to_binary<std::string>("TU");
if (std::holds_alternative<TaggedUnion>(tr)) {
ss << to_binary<std::string>("U");
const auto& tu = std::get<TaggedUnion>(tr);
const auto& members = tu.get_members();
const auto& name = tu.get_name();
const auto& tags = tu.get_tags();
const auto& tu = std::get<TaggedUnion>(tr);
const auto& members = tu.get_members();
const auto& name = tu.get_name();
const auto& tags = tu.get_tags();
const std::size_t tags_count = std::size(tags);
ss << to_binary(name);
ss << to_binary(tags_count);
Expand All @@ -141,9 +141,9 @@ void dumps(std::stringstream& ss, const StructOrReferrer& sr) {
ss << to_binary<std::string>("ST");
if (std::holds_alternative<Struct>(sr)) {
ss << to_binary<std::string>("S");
const auto& st = std::get<Struct>(sr);
const auto& name = st.get_name();
const auto& members = st.get_members();
const auto& st = std::get<Struct>(sr);
const auto& name = st.get_name();
const auto& members = st.get_members();
const std::size_t member_count = std::size(members);
ss << to_binary(name);
ss << to_binary(member_count);
Expand All @@ -164,9 +164,9 @@ void dumps(std::stringstream& ss, const EnumerationOrReferrer& er) {
ss << to_binary<std::string>("EN");
if (std::holds_alternative<Enumeration>(er)) {
ss << to_binary<std::string>("E");
const auto& enumeration = std::get<Enumeration>(er);
const auto& name = enumeration.get_name();
const auto& enumerators = enumeration.get_enumerators();
const auto& enumeration = std::get<Enumeration>(er);
const auto& name = enumeration.get_name();
const auto& enumerators = enumeration.get_enumerators();
const std::size_t enumerator_count = std::size(enumerators);
ss << to_binary(name);
ss << to_binary(enumerator_count);
Expand Down Expand Up @@ -221,8 +221,8 @@ void dumps(std::stringstream& ss, const Declaration& decl) {

// AMLFile.
void dumps(std::stringstream& ss, const AmlFile& amlf) {
const auto& decls = amlf.get_decls();
const std::size_t decl_count = std::size(decls);
const auto& decls = amlf.get_decls();
const std::size_t decl_count = std::size(decls);
ss << to_binary<std::uint32_t>(decl_count);
for (const auto& decl : decls) {
dumps(ss, decl);
Expand Down
4 changes: 2 additions & 2 deletions pya2l/aml/parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ void ANTLRFileStream::loadFromFile(const std::string &fileName) {
#endif

std::string parse(const std::string& aml_stuff) {
//std::ifstream stream(fileName, std::ios::binary);
// std::ifstream stream(fileName, std::ios::binary);

ANTLRInputStream input(aml_stuff);
ANTLRInputStream input(aml_stuff);

amlLexer lexer(&input);
CommonTokenStream tokens(&lexer);
Expand Down
7 changes: 1 addition & 6 deletions pya2l/amlparser_wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ namespace py = pybind11;
std::string parse(const std::string& aml_stuff);

PYBIND11_MODULE(amlparser_ext, m) {

m.def("parse_aml",
[](const std::string& aml_text) {
return py::bytes(parse(aml_text));
}
);
m.def("parse_aml", [](const std::string& aml_text) { return py::bytes(parse(aml_text)); });

#if 0
py::class_<ValueContainer>(m, "ValueContainer")
Expand Down
2 changes: 1 addition & 1 deletion pya2l/extensions/tokenizer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Generator<TokenizerReturnType> tokenizer(std::basic_istream<char> &stream, bool
if ((string_state == StringStateType::IDLE) && (!in_comment())) {
if (previos_ch == DQUOTE) {
LineNumbers line_numbers{ start_line, start_column, line, column - 1 };
co_yield{ Token(TokenClass::STRING, line_numbers, token[char_class_to_int(current)]) };
co_yield { Token(TokenClass::STRING, line_numbers, token[char_class_to_int(current)]) };
token[char_class_to_int(CharClass::REGULAR)].clear();
string_class = false;
}
Expand Down

0 comments on commit 1ade193

Please sign in to comment.