This commit is contained in:
Adam Jeniski 2025-08-11 09:41:22 -09:00
parent 5ac385a063
commit df6fe1e580
20 changed files with 73 additions and 73 deletions

View File

@ -1,4 +1,4 @@
(module conjure-macroreplace.main (module conjure-expand.main
{require {a aniseed.core {require {a aniseed.core
nvim aniseed.nvim nvim aniseed.nvim
str aniseed.string str aniseed.string

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/autoload.fnl" local _2afile_2a = "fnl/aniseed/autoload.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.autoload" local _2amodule_name_2a = "conjure-expand.aniseed.autoload"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/compile.fnl" local _2afile_2a = "fnl/aniseed/compile.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.compile" local _2amodule_name_2a = "conjure-expand.aniseed.compile"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,14 +10,14 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a, fennel, fs, nvim = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.fennel"), autoload("conjure-macroreplace.aniseed.fs"), autoload("conjure-macroreplace.aniseed.nvim") local a, fennel, fs, nvim = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.fennel"), autoload("conjure-expand.aniseed.fs"), autoload("conjure-expand.aniseed.nvim")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["fennel"] = fennel _2amodule_locals_2a["fennel"] = fennel
_2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["fs"] = fs
_2amodule_locals_2a["nvim"] = nvim _2amodule_locals_2a["nvim"] = nvim
local function wrap_macros(code, opts) local function wrap_macros(code, opts)
local macros_module = "conjure-macroreplace.aniseed.macros" local macros_module = "conjure-expand.aniseed.macros"
local filename local filename
do do
local _1_ = a.get(opts, "filename") local _1_ = a.get(opts, "filename")

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/core.fnl" local _2afile_2a = "fnl/aniseed/core.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.core" local _2amodule_name_2a = "conjure-expand.aniseed.core"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local view = autoload("conjure-macroreplace.aniseed.view") local view = autoload("conjure-expand.aniseed.view")
do end (_2amodule_locals_2a)["view"] = view do end (_2amodule_locals_2a)["view"] = view
math.randomseed(os.time()) math.randomseed(os.time())
local function rand(n) local function rand(n)

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/env.fnl" local _2afile_2a = "fnl/aniseed/env.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.env" local _2amodule_name_2a = "conjure-expand.aniseed.env"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local compile, fennel, fs, nvim = autoload("conjure-macroreplace.aniseed.compile"), autoload("conjure-macroreplace.aniseed.fennel"), autoload("conjure-macroreplace.aniseed.fs"), autoload("conjure-macroreplace.aniseed.nvim") local compile, fennel, fs, nvim = autoload("conjure-expand.aniseed.compile"), autoload("conjure-expand.aniseed.fennel"), autoload("conjure-expand.aniseed.fs"), autoload("conjure-expand.aniseed.nvim")
do end (_2amodule_locals_2a)["compile"] = compile do end (_2amodule_locals_2a)["compile"] = compile
_2amodule_locals_2a["fennel"] = fennel _2amodule_locals_2a["fennel"] = fennel
_2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["fs"] = fs

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/eval.fnl" local _2afile_2a = "fnl/aniseed/eval.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.eval" local _2amodule_name_2a = "conjure-expand.aniseed.eval"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a, compile, fennel, fs, nvim = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.compile"), autoload("conjure-macroreplace.aniseed.fennel"), autoload("conjure-macroreplace.aniseed.fs"), autoload("conjure-macroreplace.aniseed.nvim") local a, compile, fennel, fs, nvim = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.compile"), autoload("conjure-expand.aniseed.fennel"), autoload("conjure-expand.aniseed.fs"), autoload("conjure-expand.aniseed.nvim")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["compile"] = compile _2amodule_locals_2a["compile"] = compile
_2amodule_locals_2a["fennel"] = fennel _2amodule_locals_2a["fennel"] = fennel

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/fennel.fnl" local _2afile_2a = "fnl/aniseed/fennel.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.fennel" local _2amodule_name_2a = "conjure-expand.aniseed.fennel"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a, fs, nvim, str = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.fs"), autoload("conjure-macroreplace.aniseed.nvim"), autoload("conjure-macroreplace.aniseed.string") local a, fs, nvim, str = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.fs"), autoload("conjure-expand.aniseed.nvim"), autoload("conjure-expand.aniseed.string")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["fs"] = fs
_2amodule_locals_2a["nvim"] = nvim _2amodule_locals_2a["nvim"] = nvim
@ -37,7 +37,7 @@ _2amodule_2a["sync-rtp"] = sync_rtp
local state = {["compiler-loaded?"] = false} local state = {["compiler-loaded?"] = false}
_2amodule_locals_2a["state"] = state _2amodule_locals_2a["state"] = state
local function impl() local function impl()
local compiler = require("conjure-macroreplace.aniseed.deps.fennel") local compiler = require("conjure-expand.aniseed.deps.fennel")
if not state["compiler-loaded?"] then if not state["compiler-loaded?"] then
state["compiler-loaded?"] = true state["compiler-loaded?"] = true
sync_rtp(compiler) sync_rtp(compiler)

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/fs.fnl" local _2afile_2a = "fnl/aniseed/fs.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.fs" local _2amodule_name_2a = "conjure-expand.aniseed.fs"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a, nvim = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.nvim") local a, nvim = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.nvim")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["nvim"] = nvim _2amodule_locals_2a["nvim"] = nvim
local function basename(path) local function basename(path)

View File

@ -136,7 +136,7 @@
;; Only require autoload if it's used. ;; Only require autoload if it's used.
(when (contains? mod-fns autoload-sym) (when (contains? mod-fns autoload-sym)
(table.insert result `(local ,autoload-sym (. (require "conjure-macroreplace.aniseed.autoload") :autoload))))) (table.insert result `(local ,autoload-sym (. (require "conjure-expand.aniseed.autoload") :autoload)))))
;; When we have some keys insert the key/vals pairs locals. ;; When we have some keys insert the key/vals pairs locals.
;; If this is empty we end up generating invalid Lua. ;; If this is empty we end up generating invalid Lua.

View File

@ -1,8 +1,8 @@
local _2afile_2a = "fnl/aniseed/nvim.fnl" local _2afile_2a = "fnl/aniseed/nvim.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.nvim" local _2amodule_name_2a = "conjure-expand.aniseed.nvim"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = require("conjure-macroreplace.aniseed.deps.nvim") package.loaded[_2amodule_name_2a] = require("conjure-expand.aniseed.deps.nvim")
_2amodule_2a = package.loaded[_2amodule_name_2a] _2amodule_2a = package.loaded[_2amodule_name_2a]
end end
local _2amodule_locals_2a local _2amodule_locals_2a

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/nvim/util.fnl" local _2afile_2a = "fnl/aniseed/nvim/util.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.nvim.util" local _2amodule_name_2a = "conjure-expand.aniseed.nvim.util"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local nvim = autoload("conjure-macroreplace.aniseed.nvim") local nvim = autoload("conjure-expand.aniseed.nvim")
do end (_2amodule_locals_2a)["nvim"] = nvim do end (_2amodule_locals_2a)["nvim"] = nvim
local function normal(keys) local function normal(keys)
return nvim.ex.silent(("exe \"normal! " .. keys .. "\"")) return nvim.ex.silent(("exe \"normal! " .. keys .. "\""))

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/setup.fnl" local _2afile_2a = "fnl/aniseed/setup.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.setup" local _2amodule_name_2a = "conjure-expand.aniseed.setup"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a, env, eval, nvim = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.env"), autoload("conjure-macroreplace.aniseed.eval"), autoload("conjure-macroreplace.aniseed.nvim") local a, env, eval, nvim = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.env"), autoload("conjure-expand.aniseed.eval"), autoload("conjure-expand.aniseed.nvim")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["env"] = env _2amodule_locals_2a["env"] = env
_2amodule_locals_2a["eval"] = eval _2amodule_locals_2a["eval"] = eval

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/string.fnl" local _2afile_2a = "fnl/aniseed/string.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.string" local _2amodule_name_2a = "conjure-expand.aniseed.string"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a = autoload("conjure-macroreplace.aniseed.core") local a = autoload("conjure-expand.aniseed.core")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
local function join(...) local function join(...)
local args = {...} local args = {...}

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/test.fnl" local _2afile_2a = "fnl/aniseed/test.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.test" local _2amodule_name_2a = "conjure-expand.aniseed.test"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,8 +10,8 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload local autoload = (require("conjure-expand.aniseed.autoload")).autoload
local a, fs, nvim, str = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.fs"), autoload("conjure-macroreplace.aniseed.nvim"), autoload("conjure-macroreplace.aniseed.string") local a, fs, nvim, str = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.fs"), autoload("conjure-expand.aniseed.nvim"), autoload("conjure-expand.aniseed.string")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["fs"] = fs
_2amodule_locals_2a["nvim"] = nvim _2amodule_locals_2a["nvim"] = nvim

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/aniseed/view.fnl" local _2afile_2a = "fnl/aniseed/view.fnl"
local _2amodule_name_2a = "conjure-macroreplace.aniseed.view" local _2amodule_name_2a = "conjure-expand.aniseed.view"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,7 +10,7 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local fnl = require("conjure-macroreplace.aniseed.fennel") local fnl = require("conjure-expand.aniseed.fennel")
do end (_2amodule_locals_2a)["fnl"] = fnl do end (_2amodule_locals_2a)["fnl"] = fnl
local function serialise(...) local function serialise(...)
return fnl.impl().view(...) return fnl.impl().view(...)

View File

@ -1,5 +1,5 @@
local _2afile_2a = "fnl/conjure-macroreplace/main.fnl" local _2afile_2a = "fnl/conjure-expand/main.fnl"
local _2amodule_name_2a = "conjure-macroreplace.main" local _2amodule_name_2a = "conjure-expand.main"
local _2amodule_2a local _2amodule_2a
do do
package.loaded[_2amodule_name_2a] = {} package.loaded[_2amodule_name_2a] = {}
@ -10,7 +10,7 @@ do
_2amodule_2a["aniseed/locals"] = {} _2amodule_2a["aniseed/locals"] = {}
_2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
end end
local a, bridge, buffer, client, editor, eval, extract, log, mapping, nvim, str = require("conjure-macroreplace.aniseed.core"), require("conjure.bridge"), require("conjure.buffer"), require("conjure.client"), require("conjure.editor"), require("conjure.eval"), require("conjure.extract"), require("conjure.log"), require("conjure.mapping"), require("conjure-macroreplace.aniseed.nvim"), require("conjure-macroreplace.aniseed.string") local a, bridge, buffer, client, editor, eval, extract, log, mapping, nvim, str = require("conjure-expand.aniseed.core"), require("conjure.bridge"), require("conjure.buffer"), require("conjure.client"), require("conjure.editor"), require("conjure.eval"), require("conjure.extract"), require("conjure.log"), require("conjure.mapping"), require("conjure-expand.aniseed.nvim"), require("conjure-expand.aniseed.string")
do end (_2amodule_locals_2a)["a"] = a do end (_2amodule_locals_2a)["a"] = a
_2amodule_locals_2a["bridge"] = bridge _2amodule_locals_2a["bridge"] = bridge
_2amodule_locals_2a["buffer"] = buffer _2amodule_locals_2a["buffer"] = buffer