Deduplicate Makefile writer and Jinja parameter filter - #546
Open
ThVerg wants to merge 1 commit into
Open
Conversation
The Makefile-writing logic existed twice, byte for byte: in EdaCommands.write (used by legacy backends) and in the make build runner (used by the flow API). A fix in one could not reach the other. Make.write now delegates to EdaCommands.write. jinja_filter_param_value_str was likewise defined identically in edalize/edatool.py and edalize/tools/edatool.py. Move the single definition to edalize/utils.py and import it from both. No functional change; golden-file tests confirm generated output is identical.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two pieces of logic exist twice in the codebase, byte for byte:
EdaCommands.write()inedalize/utils.py(used by legacy backends like yosys/trellis/apicula) andMake.write()inedalize/build_runners/make.py(used by the flow API). A fix applied to one silently misses the other.Make.write()now delegates toEdaCommands.write().jinja_filter_param_value_str: defined identically inedalize/edatool.pyandedalize/tools/edatool.py. The single definition now lives inedalize/utils.py(which has no imports, so no circular-import risk) and both base classes import it.No functional change — the golden-file tests confirm the generated Makefiles are byte-identical (204 passed). Formatted with black 22.3.0.