forked from M-Labs/nac3
nac3core: fix for loop type inference
This commit is contained in:
parent
91625dd327
commit
ff27a1697e
|
@ -122,9 +122,36 @@ impl<'a> fold::Fold<()> for Inferencer<'a> {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ast::StmtKind::For { ref target, .. } => {
|
ast::StmtKind::For { target, iter, body, orelse, config_comment, type_comment } => {
|
||||||
self.infer_pattern(target)?;
|
self.infer_pattern(&target)?;
|
||||||
fold::fold_stmt(self, node)?
|
let target = self.fold_expr(*target)?;
|
||||||
|
let iter = self.fold_expr(*iter)?;
|
||||||
|
if self.unifier.unioned(iter.custom.unwrap(), self.primitives.range) {
|
||||||
|
self.unify(self.primitives.int32, target.custom.unwrap(), &target.location)?;
|
||||||
|
} else {
|
||||||
|
let list = self.unifier.add_ty(TypeEnum::TList { ty: target.custom.unwrap() });
|
||||||
|
self.unify(list, iter.custom.unwrap(), &iter.location)?;
|
||||||
|
}
|
||||||
|
let body = body
|
||||||
|
.into_iter()
|
||||||
|
.map(|b| self.fold_stmt(b))
|
||||||
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
|
let orelse = orelse
|
||||||
|
.into_iter()
|
||||||
|
.map(|o| self.fold_stmt(o))
|
||||||
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
|
Located {
|
||||||
|
location: node.location,
|
||||||
|
node: ast::StmtKind::For {
|
||||||
|
target: Box::new(target),
|
||||||
|
iter: Box::new(iter),
|
||||||
|
body,
|
||||||
|
orelse,
|
||||||
|
config_comment,
|
||||||
|
type_comment,
|
||||||
|
},
|
||||||
|
custom: None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ast::StmtKind::Assign { ref mut targets, ref config_comment, .. } => {
|
ast::StmtKind::Assign { ref mut targets, ref config_comment, .. } => {
|
||||||
for target in targets.iter_mut() {
|
for target in targets.iter_mut() {
|
||||||
|
@ -201,14 +228,7 @@ impl<'a> fold::Fold<()> for Inferencer<'a> {
|
||||||
_ => fold::fold_stmt(self, node)?,
|
_ => fold::fold_stmt(self, node)?,
|
||||||
};
|
};
|
||||||
match &stmt.node {
|
match &stmt.node {
|
||||||
ast::StmtKind::For { target, iter, .. } => {
|
ast::StmtKind::For { .. } => {}
|
||||||
if self.unifier.unioned(iter.custom.unwrap(), self.primitives.range) {
|
|
||||||
self.unify(self.primitives.int32, target.custom.unwrap(), &target.location)?;
|
|
||||||
} else {
|
|
||||||
let list = self.unifier.add_ty(TypeEnum::TList { ty: target.custom.unwrap() });
|
|
||||||
self.unify(list, iter.custom.unwrap(), &iter.location)?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ast::StmtKind::If { test, .. } | ast::StmtKind::While { test, .. } => {
|
ast::StmtKind::If { test, .. } | ast::StmtKind::While { test, .. } => {
|
||||||
self.unify(test.custom.unwrap(), self.primitives.bool, &test.location)?;
|
self.unify(test.custom.unwrap(), self.primitives.bool, &test.location)?;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue