1
0
Fork 0
mirror of https://github.com/Reuh/candran.git synced 2026-02-04 02:08:40 +00:00

feat: add named varargs from Lua 5.5

This commit is contained in:
Étienne Fildadut 2025-12-26 15:12:33 +01:00
parent 73e3f95636
commit c5be1088c5
3 changed files with 32 additions and 26 deletions

View file

@ -587,33 +587,35 @@ return function(code, ast, options, macros={functions={}, variables={}})
String = (t)
return "%q":format(t[1])
end,
-- Function{ { ( `ParPair{ Id expr } | `Id{ <string> } )* `Dots? } block }
-- Function{ { ( `ParPair{ Id expr } | `Id{ <string> } )* `ParDots? } block }
_functionParameter = {
ParPair = (t, decl)
local id = lua(t[1])
indentLevel += 1
table.insert(decl, "if "..id.." == nil then "..id.." = "..lua(t[2]).." end")
indentLevel -= 1
return id
end,
ParDots = (t, decl)
if #t == 1 then
return "..." .. lua(t[1])
else
return "..."
end
end,
},
_functionWithoutKeyword = (t)
local r = "("
local decl = {}
if t[1][1] then
if t[1][1].tag == "ParPair" then
local id = lua(t[1][1][1])
indentLevel += 1
table.insert(decl, "if "..id.." == nil then "..id.." = "..lua(t[1][1][2]).." end")
indentLevel -= 1
r ..= id
local pars = {}
for i=1, #t[1], 1 do
if tags._functionParameter[t[1][i].tag] then
table.insert(pars, tags._functionParameter[t[1][i].tag](t[1][i], decl))
else
r ..= lua(t[1][1])
end
for i=2, #t[1], 1 do
if t[1][i].tag == "ParPair" then
local id = lua(t[1][i][1])
indentLevel += 1
table.insert(decl, "if "..id.." == nil then "..id.." = "..lua(t[1][i][2]).." end")
indentLevel -= 1
r ..= ", " ..id
else
r ..= ", "..lua(t[1][i])
end
table.insert(pars, lua(t[1][i]))
end
end
r ..= ")"..indent()
r ..= table.concat(pars, ", ")..")"..indent()
for _, d in ipairs(decl) do
r ..= d..newline()
end
@ -851,6 +853,10 @@ return function(code, ast, options, macros={functions={}, variables={}})
AttributeNameList = (t)
return lua(t, "_lhs")
end,
-- NameList{ {Id+} }
NameList = (t)
return lua(t, "_lhs")
end,
-- AttributeId{ <string> <string>? }
AttributeId = (t)
if t[2] then