public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] Reuse TypeCheckPattern on LetStmt's
@ 2023-01-12 7:45 Thomas Schwinge
0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2023-01-12 7:45 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:97c1308bec6bc149b9295b882b7261ca8f3df048
commit 97c1308bec6bc149b9295b882b7261ca8f3df048
Author: Owen Avery <powerboat9.gamer@gmail.com>
Date: Mon Jan 9 19:54:55 2023 -0500
Reuse TypeCheckPattern on LetStmt's
Update Rust type-checking to reuse TypeCheckPattern on HIR::LetStmt's.
This will unify the paths and improve error handling.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diff:
---
gcc/rust/typecheck/rust-hir-type-check-stmt.cc | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
index 890901245ee..673d57cffe8 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
@@ -82,7 +82,7 @@ TypeCheckStmt::visit (HIR::LetStmt &stmt)
{
infered = TyTy::TupleType::get_unit_type (stmt.get_mappings ().get_hirid ());
- const HIR::Pattern &stmt_pattern = *stmt.get_pattern ();
+ HIR::Pattern &stmt_pattern = *stmt.get_pattern ();
TyTy::BaseType *init_expr_ty = nullptr;
Location init_expr_locus;
if (stmt.has_init_expr ())
@@ -111,27 +111,25 @@ TypeCheckStmt::visit (HIR::LetStmt &stmt)
TyTy::TyWithLocation (specified_ty, specified_ty_locus),
TyTy::TyWithLocation (init_expr_ty, init_expr_locus),
stmt.get_locus ());
- context->insert_type (stmt_pattern.get_pattern_mappings (), specified_ty);
+ TypeCheckPattern::Resolve (&stmt_pattern, specified_ty);
}
else
{
// let x:i32;
if (specified_ty != nullptr)
{
- context->insert_type (stmt_pattern.get_pattern_mappings (),
- specified_ty);
+ TypeCheckPattern::Resolve (&stmt_pattern, specified_ty);
}
// let x = 123;
else if (init_expr_ty != nullptr)
{
- context->insert_type (stmt_pattern.get_pattern_mappings (),
- init_expr_ty);
+ TypeCheckPattern::Resolve (&stmt_pattern, init_expr_ty);
}
// let x;
else
{
- context->insert_type (
- stmt_pattern.get_pattern_mappings (),
+ TypeCheckPattern::Resolve (
+ &stmt_pattern,
new TyTy::InferType (
stmt_pattern.get_pattern_mappings ().get_hirid (),
TyTy::InferType::InferTypeKind::GENERAL, stmt.get_locus ()));
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-12 7:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-12 7:45 [gcc/devel/rust/master] Reuse TypeCheckPattern on LetStmt's Thomas Schwinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).