M-Labs/nac3
M-Labs
/
nac3
8
0
Fork 10
Code Issues 97 Pull Requests 19 Releases Wiki Activity

not creating temp for borrow, more concise code

This commit is contained in:
CrescentonC 2021-08-03 09:45:39 +08:00
parent a7e3eeea0d
commit d4721db4a3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nac3core/src/typecheck/typedef/mod.rs
View File

@ -373,9 +373,8 @@ impl Unifier {
(TVar { meta: Record(map), id, range, .. }, TObj { fields, .. }) => { (TVar { meta: Record(map), id, range, .. }, TObj { fields, .. }) => {
self.occur_check(a, b)?; self.occur_check(a, b)?;
for (k, v) in map.borrow().iter() { for (k, v) in map.borrow().iter() {
let temp = fields.borrow(); let ty = fields.borrow().get(k).copied().ok_or_else(|| format!("No such attribute {}", k))?;
let ty = temp.get(k).ok_or_else(|| format!("No such attribute {}", k))?; self.unify(ty, *v)?;
self.unify(*ty, *v)?;
} }
let x = self.check_var_compatibility(*id, b, &range.borrow())?.unwrap_or(b); let x = self.check_var_compatibility(*id, b, &range.borrow())?.unwrap_or(b);
self.unify(x, b)?; self.unify(x, b)?;
@ -386,12 +385,11 @@ impl Unifier {
let ty = self.get_ty(*ty); let ty = self.get_ty(*ty);
if let TObj { fields, .. } = ty.as_ref() { if let TObj { fields, .. } = ty.as_ref() {
for (k, v) in map.borrow().iter() { for (k, v) in map.borrow().iter() {
let temp = fields.borrow(); let ty = fields.borrow().get(k).copied().ok_or_else(|| format!("No such attribute {}", k))?;
let ty = temp.get(k).ok_or_else(|| format!("No such attribute {}", k))?; if !matches!(self.get_ty(ty).as_ref(), TFunc { .. }) {
if !matches!(self.get_ty(*ty).as_ref(), TFunc { .. }) {
return Err(format!("Cannot access field {} for virtual type", k)); return Err(format!("Cannot access field {} for virtual type", k));
} }
self.unify(*v, *ty)?; self.unify(*v, ty)?;
} }
} else { } else {
// require annotation... // require annotation...