Skip to content

Cast to int format error v2 #167

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

Closed
shewitt-au wants to merge 3 commits into from
Closed

Cast to int format error v2 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d02242
Smallest change that fixes the problem
shewitt-au May 23, 2025
d3a5b02
Remove comment
shewitt-au May 23, 2025
4c6e362
cast-to-int-format-error-v2
shewitt-au May 24, 2025
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
5 changes: 5 additions & 0 deletions lib/include/pl/patterns/pattern.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ namespace pl::ptrn {
friend class core::Evaluator;
};

inline std::shared_ptr<Pattern> make_shared_pattern_raw(Pattern *p)
{
return std::shared_ptr<Pattern>(p, [](Pattern*){});
}

class Pattern {
public:
constexpr static u64 MainSectionId = 0x0000'0000'0000'0000;
Expand Down
4 changes: 2 additions & 2 deletions lib/include/pl/patterns/pattern_array_dynamic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ namespace pl::ptrn {

result += " ]";

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

[[nodiscard]] bool operator==(const Pattern &other) const override {
Expand Down Expand Up @@ -208,7 +208,7 @@ namespace pl::ptrn {
}

std::string formatDisplayValue() override {
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or("[ ... ]");
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or("[ ... ]");
}

std::vector<u8> getRawBytes() override {
Expand Down
4 changes: 2 additions & 2 deletions lib/include/pl/patterns/pattern_array_static.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ namespace pl::ptrn {
}

std::string formatDisplayValue() override {
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or("[ ... ]");
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or("[ ... ]");
}

[[nodiscard]] std::string toString() override {
Expand Down Expand Up @@ -220,7 +220,7 @@ namespace pl::ptrn {

result += " ]";

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

std::vector<u8> getRawBytes() override {
Expand Down
10 changes: 5 additions & 5 deletions lib/include/pl/patterns/pattern_bitfield.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ namespace pl::ptrn {

result += " ]";

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

[[nodiscard]] bool operator==(const Pattern &other) const override {
Expand Down Expand Up @@ -495,7 +495,7 @@ namespace pl::ptrn {
}

std::string formatDisplayValue() override {
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or("[ ... ]");
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or("[ ... ]");
}

void sort(const std::function<bool (const Pattern *, const Pattern *)> &comparator) override {
Expand Down Expand Up @@ -691,7 +691,7 @@ namespace pl::ptrn {

result += " }";

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

std::string formatDisplayValue() override {
Expand Down Expand Up @@ -725,9 +725,9 @@ namespace pl::ptrn {
}

if (valueString.size() > 64)
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or(fmt::format("{{ ... }}", valueString));
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or(fmt::format("{{ ... }}", valueString));
else
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or(fmt::format("{{ {} }}", valueString));
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or(fmt::format("{{ {} }}", valueString));
}

void setEndian(std::endian endian) override {
Expand Down
2 changes: 1 addition & 1 deletion lib/include/pl/patterns/pattern_enum.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace pl::ptrn {

[[nodiscard]] std::string toString() override {
u128 value = this->getValue().toUnsigned();
return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(getEnumName(this->getTypeName(), value, m_enumValues));
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(getEnumName(this->getTypeName(), value, m_enumValues));
}

std::vector<u8> getRawBytes() override {
Expand Down
2 changes: 1 addition & 1 deletion lib/include/pl/patterns/pattern_pointer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ namespace pl::ptrn {
[[nodiscard]] std::string toString() override {
auto result = this->m_pointedAt->toString();

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

std::vector<u8> getRawBytes() override {
Expand Down
4 changes: 2 additions & 2 deletions lib/include/pl/patterns/pattern_struct.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ namespace pl::ptrn {

result += " }";

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

void sort(const std::function<bool (const Pattern *, const Pattern *)> &comparator) override {
Expand Down Expand Up @@ -199,7 +199,7 @@ namespace pl::ptrn {
}

std::string formatDisplayValue() override {
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or("{ ... }");
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or("{ ... }");
}

std::vector<u8> getRawBytes() override {
Expand Down
4 changes: 2 additions & 2 deletions lib/include/pl/patterns/pattern_union.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ namespace pl::ptrn {

result += " }";

return Pattern::callUserFormatFunc(PatternRef::create(this), true).value_or(result);
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this), true).value_or(result);
}

void sort(const std::function<bool (const Pattern *, const Pattern *)> &comparator) override {
Expand Down Expand Up @@ -198,7 +198,7 @@ namespace pl::ptrn {
}

std::string formatDisplayValue() override {
return Pattern::callUserFormatFunc(PatternRef::create(this)).value_or("{ ... }");
return Pattern::callUserFormatFunc(make_shared_pattern_raw(this)).value_or("{ ... }");
}

std::vector<u8> getRawBytes() override {
Expand Down
Loading