From bc40a325240181c15bc6ebd360e0cd999bda8b1c Mon Sep 17 00:00:00 2001 From: David Mak Date: Tue, 9 Jul 2024 13:43:57 +0800 Subject: [PATCH] core: Add report_type_error to enable more code reuse --- nac3core/src/typecheck/type_inferencer/mod.rs | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/nac3core/src/typecheck/type_inferencer/mod.rs b/nac3core/src/typecheck/type_inferencer/mod.rs index c7ec7784..4bff17c4 100644 --- a/nac3core/src/typecheck/type_inferencer/mod.rs +++ b/nac3core/src/typecheck/type_inferencer/mod.rs @@ -4,13 +4,12 @@ use std::iter::once; use std::ops::Not; use std::{cell::RefCell, sync::Arc}; -use super::typedef::OperatorInfo; use super::{ magic_methods::*, - type_error::TypeError, + type_error::{TypeError, TypeErrorKind}, typedef::{ - into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, RecordField, Type, - TypeEnum, TypeVar, Unifier, VarMap, + into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, OperatorInfo, + RecordField, RecordKey, Type, TypeEnum, TypeVar, Unifier, VarMap, }, }; use crate::{ @@ -114,6 +113,14 @@ fn report_error(msg: &str, location: Location) -> Result> Err(HashSet::from([format!("{msg} at {location}")])) } +fn report_type_error( + kind: TypeErrorKind, + loc: Option, + unifier: &Unifier, +) -> Result> { + Err(HashSet::from([TypeError::new(kind, loc).to_display(unifier).to_string()])) +} + impl<'a> Fold<()> for Inferencer<'a> { type TargetU = Option; type Error = HashSet; @@ -1659,9 +1666,11 @@ impl<'a> Inferencer<'a> { // just a fast path match (fields.get(&attr), ctx == ExprContext::Store) { (Some((ty, true)), _) | (Some((ty, false)), false) => Ok(*ty), - (Some((_, false)), true) => { - report_error(&format!("Field `{attr}` is immutable"), value.location) - } + (Some((ty, false)), true) => report_type_error( + TypeErrorKind::MutationError(RecordKey::Str(attr), *ty), + Some(value.location), + self.unifier, + ), (None, mutable) => { // Check whether it is a class attribute let defs = self.top_level.definitions.read(); @@ -1683,13 +1692,11 @@ impl<'a> Inferencer<'a> { &format!("Class Attribute `{attr}` is immutable"), value.location, ), - None => { - let t = self.unifier.stringify(ty); - report_error( - &format!("`{t}::{attr}` field/method does not exist"), - value.location, - ) - } + None => report_type_error( + TypeErrorKind::NoSuchField(RecordKey::Str(attr), ty), + Some(value.location), + self.unifier, + ), } } }