Skip to content
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.

Sign up for GitHub

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

Get rid of unnecessary grouping operators #6

Merged
merged 11 commits into from
Jun 11, 2019
Merged

Get rid of unnecessary grouping operators #6

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6a193f6
begin removing unnecessary grouping operators
axion014 Jun 7, 2019
c87d21f
style fix
axion014 Jun 9, 2019
a34f07d
fix behavior on operators of equal binding power
axion014 Jun 9, 2019
2320343
Merge branch 'master' into minify-groups
axion014 Jun 9, 2019
fdcc1f4
test new feature
axion014 Jun 9, 2019
aaf49dc
Merge branch 'master' into minify-groups
dhritzkiv Jun 10, 2019
69806e7
Remove stripping of whitespace by deparser in tests
dhritzkiv Jun 10, 2019
772bf02
Employ a more succinct test glsl file for grouping test
dhritzkiv Jun 10, 2019
c77c55f
Merge branch 'master' into minify-groups
dhritzkiv Jun 10, 2019
307b966
Merge branch 'master' into minify-groups
dhritzkiv Jun 10, 2019
df0c7a6
Merge branch 'master' into minify-groups
dhritzkiv Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ function minifier(safe_words, mutate_storages) {
return through(mutate)

function mutate(node) {
// remove unnecessary grouping operators
if(is_unnecessary_group(node)) return

if(node.parent) for(var current = node.parent; current.parent; current = current.parent) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For stylistic/readability purposes, can you give this if statement braces, and encapsulate the for loop within it?

if(is_unnecessary_group(current)) {
current.parent.children[current.parent.children.indexOf(current)] = current.children[0]
current.children[0].parent = current.parent
}
}

if(should_mutate(node)) {
var t = node.parent.parent.children[1]
if(mutate_storages || (t.type === 'placeholder' || t.token.data === 'const')) {
Expand All @@ -45,4 +55,8 @@ function minifier(safe_words, mutate_storages) {
return base &&
!safe_words.hasOwnProperty(node.token.data)
}

function is_unnecessary_group(node) {
return node.type === 'group' && node.children[0].lbp >= node.parent.lbp
}
}