aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorEugen Wissner <belka@caraus.de>2026-11-18 00:10:23 +0100
committerEugen Wissner <belka@caraus.de>2026-11-20 00:08:40 +0100
commitd4681529c20d5cb2630bfe09f4cf4c4ca4c98a23 (patch)
treed11bc100c2e35fe7ee8e84837d8e2826e4b8731e /boot
parent9b4b13e0d9030bb21c86eea6c4ba00bf4d91f0a0 (diff)
downloadelna-cpp.tar.gz
Restrict pointer subtraction by typeHEADcpp
Diffstat (limited to 'boot')
-rw-r--r--boot/type_check.cc27
1 files changed, 19 insertions, 8 deletions
diff --git a/boot/type_check.cc b/boot/type_check.cc
index bebee9a..4e21791 100644
--- a/boot/type_check.cc
+++ b/boot/type_check.cc
@@ -423,13 +423,11 @@ namespace elna::boot
{
return rhs;
}
- const bool lhs_integral = is_integral_type(lhs);
-
- if (lhs_integral == is_integral_type(rhs))
+ if (const std::shared_ptr<pointer_type> pointer = lhs.get<pointer_type>())
{
- return std::nullopt;
+ return find_opaque_type(pointer->base);
}
- if (const auto pointer = (lhs_integral ? rhs : lhs).get<pointer_type>())
+ if (const std::shared_ptr<pointer_type> pointer = rhs.get<pointer_type>())
{
return find_opaque_type(pointer->base);
}
@@ -1544,9 +1542,22 @@ namespace elna::boot
|| (is_numeric_type(lhs_resolved) && lhs_resolved == rhs_resolved);
break;
case subtraction:
- valid = (is_any_pointer_type(lhs_resolved) && is_integral_type(rhs_resolved))
- || (is_any_pointer_type(lhs_resolved) && is_any_pointer_type(rhs_resolved))
- || (is_numeric_type(lhs_resolved) && lhs_resolved == rhs_resolved);
+ if (const std::shared_ptr<pointer_type> lhs_pointer = lhs_resolved.get<pointer_type>())
+ {
+ if (const std::shared_ptr<pointer_type> rhs_pointer = rhs_resolved.get<pointer_type>())
+ {
+ valid = resolve_underlying_type(lhs_pointer->base)
+ == resolve_underlying_type(rhs_pointer->base);
+ }
+ else
+ {
+ valid = is_integral_type(rhs_resolved);
+ }
+ }
+ else
+ {
+ valid = is_numeric_type(lhs_resolved) && lhs_resolved == rhs_resolved;
+ }
break;
case division:
case multiplication: