aboutsummaryrefslogtreecommitdiff
path: root/boot/type_check.cc
diff options
context:
space:
mode:
authorEugen Wissner <belka@caraus.de>2026-11-14 23:39:52 +0100
committerEugen Wissner <belka@caraus.de>2026-11-14 23:39:52 +0100
commit9b4b13e0d9030bb21c86eea6c4ba00bf4d91f0a0 (patch)
treedd1c8fa2336b098d6380e579125d01ac8711a3c6 /boot/type_check.cc
parent7ab6e1021611cc6913ee4ab5faf1b31f928a65e9 (diff)
downloadelna-9b4b13e0d9030bb21c86eea6c4ba00bf4d91f0a0.tar.gz
Add arity check for generic parameters
Diffstat (limited to 'boot/type_check.cc')
-rw-r--r--boot/type_check.cc50
1 files changed, 31 insertions, 19 deletions
diff --git a/boot/type_check.cc b/boot/type_check.cc
index a135bcb..bebee9a 100644
--- a/boot/type_check.cc
+++ b/boot/type_check.cc
@@ -996,6 +996,12 @@ namespace elna::boot
add_error<type_requirement_error>(expression->position(),
base_type, type_requirement_error::kind::record_base);
}
+ else
+ {
+ const std::shared_ptr<generic_type> generic = unwrap_generic(base_symbol->is_type()->symbol);
+ check_generic_arity(expression->base.value().position(), expression->base.value().name(),
+ generic, expression->base_arguments.size());
+ }
}
}
walking_visitor::visit(expression);
@@ -1065,6 +1071,25 @@ namespace elna::boot
return false;
}
+ void type_analysis_visitor::check_generic_arity(const source_position position,
+ const std::string& name, const std::shared_ptr<generic_type>& generic,
+ const std::size_t argument_count)
+ {
+ if (generic == nullptr)
+ {
+ if (argument_count > 0)
+ {
+ add_error<generic_error>(position, name, generic_error::not_generic{});
+ }
+ }
+ else if (argument_count != generic->parameters.size())
+ {
+ add_error<argument_count_error>(position,
+ argument_count_error::kind::generic, name,
+ generic->parameters.size(), argument_count);
+ }
+ }
+
void type_analysis_visitor::check_parameters_used(const source_position position,
const std::string& name, const std::vector<type>& parameters, const type& heading)
{
@@ -1153,31 +1178,18 @@ namespace elna::boot
if (const auto instance = denoted.get<instantiated_type>())
{
- std::shared_ptr<generic_type> const generic = unwrap_generic(instance->generic);
+ const std::shared_ptr<generic_type> generic = unwrap_generic(instance->generic);
- if (generic == nullptr)
- {
- add_error<generic_error>(expression->position(), expression->name,
- generic_error::not_generic{});
- }
- else if (instance->arguments.size() != generic->parameters.size())
- {
- add_error<argument_count_error>(expression->position(),
- argument_count_error::kind::generic, expression->name,
- generic->parameters.size(), instance->arguments.size());
- }
- else
+ check_generic_arity(expression->position(), expression->name,
+ generic, instance->arguments.size());
+ if (generic != nullptr && instance->arguments.size() == generic->parameters.size())
{
check_arguments(*expression, expression->argument_types, argument_rule::opaque);
}
}
- else if (std::shared_ptr<generic_type> const generic = unwrap_generic(denoted))
+ else if (const std::shared_ptr<generic_type> generic = unwrap_generic(denoted))
{
- // A bare generic is not a type at all, which is simply zero
- // arguments where some were expected.
- add_error<argument_count_error>(expression->position(),
- argument_count_error::kind::generic, expression->name,
- generic->parameters.size(), 0);
+ check_generic_arity(expression->position(), expression->name, generic, 0);
}
else if (procedure != nullptr && !expression->arguments.empty())
{