Skip to content

Support for new operators #15

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for new operators #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 24 additions & 11 deletions minify.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ local Symbols = lookupify{'+', '-', '*', '/', '^', '%', ',', '{', '}', '[', ']',

local EqualSymbols = lookupify{'~', '=', '>', '<'}

local BitwiseSymbols = lookupify{'>', '<'}

local Keywords = lookupify{
'and', 'break', 'do', 'else', 'elseif',
'end', 'false', 'for', 'function', 'goto', 'if',
Expand All @@ -122,27 +124,33 @@ local Keywords = lookupify{

local BlockFollowKeyword = lookupify{'else', 'elseif', 'until', 'end'}

local UnopSet = lookupify{'-', 'not', '#'}
local UnopSet = lookupify{'-', 'not', '#', '~'}

local BinopSet = lookupify{
'+', '-', '*', '/', '%', '^', '#',
'+', '-', '*', '/', '//', '%', '^', '#',
'..', '.', ':',
'>', '<', '<=', '>=', '~=', '==',
'and', 'or'
'and', 'or', '>>', '<<', '&', '~', '|'
}

local GlobalRenameIgnore = lookupify{

}

local BinaryPriority = {
['+'] = {6, 6};
['-'] = {6, 6};
['*'] = {7, 7};
['/'] = {7, 7};
['%'] = {7, 7};
['^'] = {10, 9};
['..'] = {5, 4};
['+'] = {9, 9};
['-'] = {9, 9};
['*'] = {10, 10};
['/'] = {10, 10};
['//'] = {10, 10};
['%'] = {10, 10};
['^'] = {12, 11};
['..'] = {8, 7};
['>>'] = {7, 7};
['<<'] = {7, 7};
['&'] = {6, 6};
['~'] = {5, 5};
['|'] = {4, 4};
['=='] = {3, 3};
['~='] = {3, 3};
['>'] = {3, 3};
Expand All @@ -152,7 +160,7 @@ local BinaryPriority = {
['and'] = {2, 2};
['or'] = {1, 1};
};
local UnaryPriority = 8
local UnaryPriority = 11

-- Eof, Ident, Keyword, Number, String, Symbol

Expand Down Expand Up @@ -398,9 +406,14 @@ function CreateLuaTokenStream(text)
elseif EqualSymbols[c1] then
if look() == '=' then
p = p + 1
elseif look() == c1 and BitwiseSymbols[c1] then
p = p + 1
end
token('Symbol')
elseif Symbols[c1] then
if c1 == '/' and look() == '/' then
p = p + 1
end
token('Symbol')
else
error("Bad symbol `"..c1.."` in source.")
Expand Down