mwojcik
/
nac3
forked from M-Labs/nac3
1
0
Fork 0
Code Pull Requests Activity

format

This commit is contained in:
ychenfo 2021-08-18 17:33:48 +08:00
parent 9cb07e6f04
commit 4b38fe66a2
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nac3core/src/top_level.rs
View File

@ -475,23 +475,24 @@ impl TopLevelComposer {
// NOTE: roughly prevent infinite loop // NOTE: roughly prevent infinite loop
let mut max_iter = to_be_analyzed_class.len() * 4; let mut max_iter = to_be_analyzed_class.len() * 4;
'class: loop { 'class: loop {
if to_be_analyzed_class.is_empty() && { max_iter -= 1; max_iter > 0 } { if to_be_analyzed_class.is_empty() && {
max_iter -= 1;
max_iter > 0
} {
break; break;
} }
let class_ind = to_be_analyzed_class.remove(0).0; let class_ind = to_be_analyzed_class.remove(0).0;
let (class_name, let (class_name, class_body_ast, class_bases_ast, class_resolver, class_ancestors) = {
class_body_ast,
class_bases_ast,
class_resolver,
class_ancestors
) = {
let (class_def, class_ast) = &mut def_ast_list[class_ind]; let (class_def, class_ast) = &mut def_ast_list[class_ind];
if let Some(ast::Located { if let Some(ast::Located {
node: ast::StmtKind::ClassDef { name, body, bases, .. }, .. node: ast::StmtKind::ClassDef { name, body, bases, .. },
..
}) = class_ast.as_ref() }) = class_ast.as_ref()
{ {
if let TopLevelDef::Class { resolver, ancestors, .. } = class_def.write().deref() { if let TopLevelDef::Class { resolver, ancestors, .. } =
class_def.write().deref()
{
(name, body, bases, resolver.as_ref().unwrap().clone(), ancestors.clone()) (name, body, bases, resolver.as_ref().unwrap().clone(), ancestors.clone())
} else { } else {
unreachable!() unreachable!()
@ -502,7 +503,8 @@ impl TopLevelComposer {
}; };
let all_base_class_analyzed = { let all_base_class_analyzed = {
let not_yet_analyzed = to_be_analyzed_class.clone().into_iter().collect::<HashSet<_>>(); let not_yet_analyzed =
to_be_analyzed_class.clone().into_iter().collect::<HashSet<_>>();
let base = class_ancestors.clone().into_iter().collect::<HashSet<_>>(); let base = class_ancestors.clone().into_iter().collect::<HashSet<_>>();
let intersection = not_yet_analyzed.intersection(&base).collect_vec(); let intersection = not_yet_analyzed.intersection(&base).collect_vec();
intersection.is_empty() intersection.is_empty()
@ -517,11 +519,16 @@ impl TopLevelComposer {
let class_bases_ty = class_bases_ast let class_bases_ty = class_bases_ast
.iter() .iter()
.filter_map(|x| { .filter_map(|x| {
class_resolver.as_ref().lock().parse_type_annotation( class_resolver
.as_ref()
.lock()
.parse_type_annotation(
converted_top_level, converted_top_level,
unifier.borrow_mut(), unifier.borrow_mut(),
primitives, primitives,
x).ok() x,
)
.ok()
}) })
.collect_vec(); .collect_vec();