diff --git a/fnl/conjure-macroreplace/main.fnl b/fnl/conjure-expand/main.fnl similarity index 98% rename from fnl/conjure-macroreplace/main.fnl rename to fnl/conjure-expand/main.fnl index 2306b05..fac62a8 100644 --- a/fnl/conjure-macroreplace/main.fnl +++ b/fnl/conjure-expand/main.fnl @@ -1,4 +1,4 @@ -(module conjure-macroreplace.main +(module conjure-expand.main {require {a aniseed.core nvim aniseed.nvim str aniseed.string diff --git a/lua/conjure-macroreplace/aniseed/autoload.lua b/lua/conjure-expand/aniseed/autoload.lua similarity index 93% rename from lua/conjure-macroreplace/aniseed/autoload.lua rename to lua/conjure-expand/aniseed/autoload.lua index cc44833..3de9f8e 100644 --- a/lua/conjure-macroreplace/aniseed/autoload.lua +++ b/lua/conjure-expand/aniseed/autoload.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} diff --git a/lua/conjure-macroreplace/aniseed/compile.lua b/lua/conjure-expand/aniseed/compile.lua similarity index 86% rename from lua/conjure-macroreplace/aniseed/compile.lua rename to lua/conjure-expand/aniseed/compile.lua index 6b6ced3..a6aeed4 100644 --- a/lua/conjure-macroreplace/aniseed/compile.lua +++ b/lua/conjure-expand/aniseed/compile.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,14 +10,14 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.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 autoload = (require("conjure-expand.aniseed.autoload")).autoload +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 _2amodule_locals_2a["fennel"] = fennel _2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["nvim"] = nvim local function wrap_macros(code, opts) - local macros_module = "conjure-macroreplace.aniseed.macros" + local macros_module = "conjure-expand.aniseed.macros" local filename do local _1_ = a.get(opts, "filename") diff --git a/lua/conjure-macroreplace/aniseed/core.lua b/lua/conjure-expand/aniseed/core.lua similarity index 97% rename from lua/conjure-macroreplace/aniseed/core.lua rename to lua/conjure-expand/aniseed/core.lua index 91e06e7..743df16 100644 --- a/lua/conjure-macroreplace/aniseed/core.lua +++ b/lua/conjure-expand/aniseed/core.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload -local view = autoload("conjure-macroreplace.aniseed.view") +local autoload = (require("conjure-expand.aniseed.autoload")).autoload +local view = autoload("conjure-expand.aniseed.view") do end (_2amodule_locals_2a)["view"] = view math.randomseed(os.time()) local function rand(n) diff --git a/lua/conjure-macroreplace/aniseed/deps/fennel.lua b/lua/conjure-expand/aniseed/deps/fennel.lua similarity index 98% rename from lua/conjure-macroreplace/aniseed/deps/fennel.lua rename to lua/conjure-expand/aniseed/deps/fennel.lua index f73f27e..e299cfe 100644 --- a/lua/conjure-macroreplace/aniseed/deps/fennel.lua +++ b/lua/conjure-expand/aniseed/deps/fennel.lua @@ -1,9 +1,9 @@ -package.preload["conjure-macroreplace.aniseed.fennel.repl"] = package.preload["conjure-macroreplace.aniseed.fennel.repl"] or function(...) - local utils = require("conjure-macroreplace.aniseed.fennel.utils") - local parser = require("conjure-macroreplace.aniseed.fennel.parser") - local compiler = require("conjure-macroreplace.aniseed.fennel.compiler") - local specials = require("conjure-macroreplace.aniseed.fennel.specials") - local view = require("conjure-macroreplace.aniseed.fennel.view") +package.preload["conjure-expand.aniseed.fennel.repl"] = package.preload["conjure-expand.aniseed.fennel.repl"] or function(...) + local utils = require("conjure-expand.aniseed.fennel.utils") + local parser = require("conjure-expand.aniseed.fennel.parser") + local compiler = require("conjure-expand.aniseed.fennel.compiler") + local specials = require("conjure-expand.aniseed.fennel.specials") + local view = require("conjure-expand.aniseed.fennel.view") local unpack = (table.unpack or _G.unpack) local function default_read_chunk(parser_state) local function _631_() @@ -735,11 +735,11 @@ package.preload["conjure-macroreplace.aniseed.fennel.repl"] = package.preload["c end return repl end -package.preload["conjure-macroreplace.aniseed.fennel.specials"] = package.preload["conjure-macroreplace.aniseed.fennel.specials"] or function(...) - local utils = require("conjure-macroreplace.aniseed.fennel.utils") - local view = require("conjure-macroreplace.aniseed.fennel.view") - local parser = require("conjure-macroreplace.aniseed.fennel.parser") - local compiler = require("conjure-macroreplace.aniseed.fennel.compiler") +package.preload["conjure-expand.aniseed.fennel.specials"] = package.preload["conjure-expand.aniseed.fennel.specials"] or function(...) + local utils = require("conjure-expand.aniseed.fennel.utils") + local view = require("conjure-expand.aniseed.fennel.view") + local parser = require("conjure-expand.aniseed.fennel.parser") + local compiler = require("conjure-expand.aniseed.fennel.compiler") local unpack = (table.unpack or _G.unpack) local SPECIALS = compiler.scopes.global.specials local function wrap_env(env) @@ -2129,7 +2129,7 @@ package.preload["conjure-macroreplace.aniseed.fennel.specials"] = package.preloa end end local function sandbox_fennel_module(modname) - if ((modname == "conjure-macroreplace.aniseed.fennel.macros") or (package and package.loaded and ("table" == type(package.loaded[modname])) and (package.loaded[modname].metadata == compiler.metadata))) then + if ((modname == "conjure-expand.aniseed.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, view = view} else return nil @@ -2322,10 +2322,10 @@ package.preload["conjure-macroreplace.aniseed.fennel.specials"] = package.preloa doc_special("eval-compiler", {"..."}, "Evaluate the body at compile-time. Use the macro system instead if possible.", true) 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["conjure-macroreplace.aniseed.fennel.compiler"] = package.preload["conjure-macroreplace.aniseed.fennel.compiler"] or function(...) - local utils = require("conjure-macroreplace.aniseed.fennel.utils") - local parser = require("conjure-macroreplace.aniseed.fennel.parser") - local friend = require("conjure-macroreplace.aniseed.fennel.friend") +package.preload["conjure-expand.aniseed.fennel.compiler"] = package.preload["conjure-expand.aniseed.fennel.compiler"] or function(...) + local utils = require("conjure-expand.aniseed.fennel.utils") + local parser = require("conjure-expand.aniseed.fennel.parser") + local friend = require("conjure-expand.aniseed.fennel.friend") local unpack = (table.unpack or _G.unpack) local scopes = {} local function make_scope(_3fparent) @@ -3536,8 +3536,8 @@ package.preload["conjure-macroreplace.aniseed.fennel.compiler"] = package.preloa end 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["conjure-macroreplace.aniseed.fennel.friend"] = package.preload["conjure-macroreplace.aniseed.fennel.friend"] or function(...) - local utils = require("conjure-macroreplace.aniseed.fennel.utils") +package.preload["conjure-expand.aniseed.fennel.friend"] = package.preload["conjure-expand.aniseed.fennel.friend"] or function(...) + local utils = require("conjure-expand.aniseed.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) @@ -3655,9 +3655,9 @@ package.preload["conjure-macroreplace.aniseed.fennel.friend"] = package.preload[ end return {["assert-compile"] = assert_compile, ["parse-error"] = parse_error} end -package.preload["conjure-macroreplace.aniseed.fennel.parser"] = package.preload["conjure-macroreplace.aniseed.fennel.parser"] or function(...) - local utils = require("conjure-macroreplace.aniseed.fennel.utils") - local friend = require("conjure-macroreplace.aniseed.fennel.friend") +package.preload["conjure-expand.aniseed.fennel.parser"] = package.preload["conjure-expand.aniseed.fennel.parser"] or function(...) + local utils = require("conjure-expand.aniseed.fennel.utils") + local friend = require("conjure-expand.aniseed.fennel.friend") local unpack = (table.unpack or _G.unpack) local function granulate(getchunk) local c, index, done_3f = "", 1, false @@ -4133,7 +4133,7 @@ package.preload["conjure-macroreplace.aniseed.fennel.parser"] = package.preload[ return {granulate = granulate, parser = parser, ["string-stream"] = string_stream, ["sym-char?"] = sym_char_3f} end local utils -package.preload["conjure-macroreplace.aniseed.fennel.view"] = package.preload["conjure-macroreplace.aniseed.fennel.view"] or function(...) +package.preload["conjure-expand.aniseed.fennel.view"] = package.preload["conjure-expand.aniseed.fennel.view"] or function(...) local type_order = {number = 1, boolean = 2, string = 3, table = 4, ["function"] = 5, userdata = 6, thread = 7} local default_opts = {["one-line?"] = false, ["detect-cycles?"] = true, ["empty-as-sequence?"] = false, ["metamethod?"] = true, ["prefer-colon?"] = false, ["escape-newlines?"] = false, ["utf8?"] = true, ["line-length"] = 80, depth = 128, ["max-sparse-gap"] = 10} local lua_pairs = pairs @@ -4780,8 +4780,8 @@ package.preload["conjure-macroreplace.aniseed.fennel.view"] = package.preload["c end return view end -package.preload["conjure-macroreplace.aniseed.fennel.utils"] = package.preload["conjure-macroreplace.aniseed.fennel.utils"] or function(...) - local view = require("conjure-macroreplace.aniseed.fennel.view") +package.preload["conjure-expand.aniseed.fennel.utils"] = package.preload["conjure-expand.aniseed.fennel.utils"] or function(...) + local view = require("conjure-expand.aniseed.fennel.view") local version = "1.3.0" local function luajit_vm_3f() return ((nil ~= _G.jit) and (type(_G.jit) == "table") and (nil ~= _G.jit.on) and (nil ~= _G.jit.off) and (type(_G.jit.version_num) == "number")) @@ -5332,12 +5332,12 @@ package.preload["conjure-macroreplace.aniseed.fennel.utils"] = package.preload[" end return {warn = warn, allpairs = allpairs, stablepairs = stablepairs, copy = copy, ["get-in"] = get_in, kvmap = kvmap, map = map, ["walk-tree"] = walk_tree, ["member?"] = member_3f, maxn = maxn, ["every?"] = every_3f, list = list, sequence = sequence, sym = sym, varg = varg, expr = expr, comment = comment_2a, ["comment?"] = comment_3f, ["expr?"] = expr_3f, ["list?"] = list_3f, ["multi-sym?"] = multi_sym_3f, ["sequence?"] = sequence_3f, ["sym?"] = sym_3f, ["table?"] = table_3f, ["varg?"] = varg_3f, ["quoted?"] = quoted_3f, ["string?"] = string_3f, ["idempotent-expr?"] = idempotent_expr_3f, ["valid-lua-identifier?"] = valid_lua_identifier_3f, ["lua-keywords"] = lua_keywords, hook = hook, ["hook-opts"] = hook_opts, ["propagate-options"] = propagate_options, root = root, ["debug-on?"] = debug_on_3f, ["ast-source"] = ast_source, version = version, ["runtime-version"] = runtime_version, len = len, path = table.concat({"./?.fnl", "./?/init.fnl", getenv("FENNEL_PATH")}, ";"), ["macro-path"] = table.concat({"./?.fnl", "./?/init-macros.fnl", "./?/init.fnl", getenv("FENNEL_MACRO_PATH")}, ";")} end -utils = require("conjure-macroreplace.aniseed.fennel.utils") -local parser = require("conjure-macroreplace.aniseed.fennel.parser") -local compiler = require("conjure-macroreplace.aniseed.fennel.compiler") -local specials = require("conjure-macroreplace.aniseed.fennel.specials") -local repl = require("conjure-macroreplace.aniseed.fennel.repl") -local view = require("conjure-macroreplace.aniseed.fennel.view") +utils = require("conjure-expand.aniseed.fennel.utils") +local parser = require("conjure-expand.aniseed.fennel.parser") +local compiler = require("conjure-expand.aniseed.fennel.compiler") +local specials = require("conjure-expand.aniseed.fennel.specials") +local repl = require("conjure-expand.aniseed.fennel.repl") +local view = require("conjure-expand.aniseed.fennel.view") local function eval_env(env, opts) if (env == "_COMPILER") then local env0 = specials["make-compiler-env"](nil, compiler.scopes.compiler, {}, opts) @@ -5426,7 +5426,7 @@ mod.install = function(_3fopts) end utils["fennel-module"] = mod do - local module_name = "conjure-macroreplace.aniseed.fennel.macros" + local module_name = "conjure-expand.aniseed.fennel.macros" local _ local function _757_() return mod diff --git a/lua/conjure-macroreplace/aniseed/deps/fun.lua b/lua/conjure-expand/aniseed/deps/fun.lua similarity index 100% rename from lua/conjure-macroreplace/aniseed/deps/fun.lua rename to lua/conjure-expand/aniseed/deps/fun.lua diff --git a/lua/conjure-macroreplace/aniseed/deps/nvim.lua b/lua/conjure-expand/aniseed/deps/nvim.lua similarity index 100% rename from lua/conjure-macroreplace/aniseed/deps/nvim.lua rename to lua/conjure-expand/aniseed/deps/nvim.lua diff --git a/lua/conjure-macroreplace/aniseed/env.lua b/lua/conjure-expand/aniseed/env.lua similarity index 83% rename from lua/conjure-macroreplace/aniseed/env.lua rename to lua/conjure-expand/aniseed/env.lua index 078aaba..30d8a5d 100644 --- a/lua/conjure-macroreplace/aniseed/env.lua +++ b/lua/conjure-expand/aniseed/env.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.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 autoload = (require("conjure-expand.aniseed.autoload")).autoload +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 _2amodule_locals_2a["fennel"] = fennel _2amodule_locals_2a["fs"] = fs diff --git a/lua/conjure-macroreplace/aniseed/eval.lua b/lua/conjure-expand/aniseed/eval.lua similarity index 83% rename from lua/conjure-macroreplace/aniseed/eval.lua rename to lua/conjure-expand/aniseed/eval.lua index 284f6ac..a430634 100644 --- a/lua/conjure-macroreplace/aniseed/eval.lua +++ b/lua/conjure-expand/aniseed/eval.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.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 autoload = (require("conjure-expand.aniseed.autoload")).autoload +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 _2amodule_locals_2a["compile"] = compile _2amodule_locals_2a["fennel"] = fennel diff --git a/lua/conjure-macroreplace/aniseed/fennel.lua b/lua/conjure-expand/aniseed/fennel.lua similarity index 77% rename from lua/conjure-macroreplace/aniseed/fennel.lua rename to lua/conjure-expand/aniseed/fennel.lua index ae7120e..c069c23 100644 --- a/lua/conjure-macroreplace/aniseed/fennel.lua +++ b/lua/conjure-expand/aniseed/fennel.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.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 autoload = (require("conjure-expand.aniseed.autoload")).autoload +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 _2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["nvim"] = nvim @@ -37,7 +37,7 @@ _2amodule_2a["sync-rtp"] = sync_rtp local state = {["compiler-loaded?"] = false} _2amodule_locals_2a["state"] = state 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 state["compiler-loaded?"] = true sync_rtp(compiler) diff --git a/lua/conjure-macroreplace/aniseed/fs.lua b/lua/conjure-expand/aniseed/fs.lua similarity index 86% rename from lua/conjure-macroreplace/aniseed/fs.lua rename to lua/conjure-expand/aniseed/fs.lua index 9f4e3bb..c491f94 100644 --- a/lua/conjure-macroreplace/aniseed/fs.lua +++ b/lua/conjure-expand/aniseed/fs.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload -local a, nvim = autoload("conjure-macroreplace.aniseed.core"), autoload("conjure-macroreplace.aniseed.nvim") +local autoload = (require("conjure-expand.aniseed.autoload")).autoload +local a, nvim = autoload("conjure-expand.aniseed.core"), autoload("conjure-expand.aniseed.nvim") do end (_2amodule_locals_2a)["a"] = a _2amodule_locals_2a["nvim"] = nvim local function basename(path) diff --git a/lua/conjure-macroreplace/aniseed/macros.fnl b/lua/conjure-expand/aniseed/macros.fnl similarity index 99% rename from lua/conjure-macroreplace/aniseed/macros.fnl rename to lua/conjure-expand/aniseed/macros.fnl index ffe1b1f..03d351d 100644 --- a/lua/conjure-macroreplace/aniseed/macros.fnl +++ b/lua/conjure-expand/aniseed/macros.fnl @@ -136,7 +136,7 @@ ;; Only require autoload if it's used. (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. ;; If this is empty we end up generating invalid Lua. diff --git a/lua/conjure-macroreplace/aniseed/macros/autocmds.fnl b/lua/conjure-expand/aniseed/macros/autocmds.fnl similarity index 100% rename from lua/conjure-macroreplace/aniseed/macros/autocmds.fnl rename to lua/conjure-expand/aniseed/macros/autocmds.fnl diff --git a/lua/conjure-macroreplace/aniseed/nvim.lua b/lua/conjure-expand/aniseed/nvim.lua similarity index 62% rename from lua/conjure-macroreplace/aniseed/nvim.lua rename to lua/conjure-expand/aniseed/nvim.lua index a9b704c..fcf8e8a 100644 --- a/lua/conjure-macroreplace/aniseed/nvim.lua +++ b/lua/conjure-expand/aniseed/nvim.lua @@ -1,8 +1,8 @@ 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 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] end local _2amodule_locals_2a diff --git a/lua/conjure-macroreplace/aniseed/nvim/util.lua b/lua/conjure-expand/aniseed/nvim/util.lua similarity index 88% rename from lua/conjure-macroreplace/aniseed/nvim/util.lua rename to lua/conjure-expand/aniseed/nvim/util.lua index 3faa6c0..3ec4044 100644 --- a/lua/conjure-macroreplace/aniseed/nvim/util.lua +++ b/lua/conjure-expand/aniseed/nvim/util.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload -local nvim = autoload("conjure-macroreplace.aniseed.nvim") +local autoload = (require("conjure-expand.aniseed.autoload")).autoload +local nvim = autoload("conjure-expand.aniseed.nvim") do end (_2amodule_locals_2a)["nvim"] = nvim local function normal(keys) return nvim.ex.silent(("exe \"normal! " .. keys .. "\"")) diff --git a/lua/conjure-macroreplace/aniseed/setup.lua b/lua/conjure-expand/aniseed/setup.lua similarity index 81% rename from lua/conjure-macroreplace/aniseed/setup.lua rename to lua/conjure-expand/aniseed/setup.lua index 6d1293e..21e42dc 100644 --- a/lua/conjure-macroreplace/aniseed/setup.lua +++ b/lua/conjure-expand/aniseed/setup.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.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 autoload = (require("conjure-expand.aniseed.autoload")).autoload +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 _2amodule_locals_2a["env"] = env _2amodule_locals_2a["eval"] = eval diff --git a/lua/conjure-macroreplace/aniseed/string.lua b/lua/conjure-expand/aniseed/string.lua similarity index 90% rename from lua/conjure-macroreplace/aniseed/string.lua rename to lua/conjure-expand/aniseed/string.lua index 7f55ced..e979e77 100644 --- a/lua/conjure-macroreplace/aniseed/string.lua +++ b/lua/conjure-expand/aniseed/string.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.aniseed.autoload")).autoload -local a = autoload("conjure-macroreplace.aniseed.core") +local autoload = (require("conjure-expand.aniseed.autoload")).autoload +local a = autoload("conjure-expand.aniseed.core") do end (_2amodule_locals_2a)["a"] = a local function join(...) local args = {...} diff --git a/lua/conjure-macroreplace/aniseed/test.lua b/lua/conjure-expand/aniseed/test.lua similarity index 93% rename from lua/conjure-macroreplace/aniseed/test.lua rename to lua/conjure-expand/aniseed/test.lua index cc2085e..ac258db 100644 --- a/lua/conjure-macroreplace/aniseed/test.lua +++ b/lua/conjure-expand/aniseed/test.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,8 +10,8 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local autoload = (require("conjure-macroreplace.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 autoload = (require("conjure-expand.aniseed.autoload")).autoload +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 _2amodule_locals_2a["fs"] = fs _2amodule_locals_2a["nvim"] = nvim diff --git a/lua/conjure-macroreplace/aniseed/view.lua b/lua/conjure-expand/aniseed/view.lua similarity index 78% rename from lua/conjure-macroreplace/aniseed/view.lua rename to lua/conjure-expand/aniseed/view.lua index 7b2f3d7..d8aee24 100644 --- a/lua/conjure-macroreplace/aniseed/view.lua +++ b/lua/conjure-expand/aniseed/view.lua @@ -1,5 +1,5 @@ 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 do package.loaded[_2amodule_name_2a] = {} @@ -10,7 +10,7 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] end -local fnl = require("conjure-macroreplace.aniseed.fennel") +local fnl = require("conjure-expand.aniseed.fennel") do end (_2amodule_locals_2a)["fnl"] = fnl local function serialise(...) return fnl.impl().view(...) diff --git a/lua/conjure-macroreplace/main.lua b/lua/conjure-expand/main.lua similarity index 89% rename from lua/conjure-macroreplace/main.lua rename to lua/conjure-expand/main.lua index ee81eec..266b3da 100644 --- a/lua/conjure-macroreplace/main.lua +++ b/lua/conjure-expand/main.lua @@ -1,5 +1,5 @@ -local _2afile_2a = "fnl/conjure-macroreplace/main.fnl" -local _2amodule_name_2a = "conjure-macroreplace.main" +local _2afile_2a = "fnl/conjure-expand/main.fnl" +local _2amodule_name_2a = "conjure-expand.main" local _2amodule_2a do package.loaded[_2amodule_name_2a] = {} @@ -10,7 +10,7 @@ do _2amodule_2a["aniseed/locals"] = {} _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] 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 _2amodule_locals_2a["bridge"] = bridge _2amodule_locals_2a["buffer"] = buffer