Reuh/candran
1
0
Fork 0
mirror of https://github.com/Reuh/candran.git synced 2025-10-27 17:59:30 +00:00
Code Releases Activity

Fixed assignemnt operators priority bug

Browse source 
accidentaly added AST dumping to canc in the process
This commit is contained in:
Étienne Fildadut 2017-08-24 17:32:20 +02:00
parent 006099a57c
commit 025a55f708
5 changed files with 133 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -189,6 +189,8 @@ The library can be used standalone through the ```canc``` and ```can``` utility:
You can choosed to run only the preprocessor or compile using the ```-preprocess``` and ```-compile``` flags. You can choosed to run only the preprocessor or compile using the ```-preprocess``` and ```-compile``` flags.
The ```-ast``` flag is also available for debugging, and will disable preprocessing, compiling and file writing, and instead directly dump the AST generated from the input file(s) to stdout.
* example uses : * example uses :
````canc foo.can```` ````canc foo.can````

9
bin/canc
View file

@ -1,10 +1,12 @@
#!/bin/lua #!/bin/lua
local candran = require("candran") local candran = require("candran")
local cmdline = require("lib.cmdline") local cmdline = require("lib.cmdline")
local parse = require("lib.lua-parser.parser").parse
local pp = require("lib.lua-parser.pp")
if #arg < 1 then if #arg < 1 then
print("Candran compiler version "..candran.VERSION.." by Reuh") print("Candran compiler version "..candran.VERSION.." by Reuh")
print("Usage: "..arg[0].." [target=<target>] [dest=<destination directory>] [-print] [-preprocess] [-compile] [options] filename...") print("Usage: "..arg[0].." [target=<target>] [dest=<destination directory>] [-print] [-preprocess] [-compile] [-ast] [options] filename...")
return return
end end
@ -25,6 +27,11 @@ for _, file in ipairs(args) do
local input = inputFile:read("*a") local input = inputFile:read("*a")
inputFile:close() inputFile:close()
if args.ast then
pp.dump(parse(input))
return
end
if args.chunkname == nil then if args.chunkname == nil then
args.chunkname = file args.chunkname = file
end end

178
candran.lua
View file

@ -150,7 +150,7 @@ lastLine = tonumber(line)
else else
for _ in code:sub(prevLinePos, lastInputPos):gmatch("\ for _ in code:sub(prevLinePos, lastInputPos):gmatch("\
") do ") do
lastLine = lastLine + 1 lastLine = lastLine + (1)
end end
end end
prevLinePos = lastInputPos prevLinePos = lastInputPos
@ -159,18 +159,18 @@ end
return r return r
end end
local function indent() local function indent()
indentLevel = indentLevel + 1 indentLevel = indentLevel + (1)
return newline() return newline()
end end
local function unindent() local function unindent()
indentLevel = indentLevel - 1 indentLevel = indentLevel - (1)
return newline() return newline()
end end
local required = {} local required = {}
local requireStr = "" local requireStr = ""
local function addRequire(mod, name, field) local function addRequire(mod, name, field)
if not required[mod] then if not required[mod] then
requireStr = requireStr .. "local " .. options["requirePrefix"] .. name .. (" = require(%q)"):format(mod) .. (field and "." .. field or "") .. options["newline"] requireStr = requireStr .. ("local " .. options["requirePrefix"] .. name .. (" = require(%q)"):format(mod) .. (field and "." .. field or "") .. options["newline"])
required[mod] = true required[mod] = true
end end
end end
@ -215,10 +215,10 @@ tags = setmetatable({
["Block"] = function(t) ["Block"] = function(t)
local r = "" local r = ""
for i = 1, # t - 1, 1 do for i = 1, # t - 1, 1 do
r = r .. lua(t[i]) .. newline() r = r .. (lua(t[i]) .. newline())
end end
if t[# t] then if t[# t] then
r = r .. lua(t[# t]) r = r .. (lua(t[# t]))
end end
return r return r
end, ["Do"] = function(t) end, ["Do"] = function(t)
@ -231,37 +231,49 @@ return lua(t[1], "_lhs") .. " = " .. lua(t[3], "_lhs")
elseif # t == 4 then elseif # t == 4 then
if t[3] == "=" then if t[3] == "=" then
local r = lua(t[1], "_lhs") .. " = " .. lua({ local r = lua(t[1], "_lhs") .. " = " .. lua({
t[2], t[1][1], t[4][1] t[2], t[1][1], {
["tag"] = "Paren", t[4][1]
}
}, "Op") }, "Op")
for i = 2, math["min"](# t[4], # t[1]), 1 do for i = 2, math["min"](# t[4], # t[1]), 1 do
r = r .. ", " .. lua({ r = r .. (", " .. lua({
t[2], t[1][i], t[4][i] t[2], t[1][i], {
}, "Op") ["tag"] = "Paren", t[4][i]
}
}, "Op"))
end end
return r return r
else else
local r = lua(t[1], "_lhs") .. " = " .. lua({ local r = lua(t[1], "_lhs") .. " = " .. lua({
t[3], t[4][1], t[1][1] t[3], {
["tag"] = "Paren", t[4][1]
}, t[1][1]
}, "Op") }, "Op")
for i = 2, math["min"](# t[4], # t[1]), 1 do for i = 2, math["min"](# t[4], # t[1]), 1 do
r = r .. ", " .. lua({ r = r .. (", " .. lua({
t[3], t[4][i], t[1][i] t[3], {
}, "Op") ["tag"] = "Paren", t[4][i]
}, t[1][i]
}, "Op"))
end end
return r return r
end end
else else
local r = lua(t[1], "_lhs") .. " = " .. lua({ local r = lua(t[1], "_lhs") .. " = " .. lua({
t[2], t[1][1], { t[2], t[1][1], {
["tag"] = "Op", t[4], t[5][1], t[1][1] ["tag"] = "Op", t[4], {
["tag"] = "Paren", t[5][1]
}, t[1][1]
} }
}, "Op") }, "Op")
for i = 2, math["min"](# t[5], # t[1]), 1 do for i = 2, math["min"](# t[5], # t[1]), 1 do
r = r .. ", " .. lua({ r = r .. (", " .. lua({
t[2], t[1][i], { t[2], t[1][i], {
["tag"] = "Op", t[4], t[5][i], t[1][i] ["tag"] = "Op", t[4], {
["tag"] = "Paren", t[5][i]
}, t[1][i]
} }
}, "Op") }, "Op"))
end end
return r return r
end end
@ -272,10 +284,10 @@ return "repeat" .. indent() .. namedLua("loop", t[1]) .. unindent() .. "until "
end, ["If"] = function(t) end, ["If"] = function(t)
local r = "if " .. lua(t[1]) .. " then" .. indent() .. lua(t[2]) .. unindent() local r = "if " .. lua(t[1]) .. " then" .. indent() .. lua(t[2]) .. unindent()
for i = 3, # t - 1, 2 do for i = 3, # t - 1, 2 do
r = r .. "elseif " .. lua(t[i]) .. " then" .. indent() .. lua(t[i + 1]) .. unindent() r = r .. ("elseif " .. lua(t[i]) .. " then" .. indent() .. lua(t[i + 1]) .. unindent())
end end
if # t % 2 == 1 then if # t % 2 == 1 then
r = r .. "else" .. indent() .. lua(t[# t]) .. unindent() r = r .. ("else" .. indent() .. lua(t[# t]) .. unindent())
end end
return r .. "end" return r .. "end"
end, ["Fornum"] = function(t) end, ["Fornum"] = function(t)
@ -290,7 +302,7 @@ return "for " .. lua(t[1], "_lhs") .. " in " .. lua(t[2], "_lhs") .. " do" .. in
end, ["Local"] = function(t) end, ["Local"] = function(t)
local r = "local " .. lua(t[1], "_lhs") local r = "local " .. lua(t[1], "_lhs")
if t[2][1] then if t[2][1] then
r = r .. " = " .. lua(t[2], "_lhs") r = r .. (" = " .. lua(t[2], "_lhs"))
end end
return r return r
end, ["Let"] = function(t) end, ["Let"] = function(t)
@ -300,9 +312,9 @@ if t[2][1] then
if any(t[2], { if any(t[2], {
"Function", "Table", "Paren" "Function", "Table", "Paren"
}) then }) then
r = r .. newline() .. nameList .. " = " .. lua(t[2], "_lhs") r = r .. (newline() .. nameList .. " = " .. lua(t[2], "_lhs"))
else else
r = r .. " = " .. lua(t[2], "_lhs") r = r .. (" = " .. lua(t[2], "_lhs"))
end end
end end
return r return r
@ -335,28 +347,28 @@ local decl = {}
if t[1][1] then if t[1][1] then
if t[1][1]["tag"] == "ParPair" then if t[1][1]["tag"] == "ParPair" then
local id = lua(t[1][1][1]) local id = lua(t[1][1][1])
indentLevel = indentLevel + 1 indentLevel = indentLevel + (1)
table["insert"](decl, id .. " = " .. id .. " == nil and " .. lua(t[1][1][2]) .. " or " .. id) table["insert"](decl, id .. " = " .. id .. " == nil and " .. lua(t[1][1][2]) .. " or " .. id)
indentLevel = indentLevel - 1 indentLevel = indentLevel - (1)
r = r .. id r = r .. (id)
else else
r = r .. lua(t[1][1]) r = r .. (lua(t[1][1]))
end end
for i = 2, # t[1], 1 do for i = 2, # t[1], 1 do
if t[1][i]["tag"] == "ParPair" then if t[1][i]["tag"] == "ParPair" then
local id = lua(t[1][i][1]) local id = lua(t[1][i][1])
indentLevel = indentLevel + 1 indentLevel = indentLevel + (1)
table["insert"](decl, "if " .. id .. " == nil then " .. id .. " = " .. lua(t[1][i][2]) .. " end") table["insert"](decl, "if " .. id .. " == nil then " .. id .. " = " .. lua(t[1][i][2]) .. " end")
indentLevel = indentLevel - 1 indentLevel = indentLevel - (1)
r = r .. ", " .. id r = r .. (", " .. id)
else else
r = r .. ", " .. lua(t[1][i]) r = r .. (", " .. lua(t[1][i]))
end end
end end
end end
r = r .. ")" .. indent() r = r .. (")" .. indent())
for _, d in ipairs(decl) do for _, d in ipairs(decl) do
r = r .. d .. newline() r = r .. (d .. newline())
end end
return r .. lua(t[2]) .. unindent() .. "end" return r .. lua(t[2]) .. unindent() .. "end"
end, ["Function"] = function(t) end, ["Function"] = function(t)
@ -399,7 +411,7 @@ local r
if t[start] then if t[start] then
r = lua(t[start]) r = lua(t[start])
for i = start + 1, # t, 1 do for i = start + 1, # t, 1 do
r = r .. ", " .. lua(t[i]) r = r .. (", " .. lua(t[i]))
end end
else else
r = "" r = ""
@ -442,7 +454,7 @@ lastLine = tonumber(line)
else else
for _ in code:sub(prevLinePos, lastInputPos):gmatch("\ for _ in code:sub(prevLinePos, lastInputPos):gmatch("\
") do ") do
lastLine = lastLine + 1 lastLine = lastLine + (1)
end end
end end
prevLinePos = lastInputPos prevLinePos = lastInputPos
@ -451,18 +463,18 @@ end
return r return r
end end
local function indent() local function indent()
indentLevel = indentLevel + 1 indentLevel = indentLevel + (1)
return newline() return newline()
end end
local function unindent() local function unindent()
indentLevel = indentLevel - 1 indentLevel = indentLevel - (1)
return newline() return newline()
end end
local required = {} local required = {}
local requireStr = "" local requireStr = ""
local function addRequire(mod, name, field) local function addRequire(mod, name, field)
if not required[mod] then if not required[mod] then
requireStr = requireStr .. "local " .. options["requirePrefix"] .. name .. (" = require(%q)"):format(mod) .. (field and "." .. field or "") .. options["newline"] requireStr = requireStr .. ("local " .. options["requirePrefix"] .. name .. (" = require(%q)"):format(mod) .. (field and "." .. field or "") .. options["newline"])
required[mod] = true required[mod] = true
end end
end end
@ -507,10 +519,10 @@ tags = setmetatable({
["Block"] = function(t) ["Block"] = function(t)
local r = "" local r = ""
for i = 1, # t - 1, 1 do for i = 1, # t - 1, 1 do
r = r .. lua(t[i]) .. newline() r = r .. (lua(t[i]) .. newline())
end end
if t[# t] then if t[# t] then
r = r .. lua(t[# t]) r = r .. (lua(t[# t]))
end end
return r return r
end, ["Do"] = function(t) end, ["Do"] = function(t)
@ -523,37 +535,49 @@ return lua(t[1], "_lhs") .. " = " .. lua(t[3], "_lhs")
elseif # t == 4 then elseif # t == 4 then
if t[3] == "=" then if t[3] == "=" then
local r = lua(t[1], "_lhs") .. " = " .. lua({ local r = lua(t[1], "_lhs") .. " = " .. lua({
t[2], t[1][1], t[4][1] t[2], t[1][1], {
["tag"] = "Paren", t[4][1]
}
}, "Op") }, "Op")
for i = 2, math["min"](# t[4], # t[1]), 1 do for i = 2, math["min"](# t[4], # t[1]), 1 do
r = r .. ", " .. lua({ r = r .. (", " .. lua({
t[2], t[1][i], t[4][i] t[2], t[1][i], {
}, "Op") ["tag"] = "Paren", t[4][i]
}
}, "Op"))
end end
return r return r
else else
local r = lua(t[1], "_lhs") .. " = " .. lua({ local r = lua(t[1], "_lhs") .. " = " .. lua({
t[3], t[4][1], t[1][1] t[3], {
["tag"] = "Paren", t[4][1]
}, t[1][1]
}, "Op") }, "Op")
for i = 2, math["min"](# t[4], # t[1]), 1 do for i = 2, math["min"](# t[4], # t[1]), 1 do
r = r .. ", " .. lua({ r = r .. (", " .. lua({
t[3], t[4][i], t[1][i] t[3], {
}, "Op") ["tag"] = "Paren", t[4][i]
}, t[1][i]
}, "Op"))
end end
return r return r
end end
else else
local r = lua(t[1], "_lhs") .. " = " .. lua({ local r = lua(t[1], "_lhs") .. " = " .. lua({
t[2], t[1][1], { t[2], t[1][1], {
["tag"] = "Op", t[4], t[5][1], t[1][1] ["tag"] = "Op", t[4], {
["tag"] = "Paren", t[5][1]
}, t[1][1]
} }
}, "Op") }, "Op")
for i = 2, math["min"](# t[5], # t[1]), 1 do for i = 2, math["min"](# t[5], # t[1]), 1 do
r = r .. ", " .. lua({ r = r .. (", " .. lua({
t[2], t[1][i], { t[2], t[1][i], {
["tag"] = "Op", t[4], t[5][i], t[1][i] ["tag"] = "Op", t[4], {
["tag"] = "Paren", t[5][i]
}, t[1][i]
} }
}, "Op") }, "Op"))
end end
return r return r
end end
@ -564,10 +588,10 @@ return "repeat" .. indent() .. namedLua("loop", t[1]) .. unindent() .. "until "
end, ["If"] = function(t) end, ["If"] = function(t)
local r = "if " .. lua(t[1]) .. " then" .. indent() .. lua(t[2]) .. unindent() local r = "if " .. lua(t[1]) .. " then" .. indent() .. lua(t[2]) .. unindent()
for i = 3, # t - 1, 2 do for i = 3, # t - 1, 2 do
r = r .. "elseif " .. lua(t[i]) .. " then" .. indent() .. lua(t[i + 1]) .. unindent() r = r .. ("elseif " .. lua(t[i]) .. " then" .. indent() .. lua(t[i + 1]) .. unindent())
end end
if # t % 2 == 1 then if # t % 2 == 1 then
r = r .. "else" .. indent() .. lua(t[# t]) .. unindent() r = r .. ("else" .. indent() .. lua(t[# t]) .. unindent())
end end
return r .. "end" return r .. "end"
end, ["Fornum"] = function(t) end, ["Fornum"] = function(t)
@ -582,7 +606,7 @@ return "for " .. lua(t[1], "_lhs") .. " in " .. lua(t[2], "_lhs") .. " do" .. in
end, ["Local"] = function(t) end, ["Local"] = function(t)
local r = "local " .. lua(t[1], "_lhs") local r = "local " .. lua(t[1], "_lhs")
if t[2][1] then if t[2][1] then
r = r .. " = " .. lua(t[2], "_lhs") r = r .. (" = " .. lua(t[2], "_lhs"))
end end
return r return r
end, ["Let"] = function(t) end, ["Let"] = function(t)
@ -592,9 +616,9 @@ if t[2][1] then
if any(t[2], { if any(t[2], {
"Function", "Table", "Paren" "Function", "Table", "Paren"
}) then }) then
r = r .. newline() .. nameList .. " = " .. lua(t[2], "_lhs") r = r .. (newline() .. nameList .. " = " .. lua(t[2], "_lhs"))
else else
r = r .. " = " .. lua(t[2], "_lhs") r = r .. (" = " .. lua(t[2], "_lhs"))
end end
end end
return r return r
@ -627,28 +651,28 @@ local decl = {}
if t[1][1] then if t[1][1] then
if t[1][1]["tag"] == "ParPair" then if t[1][1]["tag"] == "ParPair" then
local id = lua(t[1][1][1]) local id = lua(t[1][1][1])
indentLevel = indentLevel + 1 indentLevel = indentLevel + (1)
table["insert"](decl, id .. " = " .. id .. " == nil and " .. lua(t[1][1][2]) .. " or " .. id) table["insert"](decl, id .. " = " .. id .. " == nil and " .. lua(t[1][1][2]) .. " or " .. id)
indentLevel = indentLevel - 1 indentLevel = indentLevel - (1)
r = r .. id r = r .. (id)
else else
r = r .. lua(t[1][1]) r = r .. (lua(t[1][1]))
end end
for i = 2, # t[1], 1 do for i = 2, # t[1], 1 do
if t[1][i]["tag"] == "ParPair" then if t[1][i]["tag"] == "ParPair" then
local id = lua(t[1][i][1]) local id = lua(t[1][i][1])
indentLevel = indentLevel + 1 indentLevel = indentLevel + (1)
table["insert"](decl, "if " .. id .. " == nil then " .. id .. " = " .. lua(t[1][i][2]) .. " end") table["insert"](decl, "if " .. id .. " == nil then " .. id .. " = " .. lua(t[1][i][2]) .. " end")
indentLevel = indentLevel - 1 indentLevel = indentLevel - (1)
r = r .. ", " .. id r = r .. (", " .. id)
else else
r = r .. ", " .. lua(t[1][i]) r = r .. (", " .. lua(t[1][i]))
end end
end end
end end
r = r .. ")" .. indent() r = r .. (")" .. indent())
for _, d in ipairs(decl) do for _, d in ipairs(decl) do
r = r .. d .. newline() r = r .. (d .. newline())
end end
return r .. lua(t[2]) .. unindent() .. "end" return r .. lua(t[2]) .. unindent() .. "end"
end, ["Function"] = function(t) end, ["Function"] = function(t)
@ -691,7 +715,7 @@ local r
if t[start] then if t[start] then
r = lua(t[start]) r = lua(t[start])
for i = start + 1, # t, 1 do for i = start + 1, # t, 1 do
r = r .. ", " .. lua(t[i]) r = r .. (", " .. lua(t[i]))
end end
else else
r = "" r = ""
@ -1919,21 +1943,21 @@ local i = 0
for line in (input .. "\ for line in (input .. "\
"):gmatch("(.-\ "):gmatch("(.-\
)") do )") do
i = i + 1 i = i + (1)
if line:match("^%s*#") and not line:match("^#!") then if line:match("^%s*#") and not line:match("^#!") then
preprocessor = preprocessor .. line:gsub("^%s*#", "") preprocessor = preprocessor .. (line:gsub("^%s*#", ""))
else else
local l = line:sub(1, - 2) local l = line:sub(1, - 2)
if options["mapLines"] and not l:match("%-%- (.-)%:(%d+)$") then if options["mapLines"] and not l:match("%-%- (.-)%:(%d+)$") then
preprocessor = preprocessor .. ("write(%q)"):format(l .. " -- " .. options["chunkname"] .. ":" .. i) .. "\ preprocessor = preprocessor .. (("write(%q)"):format(l .. " -- " .. options["chunkname"] .. ":" .. i) .. "\
" ")
else else
preprocessor = preprocessor .. ("write(%q)"):format(line:sub(1, - 2)) .. "\ preprocessor = preprocessor .. (("write(%q)"):format(line:sub(1, - 2)) .. "\
" ")
end end
end end
end end
preprocessor = preprocessor .. "return output" preprocessor = preprocessor .. ("return output")
local env = util["merge"](_G, options) local env = util["merge"](_G, options)
env["candran"] = candran env["candran"] = candran
env["output"] = "" env["output"] = ""
@ -1967,8 +1991,8 @@ env["write"](f:read("*a"))
f:close() f:close()
end end
env["write"] = function(...) env["write"] = function(...)
env["output"] = env["output"] .. table["concat"]({ ... }, "\9") .. "\ env["output"] = env["output"] .. (table["concat"]({ ... }, "\9") .. "\
" ")
end end
env["placeholder"] = function(name) env["placeholder"] = function(name)
if env[name] then if env[name] then

12
compiler/lua53.can
View file

@ -124,22 +124,22 @@ return function(code, ast, options)
return lua(t[1], "_lhs") .. " = " .. lua(t[3], "_lhs") return lua(t[1], "_lhs") .. " = " .. lua(t[3], "_lhs")
elseif #t == 4 then elseif #t == 4 then
if t[3] == "=" then if t[3] == "=" then
local r = lua(t[1], "_lhs") .. " = " .. lua({ t[2], t[1][1], t[4][1] }, "Op") local r = lua(t[1], "_lhs") .. " = " .. lua({ t[2], t[1][1], { tag = "Paren", t[4][1] } }, "Op")
for i=2, math.min(#t[4], #t[1]), 1 do for i=2, math.min(#t[4], #t[1]), 1 do
r ..= ", " .. lua({ t[2], t[1][i], t[4][i] }, "Op") r ..= ", " .. lua({ t[2], t[1][i], { tag = "Paren", t[4][i] } }, "Op")
end end
return r return r
else else
local r = lua(t[1], "_lhs") .. " = " .. lua({ t[3], t[4][1], t[1][1] }, "Op") local r = lua(t[1], "_lhs") .. " = " .. lua({ t[3], { tag = "Paren", t[4][1] }, t[1][1] }, "Op")
for i=2, math.min(#t[4], #t[1]), 1 do for i=2, math.min(#t[4], #t[1]), 1 do
r ..= ", " .. lua({ t[3], t[4][i], t[1][i] }, "Op") r ..= ", " .. lua({ t[3], { tag = "Paren", t[4][i] }, t[1][i] }, "Op")
end end
return r return r
end end
else -- You are mad. else -- You are mad.
local r = lua(t[1], "_lhs") .. " = " .. lua({ t[2], t[1][1], { tag = "Op", t[4], t[5][1], t[1][1] } }, "Op") local r = lua(t[1], "_lhs") .. " = " .. lua({ t[2], t[1][1], { tag = "Op", t[4], { tag = "Paren", t[5][1] }, t[1][1] } }, "Op")
for i=2, math.min(#t[5], #t[1]), 1 do for i=2, math.min(#t[5], #t[1]), 1 do
r ..= ", " .. lua({ t[2], t[1][i], { tag = "Op", t[4], t[5][i], t[1][i] } }, "Op") r ..= ", " .. lua({ t[2], t[1][i], { tag = "Op", t[4], { tag = "Paren", t[5][i] }, t[1][i] } }, "Op")
end end
return r return r
end end

16
test/test.lua
View file

@ -205,6 +205,22 @@ a = "hello"
a ..=.. " world " assert(a == "hello world hello", "..=..") a ..=.. " world " assert(a == "hello world hello", "..=..")
]], nil) ]], nil)
test("left assigments operators priority", [[
local a = 5
a *= 2 + 3
return a
]], 25)
test("right assigments operators priority", [[
local a = 5
a =/ 2 + 3
return a
]], 1)
test("left+right assigments operators priority", [[
local a = 5
a *=/ 2 + 3
return a
]], 5)
-- Default function parameters -- Default function parameters
test("default parameters", [[ test("default parameters", [[
local function test(hey, def="re", no, foo=("bar"):gsub("bar", "batru")) local function test(hey, def="re", no, foo=("bar"):gsub("bar", "batru"))