@@ 3,15 3,17 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
local parser = require("fennel.parser")
local compiler = require("fennel.compiler")
local specials = require("fennel.specials")
+ local view = require("fennel.view")
+ local unpack = (table.unpack or _G.unpack)
local function default_read_chunk(parser_state)
- local function _0_()
+ local function _631_()
if (0 < parser_state["stack-size"]) then
return ".."
else
return ">> "
end
end
- io.write(_0_())
+ io.write(_631_())
io.flush()
local input = io.read()
return (input and (input .. "\n"))
@@ 21,85 23,147 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
return io.write("\n")
end
local function default_on_error(errtype, err, lua_source)
- local function _1_()
- local _0_0 = errtype
- if (_0_0 == "Lua Compile") then
+ local function _633_()
+ local _632_ = errtype
+ if (_632_ == "Lua Compile") then
return ("Bad code generated - likely a bug with the compiler:\n" .. "--- Generated Lua Start ---\n" .. lua_source .. "--- Generated Lua End ---\n")
- elseif (_0_0 == "Runtime") then
+ elseif (_632_ == "Runtime") then
return (compiler.traceback(tostring(err), 4) .. "\n")
- else
- local _ = _0_0
+ elseif true then
+ local _ = _632_
return ("%s error: %s\n"):format(errtype, tostring(err))
+ else
+ return nil
end
end
- return io.write(_1_())
+ return io.write(_633_())
end
- local save_source = table.concat({"local ___i___ = 1", "while true do", " local name, value = debug.getlocal(1, ___i___)", " if(name and name ~= \"___i___\") then", " ___replLocals___[name] = value", " ___i___ = ___i___ + 1", " else break end end"}, "\n")
- local function splice_save_locals(env, lua_source)
- env.___replLocals___ = (env.___replLocals___ or {})
- local spliced_source = {}
- local bind = "local %s = ___replLocals___['%s']"
- for line in lua_source:gmatch("([^\n]+)\n?") do
- table.insert(spliced_source, line)
+ local function splice_save_locals(env, lua_source, scope)
+ local saves
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for name in pairs(env.___replLocals___) do
+ local val_18_auto = ("local %s = ___replLocals___['%s']"):format(name, name)
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ saves = tbl_16_auto
+ end
+ local binds
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for _, name in pairs(scope.manglings) do
+ local val_18_auto
+ if not scope.gensyms[name] then
+ val_18_auto = ("___replLocals___['%s'] = %s"):format(name, name)
+ else
+ val_18_auto = nil
+ end
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ binds = tbl_16_auto
end
- for name in pairs(env.___replLocals___) do
- table.insert(spliced_source, 1, bind:format(name, name))
+ local gap
+ if lua_source:find("\n") then
+ gap = "\n"
+ else
+ gap = " "
end
- if ((1 < #spliced_source) and (spliced_source[#spliced_source]):match("^ *return .*$")) then
- table.insert(spliced_source, #spliced_source, save_source)
+ local function _639_()
+ if next(saves) then
+ return (table.concat(saves, " ") .. gap)
+ else
+ return ""
+ end
+ end
+ local function _642_()
+ local _640_, _641_ = lua_source:match("^(.*)[\n ](return .*)$")
+ if ((nil ~= _640_) and (nil ~= _641_)) then
+ local body = _640_
+ local _return = _641_
+ return (body .. gap .. table.concat(binds, " ") .. gap .. _return)
+ elseif true then
+ local _ = _640_
+ return lua_source
+ else
+ return nil
+ end
end
- return table.concat(spliced_source, "\n")
+ return (_639_() .. _642_())
end
local function completer(env, scope, text)
+ local max_items = 2000
+ local seen = {}
local matches = {}
local input_fragment = text:gsub(".*[%s)(]+", "")
local stop_looking_3f = false
- local function add_partials(input, tbl, prefix, method_3f)
- for k in utils.allpairs(tbl) do
- local k0 = nil
- if ((tbl == env) or (tbl == env.___replLocals___)) then
- k0 = scope.unmanglings[k]
+ local function add_partials(input, tbl, prefix)
+ local scope_first_3f = ((tbl == env) or (tbl == env.___replLocals___))
+ local tbl_16_auto = matches
+ local i_17_auto = #tbl_16_auto
+ local function _644_()
+ if scope_first_3f then
+ return scope.manglings
else
- k0 = k
+ return tbl
end
- if ((#matches < 2000) and (type(k0) == "string") and (input == k0:sub(0, #input)) and (not method_3f or ("function" == type(tbl[k0])))) then
- local function _1_()
- if method_3f then
- return (prefix .. ":" .. k0)
- else
- return (prefix .. k0)
- end
+ end
+ for k, is_mangled in utils.allpairs(_644_()) do
+ if (max_items <= #matches) then break end
+ local val_18_auto
+ do
+ local lookup_k
+ if scope_first_3f then
+ lookup_k = is_mangled
+ else
+ lookup_k = k
+ end
+ if ((type(k) == "string") and (input == k:sub(0, #input)) and not seen[k] and ((":" ~= prefix:sub(-1)) or ("function" == type(tbl[lookup_k])))) then
+ seen[k] = true
+ val_18_auto = (prefix .. k)
+ else
+ val_18_auto = nil
end
- table.insert(matches, _1_())
+ end
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
end
end
- return nil
+ return tbl_16_auto
end
local function descend(input, tbl, prefix, add_matches, method_3f)
- local splitter = nil
+ local splitter
if method_3f then
splitter = "^([^:]+):(.*)"
else
splitter = "^([^.]+)%.(.*)"
end
local head, tail = input:match(splitter)
- local raw_head = nil
- if ((tbl == env) or (tbl == env.___replLocals___)) then
- raw_head = scope.manglings[head]
- else
- raw_head = head
- end
+ local raw_head = (scope.manglings[head] or head)
if (type(tbl[raw_head]) == "table") then
stop_looking_3f = true
if method_3f then
- return add_partials(tail, tbl[raw_head], (prefix .. head), true)
+ return add_partials(tail, tbl[raw_head], (prefix .. head .. ":"))
else
return add_matches(tail, tbl[raw_head], (prefix .. head))
end
+ else
+ return nil
end
end
local function add_matches(input, tbl, prefix)
- local prefix0 = nil
+ local prefix0
if prefix then
prefix0 = (prefix .. ".")
else
@@ 114,10 178,8 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
end
end
for _, source in ipairs({scope.specials, scope.macros, (env.___replLocals___ or {}), env, env._G}) do
+ if stop_looking_3f then break end
add_matches(input_fragment, source)
- if stop_looking_3f then
- break
- end
end
return matches
end
@@ 126,72 188,91 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
return input:match("^%s*,")
end
local function command_docs()
- local _0_
+ local _653_
do
- local tbl_0_ = {}
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
for name, f in pairs(commands) do
- tbl_0_[(#tbl_0_ + 1)] = (" ,%s - %s"):format(name, ((compiler.metadata):get(f, "fnl/docstring") or "undocumented"))
+ local val_18_auto = (" ,%s - %s"):format(name, ((compiler.metadata):get(f, "fnl/docstring") or "undocumented"))
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
end
- _0_ = tbl_0_
+ _653_ = tbl_16_auto
end
- return table.concat(_0_, "\n")
+ return table.concat(_653_, "\n")
end
commands.help = function(_, _0, on_values)
- return on_values({("Welcome to Fennel.\nThis is the REPL where you can enter code to be evaluated.\nYou can also run these repl commands:\n\n" .. command_docs() .. "\n ,exit - Leave the repl.\n\nUse (doc something) to see descriptions for individual macros and special forms.\n\nFor more information about the language, see https://fennel-lang.org/reference")})
+ return on_values({("Welcome to Fennel.\nThis is the REPL where you can enter code to be evaluated.\nYou can also run these repl commands:\n\n" .. command_docs() .. "\n ,exit - Leave the repl.\n\nUse ,doc something to see descriptions for individual macros and special forms.\n\nFor more information about the language, see https://fennel-lang.org/reference")})
end
do end (compiler.metadata):set(commands.help, "fnl/docstring", "Show this message.")
local function reload(module_name, env, on_values, on_error)
- local _0_0, _1_0 = pcall(specials["load-code"]("return require(...)", env), module_name)
- if ((_0_0 == true) and (nil ~= _1_0)) then
- local old = _1_0
- local _ = nil
+ local _655_, _656_ = pcall(specials["load-code"]("return require(...)", env), module_name)
+ if ((_655_ == true) and (nil ~= _656_)) then
+ local old = _656_
+ local _
package.loaded[module_name] = nil
_ = nil
local ok, new = pcall(require, module_name)
- local new0 = nil
+ local new0
if not ok then
on_values({new})
new0 = old
else
new0 = new
end
+ specials["macro-loaded"][module_name] = nil
if ((type(old) == "table") and (type(new0) == "table")) then
for k, v in pairs(new0) do
old[k] = v
end
for k in pairs(old) do
- if (nil == new0[k]) then
+ if (nil == (new0)[k]) then
old[k] = nil
+ else
end
end
package.loaded[module_name] = old
+ else
end
return on_values({"ok"})
- elseif ((_0_0 == false) and (nil ~= _1_0)) then
- local msg = _1_0
- local function _3_()
- local _2_0 = msg:gsub("\n.*", "")
- return _2_0
+ elseif ((_655_ == false) and (nil ~= _656_)) then
+ local msg = _656_
+ if msg:match("loop or previous error loading module") then
+ package.loaded[module_name] = nil
+ return reload(module_name, env, on_values, on_error)
+ elseif (specials["macro-loaded"])[module_name] then
+ specials["macro-loaded"][module_name] = nil
+ return nil
+ else
+ local function _661_()
+ local _660_ = msg:gsub("\n.*", "")
+ return _660_
+ end
+ return on_error("Runtime", _661_())
end
- return on_error("Runtime", _3_())
+ else
+ return nil
end
end
local function run_command(read, on_error, f)
- local _0_0, _1_0, _2_0 = pcall(read)
- if ((_0_0 == true) and (_1_0 == true) and (nil ~= _2_0)) then
- local val = _2_0
+ local _664_, _665_, _666_ = pcall(read)
+ if ((_664_ == true) and (_665_ == true) and (nil ~= _666_)) then
+ local val = _666_
return f(val)
- elseif ((_0_0 == false) and true and true) then
- local _3fparse_ok = _1_0
- local _3ferr = _2_0
+ elseif (_664_ == false) then
return on_error("Parse", "Couldn't parse input.")
+ else
+ return nil
end
end
commands.reload = function(env, read, on_values, on_error)
- local function _0_(_241)
+ local function _668_(_241)
return reload(tostring(_241), env, on_values, on_error)
end
- return run_command(read, on_error, _0_)
+ return run_command(read, on_error, _668_)
end
do end (compiler.metadata):set(commands.reload, "fnl/docstring", "Reload the specified module.")
commands.reset = function(env, _, on_values)
@@ 199,185 280,375 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
return on_values({"ok"})
end
do end (compiler.metadata):set(commands.reset, "fnl/docstring", "Erase all repl-local scope.")
- commands.complete = function(env, read, on_values, on_error, scope)
- local function _0_(_241)
- return on_values(completer(env, scope, tostring(_241)))
- end
- return run_command(read, on_error, _0_)
- end
- do end (compiler.metadata):set(commands.complete, "fnl/docstring", "Print all possible completions for a given input.")
- local function apropos_2a(pattern, module, prefix, seen, names)
- for name, module0 in pairs(module) do
- if (("string" == type(name)) and (package ~= module0)) then
- local _0_0 = type(module0)
- if (_0_0 == "function") then
+ commands.complete = function(env, read, on_values, on_error, scope, chars)
+ local function _669_()
+ return on_values(completer(env, scope, string.char(unpack(chars)):gsub(",complete +", ""):sub(1, -2)))
+ end
+ return run_command(read, on_error, _669_)
+ end
+ do end (compiler.metadata):set(commands.complete, "fnl/docstring", "Print all possible completions for a given input symbol.")
+ local function apropos_2a(pattern, tbl, prefix, seen, names)
+ for name, subtbl in pairs(tbl) do
+ if (("string" == type(name)) and (package ~= subtbl)) then
+ local _670_ = type(subtbl)
+ if (_670_ == "function") then
if ((prefix .. name)):match(pattern) then
table.insert(names, (prefix .. name))
+ else
end
- elseif (_0_0 == "table") then
- if not seen[module0] then
- local _2_
+ elseif (_670_ == "table") then
+ if not seen[subtbl] then
+ local _673_
do
- local _1_0 = seen
- _1_0[module0] = true
- _2_ = _1_0
+ local _672_ = seen
+ _672_[subtbl] = true
+ _673_ = _672_
end
- apropos_2a(pattern, module0, (prefix .. name:gsub("%.", "/") .. "."), _2_, names)
+ apropos_2a(pattern, subtbl, (prefix .. name:gsub("%.", "/") .. "."), _673_, names)
+ else
end
+ else
end
+ else
end
end
return names
end
local function apropos(pattern)
local names = apropos_2a(pattern, package.loaded, "", {}, {})
- local tbl_0_ = {}
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
for _, name in ipairs(names) do
- tbl_0_[(#tbl_0_ + 1)] = name:gsub("^_G%.", "")
+ local val_18_auto = name:gsub("^_G%.", "")
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
end
- return tbl_0_
+ return tbl_16_auto
end
- commands.apropos = function(env, read, on_values, on_error, scope)
- local function _0_(_241)
+ commands.apropos = function(_env, read, on_values, on_error, _scope)
+ local function _678_(_241)
return on_values(apropos(tostring(_241)))
end
- return run_command(read, on_error, _0_)
+ return run_command(read, on_error, _678_)
end
do end (compiler.metadata):set(commands.apropos, "fnl/docstring", "Print all functions matching a pattern in all loaded modules.")
local function apropos_follow_path(path)
- local paths = nil
+ local paths
do
- local tbl_0_ = {}
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
for p in path:gmatch("[^%.]+") do
- tbl_0_[(#tbl_0_ + 1)] = p
+ local val_18_auto = p
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
end
- paths = tbl_0_
+ paths = tbl_16_auto
end
local tgt = package.loaded
for _, path0 in ipairs(paths) do
- local _1_
+ if (nil == tgt) then break end
+ local _681_
do
- local _0_0 = path0:gsub("%/", ".")
- _1_ = _0_0
- end
- tgt = tgt[_1_]
- if (nil == tgt) then
- break
+ local _680_ = path0:gsub("%/", ".")
+ _681_ = _680_
end
+ tgt = tgt[_681_]
end
return tgt
end
local function apropos_doc(pattern)
- local names = {}
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
for _, path in ipairs(apropos(".*")) do
- local tgt = apropos_follow_path(path)
- if ("function" == type(tgt)) then
- local _0_0 = (compiler.metadata):get(tgt, "fnl/docstring")
- if (nil ~= _0_0) then
- local docstr = _0_0
- if docstr:match(pattern) then
- table.insert(names, path)
+ local val_18_auto
+ do
+ local tgt = apropos_follow_path(path)
+ if ("function" == type(tgt)) then
+ local _682_ = (compiler.metadata):get(tgt, "fnl/docstring")
+ if (nil ~= _682_) then
+ local docstr = _682_
+ val_18_auto = (docstr:match(pattern) and path)
+ else
+ val_18_auto = nil
end
+ else
+ val_18_auto = nil
end
end
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
end
- return names
+ return tbl_16_auto
end
- commands["apropos-doc"] = function(env, read, on_values, on_error, scope)
- local function _0_(_241)
+ commands["apropos-doc"] = function(_env, read, on_values, on_error, _scope)
+ local function _686_(_241)
return on_values(apropos_doc(tostring(_241)))
end
- return run_command(read, on_error, _0_)
+ return run_command(read, on_error, _686_)
end
do end (compiler.metadata):set(commands["apropos-doc"], "fnl/docstring", "Print all functions that match the pattern in their docs")
- local function apropos_show_docs(pattern)
+ local function apropos_show_docs(on_values, pattern)
for _, path in ipairs(apropos(pattern)) do
local tgt = apropos_follow_path(path)
if (("function" == type(tgt)) and (compiler.metadata):get(tgt, "fnl/docstring")) then
- print(specials.doc(tgt, path))
- print()
+ on_values(specials.doc(tgt, path))
+ on_values()
+ else
end
end
return nil
end
- commands["apropos-show-docs"] = function(env, read, _, on_error, scope)
- local function _0_(_241)
- return apropos_show_docs(tostring(_241))
+ commands["apropos-show-docs"] = function(_env, read, on_values, on_error)
+ local function _688_(_241)
+ return apropos_show_docs(on_values, tostring(_241))
end
- return run_command(read, on_error, _0_)
+ return run_command(read, on_error, _688_)
end
do end (compiler.metadata):set(commands["apropos-show-docs"], "fnl/docstring", "Print all documentations matching a pattern in function name")
- local function load_plugin_commands()
- if (utils.root and utils.root.options and utils.root.options.plugins) then
- for _, plugin in ipairs(utils.root.options.plugins) do
- for name, f in pairs(plugin) do
- local _0_0 = name:match("^repl%-command%-(.*)")
- if (nil ~= _0_0) then
- local cmd_name = _0_0
- commands[cmd_name] = (commands[cmd_name] or f)
+ local function resolve(identifier, _689_, scope)
+ local _arg_690_ = _689_
+ local ___replLocals___ = _arg_690_["___replLocals___"]
+ local env = _arg_690_
+ local e
+ local function _691_(_241, _242)
+ return (___replLocals___[_242] or env[_242])
+ end
+ e = setmetatable({}, {__index = _691_})
+ local _692_, _693_ = pcall(compiler["compile-string"], tostring(identifier), {scope = scope})
+ if ((_692_ == true) and (nil ~= _693_)) then
+ local code = _693_
+ return specials["load-code"](code, e)()
+ else
+ return nil
+ end
+ end
+ commands.find = function(env, read, on_values, on_error, scope)
+ local function _695_(_241)
+ local _696_
+ do
+ local _697_ = utils["sym?"](_241)
+ if (nil ~= _697_) then
+ local _698_ = resolve(_697_, env, scope)
+ if (nil ~= _698_) then
+ _696_ = debug.getinfo(_698_)
+ else
+ _696_ = _698_
end
+ else
+ _696_ = _697_
+ end
+ end
+ if ((_G.type(_696_) == "table") and ((_696_).what == "Lua") and (nil ~= (_696_).source) and (nil ~= (_696_).linedefined) and (nil ~= (_696_).short_src)) then
+ local source = (_696_).source
+ local line = (_696_).linedefined
+ local src = (_696_).short_src
+ local fnlsrc
+ do
+ local t_701_ = compiler.sourcemap
+ if (nil ~= t_701_) then
+ t_701_ = (t_701_)[source]
+ else
+ end
+ if (nil ~= t_701_) then
+ t_701_ = (t_701_)[line]
+ else
+ end
+ if (nil ~= t_701_) then
+ t_701_ = (t_701_)[2]
+ else
+ end
+ fnlsrc = t_701_
+ end
+ return on_values({string.format("%s:%s", src, (fnlsrc or line))})
+ elseif (_696_ == nil) then
+ return on_error("Repl", "Unknown value")
+ elseif true then
+ local _ = _696_
+ return on_error("Repl", "No source info")
+ else
+ return nil
+ end
+ end
+ return run_command(read, on_error, _695_)
+ end
+ do end (compiler.metadata):set(commands.find, "fnl/docstring", "Print the filename and line number for a given function")
+ commands.doc = function(env, read, on_values, on_error, scope)
+ local function _706_(_241)
+ local name = tostring(_241)
+ local path = (utils["multi-sym?"](name) or {name})
+ local ok_3f, target = nil, nil
+ local function _707_()
+ return (utils["get-in"](scope.specials, path) or utils["get-in"](scope.macros, path) or resolve(name, env, scope))
+ end
+ ok_3f, target = pcall(_707_)
+ if ok_3f then
+ return on_values({specials.doc(target, name)})
+ else
+ return on_error("Repl", "Could not resolve value for docstring lookup")
+ end
+ end
+ return run_command(read, on_error, _706_)
+ end
+ do end (compiler.metadata):set(commands.doc, "fnl/docstring", "Print the docstring and arglist for a function, macro, or special form.")
+ commands.compile = function(env, read, on_values, on_error, scope)
+ local function _709_(_241)
+ local allowedGlobals = specials["current-global-names"](env)
+ local ok_3f, result = pcall(compiler.compile, _241, {env = env, scope = scope, allowedGlobals = allowedGlobals})
+ if ok_3f then
+ return on_values({result})
+ else
+ return on_error("Repl", ("Error compiling expression: " .. result))
+ end
+ end
+ return run_command(read, on_error, _709_)
+ end
+ do end (compiler.metadata):set(commands.compile, "fnl/docstring", "compiles the expression into lua and prints the result.")
+ local function load_plugin_commands(plugins)
+ for _, plugin in ipairs((plugins or {})) do
+ for name, f in pairs(plugin) do
+ local _711_ = name:match("^repl%-command%-(.*)")
+ if (nil ~= _711_) then
+ local cmd_name = _711_
+ commands[cmd_name] = (commands[cmd_name] or f)
+ else
end
end
- return nil
end
+ return nil
end
- local function run_command0(input, read, loop, env, on_values, on_error, scope)
- load_plugin_commands()
+ local function run_command_loop(input, read, loop, env, on_values, on_error, scope, chars)
local command_name = input:match(",([^%s/]+)")
do
- local _0_0 = commands[command_name]
- if (nil ~= _0_0) then
- local command = _0_0
- command(env, read, on_values, on_error, scope)
- else
- local _ = _0_0
+ local _713_ = commands[command_name]
+ if (nil ~= _713_) then
+ local command = _713_
+ command(env, read, on_values, on_error, scope, chars)
+ elseif true then
+ local _ = _713_
if ("exit" ~= command_name) then
on_values({"Unknown command", command_name})
+ else
end
+ else
end
end
if ("exit" ~= command_name) then
return loop()
+ else
+ return nil
end
end
- local function repl(options)
- local old_root_options = utils.root.options
- local env = nil
- if options.env then
- env = specials["wrap-env"](options.env)
+ local function try_readline_21(opts, ok, readline)
+ if ok then
+ if readline.set_readline_name then
+ readline.set_readline_name("fennel")
+ else
+ end
+ readline.set_options({keeplines = 1000, histfile = ""})
+ opts.readChunk = function(parser_state)
+ local prompt
+ if (0 < parser_state["stack-size"]) then
+ prompt = ".. "
+ else
+ prompt = ">> "
+ end
+ local str = readline.readline(prompt)
+ if str then
+ return (str .. "\n")
+ else
+ return nil
+ end
+ end
+ local completer0 = nil
+ opts.registerCompleter = function(repl_completer)
+ completer0 = repl_completer
+ return nil
+ end
+ local function repl_completer(text, from, to)
+ if completer0 then
+ readline.set_completion_append_character("")
+ return completer0(text:sub(from, to))
+ else
+ return {}
+ end
+ end
+ readline.set_complete_function(repl_completer)
+ return readline
else
- env = setmetatable({}, {__index = (rawget(_G, "_ENV") or _G)})
- end
- local save_locals_3f = ((options.saveLocals ~= false) and env.debug and env.debug.getlocal)
- local opts = {}
- local _ = nil
- for k, v in pairs(options) do
- opts[k] = v
+ return nil
end
+ end
+ local function should_use_readline_3f(opts)
+ return (("dumb" ~= os.getenv("TERM")) and not opts.readChunk and not opts.registerCompleter)
+ end
+ local function repl(_3foptions)
+ local old_root_options = utils.root.options
+ local _let_722_ = utils.copy(_3foptions)
+ local _3ffennelrc = _let_722_["fennelrc"]
+ local opts = _let_722_
+ local _
+ opts.fennelrc = nil
_ = nil
+ local readline = (should_use_readline_3f(opts) and try_readline_21(opts, pcall(require, "readline")))
+ local _0
+ if _3ffennelrc then
+ _0 = _3ffennelrc()
+ else
+ _0 = nil
+ end
+ local env = specials["wrap-env"]((opts.env or rawget(_G, "_ENV") or _G))
+ local save_locals_3f = (opts.saveLocals ~= false)
local read_chunk = (opts.readChunk or default_read_chunk)
local on_values = (opts.onValues or default_on_values)
local on_error = (opts.onError or default_on_error)
- local pp = (opts.pp or tostring)
+ local pp = (opts.pp or view)
local byte_stream, clear_stream = parser.granulate(read_chunk)
local chars = {}
local read, reset = nil, nil
- local function _1_(parser_state)
+ local function _724_(parser_state)
local c = byte_stream(parser_state)
table.insert(chars, c)
return c
end
- read, reset = parser.parser(_1_)
- local scope = compiler["make-scope"]()
- opts.useMetadata = (options.useMetadata ~= false)
+ read, reset = parser.parser(_724_)
+ opts.env, opts.scope = env, compiler["make-scope"]()
+ opts.useMetadata = (opts.useMetadata ~= false)
if (opts.allowedGlobals == nil) then
- opts.allowedGlobals = specials["current-global-names"](opts.env)
+ opts.allowedGlobals = specials["current-global-names"](env)
+ else
end
if opts.registerCompleter then
- local function _3_(...)
- return completer(env, scope, ...)
+ local function _728_()
+ local _726_ = env
+ local _727_ = opts.scope
+ local function _729_(...)
+ return completer(_726_, _727_, ...)
+ end
+ return _729_
+ end
+ opts.registerCompleter(_728_())
+ else
+ end
+ load_plugin_commands(opts.plugins)
+ if save_locals_3f then
+ local function newindex(t, k, v)
+ if opts.scope.unmanglings[k] then
+ return rawset(t, k, v)
+ else
+ return nil
+ end
end
- opts.registerCompleter(_3_)
+ env.___replLocals___ = setmetatable({}, {__newindex = newindex})
+ else
end
local function print_values(...)
local vals = {...}
@@ 392,621 663,212 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
for k in pairs(chars) do
chars[k] = nil
end
- local ok, parse_ok_3f, x = pcall(read)
- local src_string = string.char((table.unpack or _G.unpack)(chars))
- utils.root.options = opts
+ reset()
+ local ok, parser_not_eof_3f, x = pcall(read)
+ local src_string = string.char(unpack(chars))
+ local readline_not_eof_3f = (not readline or (src_string ~= "(null)"))
+ local not_eof_3f = (readline_not_eof_3f and parser_not_eof_3f)
if not ok then
- on_error("Parse", parse_ok_3f)
+ on_error("Parse", not_eof_3f)
clear_stream()
- reset()
return loop()
elseif command_3f(src_string) then
- return run_command0(src_string, read, loop, env, on_values, on_error, scope)
+ return run_command_loop(src_string, read, loop, env, on_values, on_error, opts.scope, chars)
else
- if parse_ok_3f then
+ if not_eof_3f then
do
- local _4_0, _5_0 = pcall(compiler.compile, x, {["assert-compile"] = opts["assert-compile"], ["parse-error"] = opts["parse-error"], correlate = opts.correlate, moduleName = opts.moduleName, scope = scope, source = src_string, useBitLib = opts.useBitLib, useMetadata = opts.useMetadata})
- if ((_4_0 == false) and (nil ~= _5_0)) then
- local msg = _5_0
+ local _733_, _734_ = nil, nil
+ local function _736_()
+ local _735_ = opts
+ _735_["source"] = src_string
+ return _735_
+ end
+ _733_, _734_ = pcall(compiler.compile, x, _736_())
+ if ((_733_ == false) and (nil ~= _734_)) then
+ local msg = _734_
clear_stream()
on_error("Compile", msg)
- elseif ((_4_0 == true) and (nil ~= _5_0)) then
- local src = _5_0
- local src0 = nil
+ elseif ((_733_ == true) and (nil ~= _734_)) then
+ local src = _734_
+ local src0
if save_locals_3f then
- src0 = splice_save_locals(env, src)
+ src0 = splice_save_locals(env, src, opts.scope)
else
src0 = src
end
- local _7_0, _8_0 = pcall(specials["load-code"], src0, env)
- if ((_7_0 == false) and (nil ~= _8_0)) then
- local msg = _8_0
+ local _738_, _739_ = pcall(specials["load-code"], src0, env)
+ if ((_738_ == false) and (nil ~= _739_)) then
+ local msg = _739_
clear_stream()
on_error("Lua Compile", msg, src0)
- elseif (true and (nil ~= _8_0)) then
- local _0 = _7_0
- local chunk = _8_0
- local function _9_()
+ elseif (true and (nil ~= _739_)) then
+ local _1 = _738_
+ local chunk = _739_
+ local function _740_()
return print_values(chunk())
end
- local function _10_(...)
- return on_error("Runtime", ...)
+ local function _741_()
+ local function _742_(...)
+ return on_error("Runtime", ...)
+ end
+ return _742_
end
- xpcall(_9_, _10_)
+ xpcall(_740_, _741_())
+ else
end
+ else
end
end
utils.root.options = old_root_options
return loop()
+ else
+ return nil
end
end
end
- return loop()
+ loop()
+ if readline then
+ return readline.save_history()
+ else
+ return nil
+ end
end
return repl
end
-package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
- local type_order = {["function"] = 5, boolean = 2, number = 1, string = 3, table = 4, thread = 7, userdata = 6}
- local function sort_keys(_0_0, _1_0)
- local _1_ = _0_0
- local a = _1_[1]
- local _2_ = _1_0
- local b = _2_[1]
- local ta = type(a)
- local tb = type(b)
- if ((ta == tb) and ((ta == "string") or (ta == "number"))) then
- return (a < b)
- else
- local dta = type_order[ta]
- local dtb = type_order[tb]
- if (dta and dtb) then
- return (dta < dtb)
- elseif dta then
- return true
- elseif dtb then
- return false
+package.preload["fennel.specials"] = package.preload["fennel.specials"] or function(...)
+ local utils = require("fennel.utils")
+ local view = require("fennel.view")
+ local parser = require("fennel.parser")
+ local compiler = require("fennel.compiler")
+ local unpack = (table.unpack or _G.unpack)
+ local SPECIALS = compiler.scopes.global.specials
+ local function wrap_env(env)
+ local function _424_(_, key)
+ if utils["string?"](key) then
+ return env[compiler["global-unmangling"](key)]
else
- return (ta < tb)
- end
- end
- end
- local function max_index_gap(kv)
- local gap = 0
- if (#kv > 0) then
- local _2_ = kv
- local _3_ = _2_[1]
- local i = _3_[1]
- local rest = {(table.unpack or unpack)(_2_, 2)}
- for _, _4_0 in ipairs(rest) do
- local _5_ = _4_0
- local k = _5_[1]
- if ((k - i) > gap) then
- gap = (k - i)
- end
- i = k
- end
- end
- return gap
- end
- local function fill_gaps(kv)
- local missing_indexes = {}
- local i = 0
- for _, _2_0 in ipairs(kv) do
- local _3_ = _2_0
- local j = _3_[1]
- if (512 < j) then
- return true
- end
- i = (i + 1)
- while (i < j) do
- table.insert(missing_indexes, i)
- i = (i + 1)
- end
- end
- for _, k in ipairs(missing_indexes) do
- table.insert(kv, k, {k})
- end
- return nil
- end
- local function table_kv_pairs(t, options)
- local assoc_3f = false
- local kv = {}
- local insert = table.insert
- for k, v in pairs(t) do
- if (type(k) ~= "number") then
- assoc_3f = true
+ return env[key]
end
- insert(kv, {k, v})
end
- table.sort(kv, sort_keys)
- if not assoc_3f then
- local gap = max_index_gap(kv)
- if (max_index_gap(kv) > options["max-sparse-gap"]) then
- assoc_3f = true
+ local function _426_(_, key, value)
+ if utils["string?"](key) then
+ env[compiler["global-unmangling"](key)] = value
+ return nil
else
- if fill_gaps(kv) then
- assoc_3f = true
- end
+ env[key] = value
+ return nil
end
end
- if (#kv == 0) then
- return kv, "empty"
- else
- local function _3_()
- if assoc_3f then
- return "table"
+ local function _428_()
+ local function putenv(k, v)
+ local _429_
+ if utils["string?"](k) then
+ _429_ = compiler["global-unmangling"](k)
else
- return "seq"
+ _429_ = k
end
+ return _429_, v
end
- return kv, _3_()
+ return next, utils.kvmap(env, putenv), nil
end
+ return setmetatable({}, {__index = _424_, __newindex = _426_, __pairs = _428_})
end
- local function count_table_appearances(t, appearances)
- if (type(t) == "table") then
- if not appearances[t] then
- appearances[t] = 1
- for k, v in pairs(t) do
- count_table_appearances(k, appearances)
- count_table_appearances(v, appearances)
+ local function current_global_names(_3fenv)
+ local mt
+ do
+ local _431_ = getmetatable(_3fenv)
+ if ((_G.type(_431_) == "table") and (nil ~= (_431_).__pairs)) then
+ local mtpairs = (_431_).__pairs
+ local tbl_13_auto = {}
+ for k, v in mtpairs(_3fenv) do
+ local k_14_auto, v_15_auto = k, v
+ if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+ tbl_13_auto[k_14_auto] = v_15_auto
+ else
+ end
end
+ mt = tbl_13_auto
+ elseif (_431_ == nil) then
+ mt = (_3fenv or _G)
else
- appearances[t] = ((appearances[t] or 0) + 1)
+ mt = nil
end
end
- return appearances
+ return (mt and utils.kvmap(mt, compiler["global-unmangling"]))
end
- local function save_table(t, seen)
- local seen0 = (seen or {len = 0})
- local id = (seen0.len + 1)
- if not seen0[t] then
- seen0[t] = id
- seen0.len = id
+ local function load_code(code, _3fenv, _3ffilename)
+ local env = (_3fenv or rawget(_G, "_ENV") or _G)
+ local _434_, _435_ = rawget(_G, "setfenv"), rawget(_G, "loadstring")
+ if ((nil ~= _434_) and (nil ~= _435_)) then
+ local setfenv = _434_
+ local loadstring = _435_
+ local f = assert(loadstring(code, _3ffilename))
+ local _436_ = f
+ setfenv(_436_, env)
+ return _436_
+ elseif true then
+ local _ = _434_
+ return assert(load(code, _3ffilename, "t", env))
+ else
+ return nil
end
- return seen0
end
- local function detect_cycle(t, seen, _3fk)
- if ("table" == type(t)) then
- seen[t] = true
- local _2_0, _3_0 = next(t, _3fk)
- if ((nil ~= _2_0) and (nil ~= _3_0)) then
- local k = _2_0
- local v = _3_0
- return (seen[k] or detect_cycle(k, seen) or seen[v] or detect_cycle(v, seen) or detect_cycle(t, seen, k))
- end
- end
- end
- local function visible_cycle_3f(t, options)
- return (options["detect-cycles?"] and detect_cycle(t, {}) and save_table(t, options.seen) and (1 < (options.appearances[t] or 0)))
- end
- local function table_indent(t, indent, id)
- local opener_length = nil
- if id then
- opener_length = (#tostring(id) + 2)
- else
- opener_length = 1
- end
- return (indent + opener_length)
- end
- local pp = nil
- local function concat_table_lines(elements, options, multiline_3f, indent, table_type, prefix)
- local indent_str = ("\n" .. string.rep(" ", indent))
- local open = nil
- local function _2_()
- if ("seq" == table_type) then
- return "["
- else
- return "{"
- end
- end
- open = ((prefix or "") .. _2_())
- local close = nil
- if ("seq" == table_type) then
- close = "]"
- else
- close = "}"
- end
- local oneline = (open .. table.concat(elements, " ") .. close)
- if (not options["one-line?"] and (multiline_3f or ((indent + #oneline) > options["line-length"]))) then
- return (open .. table.concat(elements, indent_str) .. close)
- else
- return oneline
- end
- end
- local function pp_associative(t, kv, options, indent, key_3f)
- local multiline_3f = false
- local id = options.seen[t]
- if (options.level >= options.depth) then
- return "{...}"
- elseif (id and options["detect-cycles?"]) then
- return ("@" .. id .. "{...}")
- else
- local visible_cycle_3f0 = visible_cycle_3f(t, options)
- local id0 = (visible_cycle_3f0 and options.seen[t])
- local indent0 = table_indent(t, indent, id0)
- local slength = nil
- local function _3_()
- local _2_0 = rawget(_G, "utf8")
- if _2_0 then
- return _2_0.len
- else
- return _2_0
- end
- end
- local function _4_(_241)
- return #_241
- end
- slength = ((options["utf8?"] and _3_()) or _4_)
- local prefix = nil
- if visible_cycle_3f0 then
- prefix = ("@" .. id0)
- else
- prefix = ""
- end
- local items = nil
- do
- local tbl_0_ = {}
- for _, _6_0 in pairs(kv) do
- local _7_ = _6_0
- local k = _7_[1]
- local v = _7_[2]
- local _8_
- do
- local k0 = pp(k, options, (indent0 + 1), true)
- local v0 = pp(v, options, (indent0 + slength(k0) + 1))
- multiline_3f = (multiline_3f or k0:find("\n") or v0:find("\n"))
- _8_ = (k0 .. " " .. v0)
- end
- tbl_0_[(#tbl_0_ + 1)] = _8_
- end
- items = tbl_0_
- end
- return concat_table_lines(items, options, multiline_3f, indent0, "table", prefix)
- end
- end
- local function pp_sequence(t, kv, options, indent)
- local multiline_3f = false
- local id = options.seen[t]
- if (options.level >= options.depth) then
- return "[...]"
- elseif (id and options["detect-cycles?"]) then
- return ("@" .. id .. "[...]")
- else
- local visible_cycle_3f0 = visible_cycle_3f(t, options)
- local id0 = (visible_cycle_3f0 and options.seen[t])
- local indent0 = table_indent(t, indent, id0)
- local prefix = nil
- if visible_cycle_3f0 then
- prefix = ("@" .. id0)
- else
- prefix = ""
- end
- local items = nil
- do
- local tbl_0_ = {}
- for _, _3_0 in pairs(kv) do
- local _4_ = _3_0
- local _0 = _4_[1]
- local v = _4_[2]
- local _5_
- do
- local v0 = pp(v, options, indent0)
- multiline_3f = (multiline_3f or v0:find("\n"))
- _5_ = v0
- end
- tbl_0_[(#tbl_0_ + 1)] = _5_
- end
- items = tbl_0_
- end
- return concat_table_lines(items, options, multiline_3f, indent0, "seq", prefix)
- end
- end
- local function concat_lines(lines, options, indent, force_multi_line_3f)
- if (#lines == 0) then
- if options["empty-as-sequence?"] then
- return "[]"
- else
- return "{}"
- end
- else
- local oneline = nil
- local _2_
- do
- local tbl_0_ = {}
- for _, line in ipairs(lines) do
- tbl_0_[(#tbl_0_ + 1)] = line:gsub("^%s+", "")
- end
- _2_ = tbl_0_
- end
- oneline = table.concat(_2_, " ")
- if (not options["one-line?"] and (force_multi_line_3f or oneline:find("\n") or ((indent + #oneline) > options["line-length"]))) then
- return table.concat(lines, ("\n" .. string.rep(" ", indent)))
- else
- return oneline
- end
- end
- end
- local function pp_metamethod(t, metamethod, options, indent)
- if (options.level >= options.depth) then
- if options["empty-as-sequence?"] then
- return "[...]"
- else
- return "{...}"
- end
- else
- local _ = nil
- local function _2_(_241)
- return visible_cycle_3f(_241, options)
- end
- options["visible-cycle?"] = _2_
- _ = nil
- local lines, force_multi_line_3f = metamethod(t, pp, options, indent)
- options["visible-cycle?"] = nil
- local _3_0 = type(lines)
- if (_3_0 == "string") then
- return lines
- elseif (_3_0 == "table") then
- return concat_lines(lines, options, indent, force_multi_line_3f)
- else
- local _0 = _3_0
- return error("__fennelview metamethod must return a table of lines")
- end
- end
- end
- local function pp_table(x, options, indent)
- options.level = (options.level + 1)
- local x0 = nil
- do
- local _2_0 = nil
- if options["metamethod?"] then
- local _3_0 = x
- if _3_0 then
- local _4_0 = getmetatable(_3_0)
- if _4_0 then
- _2_0 = _4_0.__fennelview
- else
- _2_0 = _4_0
- end
- else
- _2_0 = _3_0
- end
- else
- _2_0 = nil
- end
- if (nil ~= _2_0) then
- local metamethod = _2_0
- x0 = pp_metamethod(x, metamethod, options, indent)
- else
- local _ = _2_0
- local _4_0, _5_0 = table_kv_pairs(x, options)
- if (true and (_5_0 == "empty")) then
- local _0 = _4_0
- if options["empty-as-sequence?"] then
- x0 = "[]"
- else
- x0 = "{}"
- end
- elseif ((nil ~= _4_0) and (_5_0 == "table")) then
- local kv = _4_0
- x0 = pp_associative(x, kv, options, indent)
- elseif ((nil ~= _4_0) and (_5_0 == "seq")) then
- local kv = _4_0
- x0 = pp_sequence(x, kv, options, indent)
- else
- x0 = nil
- end
- end
- end
- options.level = (options.level - 1)
- return x0
- end
- local function number__3estring(n)
- local _2_0 = string.gsub(tostring(n), ",", ".")
- return _2_0
- end
- local function colon_string_3f(s)
- return s:find("^[-%w?^_!$%&*+./@|<=>]+$")
- end
- local function pp_string(str, options, indent)
- local escs = nil
- local _2_
- if (options["escape-newlines?"] and (#str < (options["line-length"] - indent))) then
- _2_ = "\\n"
- else
- _2_ = "\n"
- end
- local function _4_(_241, _242)
- return ("\\%03d"):format(_242:byte())
- end
- escs = setmetatable({["\""] = "\\\"", ["\11"] = "\\v", ["\12"] = "\\f", ["\13"] = "\\r", ["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\\"] = "\\\\", ["\n"] = _2_}, {__index = _4_})
- return ("\"" .. str:gsub("[%c\\\"]", escs) .. "\"")
- end
- local function make_options(t, options)
- local defaults = {["detect-cycles?"] = true, ["empty-as-sequence?"] = false, ["escape-newlines?"] = false, ["line-length"] = 80, ["max-sparse-gap"] = 10, ["metamethod?"] = true, ["one-line?"] = false, ["prefer-colon?"] = false, ["utf8?"] = true, depth = 128}
- local overrides = {appearances = count_table_appearances(t, {}), level = 0, seen = {len = 0}}
- for k, v in pairs((options or {})) do
- defaults[k] = v
- end
- for k, v in pairs(overrides) do
- defaults[k] = v
- end
- return defaults
- end
- local function _2_(x, options, indent, colon_3f)
- local indent0 = (indent or 0)
- local options0 = (options or make_options(x))
- local x0 = nil
- if options0.preprocess then
- x0 = options0.preprocess(x, options0)
- else
- x0 = x
- end
- local tv = type(x0)
- local function _5_()
- local _4_0 = getmetatable(x0)
- if _4_0 then
- return _4_0.__fennelview
- else
- return _4_0
- end
- end
- if ((tv == "table") or ((tv == "userdata") and _5_())) then
- return pp_table(x0, options0, indent0)
- elseif (tv == "number") then
- return number__3estring(x0)
- else
- local function _6_()
- if (colon_3f ~= nil) then
- return colon_3f
- elseif ("function" == type(options0["prefer-colon?"])) then
- return options0["prefer-colon?"](x0)
- else
- return options0["prefer-colon?"]
- end
- end
- if ((tv == "string") and colon_string_3f(x0) and _6_()) then
- return (":" .. x0)
- elseif (tv == "string") then
- return pp_string(x0, options0, indent0)
- elseif ((tv == "boolean") or (tv == "nil")) then
- return tostring(x0)
- else
- return ("#<" .. tostring(x0) .. ">")
- end
- end
- end
- pp = _2_
- local function view(x, options)
- return pp(x, make_options(x, options), 0)
- end
- return view
-end
-package.preload["fennel.specials"] = package.preload["fennel.specials"] or function(...)
- local utils = require("fennel.utils")
- local view = require("fennel.view")
- local parser = require("fennel.parser")
- local compiler = require("fennel.compiler")
- local unpack = (table.unpack or _G.unpack)
- local SPECIALS = compiler.scopes.global.specials
- local function wrap_env(env)
- local function _0_(_, key)
- if (type(key) == "string") then
- return env[compiler["global-unmangling"](key)]
- else
- return env[key]
- end
- end
- local function _1_(_, key, value)
- if (type(key) == "string") then
- env[compiler["global-unmangling"](key)] = value
- return nil
- else
- env[key] = value
- return nil
- end
- end
- local function _2_()
- local function putenv(k, v)
- local _3_
- if (type(k) == "string") then
- _3_ = compiler["global-unmangling"](k)
- else
- _3_ = k
- end
- return _3_, v
- end
- return next, utils.kvmap(env, putenv), nil
- end
- return setmetatable({}, {__index = _0_, __newindex = _1_, __pairs = _2_})
- end
- local function current_global_names(env)
- local mt = nil
- do
- local _0_0 = getmetatable(env)
- if ((type(_0_0) == "table") and (nil ~= _0_0.__pairs)) then
- local __pairs = _0_0.__pairs
- local tbl_0_ = {}
- for k, v in __pairs(env) do
- local _1_0, _2_0 = k, v
- if ((nil ~= _1_0) and (nil ~= _2_0)) then
- local k_0_ = _1_0
- local v_0_ = _2_0
- tbl_0_[k_0_] = v_0_
- end
- end
- mt = tbl_0_
- elseif (_0_0 == nil) then
- mt = (env or _G)
- else
- mt = nil
- end
- end
- return (mt and utils.kvmap(mt, compiler["global-unmangling"]))
- end
- local function load_code(code, environment, filename)
- local environment0 = (environment or rawget(_G, "_ENV") or _G)
- if (rawget(_G, "setfenv") and rawget(_G, "loadstring")) then
- local f = assert(_G.loadstring(code, filename))
- _G.setfenv(f, environment0)
- return f
- else
- return assert(load(code, filename, "t", environment0))
- end
- end
- local function doc_2a(tgt, name)
- if not tgt then
- return (name .. " not found")
- else
- local docstring = (((compiler.metadata):get(tgt, "fnl/docstring") or "#<undocumented>")):gsub("\n$", ""):gsub("\n", "\n ")
- local mt = getmetatable(tgt)
- if ((type(tgt) == "function") or ((type(mt) == "table") and (type(mt.__call) == "function"))) then
- local arglist = table.concat(((compiler.metadata):get(tgt, "fnl/arglist") or {"#<unknown-arguments>"}), " ")
- local _0_
- if (#arglist > 0) then
- _0_ = " "
- else
- _0_ = ""
- end
- return string.format("(%s%s%s)\n %s", name, _0_, arglist, docstring)
- else
- return string.format("%s\n %s", name, docstring)
+ local function doc_2a(tgt, name)
+ if not tgt then
+ return (name .. " not found")
+ else
+ local docstring = (((compiler.metadata):get(tgt, "fnl/docstring") or "#<undocumented>")):gsub("\n$", ""):gsub("\n", "\n ")
+ local mt = getmetatable(tgt)
+ if ((type(tgt) == "function") or ((type(mt) == "table") and (type(mt.__call) == "function"))) then
+ local arglist = table.concat(((compiler.metadata):get(tgt, "fnl/arglist") or {"#<unknown-arguments>"}), " ")
+ local _438_
+ if (0 < #arglist) then
+ _438_ = " "
+ else
+ _438_ = ""
+ end
+ return string.format("(%s%s%s)\n %s", name, _438_, arglist, docstring)
+ else
+ return string.format("%s\n %s", name, docstring)
end
end
end
local function doc_special(name, arglist, docstring, body_form_3f)
- compiler.metadata[SPECIALS[name]] = {["fnl/arglist"] = arglist, ["fnl/body-form?"] = body_form_3f, ["fnl/docstring"] = docstring}
+ compiler.metadata[SPECIALS[name]] = {["fnl/arglist"] = arglist, ["fnl/docstring"] = docstring, ["fnl/body-form?"] = body_form_3f}
return nil
end
- local function compile_do(ast, scope, parent, start)
- local start0 = (start or 2)
+ local function compile_do(ast, scope, parent, _3fstart)
+ local start = (_3fstart or 2)
local len = #ast
local sub_scope = compiler["make-scope"](scope)
- for i = start0, len do
+ for i = start, len do
compiler.compile1(ast[i], sub_scope, parent, {nval = 0})
end
return nil
end
- SPECIALS["do"] = function(ast, scope, parent, opts, start, chunk, sub_scope, pre_syms)
- local start0 = (start or 2)
- local sub_scope0 = (sub_scope or compiler["make-scope"](scope))
- local chunk0 = (chunk or {})
+ SPECIALS["do"] = function(ast, scope, parent, opts, _3fstart, _3fchunk, _3fsub_scope, _3fpre_syms)
+ local start = (_3fstart or 2)
+ local sub_scope = (_3fsub_scope or compiler["make-scope"](scope))
+ local chunk = (_3fchunk or {})
local len = #ast
local retexprs = {returned = true}
local function compile_body(outer_target, outer_tail, outer_retexprs)
- if (len < start0) then
- compiler.compile1(nil, sub_scope0, chunk0, {tail = outer_tail, target = outer_target})
+ if (len < start) then
+ compiler.compile1(nil, sub_scope, chunk, {tail = outer_tail, target = outer_target})
else
- for i = start0, len do
+ for i = start, len do
local subopts = {nval = (((i ~= len) and 0) or opts.nval), tail = (((i == len) and outer_tail) or nil), target = (((i == len) and outer_target) or nil)}
local _ = utils["propagate-options"](opts, subopts)
- local subexprs = compiler.compile1(ast[i], sub_scope0, chunk0, subopts)
+ local subexprs = compiler.compile1(ast[i], sub_scope, chunk, subopts)
if (i ~= len) then
compiler["keep-side-effects"](subexprs, parent, nil, ast[i])
+ else
end
end
end
- compiler.emit(parent, chunk0, ast)
+ compiler.emit(parent, chunk, ast)
compiler.emit(parent, "end", ast)
+ utils.hook("do", ast, sub_scope)
return (outer_retexprs or retexprs)
end
if (opts.target or (opts.nval == 0) or opts.tail) then
@@ 1015,8 877,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
elseif opts.nval then
local syms = {}
for i = 1, opts.nval do
- local s = ((pre_syms and pre_syms[i]) or compiler.gensym(scope))
- syms[i] = s
+ local s = ((_3fpre_syms and (_3fpre_syms)[i]) or compiler.gensym(scope))
+ do end (syms)[i] = s
retexprs[i] = utils.expr(s, "sym")
end
local outer_target = table.concat(syms, ", ")
@@ 1025,14 887,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
return compile_body(outer_target, opts.tail)
else
local fname = compiler.gensym(scope)
- local fargs = nil
+ local fargs
if scope.vararg then
fargs = "..."
else
fargs = ""
end
compiler.emit(parent, string.format("local function %s(%s)", fname, fargs), ast)
- utils.hook("do", ast, sub_scope0)
return compile_body(nil, true, utils.expr((fname .. "(" .. fargs .. ")"), "statement"))
end
end
@@ 1047,97 908,172 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
for j = 2, #subexprs do
table.insert(exprs, subexprs[j])
end
+ else
end
end
return exprs
end
doc_special("values", {"..."}, "Return multiple values from a function. Must be in tail position.")
- local function deep_tostring(x, key_3f)
- local elems = {}
- if utils["sequence?"](x) then
- local _0_
- do
- local tbl_0_ = {}
- for _, v in ipairs(x) do
- tbl_0_[(#tbl_0_ + 1)] = deep_tostring(v)
- end
- _0_ = tbl_0_
- end
- return ("[" .. table.concat(_0_, " ") .. "]")
- elseif utils["table?"](x) then
- local _0_
- do
- local tbl_0_ = {}
- for k, v in pairs(x) do
- tbl_0_[(#tbl_0_ + 1)] = (deep_tostring(k, true) .. " " .. deep_tostring(v))
+ local function __3estack(stack, tbl)
+ for k, v in pairs(tbl) do
+ local _447_ = stack
+ table.insert(_447_, k)
+ table.insert(_447_, v)
+ end
+ return stack
+ end
+ local function literal_3f(val)
+ local res = true
+ if utils["list?"](val) then
+ res = false
+ elseif utils["table?"](val) then
+ local stack = __3estack({}, val)
+ for _, elt in ipairs(stack) do
+ if not res then break end
+ if utils["list?"](elt) then
+ res = false
+ elseif utils["table?"](elt) then
+ __3estack(stack, elt)
+ else
end
- _0_ = tbl_0_
end
- return ("{" .. table.concat(_0_, " ") .. "}")
- elseif (key_3f and (type(x) == "string") and x:find("^[-%w?\\^_!$%&*+./@:|<=>]+$")) then
- return (":" .. x)
- elseif (type(x) == "string") then
- return string.format("%q", x):gsub("\\\"", "\\\\\""):gsub("\"", "\\\"")
else
- return tostring(x)
end
+ return res
end
- local function set_fn_metadata(arg_list, docstring, parent, fn_name)
- if utils.root.options.useMetadata then
- local args = nil
- local function _0_(_241)
- return ("\"%s\""):format(deep_tostring(_241))
+ local function compile_value(v)
+ local opts = {nval = 1, tail = false}
+ local scope = compiler["make-scope"]()
+ local chunk = {}
+ local _let_450_ = compiler.compile1(v, scope, chunk, opts)
+ local _let_451_ = _let_450_[1]
+ local v0 = _let_451_[1]
+ return v0
+ end
+ local function insert_meta(meta, k, v)
+ local view_opts = {["escape-newlines?"] = true, ["line-length"] = math.huge, ["one-line?"] = true}
+ compiler.assert((type(k) == "string"), ("expected string keys in metadata table, got: %s"):format(view(k, view_opts)))
+ compiler.assert(literal_3f(v), ("expected literal value in metadata table, got: %s %s"):format(view(k, view_opts), view(v, view_opts)))
+ local _452_ = meta
+ table.insert(_452_, view(k))
+ local function _453_()
+ if ("string" == type(v)) then
+ return view(v, view_opts)
+ else
+ return compile_value(v)
end
- args = utils.map(arg_list, _0_)
- local meta_fields = {"\"fnl/arglist\"", ("{" .. table.concat(args, ", ") .. "}")}
- if docstring then
- table.insert(meta_fields, "\"fnl/docstring\"")
- table.insert(meta_fields, ("\"" .. docstring:gsub("%s+$", ""):gsub("\\", "\\\\"):gsub("\n", "\\n"):gsub("\"", "\\\"") .. "\""))
+ end
+ table.insert(_452_, _453_())
+ return _452_
+ end
+ local function insert_arglist(meta, arg_list)
+ local view_opts = {["one-line?"] = true, ["escape-newlines?"] = true, ["line-length"] = math.huge}
+ local _454_ = meta
+ table.insert(_454_, "\"fnl/arglist\"")
+ local function _455_(_241)
+ return view(view(_241, view_opts))
+ end
+ table.insert(_454_, ("{" .. table.concat(utils.map(arg_list, _455_), ", ") .. "}"))
+ return _454_
+ end
+ local function set_fn_metadata(f_metadata, parent, fn_name)
+ if utils.root.options.useMetadata then
+ local meta_fields = {}
+ for k, v in utils.stablepairs(f_metadata) do
+ if (k == "fnl/arglist") then
+ insert_arglist(meta_fields, v)
+ else
+ insert_meta(meta_fields, k, v)
+ end
end
local meta_str = ("require(\"%s\").metadata"):format((utils.root.options.moduleName or "fennel"))
return compiler.emit(parent, ("pcall(function() %s:setall(%s, %s) end)"):format(meta_str, fn_name, table.concat(meta_fields, ", ")))
- end
+ else
+ return nil
+ end
end
local function get_fn_name(ast, scope, fn_name, multi)
if (fn_name and (fn_name[1] ~= "nil")) then
- local _0_
+ local _458_
if not multi then
- _0_ = compiler["declare-local"](fn_name, {}, scope, ast)
+ _458_ = compiler["declare-local"](fn_name, {}, scope, ast)
else
- _0_ = compiler["symbol-to-expression"](fn_name, scope)[1]
+ _458_ = (compiler["symbol-to-expression"](fn_name, scope))[1]
end
- return _0_, not multi, 3
+ return _458_, not multi, 3
else
return nil, true, 2
end
end
- local function compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, local_3f, arg_name_list, arg_list, docstring)
+ local function compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, local_3f, arg_name_list, f_metadata)
for i = (index + 1), #ast do
compiler.compile1(ast[i], f_scope, f_chunk, {nval = (((i ~= #ast) and 0) or nil), tail = (i == #ast)})
end
- local _0_
+ local _461_
if local_3f then
- _0_ = "local function %s(%s)"
+ _461_ = "local function %s(%s)"
else
- _0_ = "%s = function(%s)"
+ _461_ = "%s = function(%s)"
end
- compiler.emit(parent, string.format(_0_, fn_name, table.concat(arg_name_list, ", ")), ast)
+ compiler.emit(parent, string.format(_461_, fn_name, table.concat(arg_name_list, ", ")), ast)
compiler.emit(parent, f_chunk, ast)
compiler.emit(parent, "end", ast)
- set_fn_metadata(arg_list, docstring, parent, fn_name)
+ set_fn_metadata(f_metadata, parent, fn_name)
utils.hook("fn", ast, f_scope)
return utils.expr(fn_name, "sym")
end
- local function compile_anonymous_fn(ast, f_scope, f_chunk, parent, index, arg_name_list, arg_list, docstring, scope)
+ local function compile_anonymous_fn(ast, f_scope, f_chunk, parent, index, arg_name_list, f_metadata, scope)
local fn_name = compiler.gensym(scope)
- return compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, true, arg_name_list, arg_list, docstring)
+ return compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, true, arg_name_list, f_metadata)
+ end
+ local function assoc_table_3f(t)
+ local len = #t
+ local nxt, t0, k = pairs(t)
+ local function _463_()
+ if (len == 0) then
+ return k
+ else
+ return len
+ end
+ end
+ return (nil ~= nxt(t0, _463_()))
+ end
+ local function get_function_metadata(ast, arg_list, index)
+ local f_metadata = {["fnl/arglist"] = arg_list}
+ local index_2a = (index + 1)
+ local expr = ast[index_2a]
+ if (utils["string?"](expr) and (index_2a < #ast)) then
+ local _465_
+ do
+ local _464_ = f_metadata
+ _464_["fnl/docstring"] = expr
+ _465_ = _464_
+ end
+ return _465_, index_2a
+ elseif (utils["table?"](expr) and (index_2a < #ast) and assoc_table_3f(expr)) then
+ local _466_
+ do
+ local tbl_13_auto = f_metadata
+ for k, v in pairs(expr) do
+ local k_14_auto, v_15_auto = k, v
+ if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+ tbl_13_auto[k_14_auto] = v_15_auto
+ else
+ end
+ end
+ _466_ = tbl_13_auto
+ end
+ return _466_, index_2a
+ else
+ return f_metadata, index
+ end
end
SPECIALS.fn = function(ast, scope, parent)
- local f_scope = nil
+ local f_scope
do
- local _0_0 = compiler["make-scope"](scope)
- _0_0["vararg"] = false
- f_scope = _0_0
+ local _469_ = compiler["make-scope"](scope)
+ do end (_469_)["vararg"] = false
+ f_scope = _469_
end
local f_chunk = {}
local fn_sym = utils["sym?"](ast[2])
@@ 1145,93 1081,103 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local fn_name, local_3f, index = get_fn_name(ast, scope, fn_sym, multi)
local arg_list = compiler.assert(utils["table?"](ast[index]), "expected parameters table", ast)
compiler.assert((not multi or not multi["multi-sym-method-call"]), ("unexpected multi symbol " .. tostring(fn_name)), fn_sym)
- local function get_arg_name(arg)
- if utils["varg?"](arg) then
+ local function destructure_arg(arg)
+ local raw = utils.sym(compiler.gensym(scope))
+ local declared = compiler["declare-local"](raw, {}, f_scope, ast)
+ compiler.destructure(arg, raw, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"})
+ return declared
+ end
+ local function destructure_amp(i)
+ compiler.assert((i == (#arg_list - 1)), "expected rest argument before last parameter", arg_list[(i + 1)], arg_list)
+ f_scope.vararg = true
+ compiler.destructure(arg_list[#arg_list], {utils.varg()}, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"})
+ return "..."
+ end
+ local function get_arg_name(arg, i)
+ if f_scope.vararg then
+ return nil
+ elseif utils["varg?"](arg) then
compiler.assert((arg == arg_list[#arg_list]), "expected vararg as last parameter", ast)
f_scope.vararg = true
return "..."
- elseif (utils["sym?"](arg) and (utils.deref(arg) ~= "nil") and not utils["multi-sym?"](utils.deref(arg))) then
+ elseif (utils.sym("&") == arg) then
+ return destructure_amp(i)
+ elseif (utils["sym?"](arg) and (tostring(arg) ~= "nil") and not utils["multi-sym?"](tostring(arg))) then
return compiler["declare-local"](arg, {}, f_scope, ast)
elseif utils["table?"](arg) then
- local raw = utils.sym(compiler.gensym(scope))
- local declared = compiler["declare-local"](raw, {}, f_scope, ast)
- compiler.destructure(arg, raw, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"})
- return declared
+ return destructure_arg(arg)
else
- return compiler.assert(false, ("expected symbol for function parameter: %s"):format(tostring(arg)), ast[2])
+ return compiler.assert(false, ("expected symbol for function parameter: %s"):format(tostring(arg)), ast[index])
end
end
- local arg_name_list = utils.map(arg_list, get_arg_name)
- local index0, docstring = nil, nil
- if ((type(ast[(index + 1)]) == "string") and ((index + 1) < #ast)) then
- index0, docstring = (index + 1), ast[(index + 1)]
- else
- index0, docstring = index, nil
+ local arg_name_list
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for i, a in ipairs(arg_list) do
+ local val_18_auto = get_arg_name(a, i)
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ arg_name_list = tbl_16_auto
end
+ local f_metadata, index0 = get_function_metadata(ast, arg_list, index)
if fn_name then
- return compile_named_fn(ast, f_scope, f_chunk, parent, index0, fn_name, local_3f, arg_name_list, arg_list, docstring)
+ return compile_named_fn(ast, f_scope, f_chunk, parent, index0, fn_name, local_3f, arg_name_list, f_metadata)
else
- return compile_anonymous_fn(ast, f_scope, f_chunk, parent, index0, arg_name_list, arg_list, docstring, scope)
+ return compile_anonymous_fn(ast, f_scope, f_chunk, parent, index0, arg_name_list, f_metadata, scope)
end
end
- doc_special("fn", {"name?", "args", "docstring?", "..."}, "Function syntax. May optionally include a name and docstring.\nIf a name is provided, the function will be bound in the current scope.\nWhen called with the wrong number of args, excess args will be discarded\nand lacking args will be nil, use lambda for arity-checked functions.", true)
+ doc_special("fn", {"name?", "args", "docstring?", "..."}, "Function syntax. May optionally include a name and docstring or a metadata table.\nIf a name is provided, the function will be bound in the current scope.\nWhen called with the wrong number of args, excess args will be discarded\nand lacking args will be nil, use lambda for arity-checked functions.", true)
SPECIALS.lua = function(ast, _, parent)
compiler.assert(((#ast == 2) or (#ast == 3)), "expected 1 or 2 arguments", ast)
- local _1_
+ local _474_
do
- local _0_0 = utils["sym?"](ast[2])
- if _0_0 then
- _1_ = utils.deref(_0_0)
+ local _473_ = utils["sym?"](ast[2])
+ if (nil ~= _473_) then
+ _474_ = tostring(_473_)
else
- _1_ = _0_0
+ _474_ = _473_
end
end
- if ("nil" ~= _1_) then
+ if ("nil" ~= _474_) then
table.insert(parent, {ast = ast, leaf = tostring(ast[2])})
+ else
end
- local _2_
+ local _478_
do
- local _1_0 = utils["sym?"](ast[3])
- if _1_0 then
- _2_ = utils.deref(_1_0)
+ local _477_ = utils["sym?"](ast[3])
+ if (nil ~= _477_) then
+ _478_ = tostring(_477_)
else
- _2_ = _1_0
+ _478_ = _477_
end
end
- if ("nil" ~= _2_) then
+ if ("nil" ~= _478_) then
return tostring(ast[3])
- end
- end
- SPECIALS.doc = function(ast, scope, parent)
- assert(utils.root.options.useMetadata, "can't look up doc with metadata disabled.")
- compiler.assert((#ast == 2), "expected one argument", ast)
- local target = utils.deref(ast[2])
- local special_or_macro = (scope.specials[target] or scope.macros[target])
- if special_or_macro then
- return ("print(%q)"):format(doc_2a(special_or_macro, target))
else
- local _0_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
- local value = _0_[1]
- return ("print(require('%s').doc(%s, '%s'))"):format((utils.root.options.moduleName or "fennel"), tostring(value), tostring(ast[2]))
+ return nil
end
end
- doc_special("doc", {"x"}, "Print the docstring and arglist for a function, macro, or special form.")
local function dot(ast, scope, parent)
compiler.assert((1 < #ast), "expected table argument", ast)
local len = #ast
- local _0_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
- local lhs = _0_[1]
+ local _let_481_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
+ local lhs = _let_481_[1]
if (len == 2) then
return tostring(lhs)
else
local indices = {}
for i = 3, len do
local index = ast[i]
- if ((type(index) == "string") and utils["valid-lua-identifier?"](index)) then
+ if (utils["string?"](index) and utils["valid-lua-identifier?"](index)) then
table.insert(indices, ("." .. index))
else
- local _1_ = compiler.compile1(index, scope, parent, {nval = 1})
- local index0 = _1_[1]
+ local _let_482_ = compiler.compile1(index, scope, parent, {nval = 1})
+ local index0 = _let_482_[1]
table.insert(indices, ("[" .. tostring(index0) .. "]"))
end
end
@@ 1275,12 1221,34 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
return nil
end
doc_special("var", {"name", "val"}, "Introduce new mutable local.")
+ local function kv_3f(t)
+ local _486_
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for k in pairs(t) do
+ local val_18_auto
+ if ("number" ~= type(k)) then
+ val_18_auto = k
+ else
+ val_18_auto = nil
+ end
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ _486_ = tbl_16_auto
+ end
+ return (_486_)[1]
+ end
SPECIALS.let = function(ast, scope, parent, opts)
local bindings = ast[2]
local pre_syms = {}
- compiler.assert((utils["list?"](bindings) or utils["table?"](bindings)), "expected binding table", ast)
+ compiler.assert((utils["table?"](bindings) and not kv_3f(bindings)), "expected binding sequence", bindings)
compiler.assert(((#bindings % 2) == 0), "expected even number of name/value bindings", ast[2])
- compiler.assert((#ast >= 3), "expected body expression", ast[1])
+ compiler.assert((3 <= #ast), "expected body expression", ast[1])
for _ = 1, (opts.nval or 0) do
table.insert(pre_syms, compiler.gensym(scope))
end
@@ 1300,27 1268,29 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
end
end
local function disambiguate_3f(rootstr, parent)
- local function _1_()
- local _0_0 = get_prev_line(parent)
- if (nil ~= _0_0) then
- local prev_line = _0_0
+ local function _491_()
+ local _490_ = get_prev_line(parent)
+ if (nil ~= _490_) then
+ local prev_line = _490_
return prev_line:match("%)$")
+ else
+ return nil
end
end
- return (rootstr:match("^{") or _1_())
+ return (rootstr:match("^{") or _491_())
end
SPECIALS.tset = function(ast, scope, parent)
- compiler.assert((#ast > 3), "expected table, key, and value arguments", ast)
- local root = compiler.compile1(ast[2], scope, parent, {nval = 1})[1]
+ compiler.assert((3 < #ast), "expected table, key, and value arguments", ast)
+ local root = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1]
local keys = {}
for i = 3, (#ast - 1) do
- local _0_ = compiler.compile1(ast[i], scope, parent, {nval = 1})
- local key = _0_[1]
+ local _let_493_ = compiler.compile1(ast[i], scope, parent, {nval = 1})
+ local key = _let_493_[1]
table.insert(keys, tostring(key))
end
- local value = compiler.compile1(ast[#ast], scope, parent, {nval = 1})[1]
+ local value = (compiler.compile1(ast[#ast], scope, parent, {nval = 1}))[1]
local rootstr = tostring(root)
- local fmtstr = nil
+ local fmtstr
if disambiguate_3f(rootstr, parent) then
fmtstr = "do end (%s)[%s] = %s"
else
@@ 1337,7 1307,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local target_exprs = {}
for i = 1, opts.nval do
local s = compiler.gensym(scope)
- accum[i] = s
+ do end (accum)[i] = s
target_exprs[i] = utils.expr(s, "sym")
end
return "target", opts.tail, table.concat(accum, ", "), target_exprs
@@ 1346,6 1316,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
end
end
local function if_2a(ast, scope, parent, opts)
+ compiler.assert((2 < #ast), "expected condition and body", ast)
local do_scope = compiler["make-scope"](scope)
local branches = {}
local wrapper, inner_tail, inner_target, target_exprs = calculate_target(scope, opts)
@@ 1356,6 1327,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
compiler["keep-side-effects"](compiler.compile1(ast[i], cscope, chunk, body_opts), chunk, nil, ast[i])
return {chunk = chunk, scope = cscope}
end
+ if (1 == (#ast % 2)) then
+ table.insert(ast, utils.sym("nil"))
+ else
+ end
for i = 2, (#ast - 1), 2 do
local condchunk = {}
local res = compiler.compile1(ast[i], do_scope, condchunk, {nval = 1})
@@ 1366,26 1341,20 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
branch.nested = ((i ~= 2) and (next(condchunk, nil) == nil))
table.insert(branches, branch)
end
- local has_else_3f = ((#ast > 3) and ((#ast % 2) == 0))
- local else_branch = (has_else_3f and compile_body(#ast))
+ local else_branch = compile_body(#ast)
local s = compiler.gensym(scope)
local buffer = {}
local last_buffer = buffer
for i = 1, #branches do
local branch = branches[i]
- local fstr = nil
+ local fstr
if not branch.nested then
fstr = "if %s then"
else
fstr = "elseif %s then"
end
local cond = tostring(branch.cond)
- local cond_line = nil
- if ((cond == "true") and branch.nested and (i == #branches) and not has_else_3f) then
- cond_line = "else"
- else
- cond_line = fstr:format(cond)
- end
+ local cond_line = fstr:format(cond)
if branch.nested then
compiler.emit(last_buffer, branch.condchunk, ast)
else
@@ 1396,20 1365,16 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
compiler.emit(last_buffer, cond_line, ast)
compiler.emit(last_buffer, branch.chunk, ast)
if (i == #branches) then
- if has_else_3f then
- compiler.emit(last_buffer, "else", ast)
- compiler.emit(last_buffer, else_branch.chunk, ast)
- elseif (inner_target and (cond_line ~= "else")) then
- compiler.emit(last_buffer, "else", ast)
- compiler.emit(last_buffer, ("%s = nil"):format(inner_target), ast)
- end
+ compiler.emit(last_buffer, "else", ast)
+ compiler.emit(last_buffer, else_branch.chunk, ast)
compiler.emit(last_buffer, "end", ast)
- elseif not branches[(i + 1)].nested then
+ elseif not (branches[(i + 1)]).nested then
local next_buffer = {}
compiler.emit(last_buffer, "else", ast)
compiler.emit(last_buffer, next_buffer, ast)
compiler.emit(last_buffer, "end", ast)
last_buffer = next_buffer
+ else
end
end
if (wrapper == "iife") then
@@ 1434,20 1399,25 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
SPECIALS["if"] = if_2a
doc_special("if", {"cond1", "body1", "...", "condN", "bodyN"}, "Conditional form.\nTakes any number of condition/body pairs and evaluates the first body where\nthe condition evaluates to truthy. Similar to cond in other lisps.")
local function remove_until_condition(bindings)
- if ("until" == bindings[(#bindings - 1)]) then
+ local last_item = bindings[(#bindings - 1)]
+ if ((utils["sym?"](last_item) and (tostring(last_item) == "&until")) or ("until" == last_item)) then
table.remove(bindings, (#bindings - 1))
return table.remove(bindings)
+ else
+ return nil
end
end
local function compile_until(condition, scope, chunk)
if condition then
- local _0_ = compiler.compile1(condition, scope, chunk, {nval = 1})
- local condition_lua = _0_[1]
+ local _let_502_ = compiler.compile1(condition, scope, chunk, {nval = 1})
+ local condition_lua = _let_502_[1]
return compiler.emit(chunk, ("if %s then break end"):format(tostring(condition_lua)), utils.expr(condition, "expression"))
+ else
+ return nil
end
end
SPECIALS.each = function(ast, scope, parent)
- compiler.assert((#ast >= 3), "expected body expression", ast[1])
+ compiler.assert((3 <= #ast), "expected body expression", ast[1])
local binding = compiler.assert(utils["table?"](ast[2]), "expected binding table", ast)
local _ = compiler.assert((2 <= #binding), "expected binding and iterator", binding)
local until_condition = remove_until_condition(binding)
@@ 1456,17 1426,17 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local new_manglings = {}
local sub_scope = compiler["make-scope"](scope)
local function destructure_binding(v)
- compiler.assert(("string" ~= type(v)), ("unexpected iterator clause " .. tostring(v)), binding)
+ compiler.assert(not utils["string?"](v), ("unexpected iterator clause " .. tostring(v)), binding)
if utils["sym?"](v) then
return compiler["declare-local"](v, {}, sub_scope, ast, new_manglings)
else
local raw = utils.sym(compiler.gensym(sub_scope))
- destructures[raw] = v
+ do end (destructures)[raw] = v
return compiler["declare-local"](raw, {}, sub_scope, ast)
end
end
local bind_vars = utils.map(binding, destructure_binding)
- local vals = compiler.compile1(iter, sub_scope, parent)
+ local vals = compiler.compile1(iter, scope, parent)
local val_names = utils.map(vals, tostring)
local chunk = {}
compiler.emit(parent, ("for %s in %s do"):format(table.concat(bind_vars, ", "), table.concat(val_names, ", ")), ast)
@@ 1482,13 1452,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
doc_special("each", {"[key value (iterator)]", "..."}, "Runs the body once for each set of values provided by the given iterator.\nMost commonly used with ipairs for sequential tables or pairs for undefined\norder, but can be used with any iterator.", true)
local function while_2a(ast, scope, parent)
local len1 = #parent
- local condition = compiler.compile1(ast[2], scope, parent, {nval = 1})[1]
+ local condition = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1]
local len2 = #parent
local sub_chunk = {}
if (len1 ~= len2) then
for i = (len1 + 1), len2 do
table.insert(sub_chunk, parent[i])
- parent[i] = nil
+ do end (parent)[i] = nil
end
compiler.emit(parent, "while true do", ast)
compiler.emit(sub_chunk, ("if not %s then break end"):format(condition[1]), ast)
@@ 1509,10 1479,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local range_args = {}
local chunk = {}
compiler.assert(utils["sym?"](binding_sym), ("unable to bind %s %s"):format(type(binding_sym), tostring(binding_sym)), ast[2])
- compiler.assert((#ast >= 3), "expected body expression", ast[1])
+ compiler.assert((3 <= #ast), "expected body expression", ast[1])
compiler.assert((#ranges <= 3), "unexpected arguments", ranges[4])
for i = 1, math.min(#ranges, 3) do
- range_args[i] = tostring(compiler.compile1(ranges[i], sub_scope, parent, {nval = 1})[1])
+ range_args[i] = tostring((compiler.compile1(ranges[i], scope, parent, {nval = 1}))[1])
end
compiler.emit(parent, ("for %s = %s do"):format(compiler["declare-local"](binding_sym, {}, sub_scope, ast), table.concat(range_args, ", ")), ast)
compile_until(until_condition, sub_scope, chunk)
@@ 1523,11 1493,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
SPECIALS["for"] = for_2a
doc_special("for", {"[index start stop step?]", "..."}, "Numeric loop construct.\nEvaluates body once for each value between start and stop (inclusive).", true)
local function native_method_call(ast, _scope, _parent, target, args)
- local _0_ = ast
- local _ = _0_[1]
- local _0 = _0_[2]
- local method_string = _0_[3]
- local call_string = nil
+ local _let_506_ = ast
+ local _ = _let_506_[1]
+ local _0 = _let_506_[2]
+ local method_string = _let_506_[3]
+ local call_string
if ((target.type == "literal") or (target.type == "varg") or (target.type == "expression")) then
call_string = "(%s):%s(%s)"
else
@@ 1536,33 1506,33 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
return utils.expr(string.format(call_string, tostring(target), method_string, table.concat(args, ", ")), "statement")
end
local function nonnative_method_call(ast, scope, parent, target, args)
- local method_string = tostring(compiler.compile1(ast[3], scope, parent, {nval = 1})[1])
+ local method_string = tostring((compiler.compile1(ast[3], scope, parent, {nval = 1}))[1])
local args0 = {tostring(target), unpack(args)}
return utils.expr(string.format("%s[%s](%s)", tostring(target), method_string, table.concat(args0, ", ")), "statement")
end
local function double_eval_protected_method_call(ast, scope, parent, target, args)
- local method_string = tostring(compiler.compile1(ast[3], scope, parent, {nval = 1})[1])
+ local method_string = tostring((compiler.compile1(ast[3], scope, parent, {nval = 1}))[1])
local call = "(function(tgt, m, ...) return tgt[m](tgt, ...) end)(%s, %s)"
table.insert(args, 1, method_string)
return utils.expr(string.format(call, tostring(target), table.concat(args, ", ")), "statement")
end
local function method_call(ast, scope, parent)
compiler.assert((2 < #ast), "expected at least 2 arguments", ast)
- local _0_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
- local target = _0_[1]
+ local _let_508_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
+ local target = _let_508_[1]
local args = {}
for i = 4, #ast do
- local subexprs = nil
- local _1_
+ local subexprs
+ local _509_
if (i ~= #ast) then
- _1_ = 1
+ _509_ = 1
else
- _1_ = nil
+ _509_ = nil
end
- subexprs = compiler.compile1(ast[i], scope, parent, {nval = _1_})
+ subexprs = compiler.compile1(ast[i], scope, parent, {nval = _509_})
utils.map(subexprs, tostring, args)
end
- if ((type(ast[3]) == "string") and utils["valid-lua-identifier?"](ast[3])) then
+ if (utils["string?"](ast[3]) and utils["valid-lua-identifier?"](ast[3])) then
return native_method_call(ast, scope, parent, target, args)
elseif (target.type == "sym") then
return nonnative_method_call(ast, scope, parent, target, args)
@@ 1577,11 1547,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
for i = 2, #ast do
table.insert(els, view(ast[i], {["one-line?"] = true}))
end
- return compiler.emit(parent, ("-- " .. table.concat(els, " ")), ast)
+ return compiler.emit(parent, ("--[[ " .. table.concat(els, " ") .. " ]]"), ast)
end
doc_special("comment", {"..."}, "Comment which will be emitted in Lua output.", true)
local function hashfn_max_used(f_scope, i, max)
- local max0 = nil
+ local max0
if f_scope.symmeta[("$" .. i)].used then
max0 = i
else
@@ 1595,12 1565,12 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
end
SPECIALS.hashfn = function(ast, scope, parent)
compiler.assert((#ast == 2), "expected one argument", ast)
- local f_scope = nil
+ local f_scope
do
- local _0_0 = compiler["make-scope"](scope)
- _0_0["vararg"] = false
- _0_0["hashfn"] = true
- f_scope = _0_0
+ local _514_ = compiler["make-scope"](scope)
+ do end (_514_)["vararg"] = false
+ _514_["hashfn"] = true
+ f_scope = _514_
end
local f_chunk = {}
local name = compiler.gensym(scope)
@@ 1611,12 1581,12 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
args[i] = compiler["declare-local"](utils.sym(("$" .. i)), {}, f_scope, ast)
end
local function walker(idx, node, parent_node)
- if (utils["sym?"](node) and (utils.deref(node) == "$...")) then
+ if (utils["sym?"](node) and (tostring(node) == "$...")) then
parent_node[idx] = utils.varg()
f_scope.vararg = true
return nil
else
- return (utils["list?"](node) or utils["table?"](node))
+ return (("table" == type(node)) and (utils.sym("hashfn") ~= node[1]) and (utils["list?"](node) or utils["table?"](node)))
end
end
utils["walk-tree"](ast[2], walker)
@@ 1624,10 1594,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local max_used = hashfn_max_used(f_scope, 1, 0)
if f_scope.vararg then
compiler.assert((max_used == 0), "$ and $... in hashfn are mutually exclusive", ast)
+ else
end
- local arg_str = nil
+ local arg_str
if f_scope.vararg then
- arg_str = utils.deref(utils.varg())
+ arg_str = tostring(utils.varg())
else
arg_str = table.concat(args, ", ", 1, max_used)
end
@@ 1637,35 1608,63 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
return utils.expr(name, "sym")
end
doc_special("hashfn", {"..."}, "Function literal shorthand; args are either $... OR $1, $2, etc.")
- local function arithmetic_special(name, zero_arity, unary_prefix, nval, ast, scope, parent)
- local _0_0 = #ast
- if (_0_0 == 1) then
- compiler.assert(zero_arity, "Expected more than 0 arguments", ast)
- return utils.expr(zero_arity, "literal")
- elseif (nil ~= _0_0) then
- local len = _0_0
- local operands = {}
- local padded_op = (" " .. name .. " ")
- for i = 2, len do
- local subexprs = compiler.compile1(ast[i], scope, parent, {nval = nval})
+ local function maybe_short_circuit_protect(ast, i, name, _518_)
+ local _arg_519_ = _518_
+ local mac = _arg_519_["macros"]
+ local call = (utils["list?"](ast) and tostring(ast[1]))
+ if ((("or" == name) or ("and" == name)) and (1 < i) and (mac[call] or ("set" == call) or ("tset" == call) or ("global" == call))) then
+ return utils.list(utils.sym("do"), ast)
+ else
+ return ast
+ end
+ end
+ local function arithmetic_special(name, zero_arity, unary_prefix, ast, scope, parent)
+ local len = #ast
+ local operands = {}
+ local padded_op = (" " .. name .. " ")
+ for i = 2, len do
+ local subast = maybe_short_circuit_protect(ast[i], i, name, scope)
+ local subexprs = compiler.compile1(subast, scope, parent)
+ if (i == len) then
utils.map(subexprs, tostring, operands)
+ else
+ table.insert(operands, tostring(subexprs[1]))
end
- if (#operands == 1) then
- if unary_prefix then
- return ("(" .. unary_prefix .. padded_op .. operands[1] .. ")")
- else
- return operands[1]
- end
+ end
+ local _522_ = #operands
+ if (_522_ == 0) then
+ local _524_
+ do
+ local _523_ = zero_arity
+ compiler.assert(_523_, "Expected more than 0 arguments", ast)
+ _524_ = _523_
+ end
+ return utils.expr(_524_, "literal")
+ elseif (_522_ == 1) then
+ if unary_prefix then
+ return ("(" .. unary_prefix .. padded_op .. operands[1] .. ")")
else
- return ("(" .. table.concat(operands, padded_op) .. ")")
+ return operands[1]
end
+ elseif true then
+ local _ = _522_
+ return ("(" .. table.concat(operands, padded_op) .. ")")
+ else
+ return nil
end
end
- local function define_arithmetic_special(name, zero_arity, unary_prefix, lua_name)
- local function _0_(...)
- return arithmetic_special((lua_name or name), zero_arity, unary_prefix, 1, ...)
+ local function define_arithmetic_special(name, zero_arity, unary_prefix, _3flua_name)
+ local _530_
+ do
+ local _527_ = (_3flua_name or name)
+ local _528_ = zero_arity
+ local _529_ = unary_prefix
+ local function _531_(...)
+ return arithmetic_special(_527_, _528_, _529_, ...)
+ end
+ _530_ = _531_
end
- SPECIALS[name] = _0_
+ SPECIALS[name] = _530_
return doc_special(name, {"a", "b", "..."}, "Arithmetic operator; works the same as Lua but accepts more arguments.")
end
define_arithmetic_special("+", "0")
@@ 1677,10 1676,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
define_arithmetic_special("/", nil, "1")
define_arithmetic_special("//", nil, "1")
SPECIALS["or"] = function(ast, scope, parent)
- return arithmetic_special("or", "false", nil, nil, ast, scope, parent)
+ return arithmetic_special("or", "false", nil, ast, scope, parent)
end
SPECIALS["and"] = function(ast, scope, parent)
- return arithmetic_special("and", "true", nil, nil, ast, scope, parent)
+ return arithmetic_special("and", "true", nil, ast, scope, parent)
end
doc_special("and", {"a", "b", "..."}, "Boolean operator; works the same as Lua but accepts more arguments.")
doc_special("or", {"a", "b", "..."}, "Boolean operator; works the same as Lua but accepts more arguments.")
@@ 1693,14 1692,14 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local padded_native_name = (" " .. native_name .. " ")
local prefixed_lib_name = ("bit." .. lib_name)
for i = 2, len do
- local subexprs = nil
- local _0_
+ local subexprs
+ local _532_
if (i ~= len) then
- _0_ = 1
+ _532_ = 1
else
- _0_ = nil
+ _532_ = nil
end
- subexprs = compiler.compile1(ast[i], scope, parent, {nval = _0_})
+ subexprs = compiler.compile1(ast[i], scope, parent, {nval = _532_})
utils.map(subexprs, tostring, operands)
end
if (#operands == 1) then
@@ 1719,10 1718,18 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
end
end
local function define_bitop_special(name, zero_arity, unary_prefix, native)
- local function _0_(...)
- return bitop_special(native, name, zero_arity, unary_prefix, ...)
+ local _542_
+ do
+ local _538_ = native
+ local _539_ = name
+ local _540_ = zero_arity
+ local _541_ = unary_prefix
+ local function _543_(...)
+ return bitop_special(_538_, _539_, _540_, _541_, ...)
+ end
+ _542_ = _543_
end
- SPECIALS[name] = _0_
+ SPECIALS[name] = _542_
return nil
end
define_bitop_special("lshift", nil, "1", "<<")
@@ 1736,17 1743,49 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
doc_special("bor", {"x1", "x2", "..."}, "Bitwise OR of any number of arguments.\nOnly works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.")
doc_special("bxor", {"x1", "x2", "..."}, "Bitwise XOR of any number of arguments.\nOnly works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.")
doc_special("..", {"a", "b", "..."}, "String concatenation operator; works the same as Lua but accepts more arguments.")
- local function native_comparator(op, _0_0, scope, parent)
- local _1_ = _0_0
- local _ = _1_[1]
- local lhs_ast = _1_[2]
- local rhs_ast = _1_[3]
- local _2_ = compiler.compile1(lhs_ast, scope, parent, {nval = 1})
- local lhs = _2_[1]
- local _3_ = compiler.compile1(rhs_ast, scope, parent, {nval = 1})
- local rhs = _3_[1]
+ local function native_comparator(op, _544_, scope, parent)
+ local _arg_545_ = _544_
+ local _ = _arg_545_[1]
+ local lhs_ast = _arg_545_[2]
+ local rhs_ast = _arg_545_[3]
+ local _let_546_ = compiler.compile1(lhs_ast, scope, parent, {nval = 1})
+ local lhs = _let_546_[1]
+ local _let_547_ = compiler.compile1(rhs_ast, scope, parent, {nval = 1})
+ local rhs = _let_547_[1]
return string.format("(%s %s %s)", tostring(lhs), op, tostring(rhs))
end
+ local function idempotent_comparator(op, chain_op, ast, scope, parent)
+ local vals
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for i = 2, #ast do
+ local val_18_auto = tostring((compiler.compile1(ast[i], scope, parent, {nval = 1}))[1])
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ vals = tbl_16_auto
+ end
+ local comparisons
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for i = 1, (#vals - 1) do
+ local val_18_auto = string.format("(%s %s %s)", vals[i], op, vals[(i + 1)])
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ comparisons = tbl_16_auto
+ end
+ local chain = string.format(" %s ", (chain_op or "and"))
+ return table.concat(comparisons, chain)
+ end
local function double_eval_protected_comparator(op, chain_op, ast, scope, parent)
local arglist = {}
local comparisons = {}
@@ 1754,22 1793,33 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local chain = string.format(" %s ", (chain_op or "and"))
for i = 2, #ast do
table.insert(arglist, tostring(compiler.gensym(scope)))
- table.insert(vals, tostring(compiler.compile1(ast[i], scope, parent, {nval = 1})[1]))
+ table.insert(vals, tostring((compiler.compile1(ast[i], scope, parent, {nval = 1}))[1]))
end
- for i = 1, (#arglist - 1) do
- table.insert(comparisons, string.format("(%s %s %s)", arglist[i], op, arglist[(i + 1)]))
+ do
+ local tbl_16_auto = comparisons
+ local i_17_auto = #tbl_16_auto
+ for i = 1, (#arglist - 1) do
+ local val_18_auto = string.format("(%s %s %s)", arglist[i], op, arglist[(i + 1)])
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
end
return string.format("(function(%s) return %s end)(%s)", table.concat(arglist, ","), table.concat(comparisons, chain), table.concat(vals, ","))
end
- local function define_comparator_special(name, lua_op, chain_op)
+ local function define_comparator_special(name, _3flua_op, _3fchain_op)
do
- local op = (lua_op or name)
+ local op = (_3flua_op or name)
local function opfn(ast, scope, parent)
compiler.assert((2 < #ast), "expected at least two arguments", ast)
if (3 == #ast) then
return native_comparator(op, ast, scope, parent)
+ elseif utils["every?"](utils["idempotent-expr?"], {unpack(ast, 2)}) then
+ return idempotent_comparator(op, _3fchain_op, ast, scope, parent)
else
- return double_eval_protected_comparator(op, chain_op, ast, scope, parent)
+ return double_eval_protected_comparator(op, _3fchain_op, ast, scope, parent)
end
end
SPECIALS[name] = opfn
@@ 1782,11 1832,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
define_comparator_special("<=")
define_comparator_special("=", "==")
define_comparator_special("not=", "~=", "or")
- local function define_unary_special(op, realop)
+ local function define_unary_special(op, _3frealop)
local function opfn(ast, scope, parent)
compiler.assert((#ast == 2), "expected one argument", ast)
local tail = compiler.compile1(ast[2], scope, parent, {nval = 1})
- return ((realop or op) .. tostring(tail[1]))
+ return ((_3frealop or op) .. tostring(tail[1]))
end
SPECIALS[op] = opfn
return nil
@@ 1797,250 1847,338 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
doc_special("bnot", {"x"}, "Bitwise negation; only works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.")
define_unary_special("length", "#")
doc_special("length", {"x"}, "Returns the length of a table or string.")
- SPECIALS["~="] = SPECIALS["not="]
+ do end (SPECIALS)["~="] = SPECIALS["not="]
SPECIALS["#"] = SPECIALS.length
SPECIALS.quote = function(ast, scope, parent)
- compiler.assert((#ast == 2), "expected one argument")
+ compiler.assert((#ast == 2), "expected one argument", ast)
local runtime, this_scope = true, scope
while this_scope do
this_scope = this_scope.parent
if (this_scope == compiler.scopes.compiler) then
runtime = false
+ else
end
end
return compiler["do-quote"](ast[2], scope, parent, runtime)
end
doc_special("quote", {"x"}, "Quasiquote the following form. Only works in macro/compiler scope.")
local macro_loaded = {}
- local already_warned_3f = {_G = true}
- local compile_env_warning = table.concat({"WARNING: Attempting to %s %s in compile scope.", "In future versions of Fennel this will not be allowed without the", "--no-compiler-sandbox flag or passing a :compilerEnv globals table", "in the options.\n"}, "\n")
- local function compiler_env_warn(_, key)
- local v = _G[key]
- if (v and io and io.stderr and not already_warned_3f[key]) then
- already_warned_3f[key] = true
- do end (io.stderr):write(compile_env_warning:format("use global", key))
- end
- return v
- end
local function safe_getmetatable(tbl)
local mt = getmetatable(tbl)
assert((mt ~= getmetatable("")), "Illegal metatable access!")
return mt
end
local safe_require = nil
- local function safe_compiler_env(strict_3f)
- local _1_
- if strict_3f then
- _1_ = nil
- else
- _1_ = compiler_env_warn
+ local function safe_compiler_env()
+ local _554_
+ do
+ local _553_ = rawget(_G, "utf8")
+ if (nil ~= _553_) then
+ _554_ = utils.copy(_553_)
+ else
+ _554_ = _553_
+ end
end
- return setmetatable({assert = assert, bit = rawget(_G, "bit"), error = error, getmetatable = safe_getmetatable, ipairs = ipairs, math = utils.copy(math), next = next, pairs = pairs, pcall = pcall, print = print, rawequal = rawequal, rawget = rawget, rawlen = rawget(_G, "rawlen"), rawset = rawset, require = safe_require, select = select, setmetatable = setmetatable, string = utils.copy(string), table = utils.copy(table), tonumber = tonumber, tostring = tostring, type = type, xpcall = xpcall}, {__index = _1_})
+ return {table = utils.copy(table), math = utils.copy(math), string = utils.copy(string), pairs = utils.stablepairs, ipairs = ipairs, select = select, tostring = tostring, tonumber = tonumber, bit = rawget(_G, "bit"), pcall = pcall, xpcall = xpcall, next = next, print = print, type = type, assert = assert, error = error, setmetatable = setmetatable, getmetatable = safe_getmetatable, require = safe_require, rawlen = rawget(_G, "rawlen"), rawget = rawget, rawset = rawset, rawequal = rawequal, _VERSION = _VERSION, utf8 = _554_}
end
local function combined_mt_pairs(env)
local combined = {}
- local _1_ = getmetatable(env)
- local __index = _1_["__index"]
+ local _let_556_ = getmetatable(env)
+ local __index = _let_556_["__index"]
if ("table" == type(__index)) then
for k, v in pairs(__index) do
combined[k] = v
end
+ else
end
for k, v in next, env, nil do
combined[k] = v
end
return next, combined, nil
end
- local function make_compiler_env(ast, scope, parent, strict_3f)
- local provided = nil
+ local function make_compiler_env(ast, scope, parent, _3fopts)
+ local provided
do
- local _1_0 = utils.root.options
- if ((type(_1_0) == "table") and (_1_0["compiler-env"] == "strict")) then
- provided = safe_compiler_env(true)
- elseif ((type(_1_0) == "table") and (nil ~= _1_0.compilerEnv)) then
- local compilerEnv = _1_0.compilerEnv
+ local _558_ = (_3fopts or utils.root.options)
+ if ((_G.type(_558_) == "table") and ((_558_)["compiler-env"] == "strict")) then
+ provided = safe_compiler_env()
+ elseif ((_G.type(_558_) == "table") and (nil ~= (_558_).compilerEnv)) then
+ local compilerEnv = (_558_).compilerEnv
provided = compilerEnv
- elseif ((type(_1_0) == "table") and (nil ~= _1_0["compiler-env"])) then
- local compiler_env = _1_0["compiler-env"]
+ elseif ((_G.type(_558_) == "table") and (nil ~= (_558_)["compiler-env"])) then
+ local compiler_env = (_558_)["compiler-env"]
provided = compiler_env
+ elseif true then
+ local _ = _558_
+ provided = safe_compiler_env(false)
else
- local _ = _1_0
- provided = safe_compiler_env(strict_3f)
+ provided = nil
end
end
- local env = nil
- local function _2_()
+ local env
+ local function _560_(base)
+ return utils.sym(compiler.gensym((compiler.scopes.macro or scope), base))
+ end
+ local function _561_()
return compiler.scopes.macro
end
- local function _3_(symbol)
+ local function _562_(symbol)
compiler.assert(compiler.scopes.macro, "must call from macro", ast)
return compiler.scopes.macro.manglings[tostring(symbol)]
end
- local function _4_(base)
- return utils.sym(compiler.gensym((compiler.scopes.macro or scope), base))
- end
- local function _5_(form)
+ local function _563_(form)
compiler.assert(compiler.scopes.macro, "must call from macro", ast)
return compiler.macroexpand(form, compiler.scopes.macro)
end
- env = {["assert-compile"] = compiler.assert, ["get-scope"] = _2_, ["in-scope?"] = _3_, ["list?"] = utils["list?"], ["macro-loaded"] = macro_loaded, ["multi-sym?"] = utils["multi-sym?"], ["sequence?"] = utils["sequence?"], ["sym?"] = utils["sym?"], ["table?"] = utils["table?"], ["varg?"] = utils["varg?"], _AST = ast, _CHUNK = parent, _IS_COMPILER = true, _SCOPE = scope, _SPECIALS = compiler.scopes.global.specials, _VARARG = utils.varg(), gensym = _4_, list = utils.list, macroexpand = _5_, sequence = utils.sequence, sym = utils.sym, unpack = unpack, view = view}
+ env = {_AST = ast, _CHUNK = parent, _IS_COMPILER = true, _SCOPE = scope, _SPECIALS = compiler.scopes.global.specials, _VARARG = utils.varg(), ["macro-loaded"] = macro_loaded, unpack = unpack, ["assert-compile"] = compiler.assert, view = view, version = utils.version, metadata = compiler.metadata, ["ast-source"] = utils["ast-source"], list = utils.list, ["list?"] = utils["list?"], ["table?"] = utils["table?"], sequence = utils.sequence, ["sequence?"] = utils["sequence?"], sym = utils.sym, ["sym?"] = utils["sym?"], ["multi-sym?"] = utils["multi-sym?"], comment = utils.comment, ["comment?"] = utils["comment?"], ["varg?"] = utils["varg?"], gensym = _560_, ["get-scope"] = _561_, ["in-scope?"] = _562_, macroexpand = _563_}
env._G = env
return setmetatable(env, {__index = provided, __newindex = provided, __pairs = combined_mt_pairs})
end
- local cfg = string.gmatch(package.config, "([^\n]+)")
- local dirsep, pathsep, pathmark = (cfg() or "/"), (cfg() or ";"), (cfg() or "?")
- local pkg_config = {dirsep = dirsep, pathmark = pathmark, pathsep = pathsep}
+ local function _565_(...)
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for c in string.gmatch((package.config or ""), "([^\n]+)") do
+ local val_18_auto = c
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ return tbl_16_auto
+ end
+ local _local_564_ = _565_(...)
+ local dirsep = _local_564_[1]
+ local pathsep = _local_564_[2]
+ local pathmark = _local_564_[3]
+ local pkg_config = {dirsep = (dirsep or "/"), pathmark = (pathmark or ";"), pathsep = (pathsep or "?")}
local function escapepat(str)
return string.gsub(str, "[^%w]", "%%%1")
end
- local function search_module(modulename, pathstring)
+ local function search_module(modulename, _3fpathstring)
local pathsepesc = escapepat(pkg_config.pathsep)
local pattern = ("([^%s]*)%s"):format(pathsepesc, pathsepesc)
local no_dot_module = modulename:gsub("%.", pkg_config.dirsep)
- local fullpath = ((pathstring or utils["fennel-module"].path) .. pkg_config.pathsep)
+ local fullpath = ((_3fpathstring or utils["fennel-module"].path) .. pkg_config.pathsep)
local function try_path(path)
local filename = path:gsub(escapepat(pkg_config.pathmark), no_dot_module)
local filename2 = path:gsub(escapepat(pkg_config.pathmark), modulename)
- local _1_0 = (io.open(filename) or io.open(filename2))
- if (nil ~= _1_0) then
- local file = _1_0
+ local _567_ = (io.open(filename) or io.open(filename2))
+ if (nil ~= _567_) then
+ local file = _567_
file:close()
return filename
+ elseif true then
+ local _ = _567_
+ return nil, ("no file '" .. filename .. "'")
+ else
+ return nil
end
end
- local function find_in_path(start)
- local _1_0 = fullpath:match(pattern, start)
- if (nil ~= _1_0) then
- local path = _1_0
- return (try_path(path) or find_in_path((start + #path + 1)))
+ local function find_in_path(start, _3ftried_paths)
+ local _569_ = fullpath:match(pattern, start)
+ if (nil ~= _569_) then
+ local path = _569_
+ local _570_, _571_ = try_path(path)
+ if (nil ~= _570_) then
+ local filename = _570_
+ return filename
+ elseif ((_570_ == nil) and (nil ~= _571_)) then
+ local error = _571_
+ local function _573_()
+ local _572_ = (_3ftried_paths or {})
+ table.insert(_572_, error)
+ return _572_
+ end
+ return find_in_path((start + #path + 1), _573_())
+ else
+ return nil
+ end
+ elseif true then
+ local _ = _569_
+ local function _575_()
+ local tried_paths = table.concat((_3ftried_paths or {}), "\n\9")
+ if (_VERSION < "Lua 5.4") then
+ return ("\n\9" .. tried_paths)
+ else
+ return tried_paths
+ end
+ end
+ return nil, _575_()
+ else
+ return nil
end
end
return find_in_path(1)
end
- local function make_searcher(options)
- local function _1_(module_name)
+ local function make_searcher(_3foptions)
+ local function _578_(module_name)
local opts = utils.copy(utils.root.options)
- for k, v in pairs((options or {})) do
+ for k, v in pairs((_3foptions or {})) do
opts[k] = v
end
opts["module-name"] = module_name
- local _2_0 = search_module(module_name)
- if (nil ~= _2_0) then
- local filename = _2_0
- local function _3_(...)
- return utils["fennel-module"].dofile(filename, opts, ...)
+ local _579_, _580_ = search_module(module_name)
+ if (nil ~= _579_) then
+ local filename = _579_
+ local _583_
+ do
+ local _581_ = filename
+ local _582_ = opts
+ local function _584_(...)
+ return utils["fennel-module"].dofile(_581_, _582_, ...)
+ end
+ _583_ = _584_
end
- return _3_, filename
+ return _583_, filename
+ elseif ((_579_ == nil) and (nil ~= _580_)) then
+ local error = _580_
+ return error
+ else
+ return nil
end
end
- return _1_
+ return _578_
end
- local function macro_globals(env, globals)
- local allowed = current_global_names(env)
- for _, k in pairs((globals or {})) do
- table.insert(allowed, k)
- end
- return allowed
+ local function dofile_with_searcher(fennel_macro_searcher, filename, opts, ...)
+ local searchers = (package.loaders or package.searchers or {})
+ local _ = table.insert(searchers, 1, fennel_macro_searcher)
+ local m = utils["fennel-module"].dofile(filename, opts, ...)
+ table.remove(searchers, 1)
+ return m
end
local function fennel_macro_searcher(module_name)
- local _1_0 = search_module(module_name, utils["fennel-module"]["macro-path"])
- if (nil ~= _1_0) then
- local filename = _1_0
- local function _2_(...)
- return utils["fennel-module"].dofile(filename, {env = "_COMPILER"}, ...)
+ local opts
+ do
+ local _586_ = utils.copy(utils.root.options)
+ do end (_586_)["module-name"] = module_name
+ _586_["env"] = "_COMPILER"
+ _586_["requireAsInclude"] = false
+ _586_["allowedGlobals"] = nil
+ opts = _586_
+ end
+ local _587_ = search_module(module_name, utils["fennel-module"]["macro-path"])
+ if (nil ~= _587_) then
+ local filename = _587_
+ local _588_
+ if (opts["compiler-env"] == _G) then
+ local _589_ = fennel_macro_searcher
+ local _590_ = filename
+ local _591_ = opts
+ local function _593_(...)
+ return dofile_with_searcher(_589_, _590_, _591_, ...)
+ end
+ _588_ = _593_
+ else
+ local _594_ = filename
+ local _595_ = opts
+ local function _597_(...)
+ return utils["fennel-module"].dofile(_594_, _595_, ...)
+ end
+ _588_ = _597_
end
- return _2_, filename
+ return _588_, filename
+ else
+ return nil
end
end
local function lua_macro_searcher(module_name)
- local _1_0 = search_module(module_name, package.path)
- if (nil ~= _1_0) then
- local filename = _1_0
- local code = nil
+ local _600_ = search_module(module_name, package.path)
+ if (nil ~= _600_) then
+ local filename = _600_
+ local code
do
local f = io.open(filename)
- local function close_handlers_0_(ok_0_, ...)
+ local function close_handlers_8_auto(ok_9_auto, ...)
f:close()
- if ok_0_ then
+ if ok_9_auto then
return ...
else
return error(..., 0)
end
end
- local function _2_()
+ local function _602_()
return assert(f:read("*a"))
end
- code = close_handlers_0_(xpcall(_2_, (package.loaded.fennel or debug).traceback))
+ code = close_handlers_8_auto(_G.xpcall(_602_, (package.loaded.fennel or debug).traceback))
end
local chunk = load_code(code, make_compiler_env(), filename)
return chunk, filename
+ else
+ return nil
end
end
- local macro_searchers = {lua_macro_searcher, fennel_macro_searcher}
+ local macro_searchers = {fennel_macro_searcher, lua_macro_searcher}
local function search_macro_module(modname, n)
- local _1_0 = macro_searchers[n]
- if (nil ~= _1_0) then
- local f = _1_0
- local _2_0, _3_0 = f(modname)
- if ((nil ~= _2_0) and true) then
- local loader = _2_0
- local _3ffilename = _3_0
+ local _604_ = macro_searchers[n]
+ if (nil ~= _604_) then
+ local f = _604_
+ local _605_, _606_ = f(modname)
+ if ((nil ~= _605_) and true) then
+ local loader = _605_
+ local _3ffilename = _606_
return loader, _3ffilename
- else
- local _ = _2_0
+ elseif true then
+ local _ = _605_
return search_macro_module(modname, (n + 1))
+ else
+ return nil
end
+ else
+ return nil
end
end
- local function metadata_only_fennel(modname)
+ local function sandbox_fennel_module(modname)
if ((modname == "fennel.macros") or (package and package.loaded and ("table" == type(package.loaded[modname])) and (package.loaded[modname].metadata == compiler.metadata))) then
- return {metadata = compiler.metadata}
+ return {metadata = compiler.metadata, view = view}
+ else
+ return nil
end
end
- local function _1_(modname)
- local function _2_()
+ local function _610_(modname)
+ local function _611_()
local loader, filename = search_macro_module(modname, 1)
compiler.assert(loader, (modname .. " module not found."))
- macro_loaded[modname] = loader(modname, filename)
+ do end (macro_loaded)[modname] = loader(modname, filename)
return macro_loaded[modname]
end
- return (macro_loaded[modname] or metadata_only_fennel(modname) or _2_())
+ return (macro_loaded[modname] or sandbox_fennel_module(modname) or _611_())
end
- safe_require = _1_
+ safe_require = _610_
local function add_macros(macros_2a, ast, scope)
compiler.assert(utils["table?"](macros_2a), "expected macros to be table", ast)
for k, v in pairs(macros_2a) do
compiler.assert((type(v) == "function"), "expected each macro to be function", ast)
- scope.macros[k] = v
+ compiler["check-binding-valid"](utils.sym(k), scope, ast, {["macro?"] = true})
+ do end (scope.macros)[k] = v
end
return nil
end
- local function resolve_module_name(ast, scope, parent, opts)
- local filename = (ast.filename or ast[2].filename)
+ local function resolve_module_name(_612_, _scope, _parent, opts)
+ local _arg_613_ = _612_
+ local filename = _arg_613_["filename"]
+ local second = _arg_613_[2]
+ local filename0 = (filename or (utils["table?"](second) and second.filename))
local module_name = utils.root.options["module-name"]
- local modexpr = compiler.compile(ast[2], opts)
+ local modexpr = compiler.compile(second, opts)
local modname_chunk = load_code(modexpr)
- local _2_0, _3_0 = pcall(modname_chunk, module_name, filename)
- if ((_2_0 == true) and (nil ~= _3_0)) then
- local modname = _3_0
- return utils.expr(string.format("%q", modname), "literal")
- else
- local _ = _2_0
- return compiler.compile1(ast[2], scope, parent, {nval = 1})[1]
- end
+ return modname_chunk(module_name, filename0)
end
- SPECIALS["require-macros"] = function(ast, scope, parent, real_ast)
- compiler.assert((#ast == 2), "Expected one module name argument", (real_ast or ast))
- local modexpr = resolve_module_name(ast, scope, parent, {})
- local _ = compiler.assert((modexpr.type == "literal"), "module name must compile to string", (real_ast or ast))
- local modname = load_code(("return " .. modexpr[1]))()
+ SPECIALS["require-macros"] = function(ast, scope, parent, _3freal_ast)
+ compiler.assert((#ast == 2), "Expected one module name argument", (_3freal_ast or ast))
+ local modname = resolve_module_name(ast, scope, parent, {})
+ compiler.assert(utils["string?"](modname), "module name must compile to string", (_3freal_ast or ast))
if not macro_loaded[modname] then
- local env = make_compiler_env(ast, scope, parent)
local loader, filename = search_macro_module(modname, 1)
compiler.assert(loader, (modname .. " module not found."), ast)
- macro_loaded[modname] = loader(modname, filename)
+ do end (macro_loaded)[modname] = compiler.assert(utils["table?"](loader(modname, filename)), "expected macros to be table", (_3freal_ast or ast))
+ else
+ end
+ if ("import-macros" == tostring(ast[1])) then
+ return macro_loaded[modname]
+ else
+ return add_macros(macro_loaded[modname], ast, scope, parent)
end
- return add_macros(macro_loaded[modname], ast, scope, parent)
end
doc_special("require-macros", {"macro-module-name"}, "Load given module and use its contents as macro definitions in current scope.\nMacro module should return a table of macro functions with string keys.\nConsider using import-macros instead as it is more flexible.")
local function emit_included_fennel(src, path, opts, sub_chunk)
@@ 2048,12 2186,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local forms = {}
if utils.root.options.requireAsInclude then
subscope.specials.require = compiler["require-include"]
+ else
end
for _, val in parser.parser(parser["string-stream"](src), path) do
table.insert(forms, val)
end
for i = 1, #forms do
- local subopts = nil
+ local subopts
if (i == #forms) then
subopts = {tail = true}
else
@@ 2066,21 2205,21 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
end
local function include_path(ast, opts, path, mod, fennel_3f)
utils.root.scope.includes[mod] = "fnl/loading"
- local src = nil
+ local src
do
local f = assert(io.open(path))
- local function close_handlers_0_(ok_0_, ...)
+ local function close_handlers_8_auto(ok_9_auto, ...)
f:close()
- if ok_0_ then
+ if ok_9_auto then
return ...
else
return error(..., 0)
end
end
- local function _2_()
- return f:read("*all"):gsub("[\13\n]*$", "")
+ local function _619_()
+ return assert(f:read("*all")):gsub("[\13\n]*$", "")
end
- src = close_handlers_0_(xpcall(_2_, (package.loaded.fennel or debug).traceback))
+ src = close_handlers_8_auto(_G.xpcall(_619_, (package.loaded.fennel or debug).traceback))
end
local ret = utils.expr(("require(\"" .. mod .. "\")"), "statement")
local target = ("package.preload[%q]"):format(mod)
@@ 2089,8 2228,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
compiler.emit(temp_chunk, preload_str, ast)
compiler.emit(temp_chunk, sub_chunk)
compiler.emit(temp_chunk, "end", ast)
- for i, v in ipairs(temp_chunk) do
- table.insert(utils.root.chunk, i, v)
+ for _, v in ipairs(temp_chunk) do
+ table.insert(utils.root.chunk, v)
end
if fennel_3f then
emit_included_fennel(src, path, opts, sub_chunk)
@@ 2104,11 2243,25 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
if (utils.root.scope.includes[mod] == "fnl/loading") then
compiler.assert(fallback, "circular include detected", ast)
return fallback(modexpr)
+ else
+ return nil
end
end
SPECIALS.include = function(ast, scope, parent, opts)
compiler.assert((#ast == 2), "expected one argument", ast)
- local modexpr = resolve_module_name(ast, scope, parent, opts)
+ local modexpr
+ do
+ local _622_, _623_ = pcall(resolve_module_name, ast, scope, parent, opts)
+ if ((_622_ == true) and (nil ~= _623_)) then
+ local modname = _623_
+ modexpr = utils.expr(string.format("%q", modname), "literal")
+ elseif true then
+ local _ = _622_
+ modexpr = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1]
+ else
+ modexpr = nil
+ end
+ end
if ((modexpr.type ~= "literal") or ((modexpr[1]):byte() ~= 34)) then
if opts.fallback then
return opts.fallback(modexpr)
@@ 2118,17 2271,17 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
else
local mod = load_code(("return " .. modexpr[1]))()
local oldmod = utils.root.options["module-name"]
- local _ = nil
+ local _
utils.root.options["module-name"] = mod
_ = nil
- local res = nil
- local function _3_()
- local _2_0 = search_module(mod)
- if (nil ~= _2_0) then
- local fennel_path = _2_0
+ local res
+ local function _627_()
+ local _626_ = search_module(mod)
+ if (nil ~= _626_) then
+ local fennel_path = _626_
return include_path(ast, opts, fennel_path, mod, true)
- else
- local _0 = _2_0
+ elseif true then
+ local _0 = _626_
local lua_path = search_module(mod, package.path)
if lua_path then
return include_path(ast, opts, lua_path, mod, false)
@@ 2137,9 2290,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
else
return compiler.assert(false, ("module not found " .. mod), ast)
end
+ else
+ return nil
end
end
- res = ((utils["member?"](mod, (utils.root.options.skipInclude or {})) and utils.expr("nil --[[SKIPPED INCLUDE]]--", "literal")) or include_circular_fallback(mod, modexpr, opts.fallback, ast) or utils.root.scope.includes[mod] or _3_())
+ res = ((utils["member?"](mod, (utils.root.options.skipInclude or {})) and opts.fallback(modexpr, true)) or include_circular_fallback(mod, modexpr, opts.fallback, ast) or utils.root.scope.includes[mod] or _627_())
utils.root.options["module-name"] = oldmod
return res
end
@@ 2149,11 2304,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local env = make_compiler_env(ast, scope, parent)
local opts = utils.copy(utils.root.options)
opts.scope = compiler["make-scope"](compiler.scopes.compiler)
- opts.allowedGlobals = macro_globals(env, current_global_names())
- return load_code(compiler.compile(ast, opts), wrap_env(env))(opts["module-name"], ast.filename)
+ opts.allowedGlobals = current_global_names(env)
+ return assert(load_code(compiler.compile(ast, opts), wrap_env(env)), opts["module-name"], ast.filename)()
end
SPECIALS.macros = function(ast, scope, parent)
- compiler.assert((#ast == 2), "Expected one table argument", ast)
+ compiler.assert(((#ast == 2) and utils["table?"](ast[2])), "Expected one table argument", ast)
return add_macros(eval_compiler_2a(ast[2], scope, parent), ast, scope, parent)
end
doc_special("macros", {"{:macro-name-1 (fn [...] ...) ... :macro-name-N macro-body-N}"}, "Define all functions in the given table as macros local to the current scope.")
@@ 2161,11 2316,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
local old_first = ast[1]
ast[1] = utils.sym("do")
local val = eval_compiler_2a(ast, scope, parent)
- ast[1] = old_first
+ do end (ast)[1] = old_first
return val
end
doc_special("eval-compiler", {"..."}, "Evaluate the body at compile-time. Use the macro system instead if possible.", true)
- return {["current-global-names"] = current_global_names, ["load-code"] = load_code, ["macro-loaded"] = macro_loaded, ["macro-searchers"] = macro_searchers, ["make-compiler-env"] = make_compiler_env, ["make-searcher"] = make_searcher, ["search-module"] = search_module, ["wrap-env"] = wrap_env, doc = doc_2a}
+ return {doc = doc_2a, ["current-global-names"] = current_global_names, ["load-code"] = load_code, ["macro-loaded"] = macro_loaded, ["macro-searchers"] = macro_searchers, ["make-compiler-env"] = make_compiler_env, ["search-module"] = search_module, ["make-searcher"] = make_searcher, ["wrap-env"] = wrap_env}
end
package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or function(...)
local utils = require("fennel.utils")
@@ 2173,18 2328,18 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
local friend = require("fennel.friend")
local unpack = (table.unpack or _G.unpack)
local scopes = {}
- local function make_scope(parent)
- local parent0 = (parent or scopes.global)
- local _0_
- if parent0 then
- _0_ = ((parent0.depth or 0) + 1)
+ local function make_scope(_3fparent)
+ local parent = (_3fparent or scopes.global)
+ local _268_
+ if parent then
+ _268_ = ((parent.depth or 0) + 1)
else
- _0_ = 0
+ _268_ = 0
end
- return {autogensyms = setmetatable({}, {__index = (parent0 and parent0.autogensyms)}), depth = _0_, gensyms = setmetatable({}, {__index = (parent0 and parent0.gensyms)}), hashfn = (parent0 and parent0.hashfn), includes = setmetatable({}, {__index = (parent0 and parent0.includes)}), macros = setmetatable({}, {__index = (parent0 and parent0.macros)}), manglings = setmetatable({}, {__index = (parent0 and parent0.manglings)}), parent = parent0, refedglobals = setmetatable({}, {__index = (parent0 and parent0.refedglobals)}), specials = setmetatable({}, {__index = (parent0 and parent0.specials)}), symmeta = setmetatable({}, {__index = (parent0 and parent0.symmeta)}), unmanglings = setmetatable({}, {__index = (parent0 and parent0.unmanglings)}), vararg = (parent0 and parent0.vararg)}
+ return {includes = setmetatable({}, {__index = (parent and parent.includes)}), macros = setmetatable({}, {__index = (parent and parent.macros)}), manglings = setmetatable({}, {__index = (parent and parent.manglings)}), specials = setmetatable({}, {__index = (parent and parent.specials)}), symmeta = setmetatable({}, {__index = (parent and parent.symmeta)}), unmanglings = setmetatable({}, {__index = (parent and parent.unmanglings)}), gensyms = setmetatable({}, {__index = (parent and parent.gensyms)}), autogensyms = setmetatable({}, {__index = (parent and parent.autogensyms)}), vararg = (parent and parent.vararg), depth = _268_, hashfn = (parent and parent.hashfn), refedglobals = {}, parent = parent}
end
local function assert_msg(ast, msg)
- local ast_tbl = nil
+ local ast_tbl
if ("table" == type(ast)) then
ast_tbl = ast
else
@@ 2193,20 2348,32 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
local m = getmetatable(ast)
local filename = ((m and m.filename) or ast_tbl.filename or "unknown")
local line = ((m and m.line) or ast_tbl.line or "?")
+ local col = ((m and m.col) or ast_tbl.col or "?")
local target = tostring((utils["sym?"](ast_tbl[1]) or ast_tbl[1] or "()"))
- return string.format("%s:%s: Compile error in '%s': %s", filename, line, target, msg)
+ return string.format("%s:%s:%s Compile error in '%s': %s", filename, line, col, target, msg)
end
- local function assert_compile(condition, msg, ast)
+ local function assert_compile(condition, msg, ast, _3ffallback_ast)
if not condition then
- local _0_ = (utils.root.options or {})
- local source = _0_["source"]
- local unfriendly = _0_["unfriendly"]
- utils.root.reset()
- if (unfriendly or not friend or not _G.io or not _G.io.read) then
- error(assert_msg(ast, msg), 0)
+ local _let_271_ = (utils.root.options or {})
+ local source = _let_271_["source"]
+ local unfriendly = _let_271_["unfriendly"]
+ local error_pinpoint = _let_271_["error-pinpoint"]
+ local ast0
+ if next(utils["ast-source"](ast)) then
+ ast0 = ast
+ else
+ ast0 = (_3ffallback_ast or {})
+ end
+ if (nil == utils.hook("assert-compile", condition, msg, ast0, utils.root.reset)) then
+ utils.root.reset()
+ if (unfriendly or not friend or not _G.io or not _G.io.read) then
+ error(assert_msg(ast0, msg), 0)
+ else
+ friend["assert-compile"](condition, msg, ast0, source, {["error-pinpoint"] = error_pinpoint})
+ end
else
- friend["assert-compile"](condition, msg, ast, source)
end
+ else
end
return condition
end
@@ 2214,36 2381,38 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
scopes.global.vararg = true
scopes.compiler = make_scope(scopes.global)
scopes.macro = scopes.global
- local serialize_subst = {["\11"] = "\\v", ["\12"] = "\\f", ["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\n"] = "n"}
+ local serialize_subst = {["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\n"] = "n", ["\11"] = "\\v", ["\12"] = "\\f"}
local function serialize_string(str)
- local function _0_(_241)
+ local function _276_(_241)
return ("\\" .. _241:byte())
end
- return string.gsub(string.gsub(string.format("%q", str), ".", serialize_subst), "[\128-\255]", _0_)
+ return string.gsub(string.gsub(string.format("%q", str), ".", serialize_subst), "[\128-\255]", _276_)
end
local function global_mangling(str)
if utils["valid-lua-identifier?"](str) then
return str
else
- local function _0_(_241)
+ local function _277_(_241)
return string.format("_%02x", _241:byte())
end
- return ("__fnl_global__" .. str:gsub("[^%w]", _0_))
+ return ("__fnl_global__" .. str:gsub("[^%w]", _277_))
end
end
local function global_unmangling(identifier)
- local _0_0 = string.match(identifier, "^__fnl_global__(.*)$")
- if (nil ~= _0_0) then
- local rest = _0_0
- local _1_0 = nil
- local function _2_(_241)
+ local _279_ = string.match(identifier, "^__fnl_global__(.*)$")
+ if (nil ~= _279_) then
+ local rest = _279_
+ local _280_
+ local function _281_(_241)
return string.char(tonumber(_241:sub(2), 16))
end
- _1_0 = string.gsub(rest, "_[%da-f][%da-f]", _2_)
- return _1_0
- else
- local _ = _0_0
+ _280_ = string.gsub(rest, "_[%da-f][%da-f]", _281_)
+ return _280_
+ elseif true then
+ local _ = _279_
return identifier
+ else
+ return nil
end
end
local allowed_globals = nil
@@ 2257,31 2426,31 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
return mangling
end
end
- local function local_mangling(str, scope, ast, temp_manglings)
+ local function local_mangling(str, scope, ast, _3ftemp_manglings)
assert_compile(not utils["multi-sym?"](str), ("unexpected multi symbol " .. str), ast)
- local raw = nil
- if (utils["lua-keywords"][str] or str:match("^%d")) then
+ local raw
+ if ((utils["lua-keywords"])[str] or str:match("^%d")) then
raw = ("_" .. str)
else
raw = str
end
- local mangling = nil
- local function _1_(_241)
+ local mangling
+ local function _285_(_241)
return string.format("_%02x", _241:byte())
end
- mangling = string.gsub(string.gsub(raw, "-", "_"), "[^%w_]", _1_)
+ mangling = string.gsub(string.gsub(raw, "-", "_"), "[^%w_]", _285_)
local unique = unique_mangling(mangling, mangling, scope, 0)
- scope.unmanglings[unique] = str
+ do end (scope.unmanglings)[unique] = str
do
- local manglings = (temp_manglings or scope.manglings)
- manglings[str] = unique
+ local manglings = (_3ftemp_manglings or scope.manglings)
+ do end (manglings)[str] = unique
end
return unique
end
local function apply_manglings(scope, new_manglings, ast)
for raw, mangled in pairs(new_manglings) do
assert_compile(not scope.refedglobals[mangled], ("use of global " .. raw .. " is aliased by a local"), ast)
- scope.manglings[raw] = mangled
+ do end (scope.manglings)[raw] = mangled
end
return nil
end
@@ 2304,47 2473,62 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
utils.root.scope["gensym-append"] = ((utils.root.scope["gensym-append"] or 0) + 1)
return ("_" .. utils.root.scope["gensym-append"] .. "_")
end
- local function gensym(scope, base, _3fsuffix)
- local mangling = ((base or "") .. next_append() .. (_3fsuffix or ""))
+ local function gensym(scope, _3fbase, _3fsuffix)
+ local mangling = ((_3fbase or "") .. next_append() .. (_3fsuffix or ""))
while scope.unmanglings[mangling] do
- mangling = ((base or "") .. next_append() .. (_3fsuffix or ""))
+ mangling = ((_3fbase or "") .. next_append() .. (_3fsuffix or ""))
end
- scope.unmanglings[mangling] = (base or true)
- scope.gensyms[mangling] = true
+ scope.unmanglings[mangling] = (_3fbase or true)
+ do end (scope.gensyms)[mangling] = true
return mangling
end
+ local function combine_auto_gensym(parts, first)
+ parts[1] = first
+ local last = table.remove(parts)
+ local last2 = table.remove(parts)
+ local last_joiner = ((parts["multi-sym-method-call"] and ":") or ".")
+ table.insert(parts, (last2 .. last_joiner .. last))
+ return table.concat(parts, ".")
+ end
local function autogensym(base, scope)
- local _0_0 = utils["multi-sym?"](base)
- if (nil ~= _0_0) then
- local parts = _0_0
- parts[1] = autogensym(parts[1], scope)
- return table.concat(parts, ((parts["multi-sym-method-call"] and ":") or "."))
- else
- local _ = _0_0
- local function _1_()
+ local _288_ = utils["multi-sym?"](base)
+ if (nil ~= _288_) then
+ local parts = _288_
+ return combine_auto_gensym(parts, autogensym(parts[1], scope))
+ elseif true then
+ local _ = _288_
+ local function _289_()
local mangling = gensym(scope, base:sub(1, ( - 2)), "auto")
- scope.autogensyms[base] = mangling
+ do end (scope.autogensyms)[base] = mangling
return mangling
end
- return (scope.autogensyms[base] or _1_())
+ return (scope.autogensyms[base] or _289_())
+ else
+ return nil
end
end
- local already_warned = {}
- local function check_binding_valid(symbol, scope, ast)
- local name = utils.deref(symbol)
- if (io and io.stderr and name:find("&") and not already_warned[symbol]) then
- already_warned[symbol] = true
- do end (io.stderr):write(("-- Warning: & will not be allowed in identifier names in " .. "future versions: " .. (symbol.filename or "unknown") .. ":" .. (symbol.line or "?") .. "\n"))
+ local function check_binding_valid(symbol, scope, ast, _3fopts)
+ local name = tostring(symbol)
+ local macro_3f
+ do
+ local t_291_ = _3fopts
+ if (nil ~= t_291_) then
+ t_291_ = (t_291_)["macro?"]
+ else
+ end
+ macro_3f = t_291_
end
- assert_compile(not (scope.specials[name] or scope.macros[name]), ("local %s was overshadowed by a special form or macro"):format(name), ast)
+ assert_compile(not name:find("&"), "invalid character: &", symbol)
+ assert_compile(not name:find("^%."), "invalid character: .", symbol)
+ assert_compile(not (scope.specials[name] or (not macro_3f and scope.macros[name])), ("local %s was overshadowed by a special form or macro"):format(name), ast)
return assert_compile(not utils["quoted?"](symbol), string.format("macro tried to bind %s without gensym", name), symbol)
end
- local function declare_local(symbol, meta, scope, ast, temp_manglings)
+ local function declare_local(symbol, meta, scope, ast, _3ftemp_manglings)
check_binding_valid(symbol, scope, ast)
- local name = utils.deref(symbol)
+ local name = tostring(symbol)
assert_compile(not utils["multi-sym?"](name), ("unexpected multi symbol " .. name), ast)
- scope.symmeta[name] = meta
- return local_mangling(name, scope, ast, temp_manglings)
+ do end (scope.symmeta)[name] = meta
+ return local_mangling(name, scope, ast, _3ftemp_manglings)
end
local function hashfn_arg_name(name, multi_sym_parts, scope)
if not scope.hashfn then
@@ 2354,39 2538,45 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
elseif multi_sym_parts then
if (multi_sym_parts and (multi_sym_parts[1] == "$")) then
multi_sym_parts[1] = "$1"
+ else
end
return table.concat(multi_sym_parts, ".")
+ else
+ return nil
end
end
- local function symbol_to_expression(symbol, scope, reference_3f)
- utils.hook("symbol-to-expression", symbol, scope, reference_3f)
+ local function symbol_to_expression(symbol, scope, _3freference_3f)
+ utils.hook("symbol-to-expression", symbol, scope, _3freference_3f)
local name = symbol[1]
local multi_sym_parts = utils["multi-sym?"](name)
local name0 = (hashfn_arg_name(name, multi_sym_parts, scope) or name)
local parts = (multi_sym_parts or {name0})
- local etype = (((#parts > 1) and "expression") or "sym")
+ local etype = (((1 < #parts) and "expression") or "sym")
local local_3f = scope.manglings[parts[1]]
if (local_3f and scope.symmeta[parts[1]]) then
scope.symmeta[parts[1]]["used"] = true
+ else
end
- assert_compile(not scope.macros[parts[1]], "tried to reference a macro at runtime", symbol)
- assert_compile((not reference_3f or local_3f or ("_ENV" == parts[1]) or global_allowed_3f(parts[1])), ("unknown global in strict mode: " .. tostring(parts[1])), symbol)
- if (allowed_globals and not local_3f) then
- utils.root.scope.refedglobals[parts[1]] = true
+ assert_compile(not scope.macros[parts[1]], "tried to reference a macro without calling it", symbol)
+ assert_compile((not scope.specials[parts[1]] or ("require" == parts[1])), "tried to reference a special form without calling it", symbol)
+ assert_compile((not _3freference_3f or local_3f or ("_ENV" == parts[1]) or global_allowed_3f(parts[1])), ("unknown identifier: " .. tostring(parts[1])), symbol)
+ if (allowed_globals and not local_3f and scope.parent) then
+ scope.parent.refedglobals[parts[1]] = true
+ else
end
return utils.expr(combine_parts(parts, scope), etype)
end
- local function emit(chunk, out, ast)
+ local function emit(chunk, out, _3fast)
if (type(out) == "table") then
return table.insert(chunk, out)
else
- return table.insert(chunk, {ast = ast, leaf = out})
+ return table.insert(chunk, {ast = _3fast, leaf = out})
end
end
local function peephole(chunk)
if chunk.leaf then
return chunk
- elseif ((#chunk >= 3) and (chunk[(#chunk - 2)].leaf == "do") and not chunk[(#chunk - 1)].leaf and (chunk[#chunk].leaf == "end")) then
+ elseif ((3 <= #chunk) and (chunk[(#chunk - 2)].leaf == "do") and not chunk[(#chunk - 1)].leaf and (chunk[#chunk].leaf == "end")) then
local kid = peephole(chunk[(#chunk - 1)])
local new_chunk = {ast = chunk.ast}
for i = 1, (#chunk - 3) do
@@ 2400,10 2590,6 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
return utils.map(chunk, peephole)
end
end
- local function ast_source(ast)
- local m = getmetatable(ast)
- return ((m and m.line and m) or (("table" == type(ast)) and ast) or {})
- end
local function flatten_chunk_correlated(main_chunk, options)
local function flatten(chunk, out, last_line, file)
local last_line0 = last_line
@@ 2411,12 2597,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
out[last_line0] = ((out[last_line0] or "") .. " " .. chunk.leaf)
else
for _, subchunk in ipairs(chunk) do
- if (subchunk.leaf or (#subchunk > 0)) then
- local source = ast_source(subchunk.ast)
+ if (subchunk.leaf or (0 < #subchunk)) then
+ local source = utils["ast-source"](subchunk.ast)
if (file == source.filename) then
last_line0 = math.max(last_line0, (source.line or 0))
+ else
end
last_line0 = flatten(subchunk, out, last_line0, file)
+ else
end
end
end
@@ 2427,48 2615,50 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
for i = 1, last do
if (out[i] == nil) then
out[i] = ""
+ else
end
end
return table.concat(out, "\n")
end
- local function flatten_chunk(sm, chunk, tab, depth)
+ local function flatten_chunk(file_sourcemap, chunk, tab, depth)
if chunk.leaf then
- local code = chunk.leaf
- local info = chunk.ast
- if sm then
- table.insert(sm, {(info and info.filename), (info and info.line)})
- end
- return code
+ local _let_303_ = utils["ast-source"](chunk.ast)
+ local filename = _let_303_["filename"]
+ local line = _let_303_["line"]
+ table.insert(file_sourcemap, {filename, line})
+ return chunk.leaf
else
- local tab0 = nil
+ local tab0
do
- local _0_0 = tab
- if (_0_0 == true) then
+ local _304_ = tab
+ if (_304_ == true) then
tab0 = " "
- elseif (_0_0 == false) then
+ elseif (_304_ == false) then
tab0 = ""
- elseif (_0_0 == tab) then
+ elseif (_304_ == tab) then
tab0 = tab
- elseif (_0_0 == nil) then
+ elseif (_304_ == nil) then
tab0 = ""
else
- tab0 = nil
+ tab0 = nil
end
end
local function parter(c)
- if (c.leaf or (#c > 0)) then
- local sub = flatten_chunk(sm, c, tab0, (depth + 1))
- if (depth > 0) then
+ if (c.leaf or (0 < #c)) then
+ local sub = flatten_chunk(file_sourcemap, c, tab0, (depth + 1))
+ if (0 < depth) then
return (tab0 .. sub:gsub("\n", ("\n" .. tab0)))
else
return sub
end
+ else
+ return nil
end
end
return table.concat(utils.map(chunk, parter), "\n")
end
end
- local fennel_sourcemap = {}
+ local sourcemap = {}
local function make_short_src(source)
local source0 = source:gsub("\n", " ")
if (#source0 <= 49) then
@@ 2482,36 2672,37 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
if options.correlate then
return flatten_chunk_correlated(chunk0, options), {}
else
- local sm = {}
- local ret = flatten_chunk(sm, chunk0, options.indent, 0)
- if sm then
- sm.short_src = (options.filename or make_short_src((options.source or ret)))
- if options.filename then
- sm.key = ("@" .. options.filename)
- else
- sm.key = ret
- end
- fennel_sourcemap[sm.key] = sm
+ local file_sourcemap = {}
+ local src = flatten_chunk(file_sourcemap, chunk0, options.indent, 0)
+ file_sourcemap.short_src = (options.filename or make_short_src((options.source or src)))
+ if options.filename then
+ file_sourcemap.key = ("@" .. options.filename)
+ else
+ file_sourcemap.key = src
end
- return ret, sm
+ sourcemap[file_sourcemap.key] = file_sourcemap
+ return src, file_sourcemap
end
end
local function make_metadata()
- local function _0_(self, tgt, key)
+ local function _312_(self, tgt, key)
if self[tgt] then
return self[tgt][key]
+ else
+ return nil
end
end
- local function _1_(self, tgt, key, value)
+ local function _314_(self, tgt, key, value)
self[tgt] = (self[tgt] or {})
- self[tgt][key] = value
+ do end (self[tgt])[key] = value
return tgt
end
- local function _2_(self, tgt, ...)
+ local function _315_(self, tgt, ...)
local kv_len = select("#", ...)
local kvs = {...}
if ((kv_len % 2) ~= 0) then
error("metadata:setall() expected even number of k/v pairs")
+ else
end
self[tgt] = (self[tgt] or {})
for i = 1, kv_len, 2 do
@@ 2519,10 2710,10 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
end
return tgt
end
- return setmetatable({}, {__index = {get = _0_, set = _1_, setall = _2_}, __mode = "k"})
+ return setmetatable({}, {__index = {get = _312_, set = _314_, setall = _315_}, __mode = "k"})
end
local function exprs1(exprs)
- return table.concat(utils.map(exprs, 1), ", ")
+ return table.concat(utils.map(exprs, tostring), ", ")
end
local function keep_side_effects(exprs, chunk, start, ast)
local start0 = (start or 1)
@@ 2532,13 2723,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
emit(chunk, string.format("do local _ = %s end", tostring(se)), ast)
elseif (se.type == "statement") then
local code = tostring(se)
- local disambiguated = nil
+ local disambiguated
if (code:byte() == 40) then
disambiguated = ("do end " .. code)
else
disambiguated = code
end
emit(chunk, disambiguated, ast)
+ else
end
end
return nil
@@ 2548,7 2740,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
local n = opts.nval
local len = #exprs
if (n ~= len) then
- if (len > n) then
+ if (n < len) then
keep_side_effects(exprs, parent, (n + 1), ast)
for i = (n + 1), len do
exprs[i] = nil
@@ 2558,88 2750,160 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
exprs[i] = utils.expr("nil", "literal")
end
end
+ else
end
+ else
end
if opts.tail then
emit(parent, string.format("return %s", exprs1(exprs)), ast)
+ else
end
if opts.target then
local result = exprs1(exprs)
- local function _2_()
+ local function _323_()
if (result == "") then
return "nil"
else
return result
end
end
- emit(parent, string.format("%s = %s", opts.target, _2_()), ast)
+ emit(parent, string.format("%s = %s", opts.target, _323_()), ast)
+ else
end
if (opts.tail or opts.target) then
return {returned = true}
else
- local _3_0 = exprs
- _3_0["returned"] = true
- return _3_0
+ local _325_ = exprs
+ _325_["returned"] = true
+ return _325_
end
end
- local function find_macro(ast, scope, multi_sym_parts)
- local function find_in_table(t, i)
- if (i <= #multi_sym_parts) then
- return find_in_table((utils["table?"](t) and t[multi_sym_parts[i]]), (i + 1))
+ local function find_macro(ast, scope)
+ local macro_2a
+ do
+ local _327_ = utils["sym?"](ast[1])
+ if (_327_ ~= nil) then
+ local _328_ = tostring(_327_)
+ if (_328_ ~= nil) then
+ macro_2a = scope.macros[_328_]
+ else
+ macro_2a = _328_
+ end
else
- return t
+ macro_2a = _327_
end
end
- local macro_2a = (utils["sym?"](ast[1]) and scope.macros[utils.deref(ast[1])])
+ local multi_sym_parts = utils["multi-sym?"](ast[1])
if (not macro_2a and multi_sym_parts) then
- local nested_macro = find_in_table(scope.macros, 1)
+ local nested_macro = utils["get-in"](scope.macros, multi_sym_parts)
assert_compile((not scope.macros[multi_sym_parts[1]] or (type(nested_macro) == "function")), "macro not found in imported macro module", ast)
return nested_macro
else
return macro_2a
end
end
- local function macroexpand_2a(ast, scope, once)
- local _0_0 = nil
+ local function propagate_trace_info(_332_, _index, node)
+ local _arg_333_ = _332_
+ local filename = _arg_333_["filename"]
+ local line = _arg_333_["line"]
+ local bytestart = _arg_333_["bytestart"]
+ local byteend = _arg_333_["byteend"]
+ do
+ local src = utils["ast-source"](node)
+ if (("table" == type(node)) and (filename ~= src.filename)) then
+ src.filename, src.line, src["from-macro?"] = filename, line, true
+ src.bytestart, src.byteend = bytestart, byteend
+ else
+ end
+ end
+ return ("table" == type(node))
+ end
+ local function quote_literal_nils(index, node, parent)
+ if (parent and utils["list?"](parent)) then
+ for i = 1, utils.maxn(parent) do
+ local _335_ = parent[i]
+ if (_335_ == nil) then
+ parent[i] = utils.sym("nil")
+ else
+ end
+ end
+ else
+ end
+ return index, node, parent
+ end
+ local function comp(f, g)
+ local function _338_(...)
+ return f(g(...))
+ end
+ return _338_
+ end
+ local function built_in_3f(m)
+ local found_3f = false
+ for _, f in pairs(scopes.global.macros) do
+ if found_3f then break end
+ found_3f = (f == m)
+ end
+ return found_3f
+ end
+ local function macroexpand_2a(ast, scope, _3fonce)
+ local _339_
if utils["list?"](ast) then
- _0_0 = find_macro(ast, scope, utils["multi-sym?"](ast[1]))
+ _339_ = find_macro(ast, scope)
else
- _0_0 = nil
+ _339_ = nil
end
- if (_0_0 == false) then
+ if (_339_ == false) then
return ast
- elseif (nil ~= _0_0) then
- local macro_2a = _0_0
+ elseif (nil ~= _339_) then
+ local macro_2a = _339_
local old_scope = scopes.macro
- local _ = nil
+ local _
scopes.macro = scope
_ = nil
local ok, transformed = nil, nil
- local function _2_()
+ local function _341_()
return macro_2a(unpack(ast, 2))
end
- ok, transformed = xpcall(_2_, debug.traceback)
+ local function _342_()
+ if built_in_3f(macro_2a) then
+ return tostring
+ else
+ return debug.traceback
+ end
+ end
+ ok, transformed = xpcall(_341_, _342_())
+ local _344_
+ do
+ local _343_ = ast
+ local function _345_(...)
+ return propagate_trace_info(_343_, ...)
+ end
+ _344_ = _345_
+ end
+ utils["walk-tree"](transformed, comp(_344_, quote_literal_nils))
scopes.macro = old_scope
assert_compile(ok, transformed, ast)
- if (once or not transformed) then
+ if (_3fonce or not transformed) then
return transformed
else
return macroexpand_2a(transformed, scope)
end
- else
- local _ = _0_0
+ elseif true then
+ local _ = _339_
return ast
+ else
+ return nil
end
end
local function compile_special(ast, scope, parent, opts, special)
local exprs = (special(ast, scope, parent, opts) or utils.expr("nil", "literal"))
- local exprs0 = nil
- if (type(exprs) == "string") then
+ local exprs0
+ if ("table" ~= type(exprs)) then
exprs0 = utils.expr(exprs, "expression")
else
exprs0 = exprs
end
- local exprs2 = nil
+ local exprs2
if utils["expr?"](exprs0) then
exprs2 = {exprs0}
else
@@ 2655,18 2919,18 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
end
local function compile_function_call(ast, scope, parent, opts, compile1, len)
local fargs = {}
- local fcallee = compile1(ast[1], scope, parent, {nval = 1})[1]
- assert_compile((("string" == type(ast[1])) or (fcallee.type ~= "literal")), ("cannot call literal value " .. tostring(ast[1])), ast)
+ local fcallee = (compile1(ast[1], scope, parent, {nval = 1}))[1]
+ assert_compile((utils["sym?"](ast[1]) or utils["list?"](ast[1]) or ("string" == type(ast[1]))), ("cannot call literal value " .. tostring(ast[1])), ast)
for i = 2, len do
- local subexprs = nil
- local _0_
+ local subexprs
+ local _351_
if (i ~= len) then
- _0_ = 1
+ _351_ = 1
else
- _0_ = nil
+ _351_ = nil
end
- subexprs = compile1(ast[i], scope, parent, {nval = _0_})
- table.insert(fargs, (subexprs[1] or utils.expr("nil", "literal")))
+ subexprs = compile1(ast[i], scope, parent, {nval = _351_})
+ table.insert(fargs, subexprs[1])
if (i == len) then
for j = 2, #subexprs do
table.insert(fargs, subexprs[j])
@@ 2675,7 2939,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
keep_side_effects(subexprs, parent, 2, ast[i])
end
end
- local pat = nil
+ local pat
if ("string" == type(ast[1])) then
pat = "(%s)(%s)"
else
@@ 2689,27 2953,33 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
local len = #ast
local first = ast[1]
local multi_sym_parts = utils["multi-sym?"](first)
- local special = (utils["sym?"](first) and scope.specials[utils.deref(first)])
- assert_compile((len > 0), "expected a function, macro, or special to call", ast)
+ local special = (utils["sym?"](first) and scope.specials[tostring(first)])
+ assert_compile((0 < len), "expected a function, macro, or special to call", ast)
if special then
return compile_special(ast, scope, parent, opts, special)
elseif (multi_sym_parts and multi_sym_parts["multi-sym-method-call"]) then
local table_with_method = table.concat({unpack(multi_sym_parts, 1, (#multi_sym_parts - 1))}, ".")
local method_to_call = multi_sym_parts[#multi_sym_parts]
- local new_ast = utils.list(utils.sym(":", nil, scope), utils.sym(table_with_method, nil, scope), method_to_call, select(2, unpack(ast)))
+ local new_ast = utils.list(utils.sym(":", ast), utils.sym(table_with_method, ast), method_to_call, select(2, unpack(ast)))
return compile1(new_ast, scope, parent, opts)
else
return compile_function_call(ast, scope, parent, opts, compile1, len)
end
end
local function compile_varg(ast, scope, parent, opts)
- assert_compile(scope.vararg, "unexpected vararg", ast)
+ local _356_
+ if scope.hashfn then
+ _356_ = "use $... in hashfn"
+ else
+ _356_ = "unexpected vararg"
+ end
+ assert_compile(scope.vararg, _356_, ast)
return handle_compile_opts({utils.expr("...", "varg")}, parent, opts, ast)
end
local function compile_sym(ast, scope, parent, opts)
local multi_sym_parts = utils["multi-sym?"](ast)
assert_compile(not (multi_sym_parts and multi_sym_parts["multi-sym-method-call"]), "multisym method calls may only be in call position", ast)
- local e = nil
+ local e
if (ast[1] == "nil") then
e = utils.expr("nil", "literal")
else
@@ 2718,94 2988,105 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
return handle_compile_opts({e}, parent, opts, ast)
end
local function serialize_number(n)
- local _0_0 = string.gsub(tostring(n), ",", ".")
- return _0_0
+ local _359_ = string.gsub(tostring(n), ",", ".")
+ return _359_
end
local function compile_scalar(ast, _scope, parent, opts)
- local serialize = nil
+ local serialize
do
- local _0_0 = type(ast)
- if (_0_0 == "nil") then
+ local _360_ = type(ast)
+ if (_360_ == "nil") then
serialize = tostring
- elseif (_0_0 == "boolean") then
+ elseif (_360_ == "boolean") then
serialize = tostring
- elseif (_0_0 == "string") then
+ elseif (_360_ == "string") then
serialize = serialize_string
- elseif (_0_0 == "number") then
+ elseif (_360_ == "number") then
serialize = serialize_number
else
- serialize = nil
+ serialize = nil
end
end
return handle_compile_opts({utils.expr(serialize(ast), "literal")}, parent, opts)
end
local function compile_table(ast, scope, parent, opts, compile1)
- local buffer = {}
- for i = 1, #ast do
- local nval = ((i ~= #ast) and 1)
- table.insert(buffer, exprs1(compile1(ast[i], scope, parent, {nval = nval})))
- end
- local function write_other_values(k)
- if ((type(k) ~= "number") or (math.floor(k) ~= k) or (k < 1) or (k > #ast)) then
- if ((type(k) == "string") and utils["valid-lua-identifier?"](k)) then
- return {k, k}
+ local function escape_key(k)
+ if ((type(k) == "string") and utils["valid-lua-identifier?"](k)) then
+ return k
+ else
+ local _let_362_ = compile1(k, scope, parent, {nval = 1})
+ local compiled = _let_362_[1]
+ return ("[" .. tostring(compiled) .. "]")
+ end
+ end
+ local keys = {}
+ local buffer
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for i, elem in ipairs(ast) do
+ local val_18_auto
+ do
+ local nval = ((nil ~= ast[(i + 1)]) and 1)
+ do end (keys)[i] = true
+ val_18_auto = exprs1(compile1(elem, scope, parent, {nval = nval}))
+ end
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
else
- local _0_ = compile1(k, scope, parent, {nval = 1})
- local compiled = _0_[1]
- local kstr = ("[" .. tostring(compiled) .. "]")
- return {kstr, k}
end
end
+ buffer = tbl_16_auto
end
do
- local keys = nil
- do
- local _0_0 = utils.kvmap(ast, write_other_values)
- local function _1_(a, b)
- return (a[1] < b[1])
+ local tbl_16_auto = buffer
+ local i_17_auto = #tbl_16_auto
+ for k, v in utils.stablepairs(ast) do
+ local val_18_auto
+ if not keys[k] then
+ local _let_365_ = compile1(ast[k], scope, parent, {nval = 1})
+ local v0 = _let_365_[1]
+ val_18_auto = string.format("%s = %s", escape_key(k), tostring(v0))
+ else
+ val_18_auto = nil
+ end
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
end
- table.sort(_0_0, _1_)
- keys = _0_0
- end
- local function _1_(_2_0)
- local _3_ = _2_0
- local k1 = _3_[1]
- local k2 = _3_[2]
- local _4_ = compile1(ast[k2], scope, parent, {nval = 1})
- local v = _4_[1]
- return string.format("%s = %s", k1, tostring(v))
end
- utils.map(keys, _1_, buffer)
end
return handle_compile_opts({utils.expr(("{" .. table.concat(buffer, ", ") .. "}"), "expression")}, parent, opts, ast)
end
- local function compile1(ast, scope, parent, opts)
- local opts0 = (opts or {})
+ local function compile1(ast, scope, parent, _3fopts)
+ local opts = (_3fopts or {})
local ast0 = macroexpand_2a(ast, scope)
if utils["list?"](ast0) then
- return compile_call(ast0, scope, parent, opts0, compile1)
+ return compile_call(ast0, scope, parent, opts, compile1)
elseif utils["varg?"](ast0) then
- return compile_varg(ast0, scope, parent, opts0)
+ return compile_varg(ast0, scope, parent, opts)
elseif utils["sym?"](ast0) then
- return compile_sym(ast0, scope, parent, opts0)
+ return compile_sym(ast0, scope, parent, opts)
elseif (type(ast0) == "table") then
- return compile_table(ast0, scope, parent, opts0, compile1)
+ return compile_table(ast0, scope, parent, opts, compile1)
elseif ((type(ast0) == "nil") or (type(ast0) == "boolean") or (type(ast0) == "number") or (type(ast0) == "string")) then
- return compile_scalar(ast0, scope, parent, opts0)
+ return compile_scalar(ast0, scope, parent, opts)
else
return assert_compile(false, ("could not compile value of type " .. type(ast0)), ast0)
end
end
local function destructure(to, from, ast, scope, parent, opts)
local opts0 = (opts or {})
- local _0_ = opts0
- local declaration = _0_["declaration"]
- local forceglobal = _0_["forceglobal"]
- local forceset = _0_["forceset"]
- local isvar = _0_["isvar"]
- local symtype = _0_["symtype"]
+ local _let_369_ = opts0
+ local isvar = _let_369_["isvar"]
+ local declaration = _let_369_["declaration"]
+ local forceglobal = _let_369_["forceglobal"]
+ local forceset = _let_369_["forceset"]
+ local symtype = _let_369_["symtype"]
local symtype0 = ("_" .. (symtype or "dst"))
- local setter = nil
+ local setter
if declaration then
setter = "local %s = %s"
else
@@ 2820,40 3101,46 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
else
local parts = (utils["multi-sym?"](raw) or {raw})
local meta = scope.symmeta[parts[1]]
+ assert_compile(not raw:find(":"), "cannot set method sym", symbol)
if ((#parts == 1) and not forceset) then
assert_compile(not (forceglobal and meta), string.format("global %s conflicts with local", tostring(symbol)), symbol)
assert_compile(not (meta and not meta.var), ("expected var " .. raw), symbol)
- assert_compile((meta or not opts0.noundef), ("expected local " .. parts[1]), symbol)
+ else
end
+ assert_compile((meta or not opts0.noundef or global_allowed_3f(parts[1])), ("expected local " .. parts[1]), symbol)
if forceglobal then
assert_compile(not scope.symmeta[scope.unmanglings[raw]], ("global " .. raw .. " conflicts with local"), symbol)
- scope.manglings[raw] = global_mangling(raw)
- scope.unmanglings[global_mangling(raw)] = raw
+ do end (scope.manglings)[raw] = global_mangling(raw)
+ do end (scope.unmanglings)[global_mangling(raw)] = raw
if allowed_globals then
table.insert(allowed_globals, raw)
+ else
end
+ else
end
return symbol_to_expression(symbol, scope)[1]
end
end
local function compile_top_target(lvalues)
- local inits = nil
- local function _2_(_241)
+ local inits
+ local function _375_(_241)
if scope.manglings[_241] then
return _241
else
return "nil"
end
end
- inits = utils.map(lvalues, _2_)
+ inits = utils.map(lvalues, _375_)
local init = table.concat(inits, ", ")
local lvalue = table.concat(lvalues, ", ")
- local plen, plast = #parent, parent[#parent]
+ local plast = parent[#parent]
+ local plen = #parent
local ret = compile1(from, scope, parent, {target = lvalue})
if declaration then
for pi = plen, #parent do
if (parent[pi] == plast) then
plen = pi
+ else
end
end
if ((#parent == (plen + 1)) and parent[#parent].leaf) then
@@ 2863,6 3150,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
else
table.insert(parent, (plen + 1), {ast = ast, leaf = ("local " .. lvalue .. " = " .. init)})
end
+ else
end
return ret
end
@@ 2875,54 3163,88 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
emit(parent, setter:format(lname, exprs1(rightexprs)), left)
end
if declaration then
- scope.symmeta[utils.deref(left)] = {var = isvar}
+ scope.symmeta[tostring(left)] = {var = isvar}
+ return nil
+ else
return nil
end
end
+ local unpack_fn = "function (t, k, e)\n local mt = getmetatable(t)\n if 'table' == type(mt) and mt.__fennelrest then\n return mt.__fennelrest(t, k)\n elseif e then\n local rest = {}\n for k, v in pairs(t) do\n if not e[k] then rest[k] = v end\n end\n return rest\n else\n return {(table.unpack or unpack)(t, k)}\n end\n end"
+ local function destructure_kv_rest(s, v, left, excluded_keys, destructure1)
+ local exclude_str
+ local _382_
+ do
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for _, k in ipairs(excluded_keys) do
+ local val_18_auto = string.format("[%s] = true", serialize_string(k))
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
+ end
+ end
+ _382_ = tbl_16_auto
+ end
+ exclude_str = table.concat(_382_, ", ")
+ local subexpr = utils.expr(string.format(string.gsub(("(" .. unpack_fn .. ")(%s, %s, {%s})"), "\n%s*", " "), s, tostring(v), exclude_str), "expression")
+ return destructure1(v, {subexpr}, left)
+ end
+ local function destructure_rest(s, k, left, destructure1)
+ local unpack_str = ("(" .. unpack_fn .. ")(%s, %s)")
+ local formatted = string.format(string.gsub(unpack_str, "\n%s*", " "), s, k)
+ local subexpr = utils.expr(formatted, "expression")
+ assert_compile((utils["sequence?"](left) and (nil == left[(k + 2)])), "expected rest argument before last parameter", left)
+ return destructure1(left[(k + 1)], {subexpr}, left)
+ end
local function destructure_table(left, rightexprs, top_3f, destructure1)
local s = gensym(scope, symtype0)
- local right = nil
+ local right
do
- local _2_0 = nil
+ local _384_
if top_3f then
- _2_0 = exprs1(compile1(from, scope, parent))
+ _384_ = exprs1(compile1(from, scope, parent))
else
- _2_0 = exprs1(rightexprs)
+ _384_ = exprs1(rightexprs)
end
- if (_2_0 == "") then
+ if (_384_ == "") then
right = "nil"
- elseif (nil ~= _2_0) then
- local right0 = _2_0
+ elseif (nil ~= _384_) then
+ local right0 = _384_
right = right0
else
- right = nil
+ right = nil
end
end
+ local excluded_keys = {}
emit(parent, string.format("local %s = %s", s, right), left)
for k, v in utils.stablepairs(left) do
if not (("number" == type(k)) and tostring(left[(k - 1)]):find("^&")) then
- if (utils["sym?"](v) and (utils.deref(v) == "&")) then
- local unpack_str = "{(table.unpack or unpack)(%s, %s)}"
- local formatted = string.format(unpack_str, s, k)
- local subexpr = utils.expr(formatted, "expression")
- assert_compile((utils["sequence?"](left) and (nil == left[(k + 2)])), "expected rest argument before last parameter", left)
- destructure1(left[(k + 1)], {subexpr}, left)
- elseif (utils["sym?"](k) and (utils.deref(k) == "&as")) then
+ if (utils["sym?"](k) and (tostring(k) == "&")) then
+ destructure_kv_rest(s, v, left, excluded_keys, destructure1)
+ elseif (utils["sym?"](v) and (tostring(v) == "&")) then
+ destructure_rest(s, k, left, destructure1)
+ elseif (utils["sym?"](k) and (tostring(k) == "&as")) then
destructure_sym(v, {utils.expr(tostring(s))}, left)
- elseif (utils["sequence?"](left) and (utils.deref(v) == "&as")) then
+ elseif (utils["sequence?"](left) and (tostring(v) == "&as")) then
local _, next_sym, trailing = select(k, unpack(left))
assert_compile((nil == trailing), "expected &as argument before last parameter", left)
destructure_sym(next_sym, {utils.expr(tostring(s))}, left)
else
- local key = nil
+ local key
if (type(k) == "string") then
key = serialize_string(k)
else
key = k
end
local subexpr = utils.expr(string.format("%s[%s]", s, key), "expression")
+ if (type(k) == "string") then
+ table.insert(excluded_keys, k)
+ else
+ end
destructure1(v, {subexpr}, left)
end
+ else
end
end
return nil
@@ 2935,17 3257,20 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
else
local symname = gensym(scope, symtype0)
table.insert(left_names, symname)
- tables[i] = {name, utils.expr(symname, "sym")}
+ do end (tables)[i] = {name, utils.expr(symname, "sym")}
end
end
+ assert_compile(left[1], "must provide at least one value", left)
assert_compile(top_3f, "can't nest multi-value destructuring", left)
compile_top_target(left_names)
if declaration then
for _, sym in ipairs(left) do
if utils["sym?"](sym) then
- scope.symmeta[utils.deref(sym)] = {var = isvar}
+ scope.symmeta[tostring(sym)] = {var = isvar}
+ else
end
end
+ else
end
for _, pair in utils.stablepairs(tables) do
destructure1(pair[1], {pair[2]}, left)
@@ 2960,19 3285,25 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
elseif utils["list?"](left) then
destructure_values(left, up1, top_3f, destructure1)
else
- assert_compile(false, string.format("unable to bind %s %s", type(left), tostring(left)), (((type(up1[2]) == "table") and up1[2]) or up1))
+ assert_compile(false, string.format("unable to bind %s %s", type(left), tostring(left)), (((type((up1)[2]) == "table") and (up1)[2]) or up1))
end
if top_3f then
return {returned = true}
+ else
+ return nil
end
end
local ret = destructure1(to, nil, ast, true)
- utils.hook("destructure", from, to, scope)
+ utils.hook("destructure", from, to, scope, opts0)
apply_manglings(scope, new_manglings, ast)
return ret
end
local function require_include(ast, scope, parent, opts)
- opts.fallback = function(e)
+ opts.fallback = function(e, no_warn)
+ if (not no_warn and ("literal" == e.type)) then
+ utils.warn(("include module not found, falling back to require: %s"):format(tostring(e)))
+ else
+ end
return utils.expr(string.format("require(%s)", tostring(e)), "statement")
end
return scopes.global.specials.include(ast, scope, parent, opts)
@@ 2983,14 3314,15 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
local scope = (opts.scope or make_scope(scopes.global))
local vals = {}
local chunk = {}
- local _0_ = utils.root
- _0_["set-reset"](_0_)
+ do end (function(tgt, m, ...) return tgt[m](tgt, ...) end)(utils.root, "set-reset")
allowed_globals = opts.allowedGlobals
if (opts.indent == nil) then
opts.indent = " "
+ else
end
if opts.requireAsInclude then
scope.specials.require = require_include
+ else
end
utils.root.chunk, utils.root.scope, utils.root.options = chunk, scope, opts
for _, val in parser.parser(strm, opts.filename, opts) do
@@ 2999,31 3331,38 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
for i = 1, #vals do
local exprs = compile1(vals[i], scope, chunk, {nval = (((i < #vals) and 0) or nil), tail = (i == #vals)})
keep_side_effects(exprs, chunk, nil, vals[i])
+ if (i == #vals) then
+ utils.hook("chunk", vals[i], scope)
+ else
+ end
end
allowed_globals = old_globals
utils.root.reset()
return flatten(chunk, opts)
end
- local function compile_string(str, opts)
- return compile_stream(parser["string-stream"](str), (opts or {}))
+ local function compile_string(str, _3fopts)
+ local opts = (_3fopts or {})
+ return compile_stream(parser["string-stream"](str, opts), opts)
end
local function compile(ast, opts)
local opts0 = utils.copy(opts)
local old_globals = allowed_globals
local chunk = {}
local scope = (opts0.scope or make_scope(scopes.global))
- local _0_ = utils.root
- _0_["set-reset"](_0_)
+ do end (function(tgt, m, ...) return tgt[m](tgt, ...) end)(utils.root, "set-reset")
allowed_globals = opts0.allowedGlobals
if (opts0.indent == nil) then
opts0.indent = " "
+ else
end
if opts0.requireAsInclude then
scope.specials.require = require_include
+ else
end
utils.root.chunk, utils.root.scope, utils.root.options = chunk, scope, opts0
local exprs = compile1(ast, scope, chunk, {tail = true})
keep_side_effects(exprs, chunk, nil, ast)
+ utils.hook("chunk", ast, scope)
allowed_globals = old_globals
utils.root.reset()
return flatten(chunk, opts0)
@@ 3034,24 3373,25 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
elseif (info.what == "C") then
return " [C]: in ?"
else
- local remap = fennel_sourcemap[info.source]
+ local remap = sourcemap[info.source]
if (remap and remap[info.currentline]) then
- if remap[info.currentline][1] then
- info.short_src = fennel_sourcemap[("@" .. remap[info.currentline][1])].short_src
+ if ((remap[info.currentline][1] or "unknown") ~= "unknown") then
+ info.short_src = sourcemap[("@" .. remap[info.currentline][1])].short_src
else
info.short_src = remap.short_src
end
info.currentline = (remap[info.currentline][2] or -1)
+ else
end
if (info.what == "Lua") then
- local function _1_()
+ local function _404_()
if info.name then
return ("'" .. info.name .. "'")
else
return "?"
end
end
- return string.format(" %s:%d: in function %s", info.short_src, info.currentline, _1_())
+ return string.format(" %s:%d: in function %s", info.short_src, info.currentline, _404_())
elseif (info.short_src == "(tail call)") then
return " (tail call)"
else
@@ 3059,28 3399,29 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
end
end
end
- local function traceback(msg, start)
- local msg0 = tostring((msg or ""))
- if ((msg0:find("^Compile error") or msg0:find("^Parse error")) and not utils["debug-on?"]("trace")) then
- return msg0
+ local function traceback(_3fmsg, _3fstart)
+ local msg = tostring((_3fmsg or ""))
+ if ((msg:find("^%g+:%d+:%d+ Compile error:.*") or msg:find("^%g+:%d+:%d+ Parse error:.*")) and not utils["debug-on?"]("trace")) then
+ return msg
else
local lines = {}
- if (msg0:find("^Compile error") or msg0:find("^Parse error")) then
- table.insert(lines, msg0)
+ if (msg:find("^%g+:%d+:%d+ Compile error:") or msg:find("^%g+:%d+:%d+ Parse error:")) then
+ table.insert(lines, msg)
else
- local newmsg = msg0:gsub("^[^:]*:%d+:%s+", "runtime error: ")
+ local newmsg = msg:gsub("^[^:]*:%d+:%s+", "runtime error: ")
table.insert(lines, newmsg)
end
table.insert(lines, "stack traceback:")
- local done_3f, level = false, (start or 2)
+ local done_3f, level = false, (_3fstart or 2)
while not done_3f do
do
- local _1_0 = debug.getinfo(level, "Sln")
- if (_1_0 == nil) then
+ local _408_ = debug.getinfo(level, "Sln")
+ if (_408_ == nil) then
done_3f = true
- elseif (nil ~= _1_0) then
- local info = _1_0
+ elseif (nil ~= _408_) then
+ local info = _408_
table.insert(lines, traceback_frame(info))
+ else
end
end
level = (level + 1)
@@ 3089,14 3430,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
end
end
local function entry_transform(fk, fv)
- local function _0_(k, v)
+ local function _411_(k, v)
if (type(k) == "number") then
return k, fv(v)
else
return fk(k), fv(v)
end
end
- return _0_
+ return _411_
end
local function mixed_concat(t, joiner)
local seen = {}
@@ 3110,6 3451,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
if not seen[k] then
ret = (ret .. s .. "[" .. k .. "]" .. "=" .. v)
s = joiner
+ else
end
end
return ret
@@ 3122,30 3464,30 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
assert_compile(not runtime_3f, "quoted ... may only be used at compile time", form)
return "_VARARG"
elseif utils["sym?"](form) then
- local filename = nil
+ local filename
if form.filename then
filename = string.format("%q", form.filename)
else
filename = "nil"
end
- local symstr = utils.deref(form)
+ local symstr = tostring(form)
assert_compile(not runtime_3f, "symbols may only be used at compile time", form)
if (symstr:find("#$") or symstr:find("#[:.]")) then
return string.format("sym('%s', {filename=%s, line=%s})", autogensym(symstr, scope), filename, (form.line or "nil"))
else
return string.format("sym('%s', {quoted=true, filename=%s, line=%s})", symstr, filename, (form.line or "nil"))
end
- elseif (utils["list?"](form) and utils["sym?"](form[1]) and (utils.deref(form[1]) == "unquote")) then
+ elseif (utils["list?"](form) and utils["sym?"](form[1]) and (tostring(form[1]) == "unquote")) then
local payload = form[2]
local res = unpack(compile1(payload, scope, parent))
return res[1]
elseif utils["list?"](form) then
- local mapped = nil
- local function _0_()
+ local mapped
+ local function _416_()
return nil
end
- mapped = utils.kvmap(form, entry_transform(_0_, q))
- local filename = nil
+ mapped = utils.kvmap(form, entry_transform(_416_, q))
+ local filename
if form.filename then
filename = string.format("%q", form.filename)
else
@@ 3156,135 3498,160 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
elseif utils["sequence?"](form) then
local mapped = utils.kvmap(form, entry_transform(q, q))
local source = getmetatable(form)
- local filename = nil
+ local filename
if source.filename then
filename = string.format("%q", source.filename)
else
filename = "nil"
end
- local _1_
+ local _419_
if source then
- _1_ = source.line
+ _419_ = source.line
else
- _1_ = "nil"
+ _419_ = "nil"
end
- return string.format("setmetatable({%s}, {filename=%s, line=%s, sequence=%s})", mixed_concat(mapped, ", "), filename, _1_, "(getmetatable(sequence()))['sequence']")
+ return string.format("setmetatable({%s}, {filename=%s, line=%s, sequence=%s})", mixed_concat(mapped, ", "), filename, _419_, "(getmetatable(sequence()))['sequence']")
elseif (type(form) == "table") then
local mapped = utils.kvmap(form, entry_transform(q, q))
local source = getmetatable(form)
- local filename = nil
+ local filename
if source.filename then
filename = string.format("%q", source.filename)
else
filename = "nil"
end
- local function _1_()
+ local function _422_()
if source then
return source.line
else
return "nil"
end
end
- return string.format("setmetatable({%s}, {filename=%s, line=%s})", mixed_concat(mapped, ", "), filename, _1_())
+ return string.format("setmetatable({%s}, {filename=%s, line=%s})", mixed_concat(mapped, ", "), filename, _422_())
elseif (type(form) == "string") then
return serialize_string(form)
else
return tostring(form)
end
end
- return {["apply-manglings"] = apply_manglings, ["compile-stream"] = compile_stream, ["compile-string"] = compile_string, ["declare-local"] = declare_local, ["do-quote"] = do_quote, ["global-mangling"] = global_mangling, ["global-unmangling"] = global_unmangling, ["keep-side-effects"] = keep_side_effects, ["make-scope"] = make_scope, ["require-include"] = require_include, ["symbol-to-expression"] = symbol_to_expression, assert = assert_compile, autogensym = autogensym, compile = compile, compile1 = compile1, destructure = destructure, emit = emit, gensym = gensym, macroexpand = macroexpand_2a, metadata = make_metadata(), scopes = scopes, traceback = traceback}
+ return {compile = compile, compile1 = compile1, ["compile-stream"] = compile_stream, ["compile-string"] = compile_string, ["check-binding-valid"] = check_binding_valid, emit = emit, destructure = destructure, ["require-include"] = require_include, autogensym = autogensym, gensym = gensym, ["do-quote"] = do_quote, ["global-mangling"] = global_mangling, ["global-unmangling"] = global_unmangling, ["apply-manglings"] = apply_manglings, macroexpand = macroexpand_2a, ["declare-local"] = declare_local, ["make-scope"] = make_scope, ["keep-side-effects"] = keep_side_effects, ["symbol-to-expression"] = symbol_to_expression, assert = assert_compile, scopes = scopes, traceback = traceback, metadata = make_metadata(), sourcemap = sourcemap}
end
package.preload["fennel.friend"] = package.preload["fennel.friend"] or function(...)
- local function ast_source(ast)
- local m = getmetatable(ast)
- return ((m and m.line and m) or (("table" == type(ast)) and ast) or {})
- end
- local suggestions = {["$ and $... in hashfn are mutually exclusive"] = {"modifying the hashfn so it only contains $... or $, $1, $2, $3, etc"}, ["can't start multisym segment with a digit"] = {"removing the digit", "adding a non-digit before the digit"}, ["cannot call literal value"] = {"checking for typos", "checking for a missing function name"}, ["could not compile value of type "] = {"debugging the macro you're calling to return a list or table"}, ["could not read number (.*)"] = {"removing the non-digit character", "beginning the identifier with a non-digit if it is not meant to be a number"}, ["expected a function.* to call"] = {"removing the empty parentheses", "using square brackets if you want an empty table"}, ["expected binding and iterator"] = {"making sure you haven't omitted a local name or iterator"}, ["expected binding table"] = {"placing a table here in square brackets containing identifiers to bind"}, ["expected body expression"] = {"putting some code in the body of this form after the bindings"}, ["expected each macro to be function"] = {"ensuring that the value for each key in your macros table contains a function", "avoid defining nested macro tables"}, ["expected even number of name/value bindings"] = {"finding where the identifier or value is missing"}, ["expected even number of pattern/body pairs"] = {"checking that every pattern has a body to go with it", "adding _ before the final body"}, ["expected even number of values in table literal"] = {"removing a key", "adding a value"}, ["expected local"] = {"looking for a typo", "looking for a local which is used out of its scope"}, ["expected macros to be table"] = {"ensuring your macro definitions return a table"}, ["expected parameters"] = {"adding function parameters as a list of identifiers in brackets"}, ["expected rest argument before last parameter"] = {"moving & to right before the final identifier when destructuring"}, ["expected symbol for function parameter: (.*)"] = {"changing %s to an identifier instead of a literal value"}, ["expected var (.*)"] = {"declaring %s using var instead of let/local", "introducing a new local instead of changing the value of %s"}, ["expected vararg as last parameter"] = {"moving the \"...\" to the end of the parameter list"}, ["expected whitespace before opening delimiter"] = {"adding whitespace"}, ["global (.*) conflicts with local"] = {"renaming local %s"}, ["illegal character: (.)"] = {"deleting or replacing %s", "avoiding reserved characters like \", \\, ', ~, ;, @, `, and comma"}, ["local (.*) was overshadowed by a special form or macro"] = {"renaming local %s"}, ["macro not found in macro module"] = {"checking the keys of the imported macro module's returned table"}, ["macro tried to bind (.*) without gensym"] = {"changing to %s# when introducing identifiers inside macros"}, ["malformed multisym"] = {"ensuring each period or colon is not followed by another period or colon"}, ["may only be used at compile time"] = {"moving this to inside a macro if you need to manipulate symbols/lists", "using square brackets instead of parens to construct a table"}, ["method must be last component"] = {"using a period instead of a colon for field access", "removing segments after the colon", "making the method call, then looking up the field on the result"}, ["mismatched closing delimiter (.), expected (.)"] = {"replacing %s with %s", "deleting %s", "adding matching opening delimiter earlier"}, ["multisym method calls may only be in call position"] = {"using a period instead of a colon to reference a table's fields", "putting parens around this"}, ["tried to reference a macro at runtime"] = {"renaming the macro so as not to conflict with locals"}, ["unable to bind (.*)"] = {"replacing the %s with an identifier"}, ["unexpected arguments"] = {"removing an argument", "checking for typos"}, ["unexpected closing delimiter (.)"] = {"deleting %s", "adding matching opening delimiter earlier"}, ["unexpected iterator clause"] = {"removing an argument", "checking for typos"}, ["unexpected multi symbol (.*)"] = {"removing periods or colons from %s"}, ["unexpected vararg"] = {"putting \"...\" at the end of the fn parameters if the vararg was intended"}, ["unknown global in strict mode: (.*)"] = {"looking to see if there's a typo", "using the _G table instead, eg. _G.%s if you really want a global", "moving this code to somewhere that %s is in scope", "binding %s as a local in the scope of this code"}, ["unused local (.*)"] = {"fixing a typo so %s is used", "renaming the local to _%s"}, ["use of global (.*) is aliased by a local"] = {"renaming local %s", "refer to the global using _G.%s instead of directly"}}
+ local utils = require("fennel.utils")
+ local utf8_ok_3f, utf8 = pcall(require, "utf8")
+ local suggestions = {["unexpected multi symbol (.*)"] = {"removing periods or colons from %s"}, ["use of global (.*) is aliased by a local"] = {"renaming local %s", "refer to the global using _G.%s instead of directly"}, ["local (.*) was overshadowed by a special form or macro"] = {"renaming local %s"}, ["global (.*) conflicts with local"] = {"renaming local %s"}, ["expected var (.*)"] = {"declaring %s using var instead of let/local", "introducing a new local instead of changing the value of %s"}, ["expected macros to be table"] = {"ensuring your macro definitions return a table"}, ["expected each macro to be function"] = {"ensuring that the value for each key in your macros table contains a function", "avoid defining nested macro tables"}, ["macro not found in macro module"] = {"checking the keys of the imported macro module's returned table"}, ["macro tried to bind (.*) without gensym"] = {"changing to %s# when introducing identifiers inside macros"}, ["unknown identifier: (.*)"] = {"looking to see if there's a typo", "using the _G table instead, eg. _G.%s if you really want a global", "moving this code to somewhere that %s is in scope", "binding %s as a local in the scope of this code"}, ["expected a function.* to call"] = {"removing the empty parentheses", "using square brackets if you want an empty table"}, ["cannot call literal value"] = {"checking for typos", "checking for a missing function name", "making sure to use prefix operators, not infix"}, ["unexpected vararg"] = {"putting \"...\" at the end of the fn parameters if the vararg was intended"}, ["multisym method calls may only be in call position"] = {"using a period instead of a colon to reference a table's fields", "putting parens around this"}, ["unused local (.*)"] = {"renaming the local to _%s if it is meant to be unused", "fixing a typo so %s is used", "disabling the linter which checks for unused locals"}, ["expected parameters"] = {"adding function parameters as a list of identifiers in brackets"}, ["unable to bind (.*)"] = {"replacing the %s with an identifier"}, ["expected rest argument before last parameter"] = {"moving & to right before the final identifier when destructuring"}, ["expected vararg as last parameter"] = {"moving the \"...\" to the end of the parameter list"}, ["expected symbol for function parameter: (.*)"] = {"changing %s to an identifier instead of a literal value"}, ["could not compile value of type "] = {"debugging the macro you're calling to return a list or table"}, ["expected local"] = {"looking for a typo", "looking for a local which is used out of its scope"}, ["expected body expression"] = {"putting some code in the body of this form after the bindings"}, ["expected binding and iterator"] = {"making sure you haven't omitted a local name or iterator"}, ["expected binding sequence"] = {"placing a table here in square brackets containing identifiers to bind"}, ["expected even number of name/value bindings"] = {"finding where the identifier or value is missing"}, ["may only be used at compile time"] = {"moving this to inside a macro if you need to manipulate symbols/lists", "using square brackets instead of parens to construct a table"}, ["unexpected closing delimiter (.)"] = {"deleting %s", "adding matching opening delimiter earlier"}, ["mismatched closing delimiter (.), expected (.)"] = {"replacing %s with %s", "deleting %s", "adding matching opening delimiter earlier"}, ["expected even number of values in table literal"] = {"removing a key", "adding a value"}, ["expected whitespace before opening delimiter"] = {"adding whitespace"}, ["invalid character: (.)"] = {"deleting or replacing %s", "avoiding reserved characters like \", \\, ', ~, ;, @, `, and comma"}, ["could not read number (.*)"] = {"removing the non-digit character", "beginning the identifier with a non-digit if it is not meant to be a number"}, ["can't start multisym segment with a digit"] = {"removing the digit", "adding a non-digit before the digit"}, ["malformed multisym"] = {"ensuring each period or colon is not followed by another period or colon"}, ["method must be last component"] = {"using a period instead of a colon for field access", "removing segments after the colon", "making the method call, then looking up the field on the result"}, ["$ and $... in hashfn are mutually exclusive"] = {"modifying the hashfn so it only contains $... or $, $1, $2, $3, etc"}, ["tried to reference a macro without calling it"] = {"renaming the macro so as not to conflict with locals"}, ["tried to reference a special form without calling it"] = {"making sure to use prefix operators, not infix", "wrapping the special in a function if you need it to be first class"}, ["missing subject"] = {"adding an item to operate on"}, ["expected even number of pattern/body pairs"] = {"checking that every pattern has a body to go with it", "adding _ before the final body"}, ["expected at least one pattern/body pair"] = {"adding a pattern and a body to execute when the pattern matches"}, ["unexpected arguments"] = {"removing an argument", "checking for typos"}, ["unexpected iterator clause"] = {"removing an argument", "checking for typos"}}
local unpack = (table.unpack or _G.unpack)
local function suggest(msg)
- local suggestion = nil
+ local s = nil
for pat, sug in pairs(suggestions) do
+ if s then break end
local matches = {msg:match(pat)}
if (0 < #matches) then
- if ("table" == type(sug)) then
- local out = {}
- for _, s in ipairs(sug) do
- table.insert(out, s:format(unpack(matches)))
+ local tbl_16_auto = {}
+ local i_17_auto = #tbl_16_auto
+ for _, s0 in ipairs(sug) do
+ local val_18_auto = s0:format(unpack(matches))
+ if (nil ~= val_18_auto) then
+ i_17_auto = (i_17_auto + 1)
+ do end (tbl_16_auto)[i_17_auto] = val_18_auto
+ else
end
- suggestion = out
+ end
+ s = tbl_16_auto
+ else
+ s = nil
+ end
+ end
+ return s
+ end
+ local function read_line(filename, line, _3fsource)
+ if _3fsource then
+ local matcher = string.gmatch((_3fsource .. "\n"), "(.-)(\13?\n)")
+ for _ = 2, line do
+ matcher()
+ end
+ return matcher()
+ else
+ local f = assert(io.open(filename))
+ local function close_handlers_8_auto(ok_9_auto, ...)
+ f:close()
+ if ok_9_auto then
+ return ...
else
- suggestion = sug(matches)
+ return error(..., 0)
+ end
+ end
+ local function _185_()
+ for _ = 2, line do
+ f:read()
end
+ return f:read()
end
+ return close_handlers_8_auto(_G.xpcall(_185_, (package.loaded.fennel or debug).traceback))
end
- return suggestion
end
- local function read_line_from_file(filename, line)
- local bytes = 0
- local f = assert(io.open(filename))
- local _ = nil
- for _0 = 1, (line - 1) do
- bytes = (bytes + 1 + #f:read())
+ local function sub(str, start, _end)
+ if ((_end < start) or (#str < start) or (#str < _end)) then
+ return ""
+ elseif utf8_ok_3f then
+ return string.sub(str, utf8.offset(str, start), ((utf8.offset(str, (_end + 1)) or (utf8.len(str) + 1)) - 1))
+ else
+ return string.sub(str, start, math.min(_end, str:len()))
end
- _ = nil
- local codeline = f:read()
- f:close()
- return codeline, bytes
- end
- local function read_line_from_string(matcher, target_line, _3fcurrent_line, _3fbytes)
- local this_line, newline = matcher()
- local current_line = (_3fcurrent_line or 1)
- local bytes = ((_3fbytes or 0) + #this_line + #newline)
- if (target_line == current_line) then
- return this_line, bytes
- elseif this_line then
- return read_line_from_string(matcher, target_line, (current_line + 1), bytes)
- end
- end
- local function read_line(filename, line, source)
- if source then
- return read_line_from_string(string.gmatch((source .. "\n"), "(.-)(\13?\n)"), line)
- else
- return read_line_from_file(filename, line)
- end
- end
- local function friendly_msg(msg, _0_0, source)
- local _1_ = _0_0
- local byteend = _1_["byteend"]
- local bytestart = _1_["bytestart"]
- local filename = _1_["filename"]
- local line = _1_["line"]
- local ok, codeline, bol = pcall(read_line, filename, line, source)
- local suggestions0 = suggest(msg)
+ end
+ local function highlight_line(codeline, col, _3fendcol, opts)
+ if ((opts and (false == opts["error-pinpoint"])) or (os and os.getenv and os.getenv("NO_COLOR"))) then
+ return codeline
+ else
+ local _let_188_ = (opts or {})
+ local error_pinpoint = _let_188_["error-pinpoint"]
+ local endcol = (_3fendcol or col)
+ local eol
+ if utf8_ok_3f then
+ eol = utf8.len(codeline)
+ else
+ eol = string.len(codeline)
+ end
+ local _let_190_ = (error_pinpoint or {"\27[7m", "\27[0m"})
+ local open = _let_190_[1]
+ local close = _let_190_[2]
+ return (sub(codeline, 1, col) .. open .. sub(codeline, (col + 1), (endcol + 1)) .. close .. sub(codeline, (endcol + 2), eol))
+ end
+ end
+ local function friendly_msg(msg, _192_, source, opts)
+ local _arg_193_ = _192_
+ local filename = _arg_193_["filename"]
+ local line = _arg_193_["line"]
+ local col = _arg_193_["col"]
+ local endcol = _arg_193_["endcol"]
+ local ok, codeline = pcall(read_line, filename, line, source)
local out = {msg, ""}
if (ok and codeline) then
- table.insert(out, codeline)
- end
- if (ok and codeline and bytestart and byteend) then
- table.insert(out, (string.rep(" ", (bytestart - bol - 1)) .. "^" .. string.rep("^", math.min((byteend - bytestart), ((bol + #codeline) - bytestart)))))
- end
- if (ok and codeline and bytestart and not byteend) then
- table.insert(out, (string.rep("-", (bytestart - bol - 1)) .. "^"))
- table.insert(out, "")
- end
- if suggestions0 then
- for _, suggestion in ipairs(suggestions0) do
- table.insert(out, ("* Try %s."):format(suggestion))
+ if col then
+ table.insert(out, highlight_line(codeline, col, endcol, opts))
+ else
+ table.insert(out, codeline)
end
+ else
+ end
+ for _, suggestion in ipairs((suggest(msg) or {})) do
+ table.insert(out, ("* Try %s."):format(suggestion))
end
return table.concat(out, "\n")
end
- local function assert_compile(condition, msg, ast, source)
+ local function assert_compile(condition, msg, ast, source, opts)
if not condition then
- local _1_ = ast_source(ast)
- local filename = _1_["filename"]
- local line = _1_["line"]
- error(friendly_msg(("Compile error in %s:%s\n %s"):format((filename or "unknown"), (line or "?"), msg), ast_source(ast), source), 0)
+ local _let_196_ = utils["ast-source"](ast)
+ local filename = _let_196_["filename"]
+ local line = _let_196_["line"]
+ local col = _let_196_["col"]
+ error(friendly_msg(("%s:%s:%s Compile error: %s"):format((filename or "unknown"), (line or "?"), (col or "?"), msg), utils["ast-source"](ast), source, opts), 0)
+ else
end
return condition
end
- local function parse_error(msg, filename, line, bytestart, source)
- return error(friendly_msg(("Parse error in %s:%s\n %s"):format(filename, line, msg), {bytestart = bytestart, filename = filename, line = line}, source), 0)
+ local function parse_error(msg, filename, line, col, source, opts)
+ return error(friendly_msg(("%s:%s:%s Parse error: %s"):format(filename, line, col, msg), {filename = filename, line = line, col = col}, source, opts), 0)
end
return {["assert-compile"] = assert_compile, ["parse-error"] = parse_error}
end
@@ 3294,70 3661,85 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
local unpack = (table.unpack or _G.unpack)
local function granulate(getchunk)
local c, index, done_3f = "", 1, false
- local function _0_(parser_state)
+ local function _198_(parser_state)
if not done_3f then
if (index <= #c) then
local b = c:byte(index)
index = (index + 1)
return b
else
- local _1_0, _2_0, _3_0 = getchunk(parser_state)
- local _4_
- do
- local char = _1_0
- _4_ = ((nil ~= _1_0) and (char ~= ""))
+ local _199_ = getchunk(parser_state)
+ local function _200_()
+ local char = _199_
+ return (char ~= "")
end
- if _4_ then
- local char = _1_0
+ if ((nil ~= _199_) and _200_()) then
+ local char = _199_
c = char
index = 2
return c:byte()
- else
- local _ = _1_0
+ elseif true then
+ local _ = _199_
done_3f = true
return nil
+ else
+ return nil
end
end
+ else
+ return nil
end
end
- local function _1_()
+ local function _204_()
c = ""
return nil
end
- return _0_, _1_
+ return _198_, _204_
end
- local function string_stream(str)
+ local function string_stream(str, _3foptions)
local str0 = str:gsub("^#!", ";;")
+ if _3foptions then
+ _3foptions.source = str0
+ else
+ end
local index = 1
- local function _0_()
+ local function _206_()
local r = str0:byte(index)
index = (index + 1)
return r
end
- return _0_
- end
- local delims = {[123] = 125, [125] = true, [40] = 41, [41] = true, [91] = 93, [93] = true}
- local function whitespace_3f(b)
- return ((b == 32) or ((b >= 9) and (b <= 13)))
+ return _206_
end
+ local delims = {[40] = 41, [41] = true, [91] = 93, [93] = true, [123] = 125, [125] = true}
local function sym_char_3f(b)
- local b0 = nil
+ local b0
if ("number" == type(b)) then
b0 = b
else
b0 = string.byte(b)
end
- return ((b0 > 32) and not delims[b0] and (b0 ~= 127) and (b0 ~= 34) and (b0 ~= 39) and (b0 ~= 126) and (b0 ~= 59) and (b0 ~= 44) and (b0 ~= 64) and (b0 ~= 96))
+ return ((32 < b0) and not delims[b0] and (b0 ~= 127) and (b0 ~= 34) and (b0 ~= 39) and (b0 ~= 126) and (b0 ~= 59) and (b0 ~= 44) and (b0 ~= 64) and (b0 ~= 96))
end
local prefixes = {[35] = "hashfn", [39] = "quote", [44] = "unquote", [96] = "quote"}
- local function parser(getbyte, filename, options)
+ local function char_starter_3f(b)
+ return ((function(_208_,_209_,_210_) return (_208_ < _209_) and (_209_ < _210_) end)(1,b,127) or (function(_211_,_212_,_213_) return (_211_ < _212_) and (_212_ < _213_) end)(192,b,247))
+ end
+ local function parser_fn(getbyte, filename, _214_)
+ local _arg_215_ = _214_
+ local source = _arg_215_["source"]
+ local unfriendly = _arg_215_["unfriendly"]
+ local comments = _arg_215_["comments"]
+ local options = _arg_215_
local stack = {}
- local line = 1