M-Labs/nac3
M-Labs/nac3
8
1
Fork 13
Code Issues 95 Pull Requests 4 Releases Wiki Activity

nac3core: Add field "constructor_lookup" to the struct TopLevelComposer #308

Closed
z78078 wants to merge 9 commits from issue-139 into master
pull from: issue-139
merge into: M-Labs:master
Conversation 1 Commits 9 Files Changed 4 +1 -64
1 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7d68efc599 - Show all commits

65
nac3core/src/toplevel/composer.rs
View File

@ -172,7 +172,7 @@ impl TopLevelComposer {
}) })
); );
let mut constructor_lookup: HashMap<StrRef, ast::Located<ast::StmtKind>> = HashMap::from_iter( let constructor_lookup: HashMap<StrRef, ast::Located<ast::StmtKind>> = HashMap::from_iter(
classes.iter().filter_map(|(class_name, _, body)| { classes.iter().filter_map(|(class_name, _, body)| {
for stmt in body.iter() { for stmt in body.iter() {
let func_name = if let ast::StmtKind::FunctionDef { name, .. } = &stmt.node { let func_name = if let ast::StmtKind::FunctionDef { name, .. } = &stmt.node {
@ -189,69 +189,6 @@ impl TopLevelComposer {
}) })
); );
constructor_lookup.insert(
"Exception".into(),
ast::Located::new(
ast::Location::new(0, 0, ast::FileName("".into())),
ast::StmtKind::FunctionDef {
name: "__init__".into(),
args: Box::new(ast::Arguments {
posonlyargs: vec![],
args: vec![
ast::Located {
location: Location {
row: 8,
column: 18,
file: ast::FileName("".into()),
},
custom: (),
node: ast::ArgData {
arg: "self".into(),
annotation: None,
type_comment: None,
},
},
ast::Located {
location: Location {
row: 8,
column: 18,
file: ast::FileName("".into()),
},
custom: (),
node: ast::ArgData {
arg: "message".into(),
annotation: None,
type_comment: None,
},
}
],
vararg: None,
kwonlyargs: Default::default(),
kw_defaults: Default::default(),
kwarg: None,
defaults: Default::default(),
}),
body: vec![
ast::Located {
location: Location {
row: 0,
column: 0,
file: ast::FileName("".into()),
},
custom: (),
node: ast::StmtKind::Pass {
config_comment: Default::default(),
},
},
],
decorator_list: Default::default(),
returns: None,
type_comment: Default::default(),
config_comment: Default::default(),
}
)
);
for (class, _, _) in classes for (class, _, _) in classes
.iter() .iter()
.filter(|(c, _, _)| constructor_lookup.get(c).is_none()) .filter(|(c, _, _)| constructor_lookup.get(c).is_none())