M-Labs/nac3
M-Labs/nac3
8
1
Fork 12
Code Issues 98 Pull Requests 19 Releases Wiki Activity

optimization (#13) #15

Merged
pca006132 merged 9 commits from optimization into master 2021-09-23 19:58:43 +08:00
Conversation 0 Commits 9 Files Changed 24 +20 -23
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b5ac3cd25 - Show all commits

16
nac3core/src/codegen/expr.rs
View File

@ -650,10 +650,18 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
) )
}); });
params.extend(kw_iter); params.extend(kw_iter);
let signature = self let call = self.calls.get(&expr.location.into());
.unifier let signature = match call {
.get_call_signature(*self.calls.get(&expr.location.into()).unwrap()) Some(call) => self.unifier.get_call_signature(*call).unwrap(),
.unwrap(); None => {
let ty = func.custom.unwrap();
if let TypeEnum::TFunc(sign) = &*self.unifier.get_ty(ty) {
sign.borrow().clone()
} else {
unreachable!()
}
}
};
match &func.as_ref().node { match &func.as_ref().node {
ExprKind::Name { id, .. } => { ExprKind::Name { id, .. } => {
// TODO: handle primitive casts and function pointers // TODO: handle primitive casts and function pointers

27
nac3core/src/typecheck/type_inferencer/mod.rs
View File

@ -180,7 +180,9 @@ impl<'a> fold::Fold<()> for Inferencer<'a> {
Some(self.infer_attribute(value, attr)?) Some(self.infer_attribute(value, attr)?)
} }
ast::ExprKind::BoolOp { values, .. } => Some(self.infer_bool_ops(values)?), ast::ExprKind::BoolOp { values, .. } => Some(self.infer_bool_ops(values)?),
ast::ExprKind::BinOp { left, op, right } => Some(self.infer_bin_ops(expr.location, left, op, right)?), ast::ExprKind::BinOp { left, op, right } => {
Some(self.infer_bin_ops(expr.location, left, op, right)?)
}
ast::ExprKind::UnaryOp { op, operand } => Some(self.infer_unary_ops(op, operand)?), ast::ExprKind::UnaryOp { op, operand } => Some(self.infer_unary_ops(op, operand)?),
ast::ExprKind::Compare { left, ops, comparators } => { ast::ExprKind::Compare { left, ops, comparators } => {
Some(self.infer_compare(left, ops, comparators)?) Some(self.infer_compare(left, ops, comparators)?)
@ -246,17 +248,10 @@ impl<'a> Inferencer<'a> {
if let TypeEnum::TFunc(sign) = &*self.unifier.get_ty(*ty) { if let TypeEnum::TFunc(sign) = &*self.unifier.get_ty(*ty) {
let sign = sign.borrow(); let sign = sign.borrow();
if sign.vars.is_empty() { if sign.vars.is_empty() {
let call = self.unifier.add_call(Call {
posargs: params,
kwargs: HashMap::new(),
fun: RefCell::new(Some(*ty)),
ret: sign.ret,
});
if let Some(ret) = ret { if let Some(ret) = ret {
self.unifier.unify(sign.ret, ret).unwrap(); self.unifier.unify(sign.ret, ret).unwrap();
} }
self.calls.insert(location.into(), call); return Ok(sign.ret);
return Ok(sign.ret)
} }
} }
} }
@ -488,17 +483,11 @@ impl<'a> Inferencer<'a> {
if let TypeEnum::TFunc(sign) = &*self.unifier.get_ty(func.custom.unwrap()) { if let TypeEnum::TFunc(sign) = &*self.unifier.get_ty(func.custom.unwrap()) {
let sign = sign.borrow(); let sign = sign.borrow();
if sign.vars.is_empty() { if sign.vars.is_empty() {
let call = self.unifier.add_call(Call { return Ok(Located {
posargs: args.iter().map(|v| v.custom.unwrap()).collect(), location,
kwargs: keywords custom: Some(sign.ret),
.iter() node: ExprKind::Call { func, args, keywords },
.map(|v| (v.node.arg.as_ref().unwrap().clone(), v.custom.unwrap()))
.collect(),
fun: RefCell::new(func.custom),
ret: sign.ret,
}); });
self.calls.insert(location.into(), call);
return Ok(Located { location, custom: Some(sign.ret), node: ExprKind::Call { func, args, keywords } })
} }
} }