Skip to content

Commit

Permalink
Bump Fennel dep 1.1.0 -> 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Caldwell committed Sep 17, 2022
1 parent 9892a40 commit ce644e2
Show file tree
Hide file tree
Showing 5 changed files with 1,255 additions and 932 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SRC_FILES := $(basename $(shell find fnl -type f -name "*.fnl" ! -name "macros.f
default: deps compile test

deps:
scripts/dep.sh bakpakin Fennel 21c429235d49b2908c7e46442660b6f22da90efc
scripts/dep.sh bakpakin Fennel 75d9afc819bb587cd25ffceb278f8f7a947a21c8
scripts/dep.sh norcalli nvim.lua 5d57be0b6eea6c06977b1c5fe0752da909cf4154
scripts/dep.sh luafun luafun cb6a7e25d4b55d9578fd371d1474b00e47bd29f3
LUA=luajit cd deps/Fennel && make build
Expand Down
2 changes: 1 addition & 1 deletion lua/aniseed/compile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ local function str(code, opts)
ANISEED_STATIC_MODULES = (true == a.get(opts, "static?"))
local fnl = fennel.impl()
local function _4_()
return string.gsub(string.gsub(fnl.compileString(wrap_macros(code, opts), a["merge!"]({allowedGlobals = false, compilerEnv = _G}, opts)), (delete_marker_pat .. "\n"), "\n"), (delete_marker_pat .. "$"), "")
return string.gsub(string.gsub(fnl.compileString(wrap_macros(code, opts), a["merge!"]({compilerEnv = _G, allowedGlobals = false}, opts)), (delete_marker_pat .. "\n"), "\n"), (delete_marker_pat .. "$"), "")
end
return xpcall(_4_, fnl.traceback)
end
Expand Down
2 changes: 1 addition & 1 deletion lua/aniseed/core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ local function assoc(t, ...)
local _let_54_ = {...}
local k = _let_54_[1]
local v = _let_54_[2]
local xs = (function (t, k) local mt = getmetatable(t) if "table" == type(mt) and mt.__fennelrest then return mt.__fennelrest(t, k) else return {(table.unpack or unpack)(t, k)} end end)(_let_54_, 3)
local xs = (function (t, k, e) local mt = getmetatable(t) if 'table' == type(mt) and mt.__fennelrest then return mt.__fennelrest(t, k) elseif e then local rest = {} for k, v in pairs(t) do if not e[k] then rest[k] = v end end return rest else return {(table.unpack or unpack)(t, k)} end end)(_let_54_, 3)
local rem = count(xs)
local t0 = (t or {})
if odd_3f(rem) then
Expand Down
Loading

0 comments on commit ce644e2

Please sign in to comment.