Skip to content

Fix restrictive numeric casts/assignments. #134

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix restrictive numeric casts/assignments. #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f3a179
Fix restrictive numeric casts/assignments.
willvale Nov 21, 2025
adefe3e
Clangformat fixes.
willvale Nov 21, 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
1 change: 1 addition & 0 deletions inkcpp/numeric_operations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ namespace casting
// int value can cast to float
case value_type::int32: return static_cast<float>(v.get<value_type::int32>());
case value_type::uint32: return static_cast<float>(v.get<value_type::uint32>());
case value_type::boolean: return v.get<value_type::boolean>() ? 1.0f : 0.0f;
default: inkFail("invalid numeric_cast!"); return 0;
}
}
Expand Down
19 changes: 10 additions & 9 deletions inkcpp/operations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,16 @@ template<typename... T>
ink::runtime::internal::value
ink::runtime::internal::value::redefine(const value& oth, T&... env) const
{
if (type() != oth.type() && (type() == value_type::list_flag || type() == value_type::list)
&& (oth.type() == value_type::list_flag || oth.type() == value_type::list)) {
/// @todo could break origin
if (oth.type() == value_type::list) {
return value{}.set<value_type::list>(oth.get<value_type::list>());
} else {
return value{}.set<value_type::list_flag>(oth.get<value_type::list_flag>());
}
if (type() != oth.type()) {

const value vs[] = {*this, oth};
inkAssert(
casting::common_base<2>(vs) != value_type::none,
"try to redefine value of other type with no cast available"
);

// There's a valid conversion, so redefine as input value.
return oth;
}
inkAssert(type() == oth.type(), "try to redefine value of other type");
return redefine<value_type::OP_BEGIN, T...>(oth, {&env...});
}
Loading