1
0
Fork 0
mirror of https://github.com/Reuh/candran.git synced 2025-10-27 09:59:29 +00:00

Lua <5.4: Only error when the variable is declared with an attribute

This commit is contained in:
Étienne Fildadut 2020-07-04 23:42:51 +02:00
parent 10be62a2fe
commit cecb2aea03
2 changed files with 41 additions and 17 deletions

View file

@ -1848,19 +1848,25 @@ end, -- ./compiler/lua54.can:813
error("don't know how to compile a " .. tostring(key) .. " to " .. targetName) -- ./compiler/lua54.can:827 error("don't know how to compile a " .. tostring(key) .. " to " .. targetName) -- ./compiler/lua54.can:827
end }) -- ./compiler/lua54.can:827 end }) -- ./compiler/lua54.can:827
targetName = "Lua 5.3" -- ./compiler/lua53.can:1 targetName = "Lua 5.3" -- ./compiler/lua53.can:1
tags["AttributeId"] = nil -- ./compiler/lua53.can:4 tags["AttributeId"] = function(t) -- ./compiler/lua53.can:4
if t[2] then -- ./compiler/lua53.can:5
error("target does not support variable attributes") -- ./compiler/lua53.can:6
else -- ./compiler/lua53.can:6
return t[1] -- ./compiler/lua53.can:8
end -- ./compiler/lua53.can:8
end -- ./compiler/lua53.can:8
local code = lua(ast) .. newline() -- ./compiler/lua54.can:833 local code = lua(ast) .. newline() -- ./compiler/lua54.can:833
return requireStr .. code -- ./compiler/lua54.can:834 return requireStr .. code -- ./compiler/lua54.can:834
end -- ./compiler/lua54.can:834 end -- ./compiler/lua54.can:834
end -- ./compiler/lua54.can:834 end -- ./compiler/lua54.can:834
local lua54 = _() or lua54 -- ./compiler/lua54.can:839 local lua54 = _() or lua54 -- ./compiler/lua54.can:839
return lua54 -- ./compiler/lua53.can:10 return lua54 -- ./compiler/lua53.can:16
end -- ./compiler/lua53.can:10 end -- ./compiler/lua53.can:16
local lua53 = _() or lua53 -- ./compiler/lua53.can:14 local lua53 = _() or lua53 -- ./compiler/lua53.can:20
package["loaded"]["compiler.lua53"] = lua53 or true -- ./compiler/lua53.can:15 package["loaded"]["compiler.lua53"] = lua53 or true -- ./compiler/lua53.can:21
local function _() -- ./compiler/lua53.can:18 local function _() -- ./compiler/lua53.can:24
local function _() -- ./compiler/lua53.can:20 local function _() -- ./compiler/lua53.can:26
local function _() -- ./compiler/lua53.can:22 local function _() -- ./compiler/lua53.can:28
local targetName = "Lua 5.4" -- ./compiler/lua54.can:1 local targetName = "Lua 5.4" -- ./compiler/lua54.can:1
return function(code, ast, options) -- ./compiler/lua54.can:3 return function(code, ast, options) -- ./compiler/lua54.can:3
local lastInputPos = 1 -- ./compiler/lua54.can:5 local lastInputPos = 1 -- ./compiler/lua54.can:5
@ -2717,15 +2723,21 @@ end, -- ./compiler/lua54.can:813
error("don't know how to compile a " .. tostring(key) .. " to " .. targetName) -- ./compiler/lua54.can:827 error("don't know how to compile a " .. tostring(key) .. " to " .. targetName) -- ./compiler/lua54.can:827
end }) -- ./compiler/lua54.can:827 end }) -- ./compiler/lua54.can:827
targetName = "Lua 5.3" -- ./compiler/lua53.can:1 targetName = "Lua 5.3" -- ./compiler/lua53.can:1
tags["AttributeId"] = nil -- ./compiler/lua53.can:4 tags["AttributeId"] = function(t) -- ./compiler/lua53.can:4
if t[2] then -- ./compiler/lua53.can:5
error("target does not support variable attributes") -- ./compiler/lua53.can:6
else -- ./compiler/lua53.can:6
return t[1] -- ./compiler/lua53.can:8
end -- ./compiler/lua53.can:8
end -- ./compiler/lua53.can:8
local code = lua(ast) .. newline() -- ./compiler/lua54.can:833 local code = lua(ast) .. newline() -- ./compiler/lua54.can:833
return requireStr .. code -- ./compiler/lua54.can:834 return requireStr .. code -- ./compiler/lua54.can:834
end -- ./compiler/lua54.can:834 end -- ./compiler/lua54.can:834
end -- ./compiler/lua54.can:834 end -- ./compiler/lua54.can:834
local lua54 = _() or lua54 -- ./compiler/lua54.can:839 local lua54 = _() or lua54 -- ./compiler/lua54.can:839
return lua54 -- ./compiler/lua53.can:10 return lua54 -- ./compiler/lua53.can:16
end -- ./compiler/lua53.can:10 end -- ./compiler/lua53.can:16
local lua53 = _() or lua53 -- ./compiler/lua53.can:14 local lua53 = _() or lua53 -- ./compiler/lua53.can:20
return lua53 -- ./compiler/luajit.can:44 return lua53 -- ./compiler/luajit.can:44
end -- ./compiler/luajit.can:44 end -- ./compiler/luajit.can:44
local luajit = _() or luajit -- ./compiler/luajit.can:48 local luajit = _() or luajit -- ./compiler/luajit.can:48
@ -3590,15 +3602,21 @@ end, -- ./compiler/lua54.can:813
error("don't know how to compile a " .. tostring(key) .. " to " .. targetName) -- ./compiler/lua54.can:827 error("don't know how to compile a " .. tostring(key) .. " to " .. targetName) -- ./compiler/lua54.can:827
end }) -- ./compiler/lua54.can:827 end }) -- ./compiler/lua54.can:827
targetName = "Lua 5.3" -- ./compiler/lua53.can:1 targetName = "Lua 5.3" -- ./compiler/lua53.can:1
tags["AttributeId"] = nil -- ./compiler/lua53.can:4 tags["AttributeId"] = function(t) -- ./compiler/lua53.can:4
if t[2] then -- ./compiler/lua53.can:5
error("target does not support variable attributes") -- ./compiler/lua53.can:6
else -- ./compiler/lua53.can:6
return t[1] -- ./compiler/lua53.can:8
end -- ./compiler/lua53.can:8
end -- ./compiler/lua53.can:8
local code = lua(ast) .. newline() -- ./compiler/lua54.can:833 local code = lua(ast) .. newline() -- ./compiler/lua54.can:833
return requireStr .. code -- ./compiler/lua54.can:834 return requireStr .. code -- ./compiler/lua54.can:834
end -- ./compiler/lua54.can:834 end -- ./compiler/lua54.can:834
end -- ./compiler/lua54.can:834 end -- ./compiler/lua54.can:834
local lua54 = _() or lua54 -- ./compiler/lua54.can:839 local lua54 = _() or lua54 -- ./compiler/lua54.can:839
return lua54 -- ./compiler/lua53.can:10 return lua54 -- ./compiler/lua53.can:16
end -- ./compiler/lua53.can:10 end -- ./compiler/lua53.can:16
local lua53 = _() or lua53 -- ./compiler/lua53.can:14 local lua53 = _() or lua53 -- ./compiler/lua53.can:20
return lua53 -- ./compiler/luajit.can:44 return lua53 -- ./compiler/luajit.can:44
end -- ./compiler/luajit.can:44 end -- ./compiler/luajit.can:44
local luajit = _() or luajit -- ./compiler/luajit.can:48 local luajit = _() or luajit -- ./compiler/luajit.can:48

View file

@ -1,7 +1,13 @@
targetName = "Lua 5.3" targetName = "Lua 5.3"
-- Unsuported features -- Unsuported features
tags.AttributeId = nil tags.AttributeId = (t)
if t[2] then
error("target does not support variable attributes")
else
return t[1]
end
end
#local patch = output #local patch = output
#output = "" #output = ""