-
-
Notifications
You must be signed in to change notification settings - Fork 374
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
inlining of the function definitions that have conflicting arguments #908
Draft
aminya
wants to merge
8
commits into
terser:master
Choose a base branch
from
aminya:inline-if-args-injectable
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
09b0a8c
test: assign_and_inline
aminya 4ade54a
test: inline_different_name
aminya 208e584
test: rename_and_inline
aminya 79c1c43
prep: add rename_arg
aminya a7e207c
feat: rename function arguments for inlining
aminya 1be33ba
test: use the arguments of the parent function for transparency
aminya 58e62f9
test: set pure_getters to false and add TODO
aminya 8a42c82
Merge branch 'master' into inline-if-args-injectable
aminya File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
assign_and_inline: { | ||
options = { | ||
toplevel: true, | ||
defaults: true, | ||
} | ||
input: { | ||
class MyClass { | ||
method(a1) { | ||
myPureFunction(a1) | ||
} | ||
} | ||
|
||
function myPureFunction (a) { | ||
console.log(a) | ||
} | ||
|
||
new MyClass(); | ||
} | ||
expect: { | ||
new class{method(a1) {var a;a=a1,console.log(a)}}; | ||
} | ||
} | ||
|
||
inline_different_name: { | ||
options = { | ||
toplevel: true, | ||
defaults: true, | ||
pure_getters: true | ||
} | ||
input: { | ||
class MyClass { | ||
method(a1) { | ||
myPureFunction(a1) | ||
} | ||
} | ||
|
||
function myPureFunction (a) { | ||
console.log(a) | ||
} | ||
|
||
new MyClass(); | ||
} | ||
expect: { | ||
new class{method(a1) {console.log(a1)}}; | ||
} | ||
} | ||
|
||
rename_and_inline: { | ||
options = { | ||
toplevel: true, | ||
defaults: true, | ||
pure_getters: true | ||
} | ||
input: { | ||
class MyClass { | ||
method(a) { | ||
myPureFunction(a) | ||
} | ||
} | ||
|
||
function myPureFunction (a) { | ||
console.log(a) | ||
} | ||
|
||
new MyClass(); | ||
} | ||
expect: { | ||
new class{method(a) {console.log(a)}}; | ||
} | ||
} |
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.
In lib/scope.js is an easy example of how to rename a variable. The definition object (obtained through
node.thedef
ornode.definition()
) can help us iterate on references and definitions alike.It also deal with shadowing (in case
fn
here contains another scope which redefines a variable of the same name)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.
Otherwise this looks great, and the tests are sound.
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.
I edited the renaming code. However, I don't know why the original function node doesn't seem to update. The last test should fail as I have written it. The inlined argument should be named
argument_1
. Or maybe I am understanding this wrong.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.
Maybe the cause is the fact that the "defaults" option is enabled, causing more transforms to occur.
If you remove defaults and add reduce_vars, inline and unused, it should showcase what you did a bit better. Even if the code in the "expect" section isn't truly optimally minified, which isn't so important for a test.
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.
I should have a deeper review of this PR later today. My cursory look says it's good to merge, but I'll check it out better after work.
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.
After spending more time on this, if I am correct, I actually think this is the expected behavior! I wanted to rename the variables of the pure function so they can be inlined by the compressor (like the second test). The compressor correctly substituted the new name we created with the argument passed in!