diff --git a/nac3core/src/toplevel/composer.rs b/nac3core/src/toplevel/composer.rs index 8568011..09ec2da 100644 --- a/nac3core/src/toplevel/composer.rs +++ b/nac3core/src/toplevel/composer.rs @@ -228,6 +228,7 @@ impl TopLevelComposer { // subclass of other exception classes. let mut contains_constructor = bases .iter().any(|base| matches!(base.node, ast::ExprKind::Name { id, .. } if id == exception_id)); + for b in body { if let ast::StmtKind::FunctionDef { name: method_name, .. } = &b.node { if method_name == &init_id { @@ -297,8 +298,10 @@ impl TopLevelComposer { for (_, def, _, _, ast) in class_method_name_def_ids { self.definition_ast_list.push((def, Some(ast))); } + + // Quick way to fix #221, contains constructor can be used in the future for some implementation if required. + let result_ty = if contains_constructor { Some(constructor_ty) } else { Some(constructor_ty) }; - let result_ty = if contains_constructor { Some(constructor_ty) } else { None }; Ok((class_name, DefinitionId(class_def_id), result_ty)) } @@ -1470,7 +1473,7 @@ impl TopLevelComposer { /// step 5, analyze and call type inferecer to fill the `instance_to_stmt` of topleveldef::function fn analyze_function_instance(&mut self) -> Result<(), String> { - // first get the class contructor type correct for the following type check in function body + // first get the class constructor type correct for the following type check in function body // also do class field instantiation check let init_str_id = "__init__".into(); let mut definition_extension = Vec::new(); @@ -1581,7 +1584,7 @@ impl TopLevelComposer { return Ok(()); } let mut init_id: Option = None; - // get the class contructor type correct + // get the class constructor type correct let (contor_args, contor_type_vars) = { let mut constructor_args: Vec = Vec::new(); let mut type_vars: HashMap = HashMap::new(); diff --git a/nac3standalone/demo/src/initless.py b/nac3standalone/demo/src/initless.py new file mode 100644 index 0000000..abe6e50 --- /dev/null +++ b/nac3standalone/demo/src/initless.py @@ -0,0 +1,13 @@ +@extern +def output_int32(x: int32): + ... + +class A: + def foo(self): + output_int32(1) + +def run() -> int32: + inst = A() + inst.foo() + output_int32(1) + return 0