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

feat: Make for-loop range be a polymorphic integer instead of just Field in unconstrained functions #1583

Merged
merged 5 commits into from
Jun 8, 2023
Merged

feat: Make for-loop range be a polymorphic integer instead of just Field in unconstrained functions #1583

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6810af
make ranges be polymorphic integers
kevaundray Jun 6, 2023
1d52f5e
make behavior consistent
kevaundray Jun 8, 2023
2d3ab61
remove closure
kevaundray Jun 8, 2023
801a739
change index_type
kevaundray Jun 8, 2023
2bcfc24
Update crates/noirc_frontend/src/hir/type_check/expr.rs
jfecher Jun 8, 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
43 changes: 27 additions & 16 deletions crates/noirc_frontend/src/hir/type_check/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,25 +153,36 @@ impl<'interner> TypeChecker<'interner> {
let start_span = self.interner.expr_span(&for_expr.start_range);
let end_span = self.interner.expr_span(&for_expr.end_range);

let mut unify_loop_range = |actual_type, span| {
let expected_type = if self.is_unconstrained() {
Type::FieldElement(CompTime::new(self.interner))
} else {
Type::comp_time(Some(span))
};
// Check that start range and end range have the same types
let range_span = start_span.merge(end_span);
self.unify(&start_range_type, &end_range_type, range_span, || {
TypeCheckError::TypeMismatch {
expected_typ: start_range_type.to_string(),
expr_typ: end_range_type.to_string(),
expr_span: range_span,
}
});

self.unify(actual_type, &expected_type, span, || {
TypeCheckError::TypeCannotBeUsed {
typ: start_range_type.clone(),
place: "for loop",
span,
}
.add_context("The range of a loop must be known at compile-time")
});
let expected_type = if self.is_unconstrained() {
Type::PolymorphicInteger(
CompTime::new(self.interner),
Shared::new(TypeBinding::Bound(start_range_type.clone())),
)
} else {
Type::PolymorphicInteger(
CompTime::Yes(Some(range_span)),
Shared::new(TypeBinding::Bound(start_range_type.clone())),
)
};
jfecher marked this conversation as resolved.
Show resolved Hide resolved

unify_loop_range(&start_range_type, start_span);
unify_loop_range(&end_range_type, end_span);
self.unify(&start_range_type, &expected_type, range_span, || {
TypeCheckError::TypeCannotBeUsed {
typ: start_range_type.clone(),
place: "for loop",
span: range_span,
}
.add_context("The range of a loop must be known at compile-time")
});

self.interner.push_definition_type(for_expr.identifier.id, start_range_type);

Expand Down