-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow inlining of Statement Functions #345
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1065e1b
extend InlineTransformation and utilities to allow inlining of statem…
MichaelSt98 ad82b64
improve test for inline statement functions and make inlining of stat…
MichaelSt98 661c426
introduce 'mapper_cls' as argument for 'recursive_expression_map_update'
MichaelSt98 553ee68
some refactoring for inlining statement functions
MichaelSt98 56d4931
extend tests to include test of inlining a statement function via the…
MichaelSt98 0f91045
use expr.arg_iter() instead of manual zipping inline call arguments a…
MichaelSt98 a29f729
remove unused variable
MichaelSt98 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -468,7 +468,7 @@ def replace_selected_kind(routine): | |
routine.spec.prepend(imprt) | ||
|
||
|
||
def recursive_expression_map_update(expr_map, max_iterations=10): | ||
def recursive_expression_map_update(expr_map, max_iterations=10, mapper_cls=SubstituteExpressionsMapper): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No action: Very neat! 👏 |
||
""" | ||
Utility function to apply a substitution map for expressions to itself | ||
|
@@ -490,6 +490,8 @@ def recursive_expression_map_update(expr_map, max_iterations=10): | |
max_iterations : int | ||
Maximum number of iterations, corresponds to the maximum level of | ||
nesting that can be replaced. | ||
mapper_cls: :any:`SubstituteExpressionsMapper` | ||
The underlying mapper to be used (default: :any:`SubstituteExpressionsMapper`). | ||
""" | ||
def apply_to_init_arg(name, arg, expr, mapper): | ||
# Helper utility to apply the mapper only to expression arguments and | ||
|
@@ -504,7 +506,7 @@ def apply_to_init_arg(name, arg, expr, mapper): | |
# We update the expression map by applying it to the children of each replacement | ||
# node, thus making sure node replacements are also applied to nested attributes, | ||
# e.g. call arguments or array subscripts etc. | ||
mapper = SubstituteExpressionsMapper(expr_map) | ||
mapper = mapper_cls(expr_map) | ||
prev_map, expr_map = expr_map, { | ||
expr: type(replacement)(**{ | ||
name: apply_to_init_arg(name, arg, expr, mapper) | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code path is currently untested. Can we add a test where
InlineTransformation
is called to apply the statement function inlining?