Skip to content

Fix vararg operator not being parsed in function arguments. #1

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

Closed
wants to merge 2 commits into from
Closed

Fix vararg operator not being parsed in function arguments. #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1d8dac
Remove trailing whitespace.
Jul 25, 2017
1b5254f
Fix vararg operator not being parsed in function arguments.
Jul 25, 2017
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
105 changes: 55 additions & 50 deletions minify.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function FormatTableInt(tb, atIndent, ignoreFunc)
out = out..(useNewlines and baseIndent or '')
if type(k) == 'number' then
--nothing to do
elseif type(k) == 'string' and k:match("^[A-Za-z_][A-Za-z0-9_]*$") then
elseif type(k) == 'string' and k:match("^[A-Za-z_][A-Za-z0-9_]*$") then
out = out..k.." = "
elseif type(k) == 'string' then
out = out.."[\""..k.."\"] = "
Expand Down Expand Up @@ -77,8 +77,8 @@ function FormatTableInt(tb, atIndent, ignoreFunc)
end

function FormatTable(tb, ignoreFunc)
ignoreFunc = ignoreFunc or function()
return false
ignoreFunc = ignoreFunc or function()
return false
end
return FormatTableInt(tb, 0, ignoreFunc)
end
Expand All @@ -89,24 +89,24 @@ local EscapeForCharacter = {['\r'] = '\\r', ['\n'] = '\\n', ['\t'] = '\\t', ['"'

local CharacterForEscape = {['r'] = '\r', ['n'] = '\n', ['t'] = '\t', ['"'] = '"', ["'"] = "'", ['\\'] = '\\'}

local AllIdentStartChars = lookupify{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
local AllIdentStartChars = lookupify{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '_'}

local AllIdentChars = lookupify{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
local AllIdentChars = lookupify{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '_',
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}

local Digits = lookupify{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}

local HexDigits = lookupify{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
local HexDigits = lookupify{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'A', 'a', 'B', 'b', 'C', 'c', 'D', 'd', 'E', 'e', 'F', 'f'}

local Symbols = lookupify{'+', '-', '*', '/', '^', '%', ',', '{', '}', '[', ']', '(', ')', ';', '#', '.', ':'}
Expand Down Expand Up @@ -465,7 +465,7 @@ function CreateLuaParser(text)
local function isBlockFollow()
local tok = peek()
return tok.Type == 'Eof' or (tok.Type == 'Keyword' and BlockFollowKeyword[tok.Source])
end
end
local function isUnop()
return UnopSet[peek().Source] or false
end
Expand Down Expand Up @@ -619,14 +619,19 @@ function CreateLuaParser(text)
end

-- List of identifiers
local function varlist()
local function varlist(funcArgs)
local varList = {}
local commaList = {}
if peek().Type == 'Ident' then
table.insert(varList, get())
end
while peek().Source == ',' do
table.insert(commaList, get())
if funcArgs and peek().Source == '...' then
local id = get()
table.insert(varList, id)
break
end
local id = expect('Ident')
table.insert(varList, id)
end
Expand Down Expand Up @@ -670,7 +675,7 @@ function CreateLuaParser(text)
end
--
local oparenTk = expect('Symbol', '(')
local argList, argCommaList = varlist()
local argList, argCommaList = varlist(true)
local cparenTk = expect('Symbol', ')')
local fbody, enTk = blockbody('end')
--
Expand Down Expand Up @@ -920,7 +925,7 @@ function CreateLuaParser(text)
return self.Rhs:GetLastToken()
end;
}
else
else
curNode = simpleexpr()
assert(curNode, "nil simpleexpr")
end
Expand Down Expand Up @@ -1212,7 +1217,7 @@ function CreateLuaParser(text)
Token_Local = localKw;
Token_Equals = eqToken;
Token_VarCommaList = varCommaList;
Token_ExprCommaList = exprCommaList;
Token_ExprCommaList = exprCommaList;
GetFirstToken = function(self)
return self.Token_Local
end;
Expand Down Expand Up @@ -1343,7 +1348,7 @@ end

function VisitAst(ast, visitors)
local ExprType = lookupify{
'BinopExpr'; 'UnopExpr';
'BinopExpr'; 'UnopExpr';
'NumberLiteral'; 'StringLiteral'; 'NilLiteral'; 'BooleanLiteral'; 'VargLiteral';
'FieldExpr'; 'IndexExpr';
'MethodExpr'; 'CallExpr';
Expand Down Expand Up @@ -1405,9 +1410,9 @@ function VisitAst(ast, visitors)
visitExpr(expr.Rhs)
elseif expr.Type == 'UnopExpr' then
visitExpr(expr.Rhs)
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
then
-- No children to visit, single token literals
elseif expr.Type == 'FieldExpr' then
Expand Down Expand Up @@ -1512,7 +1517,7 @@ function VisitAst(ast, visitors)
end
else
assert(false, "unreachable")
end
end
postVisit(stat)
end

Expand Down Expand Up @@ -1665,7 +1670,7 @@ function AddVariableInfo(ast)
end
end

-- Then
-- Then
return nil
end
local function referenceVariable(name, setNameFunc)
Expand Down Expand Up @@ -1733,7 +1738,7 @@ function AddVariableInfo(ast)
end, {
Type = 'Local';
})
end
end
end;
}
visitor.LocalFunctionStat = {
Expand Down Expand Up @@ -1761,11 +1766,11 @@ function AddVariableInfo(ast)
end;
}
visitor.FunctionStat = {
Pre = function(stat)
Pre = function(stat)
-- Function stat adds a new scope containing the function arguments
-- as local variables.
-- A function stat may also assign to a global variable if it is in
-- the form `function foo()` with no additional dots/colons in the
-- the form `function foo()` with no additional dots/colons in the
-- name chain.
local nameChain = stat.NameChain
local var;
Expand Down Expand Up @@ -1879,9 +1884,9 @@ function PrintAst(ast)
elseif expr.Type == 'UnopExpr' then
printt(expr.Token_Op)
printExpr(expr.Rhs)
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
then
-- Just print the token
printt(expr.Token)
Expand Down Expand Up @@ -2079,7 +2084,7 @@ function PrintAst(ast)
end
printt(stat.Token_Do)
printStat(stat.Body)
printt(stat.Token_End)
printt(stat.Token_End)
elseif stat.Type == 'WhileStat' then
printt(stat.Token_While)
printExpr(stat.Condition)
Expand Down Expand Up @@ -2124,7 +2129,7 @@ function PrintAst(ast)
end
else
assert(false, "unreachable")
end
end
end

printStat(ast)
Expand Down Expand Up @@ -2193,9 +2198,9 @@ local function FormatAst(ast)
elseif expr.Type == 'UnopExpr' then
formatExpr(expr.Rhs)
--(expr.Token_Op)
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
then
-- Nothing to do
--(expr.Token)
Expand Down Expand Up @@ -2414,7 +2419,7 @@ local function FormatAst(ast)
end
end
padToken(stat.Token_Do)
formatBody(stat.Token_Do, stat.Body, stat.Token_End)
formatBody(stat.Token_Do, stat.Body, stat.Token_End)
elseif stat.Type == 'WhileStat' then
--(stat.Token_While)
formatExpr(stat.Condition)
Expand Down Expand Up @@ -2472,7 +2477,7 @@ local function FormatAst(ast)
end
else
assert(false, "unreachable")
end
end
end

formatStat(ast)
Expand Down Expand Up @@ -2502,7 +2507,7 @@ local function StripAst(ast)
-- Abiguous syntax: `f(x)\n(x)()` is already disallowed, we can't cause a problem by removing newlines

-- Figure out what separation is needed
if
if
(lastCh == '-' and firstCh == '-') or
(AllIdentChars[lastCh] and AllIdentChars[firstCh])
then
Expand Down Expand Up @@ -2542,9 +2547,9 @@ local function StripAst(ast)
stripExpr(expr.Rhs)
-- Handle the `- -b` -/-> `--b` case which would otherwise incorrectly generate a comment
joint(expr.Token_Op, expr.Rhs:GetFirstToken())
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
elseif expr.Type == 'NumberLiteral' or expr.Type == 'StringLiteral' or
expr.Type == 'NilLiteral' or expr.Type == 'BooleanLiteral' or
expr.Type == 'VargLiteral'
then
-- Just print the token
stript(expr.Token)
Expand Down Expand Up @@ -2641,7 +2646,7 @@ local function StripAst(ast)
-- See if we can remove a semi-colon, the only case where we can't is if
-- this and the last statement have a `);(` pair, where removing the semi-colon
-- would introduce ambiguous syntax.
if stat.SemicolonList[i-1] and
if stat.SemicolonList[i-1] and
(lastChStat:GetLastToken().Source ~= ')' or chStat:GetFirstToken().Source ~= ')')
then
stat.SemicolonList[i-1] = nil
Expand Down Expand Up @@ -2793,7 +2798,7 @@ local function StripAst(ast)
end
end
joint(stat.RangeList[#stat.RangeList]:GetLastToken(), stat.Token_Do)
bodyjoint(stat.Token_Do, stat.Body, stat.Token_End)
bodyjoint(stat.Token_Do, stat.Body, stat.Token_End)
elseif stat.Type == 'WhileStat' then
stript(stat.Token_While)
stripExpr(stat.Condition)
Expand Down Expand Up @@ -2850,7 +2855,7 @@ local function StripAst(ast)
end
else
assert(false, "unreachable")
end
end
end

stripStat(ast)
Expand Down Expand Up @@ -2891,8 +2896,8 @@ local function genVarName()
end
local function MinifyVariables(globalScope, rootScope)
-- externalGlobals is a set of global variables that have not been assigned to, that is
-- global variables defined "externally to the script". We are not going to be renaming
-- those, and we have to make sure that we don't collide with them when renaming
-- global variables defined "externally to the script". We are not going to be renaming
-- those, and we have to make sure that we don't collide with them when renaming
-- things so we keep track of them in this set.
local externalGlobals = {}

Expand Down Expand Up @@ -2956,7 +2961,7 @@ end
local function MinifyVariables_2(globalScope, rootScope)
-- Variable names and other names that are fixed, that we cannot use
-- Either these are Lua keywords, or globals that are not assigned to,
-- that is environmental globals that are assigned elsewhere beyond our
-- that is environmental globals that are assigned elsewhere beyond our
-- control.
local globalUsedNames = {}
for kw, _ in pairs(Keywords) do
Expand All @@ -2971,7 +2976,7 @@ local function MinifyVariables_2(globalScope, rootScope)
for _, var in pairs(globalScope) do
if var.AssignedTo then
-- We can try to rename this global since it was assigned to
-- (and thus presumably initialized) in the script we are
-- (and thus presumably initialized) in the script we are
-- minifying.
table.insert(allVariables, var)
else
Expand Down Expand Up @@ -3008,7 +3013,7 @@ local function MinifyVariables_2(globalScope, rootScope)
local nextValidNameIndex = 0
local varNamesLazy = {}
local function varIndexToValidVarName(i)
local name = varNamesLazy[i]
local name = varNamesLazy[i]
if not name then
repeat
name = indexToVarName(nextValidNameIndex)
Expand All @@ -3021,7 +3026,7 @@ local function MinifyVariables_2(globalScope, rootScope)

-- For each variable, go to rename it
for _, var in pairs(allVariables) do
-- Lazy... todo: Make theis pair a proper for-each-pair-like set of loops
-- Lazy... todo: Make theis pair a proper for-each-pair-like set of loops
-- rather than using a renamed flag.
var.Renamed = true

Expand Down Expand Up @@ -3108,7 +3113,7 @@ local function MinifyVariables_2(globalScope, rootScope)
end


-- --
-- --
-- print("Total Variables: "..#allVariables)
-- print("Total Range: "..rootScope.BeginLocation.."-"..rootScope.EndLocation)
-- print("")
Expand Down