Fix renaming of variables

fkie-cad / dewolf

A research decompiler implemented as a Binary Ninja plugin.

GNU Lesser General Public License v2.1

162 stars 9 forks source link

Closed NeoQuix closed 10 months ago

NeoQuix commented 11 months ago

Manual PR for #303

NeoQuix commented 11 months ago

Move:

Caller code for For/WhileLoopRenamer into namegeneration (after it has done hungarian/other schemes)
cheap move (maybe make a file for both renamers)

Rewrite:

Hungarian now collects a set of variables and lets ast.replace_variable_in_subtree do the job. ==> Should be no problem with shallow/deep copies like before

To do:

Move both renamers / split them from readabilitybased ==> maybe just rename the whole stage itself? Afterwards it will only replace while loops + remove guarded do whiles
update config names/options

To do (after that PR):

Fix ForLoopRenamer ==> Has problems with empty declaration/modification and with multiple vars in them

NeoQuix commented 11 months ago

Don't fear the commit numbers, 1.5k are just moves! Will list them after this comment

Changed:

moved For/WhileLoopRenamer into own stage which runs after variable-name-generation
moved pure tests for them into own file
moved tests which test both (WhileLoopReplacer and For/WhileLoopRenamer) as well into new file

To do:

WhileLoopReplacer + For/WhileLoopRenamer use the same methods ==> move them into a shared file (name?)
rename readability based refinement into something else

NeoQuix commented 11 months ago

File/Line moves:

loop_name_generator.py -> new stage wrapper + moved For/WhileLoopRenamer into it from readability_based_refinement.py
default.json moved options for For/WhileLoopRenamer into new stage
test_loop_name_generator.py -> moved tests from test_readability_based_refinement.py ==> both the tests for For/WhileLoopRenamer + the ones which tested WhileLoopReplacer with them together (just run both stages after another)

NeoQuix commented 10 months ago

Will close this PR and split it into two: