Skip to content

Fix #50 by adding precedence for binary operators | and & #78

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

Open
hsandt wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix #50 by adding precedence for binary operators | and & #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26455c7
Fix #50 (lost brackets) by adding precedence for binary operators | a…
hsandt Sep 22, 2020
1b148ff
Updated PRECEDENCE doc ref to Lua 5.4 and added comments that new 5.3…
hsandt Sep 24, 2020
147795e
Updated PRECEDENCE doc ref to Lua 5.4 in tests.js too
hsandt Sep 24, 2020
7810e74
Fix remaining 5.4 operator precedence order following documentation
hsandt Mar 18, 2024
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
19 changes: 12 additions & 7 deletions luamin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,22 @@
var regexAlphaNumUnderscore = /[a-zA-Z0-9_]/;
var regexDigits = /[0-9]/;

// http://www.lua.org/manual/5.2/manual.html#3.4.7
// http://www.lua.org/source/5.2/lparser.c.html#priority
// https://www.lua.org/manual/5.4/manual.html#3.4.8
// https://www.lua.org/source/5.4/lparser.c.html#priority
// not supported yet: binary ~, <<, >>, //, unary~
var PRECEDENCE = {
'or': 1,
'and': 2,
'<': 3, '>': 3, '<=': 3, '>=': 3, '~=': 3, '==': 3,
'..': 5,
'+': 6, '-': 6, // binary -
'*': 7, '/': 7, '%': 7,
'unarynot': 8, 'unary#': 8, 'unary-': 8, // unary -
'^': 10
'|': 4,
'~': 5,
'&': 6,
'<<': 7, '>>': 7,
'..': 8,
'+': 9, '-': 9, // binary -
'*': 10, '/': 10, '//': 10, '%': 10,
'unarynot': 11, 'unary#': 11, 'unary~': 11, 'unary-': 11, // unary -
'^': 12,
};

var IDENTIFIER_PARTS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a',
Expand Down
109 changes: 107 additions & 2 deletions tests/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@

// Operator precedence
'Operator precedence': [
// http://www.lua.org/manual/5.1/manual.html#2.5.6
// https://www.lua.org/manual/5.4/manual.html#3.4.8
{
'description': 'Operator precedence',
'original': 'a = (1 + 2) * 3',
Expand Down Expand Up @@ -1760,6 +1760,31 @@
'original': 'a = (4 ^ (2 ^ 3))',
'minified': 'a=4^2^3'
},
{
'description': 'Operator precedence',
'original': 'a = (1 | 2) & 0',
'minified': 'a=(1|2)&0'
},
{
'description': 'Operator precedence',
'original': 'a = 1 | (2 & 0)',
'minified': 'a=1|2&0'
},
{
'description': 'Operator precedence',
'original': 'a = (1 | 0) < 1',
'minified': 'a=1|0<1'
},
{
'description': 'Operator precedence',
'original': 'a = (0 & 1) + 1',
'minified': 'a=(0&1)+1'
},
{
'description': 'Operator precedence',
'original': 'a = 0 & (1 + 1)',
'minified': 'a=0&1+1'
},
{
'description': 'Operator precedence: right associativity',
'original': 'a = (((4) ^ 2) ^ 3)',
Expand Down Expand Up @@ -1809,7 +1834,87 @@
'description': 'Operator precedence: RHS parens',
'original': 'a = 1 * (2 - 3)',
'minified': 'a=1*(2-3)'
}
},
{
'description': 'Operator precedence: ^ before unary~, keep parentheses',
'original': 'a =(~1)^2',
'minified': 'a=(~1)^2'
},
{
'description': 'Operator precedence: ^ before unary~, strip parentheses',
'original': 'a =~(1^2)',
'minified': 'a=~1^2'
},
{
'description': 'Operator precedence: unary~ before *, keep parentheses',
'original': 'a = ~(1 * 2)',
'minified': 'a=~(1*2)'
},
{
'description': 'Operator precedence: unary~ before *, strip parentheses',
'original': 'a = (~1) * 2',
'minified': 'a=~1*2'
},
{
'description': 'Operator precedence: unary~ before //, keep parentheses',
'original': 'a = ~(1 // 2)',
'minified': 'a=~(1//2)'
},
{
'description': 'Operator precedence: unary~ before //, strip parentheses',
'original': 'a = (~1) // 2',
'minified': 'a=~1//2'
},
{
'description': 'Operator precedence: // before +, keep parentheses',
'original': 'a = (1 + 2) // 3',
'minified': 'a=(1+2)//3'
},
{
'description': 'Operator precedence: // before +, strip parentheses',
'original': 'a = 1 + (2 // 3)',
'minified': 'a=1+2//3'
},
{
'description': 'Operator precedence: .. before <<, keep parentheses',
'original': 'a = 1 .. (2 << 3)',
'minified': 'a=1 ..(2<<3)'
},
{
'description': 'Operator precedence: .. before <<, strip parentheses',
'original': 'a = (1 .. 2) << 3',
'minified': 'a=1 ..2<<3'
},
{
'description': 'Operator precedence: .. before >>, keep parentheses',
'original': 'a = 1 .. (2 >> 3)',
'minified': 'a=1 ..(2>>3)'
},
{
'description': 'Operator precedence: .. before >>, strip parentheses',
'original': 'a = (1 .. 2) >> 3',
'minified': 'a=1 ..2>>3'
},
{
'description': 'Operator precedence: & before binary ~, keep parentheses',
'original': 'a = 1 & (2 ~ 3)',
'minified': 'a=1&(2~3)'
},
{
'description': 'Operator precedence: & before binary ~, strip parentheses',
'original': 'a = (1 & 2) ~ 3',
'minified': 'a=1&2~3'
},
{
'description': 'Operator precedence: ~ before |, keep parentheses',
'original': 'a = 1 ~ (2 | 3)',
'minified': 'a=1~(2|3)'
},
{
'description': 'Operator precedence: ~ before |, strip parentheses',
'original': 'a = (1 ~ 2) | 3',
'minified': 'a=1~2|3'
},
],

// RepeatStatement
Expand Down