From 1eac111d4c405c1f101f82b391041424faff6f99 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 18 Apr 2022 15:55:37 +0800 Subject: [PATCH] cleanup --- nac3core/src/codegen/expr.rs | 23 +++-------------------- nac3standalone/src/main.rs | 9 +++++---- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/nac3core/src/codegen/expr.rs b/nac3core/src/codegen/expr.rs index 98972a81..50e5b560 100644 --- a/nac3core/src/codegen/expr.rs +++ b/nac3core/src/codegen/expr.rs @@ -496,12 +496,7 @@ pub fn gen_constructor<'ctx, 'a, G: CodeGenerator>( match def { TopLevelDef::Class { methods, .. } => { // TODO: what about other fields that require alloca? - let mut fun_id = None; - for (name, _, id) in methods.iter() { - if name == &"__init__".into() { - fun_id = Some(*id); - } - } + let fun_id = methods.iter().find(|method| method.0 == "__init__".into()).and_then(|method| Some(method.2)); let ty = ctx.get_llvm_type(generator, signature.ret).into_pointer_type(); let zelf_ty: BasicTypeEnum = ty.get_element_type().try_into().unwrap(); let zelf: BasicValueEnum<'ctx> = ctx.builder.build_alloca(zelf_ty, "alloca").into(); @@ -1005,13 +1000,7 @@ pub fn gen_binop_expr<'ctx, 'a, G: CodeGenerator>( let defs = ctx.top_level.definitions.read(); let obj_def = defs.get(id.0).unwrap().read(); if let TopLevelDef::Class { methods, .. } = &*obj_def { - let mut fun_id = None; - for (name, _, id) in methods.iter() { - if name == &op_name { - fun_id = Some(*id); - } - } - fun_id.unwrap() + methods.iter().find(|method| method.0 == op_name).unwrap().2 } else { unreachable!() } @@ -1409,13 +1398,7 @@ pub fn gen_expr<'ctx, 'a, G: CodeGenerator>( let defs = ctx.top_level.definitions.read(); let obj_def = defs.get(id.0).unwrap().read(); if let TopLevelDef::Class { methods, .. } = &*obj_def { - let mut fun_id = None; - for (name, _, id) in methods.iter() { - if name == attr { - fun_id = Some(*id); - } - } - fun_id.unwrap() + methods.iter().find(|method| method.0 == *attr).unwrap().2 } else { unreachable!() } diff --git a/nac3standalone/src/main.rs b/nac3standalone/src/main.rs index 6b624aa6..2564e013 100644 --- a/nac3standalone/src/main.rs +++ b/nac3standalone/src/main.rs @@ -205,13 +205,14 @@ fn main() { continue; } - // still needs to skip this `from __future__ import annotations` because this seems to be - // magic in python and there seems no way to patch it from another module.. + // allow (and ignore) "from __future__ import annotations" if matches!( &stmt.node, StmtKind::ImportFrom { module, names, .. } - if module == &Some("__future__".into()) && names[0].name == "annotations".into() - ) { continue; } + if module == &Some("__future__".into()) && names.len() == 1 && names[0].name == "annotations".into() + ) { + continue; + } let (name, def_id, ty) = composer.register_top_level(stmt, Some(resolver.clone()), "__main__".into()).unwrap();