Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move serialization functions to include #875

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Move serialization functions to include #875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eff8063
Rename params stringifier
PatKamin Sep 5, 2023
eed9899
Move print operators into the ur_print namespace
PatKamin Sep 6, 2023
5f0e6d4
Move printing C++ API to include
PatKamin Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move print operators into the ur_print namespace
  • Loading branch information
@PatKamin
PatKamin committed Oct 23, 2023
commit eed98998d060b8b3f718d7a9c826efe6acc669a7
30 changes: 11 additions & 19 deletions scripts/templates/print.hpp.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ from templates import helper as th

<%def name="member(iname, itype, loop)">
%if iname == "pNext":
${x}_print::printStruct(os, ${caller.body()});
printStruct(os, ${caller.body()});
%elif th.type_traits.is_flags(itype):
${x}_print::printFlag<${th.type_traits.get_flag_type(itype)}>(os, ${caller.body()});
printFlag<${th.type_traits.get_flag_type(itype)}>(os, ${caller.body()});
%elif not loop and th.type_traits.is_pointer(itype):
${x}_print::printPtr(os, ${caller.body()});
printPtr(os, ${caller.body()});
%elif loop and th.type_traits.is_pointer_to_pointer(itype):
${x}_print::printPtr(os, ${caller.body()});
printPtr(os, ${caller.body()});
%elif th.type_traits.is_handle(itype):
${x}_print::printPtr(os, ${caller.body()});
printPtr(os, ${caller.body()});
%elif iname and iname.startswith("pfn"):
os << reinterpret_cast<void*>(${caller.body()});
%else:
Expand Down Expand Up @@ -83,7 +83,7 @@ def findMemberType(_item):
os << "}";
%elif findMemberType(item) is not None and findMemberType(item)['type'] == "union":
os << ".${iname} = ";
${x}_print::printUnion(os, ${deref}(params${access}${item['name']}), params${access}${th.param_traits.tagged_member(item)});
printUnion(os, ${deref}(params${access}${item['name']}), params${access}${th.param_traits.tagged_member(item)});
%elif th.type_traits.is_array(item['type']):
os << ".${iname} = {";
for(auto i = 0; i < ${th.type_traits.get_array_length(item['type'])}; i++){
Expand All @@ -97,7 +97,7 @@ def findMemberType(_item):
os << "}";
%elif typename is not None:
os << ".${iname} = ";
${x}_print::printTagged(os, ${deref}(params${access}${pname}), ${deref}(params${access}${prefix}${typename}), ${deref}(params${access}${prefix}${typename_size}));
printTagged(os, ${deref}(params${access}${pname}), ${deref}(params${access}${prefix}${typename}), ${deref}(params${access}${prefix}${typename_size}));
%else:
os << ".${iname} = ";
<%call expr="member(iname, itype, False)">
Expand Down Expand Up @@ -147,7 +147,6 @@ template <typename T> inline void printTagged(std::ostream &os, const void *ptr,
%endif
%endfor # obj in spec['objects']
%endfor
} // namespace ${x}_print

%for spec in specs:
%for obj in spec['objects']:
Expand Down Expand Up @@ -188,7 +187,6 @@ template <typename T> inline void printTagged(std::ostream &os, const void *ptr,
}
%endif
%if obj.get('typed_etors', False) is True:
namespace ${x}_print {
template <>
inline void printTagged(std::ostream &os, const void *ptr, ${th.make_enum_name(n, tags, obj)} value, size_t size) {
if (ptr == NULL) {
Expand Down Expand Up @@ -248,12 +246,11 @@ template <typename T> inline void printTagged(std::ostream &os, const void *ptr,
break;
}
}
}

%elif "structure_type" in obj['name']:
namespace ${x}_print {
inline void printStruct(std::ostream &os, const void *ptr) {
if (ptr == NULL) {
${x}_print::printPtr(os, ptr);
printPtr(os, ptr);
return;
}

Expand All @@ -266,18 +263,16 @@ template <typename T> inline void printTagged(std::ostream &os, const void *ptr,
%>
case ${ename}: {
const ${th.subt(n, tags, item['desc'])} *pstruct = (const ${th.subt(n, tags, item['desc'])} *)ptr;
${x}_print::printPtr(os, pstruct);
printPtr(os, pstruct);
} break;
%endfor
default:
os << "unknown enumerator";
break;
}
}
} // namespace ${x}_print
%endif
%if th.type_traits.is_flags(obj['name']):
namespace ${x}_print {

template<>
inline void printFlag<${th.make_enum_name(n, tags, obj)}>(std::ostream &os, uint32_t flag) {
Expand Down Expand Up @@ -310,7 +305,6 @@ inline void printFlag<${th.make_enum_name(n, tags, obj)}>(std::ostream &os, uint
os << "0";
}
}
} // namespace ${x}_print
%endif
## STRUCT/UNION ###############################################################
%elif re.match(r"struct", obj['type']):
Expand All @@ -332,7 +326,7 @@ inline std::ostream &operator<<(std::ostream &os, const ${obj['type']} ${th.make
}
%elif re.match(r"union", obj['type']) and obj['name']:
<% tag = findUnionTag(obj) %>
inline void ${x}_print::printUnion(
inline void printUnion(
std::ostream &os,
const ${obj['type']} ${th.make_type_name(n, tags, obj)} params,
const ${tag['type']} ${th.make_type_name(n, tags, tag)} tag
Expand Down Expand Up @@ -381,8 +375,6 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
%endfor
%endfor

namespace ${x}_print {

template <typename T> inline void printPtr(std::ostream &os, const T *ptr) {
if (ptr == nullptr) {
os << "nullptr";
Expand Down
2 changes: 2 additions & 0 deletions source/common/logger/ur_sinks.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@

#include "ur_filesystem_resolved.hpp"
#include "ur_level.hpp"
#include "ur_print.hpp"

namespace logger {
using namespace ur_print;

class Sink {
public:
Expand Down
Loading