From eb8b6e0256d4df1b8a7840d0fa877573b15fddbb Mon Sep 17 00:00:00 2001 From: Oliver Caldwell Date: Sun, 9 Feb 2025 08:07:01 +0000 Subject: [PATCH] Move nfnl into a conjure.nfnl.* prefixed space, compile everything Also fix the fact that guile/nrepl wasn't compiling because it was missing the nfnl header. Still need to clone bencode to the repo so I can rebuild the bencode file through include but I'm on a plane lol Almost have everything nfnl compiling and embedding Tests hang though and bencode impl won't embed for some reason. Use relative include for bencode, don't need to mess with paths Remove nfnl from make deps, we do it from the nfnl repo now Remove stray files --- Makefile | 5 - fnl/conjure/buffer.fnl | 4 +- fnl/conjure/client.fnl | 2 +- fnl/conjure/client/clojure/nrepl/action.fnl | 2 +- .../client/clojure/nrepl/auto-repl.fnl | 2 +- fnl/conjure/client/clojure/nrepl/debugger.fnl | 2 +- fnl/conjure/client/clojure/nrepl/init.fnl | 2 +- fnl/conjure/client/clojure/nrepl/server.fnl | 4 +- fnl/conjure/client/clojure/nrepl/state.fnl | 2 +- fnl/conjure/client/clojure/nrepl/ui.fnl | 2 +- fnl/conjure/client/common-lisp/swank.fnl | 2 +- fnl/conjure/client/fennel/aniseed.fnl | 2 +- fnl/conjure/client/fennel/nfnl.fnl | 14 +- fnl/conjure/client/fennel/stdio.fnl | 2 +- fnl/conjure/client/guile/socket.fnl | 2 +- fnl/conjure/client/hy/stdio.fnl | 2 +- fnl/conjure/client/janet/netrepl.fnl | 2 +- fnl/conjure/client/janet/stdio.fnl | 2 +- fnl/conjure/client/julia/stdio.fnl | 2 +- fnl/conjure/client/lua/neovim.fnl | 2 +- fnl/conjure/client/python/stdio.fnl | 2 +- fnl/conjure/client/racket/stdio.fnl | 2 +- fnl/conjure/client/rust/evcxr.fnl | 2 +- fnl/conjure/client/scheme/stdio.fnl | 2 +- fnl/conjure/client/snd-s7/stdio.fnl | 2 +- fnl/conjure/client/sql/stdio.fnl | 2 +- fnl/conjure/config.fnl | 2 +- fnl/conjure/dynamic.fnl | 2 +- fnl/conjure/editor.fnl | 2 +- fnl/conjure/eval.fnl | 2 +- fnl/conjure/event.fnl | 2 +- fnl/conjure/extract.fnl | 2 +- fnl/conjure/extract/searchpair.fnl | 2 +- fnl/conjure/fs.fnl | 4 +- fnl/conjure/hook.fnl | 2 +- fnl/conjure/inline.fnl | 2 +- fnl/conjure/linked-list.fnl | 2 +- fnl/conjure/log.fnl | 2 +- fnl/conjure/main.fnl | 2 +- fnl/conjure/mapping.fnl | 2 +- fnl/conjure/net.fnl | 2 +- fnl/{ => conjure}/nfnl/macros.fnl | 0 fnl/conjure/nfnl/macros/aniseed.fnl | 53 +++++++ fnl/conjure/process.fnl | 2 +- fnl/conjure/promise.fnl | 2 +- fnl/conjure/remote/netrepl.fnl | 2 +- fnl/conjure/remote/nrepl.fnl | 2 +- fnl/conjure/remote/socket.fnl | 2 +- fnl/conjure/remote/stdio-rt.fnl | 2 +- fnl/conjure/remote/stdio.fnl | 2 +- fnl/conjure/remote/stdio2.fnl | 2 +- fnl/conjure/remote/swank.fnl | 2 +- fnl/conjure/remote/transport/bencode/impl.fnl | 2 +- fnl/conjure/remote/transport/bencode/init.fnl | 2 +- fnl/conjure/remote/transport/elisp.fnl | 2 +- fnl/conjure/remote/transport/netrepl.fnl | 2 +- fnl/conjure/remote/transport/swank.fnl | 2 +- fnl/conjure/school.fnl | 4 +- fnl/conjure/stack.fnl | 2 +- fnl/conjure/text.fnl | 2 +- fnl/conjure/timer.fnl | 2 +- fnl/conjure/tree-sitter.fnl | 4 +- fnl/conjure/uuid.fnl | 6 +- lua/conjure/buffer.lua | 4 +- lua/conjure/client.lua | 2 +- lua/conjure/client/clojure/nrepl/action.lua | 2 +- .../client/clojure/nrepl/auto-repl.lua | 2 +- lua/conjure/client/clojure/nrepl/debugger.lua | 2 +- lua/conjure/client/clojure/nrepl/init.lua | 2 +- lua/conjure/client/clojure/nrepl/server.lua | 4 +- lua/conjure/client/clojure/nrepl/state.lua | 2 +- lua/conjure/client/clojure/nrepl/ui.lua | 2 +- lua/conjure/client/common-lisp/swank.lua | 2 +- lua/conjure/client/fennel/aniseed.lua | 2 +- lua/conjure/client/fennel/nfnl.lua | 14 +- lua/conjure/client/fennel/stdio.lua | 2 +- lua/conjure/client/guile/nrepl.lua | 137 +++++------------- lua/conjure/client/guile/socket.lua | 2 +- lua/conjure/client/hy/stdio.lua | 2 +- lua/conjure/client/janet/netrepl.lua | 2 +- lua/conjure/client/janet/stdio.lua | 2 +- lua/conjure/client/julia/stdio.lua | 2 +- lua/conjure/client/lua/neovim.lua | 2 +- lua/conjure/client/python/stdio.lua | 2 +- lua/conjure/client/racket/stdio.lua | 2 +- lua/conjure/client/rust/evcxr.lua | 2 +- lua/conjure/client/scheme/stdio.lua | 2 +- lua/conjure/client/snd-s7/stdio.lua | 2 +- lua/conjure/client/sql/stdio.lua | 2 +- lua/conjure/config.lua | 2 +- lua/conjure/dynamic.lua | 2 +- lua/conjure/editor.lua | 2 +- lua/conjure/eval.lua | 2 +- lua/conjure/event.lua | 2 +- lua/conjure/extract.lua | 2 +- lua/conjure/extract/searchpair.lua | 2 +- lua/conjure/fs.lua | 4 +- lua/conjure/hook.lua | 2 +- lua/conjure/inline.lua | 2 +- lua/conjure/linked-list.lua | 2 +- lua/conjure/log.lua | 2 +- lua/conjure/main.lua | 2 +- lua/conjure/mapping.lua | 2 +- lua/conjure/net.lua | 2 +- lua/{ => conjure}/nfnl/api.lua | 12 +- lua/{ => conjure}/nfnl/autoload.lua | 0 lua/{ => conjure}/nfnl/callback.lua | 18 +-- lua/{ => conjure}/nfnl/compile.lua | 12 +- lua/{ => conjure}/nfnl/config.lua | 12 +- lua/{ => conjure}/nfnl/core.lua | 4 +- lua/{ => conjure}/nfnl/fennel.lua | 0 lua/{ => conjure}/nfnl/fs.lua | 6 +- lua/{ => conjure}/nfnl/init.lua | 4 +- lua/{ => conjure}/nfnl/module.lua | 0 lua/{ => conjure}/nfnl/notify.lua | 4 +- lua/{ => conjure}/nfnl/nvim.lua | 4 +- lua/{ => conjure}/nfnl/repl.lua | 10 +- lua/{ => conjure}/nfnl/string.lua | 4 +- lua/conjure/process.lua | 2 +- lua/conjure/promise.lua | 2 +- lua/conjure/remote/netrepl.lua | 2 +- lua/conjure/remote/nrepl.lua | 2 +- lua/conjure/remote/socket.lua | 2 +- lua/conjure/remote/stdio-rt.lua | 2 +- lua/conjure/remote/stdio.lua | 2 +- lua/conjure/remote/stdio2.lua | 2 +- lua/conjure/remote/swank.lua | 2 +- lua/conjure/remote/transport/bencode/impl.lua | 4 +- lua/conjure/remote/transport/bencode/init.lua | 2 +- lua/conjure/remote/transport/elisp.lua | 2 +- lua/conjure/remote/transport/netrepl.lua | 2 +- lua/conjure/remote/transport/swank.lua | 2 +- lua/conjure/school.lua | 4 +- lua/conjure/stack.lua | 2 +- lua/conjure/text.lua | 2 +- lua/conjure/timer.lua | 2 +- lua/conjure/tree-sitter.lua | 4 +- lua/conjure/uuid.lua | 6 +- 138 files changed, 283 insertions(+), 296 deletions(-) rename fnl/{ => conjure}/nfnl/macros.fnl (100%) create mode 100644 fnl/conjure/nfnl/macros/aniseed.fnl rename lua/{ => conjure}/nfnl/api.lua (83%) rename lua/{ => conjure}/nfnl/autoload.lua (100%) rename lua/{ => conjure}/nfnl/callback.lua (87%) rename lua/{ => conjure}/nfnl/compile.lua (93%) rename lua/{ => conjure}/nfnl/config.lua (92%) rename lua/{ => conjure}/nfnl/core.lua (99%) rename lua/{ => conjure}/nfnl/fennel.lua (100%) rename lua/{ => conjure}/nfnl/fs.lua (95%) rename lua/{ => conjure}/nfnl/init.lua (89%) rename lua/{ => conjure}/nfnl/module.lua (100%) rename lua/{ => conjure}/nfnl/notify.lua (87%) rename lua/{ => conjure}/nfnl/nvim.lua (78%) rename lua/{ => conjure}/nfnl/repl.lua (87%) rename lua/{ => conjure}/nfnl/string.lua (95%) diff --git a/Makefile b/Makefile index c474427d..4f486a9e 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,6 @@ default: deps sponsors test deps: scripts/dep.sh Olical bencode origin/master - scripts/dep.sh Olical nfnl origin/main - rm -rf lua/nfnl fnl/nfnl - cp -r deps/nfnl/lua/nfnl lua/nfnl - mkdir -p fnl/nfnl - cp -r deps/nfnl/fnl/nfnl/macros* fnl/nfnl sponsors: echo "[ ;; Generated by: make sponsors" > fnl/conjure/sponsors.fnl diff --git a/fnl/conjure/buffer.fnl b/fnl/conjure/buffer.fnl index e58f9cd2..3647632a 100644 --- a/fnl/conjure/buffer.fnl +++ b/fnl/conjure/buffer.fnl @@ -1,6 +1,6 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local nvim (autoload :conjure.aniseed.nvim)) -(local core (autoload :nfnl.core)) +(local core (autoload :conjure.nfnl.core)) (local text (autoload :conjure.text)) (fn unlist [buf] diff --git a/fnl/conjure/client.fnl b/fnl/conjure/client.fnl index ec0d303e..c71eba86 100644 --- a/fnl/conjure/client.fnl +++ b/fnl/conjure/client.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) (local fennel (autoload :conjure.aniseed.fennel)) diff --git a/fnl/conjure/client/clojure/nrepl/action.fnl b/fnl/conjure/client/clojure/nrepl/action.fnl index 11b2bc43..5c3957bb 100644 --- a/fnl/conjure/client/clojure/nrepl/action.fnl +++ b/fnl/conjure/client/clojure/nrepl/action.fnl @@ -1,4 +1,4 @@ -(local autoload (require :nfnl.autoload)) +(local autoload (require :conjure.nfnl.autoload)) (local a (autoload :conjure.aniseed.core)) (local auto-repl (autoload :conjure.client.clojure.nrepl.auto-repl)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/clojure/nrepl/auto-repl.fnl b/fnl/conjure/client/clojure/nrepl/auto-repl.fnl index 34cd055d..28e2ee97 100644 --- a/fnl/conjure/client/clojure/nrepl/auto-repl.fnl +++ b/fnl/conjure/client/clojure/nrepl/auto-repl.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/clojure/nrepl/debugger.fnl b/fnl/conjure/client/clojure/nrepl/debugger.fnl index c88ea9f7..728390f2 100644 --- a/fnl/conjure/client/clojure/nrepl/debugger.fnl +++ b/fnl/conjure/client/clojure/nrepl/debugger.fnl @@ -1,4 +1,4 @@ -(local autoload (require :nfnl.autoload)) +(local autoload (require :conjure.nfnl.autoload)) (local a (autoload :conjure.aniseed.core)) (local elisp (autoload :conjure.remote.transport.elisp)) (local extract (autoload :conjure.extract)) diff --git a/fnl/conjure/client/clojure/nrepl/init.fnl b/fnl/conjure/client/clojure/nrepl/init.fnl index b70f8d40..c69e7b92 100644 --- a/fnl/conjure/client/clojure/nrepl/init.fnl +++ b/fnl/conjure/client/clojure/nrepl/init.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local action (autoload :conjure.client.clojure.nrepl.action)) (local auto-repl (autoload :conjure.client.clojure.nrepl.auto-repl)) diff --git a/fnl/conjure/client/clojure/nrepl/server.fnl b/fnl/conjure/client/clojure/nrepl/server.fnl index 8258af19..26ec322d 100644 --- a/fnl/conjure/client/clojure/nrepl/server.fnl +++ b/fnl/conjure/client/clojure/nrepl/server.fnl @@ -1,4 +1,4 @@ -(local autoload (require :nfnl.autoload)) +(local autoload (require :conjure.nfnl.autoload)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) @@ -11,7 +11,7 @@ (local timer (autoload :conjure.timer)) (local ui (autoload :conjure.client.clojure.nrepl.ui)) (local uuid (autoload :conjure.uuid)) -(local fs (autoload :nfnl.fs)) +(local fs (autoload :conjure.nfnl.fs)) (fn with-conn-or-warn [f opts] (let [conn (state.get :conn)] diff --git a/fnl/conjure/client/clojure/nrepl/state.fnl b/fnl/conjure/client/clojure/nrepl/state.fnl index daa03e26..d3f96d5e 100644 --- a/fnl/conjure/client/clojure/nrepl/state.fnl +++ b/fnl/conjure/client/clojure/nrepl/state.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local client (autoload :conjure.client)) (local get diff --git a/fnl/conjure/client/clojure/nrepl/ui.fnl b/fnl/conjure/client/clojure/nrepl/ui.fnl index b7f924f3..6926638e 100644 --- a/fnl/conjure/client/clojure/nrepl/ui.fnl +++ b/fnl/conjure/client/clojure/nrepl/ui.fnl @@ -1,4 +1,4 @@ -(local autoload (require :nfnl.autoload)) +(local autoload (require :conjure.nfnl.autoload)) (local a (autoload :conjure.aniseed.core)) (local config (autoload :conjure.config)) (local log (autoload :conjure.log)) diff --git a/fnl/conjure/client/common-lisp/swank.fnl b/fnl/conjure/client/common-lisp/swank.fnl index 1f2e905a..57d19bda 100644 --- a/fnl/conjure/client/common-lisp/swank.fnl +++ b/fnl/conjure/client/common-lisp/swank.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/fennel/aniseed.fnl b/fnl/conjure/client/fennel/aniseed.fnl index 59fbafcf..5784f82a 100644 --- a/fnl/conjure/client/fennel/aniseed.fnl +++ b/fnl/conjure/client/fennel/aniseed.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/fennel/nfnl.fnl b/fnl/conjure/client/fennel/nfnl.fnl index 88d49782..1b6f1077 100644 --- a/fnl/conjure/client/fennel/nfnl.fnl +++ b/fnl/conjure/client/fennel/nfnl.fnl @@ -1,14 +1,14 @@ -(local {: autoload : define} (require :nfnl.module)) +(local {: autoload : define} (require :conjure.nfnl.module)) (local ts (autoload :conjure.tree-sitter)) (local config (autoload :conjure.config)) -(local nfnl-config (autoload :nfnl.config)) +(local nfnl-config (autoload :conjure.nfnl.config)) (local text (autoload :conjure.text)) (local log (autoload :conjure.log)) -(local core (autoload :nfnl.core)) -(local fennel (autoload :nfnl.fennel)) -(local str (autoload :nfnl.string)) -(local repl (autoload :nfnl.repl)) -(local fs (autoload :nfnl.fs)) +(local core (autoload :conjure.nfnl.core)) +(local fennel (autoload :conjure.nfnl.fennel)) +(local str (autoload :conjure.nfnl.string)) +(local repl (autoload :conjure.nfnl.repl)) +(local fs (autoload :conjure.nfnl.fs)) (local M (define :conjure.client.fennel.nfnl diff --git a/fnl/conjure/client/fennel/stdio.fnl b/fnl/conjure/client/fennel/stdio.fnl index 478f4b24..774867d5 100644 --- a/fnl/conjure/client/fennel/stdio.fnl +++ b/fnl/conjure/client/fennel/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local afs (autoload :conjure.aniseed.fs)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/client/guile/socket.fnl b/fnl/conjure/client/guile/socket.fnl index 291ee658..a80a3b0e 100644 --- a/fnl/conjure/client/guile/socket.fnl +++ b/fnl/conjure/client/guile/socket.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/hy/stdio.fnl b/fnl/conjure/client/hy/stdio.fnl index a5853793..fd389c9a 100644 --- a/fnl/conjure/client/hy/stdio.fnl +++ b/fnl/conjure/client/hy/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local extract (autoload :conjure.extract)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/client/janet/netrepl.fnl b/fnl/conjure/client/janet/netrepl.fnl index 01f92224..51bba3e4 100644 --- a/fnl/conjure/client/janet/netrepl.fnl +++ b/fnl/conjure/client/janet/netrepl.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/janet/stdio.fnl b/fnl/conjure/client/janet/stdio.fnl index c2263f3f..c1bbab2a 100644 --- a/fnl/conjure/client/janet/stdio.fnl +++ b/fnl/conjure/client/janet/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local stdio (autoload :conjure.remote.stdio)) diff --git a/fnl/conjure/client/julia/stdio.fnl b/fnl/conjure/client/julia/stdio.fnl index b148062c..33161d82 100644 --- a/fnl/conjure/client/julia/stdio.fnl +++ b/fnl/conjure/client/julia/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local stdio (autoload :conjure.remote.stdio)) diff --git a/fnl/conjure/client/lua/neovim.fnl b/fnl/conjure/client/lua/neovim.fnl index a7328d6d..11db1960 100644 --- a/fnl/conjure/client/lua/neovim.fnl +++ b/fnl/conjure/client/lua/neovim.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/python/stdio.fnl b/fnl/conjure/client/python/stdio.fnl index 6dbf9a8c..6ea300fb 100644 --- a/fnl/conjure/client/python/stdio.fnl +++ b/fnl/conjure/client/python/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local extract (autoload :conjure.extract)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/client/racket/stdio.fnl b/fnl/conjure/client/racket/stdio.fnl index 7bbabd22..650cd551 100644 --- a/fnl/conjure/client/racket/stdio.fnl +++ b/fnl/conjure/client/racket/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local stdio (autoload :conjure.remote.stdio)) diff --git a/fnl/conjure/client/rust/evcxr.fnl b/fnl/conjure/client/rust/evcxr.fnl index c6549213..a628babb 100644 --- a/fnl/conjure/client/rust/evcxr.fnl +++ b/fnl/conjure/client/rust/evcxr.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/client/scheme/stdio.fnl b/fnl/conjure/client/scheme/stdio.fnl index 48d30b8f..354f1d54 100644 --- a/fnl/conjure/client/scheme/stdio.fnl +++ b/fnl/conjure/client/scheme/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local stdio (autoload :conjure.remote.stdio)) diff --git a/fnl/conjure/client/snd-s7/stdio.fnl b/fnl/conjure/client/snd-s7/stdio.fnl index d6fab2bb..9c660b72 100644 --- a/fnl/conjure/client/snd-s7/stdio.fnl +++ b/fnl/conjure/client/snd-s7/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/client/sql/stdio.fnl b/fnl/conjure/client/sql/stdio.fnl index f9f9727d..a5b74e87 100644 --- a/fnl/conjure/client/sql/stdio.fnl +++ b/fnl/conjure/client/sql/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local client (autoload :conjure.client)) diff --git a/fnl/conjure/config.fnl b/fnl/conjure/config.fnl index 5bf15b28..45ec7e7b 100644 --- a/fnl/conjure/config.fnl +++ b/fnl/conjure/config.fnl @@ -1,4 +1,4 @@ -(local autoload (require :nfnl.autoload)) +(local autoload (require :conjure.nfnl.autoload)) (local nvim (autoload :conjure.aniseed.nvim)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/dynamic.fnl b/fnl/conjure/dynamic.fnl index 67e65bd1..e2d5223f 100644 --- a/fnl/conjure/dynamic.fnl +++ b/fnl/conjure/dynamic.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local get-stack-key :conjure.dynamic/get-stack) diff --git a/fnl/conjure/editor.fnl b/fnl/conjure/editor.fnl index 503c5fb7..8bce9207 100644 --- a/fnl/conjure/editor.fnl +++ b/fnl/conjure/editor.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local fs (autoload :conjure.fs)) (local nvim (autoload :conjure.aniseed.nvim)) diff --git a/fnl/conjure/eval.fnl b/fnl/conjure/eval.fnl index eeb12be5..44c373cc 100644 --- a/fnl/conjure/eval.fnl +++ b/fnl/conjure/eval.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/event.fnl b/fnl/conjure/event.fnl index 168eaf8b..08677188 100644 --- a/fnl/conjure/event.fnl +++ b/fnl/conjure/event.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local nvim (autoload :conjure.aniseed.nvim)) (local a (autoload :conjure.aniseed.core)) (local text (autoload :conjure.text)) diff --git a/fnl/conjure/extract.fnl b/fnl/conjure/extract.fnl index 9f650d0b..9f217d17 100644 --- a/fnl/conjure/extract.fnl +++ b/fnl/conjure/extract.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) (local nu (autoload :conjure.aniseed.nvim.util)) diff --git a/fnl/conjure/extract/searchpair.fnl b/fnl/conjure/extract/searchpair.fnl index ca2866ff..62865be3 100644 --- a/fnl/conjure/extract/searchpair.fnl +++ b/fnl/conjure/extract/searchpair.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/fs.fnl b/fnl/conjure/fs.fnl index 2a0306d3..dcecf5ad 100644 --- a/fnl/conjure/fs.fnl +++ b/fnl/conjure/fs.fnl @@ -1,8 +1,8 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local config (autoload :conjure.config)) -(local nfs (autoload :nfnl.fs)) +(local nfs (autoload :conjure.nfnl.fs)) (local path-sep (nfs.path-sep)) diff --git a/fnl/conjure/hook.fnl b/fnl/conjure/hook.fnl index 734a2483..27565d23 100644 --- a/fnl/conjure/hook.fnl +++ b/fnl/conjure/hook.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/inline.fnl b/fnl/conjure/inline.fnl index a0439ceb..0c42ade3 100644 --- a/fnl/conjure/inline.fnl +++ b/fnl/conjure/inline.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/linked-list.fnl b/fnl/conjure/linked-list.fnl index 3ce046b5..503e1720 100644 --- a/fnl/conjure/linked-list.fnl +++ b/fnl/conjure/linked-list.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (fn create [xs prev] diff --git a/fnl/conjure/log.fnl b/fnl/conjure/log.fnl index 5b134f02..03720b8c 100644 --- a/fnl/conjure/log.fnl +++ b/fnl/conjure/log.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local buffer (autoload :conjure.buffer)) diff --git a/fnl/conjure/main.fnl b/fnl/conjure/main.fnl index e6413765..8a429de9 100644 --- a/fnl/conjure/main.fnl +++ b/fnl/conjure/main.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local mapping (autoload :conjure.mapping)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/mapping.fnl b/fnl/conjure/mapping.fnl index 143ef2f5..a8370296 100644 --- a/fnl/conjure/mapping.fnl +++ b/fnl/conjure/mapping.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local config (autoload :conjure.config)) diff --git a/fnl/conjure/net.fnl b/fnl/conjure/net.fnl index a7da3c9e..84e1e1c7 100644 --- a/fnl/conjure/net.fnl +++ b/fnl/conjure/net.fnl @@ -1,4 +1,4 @@ -(local {: autoload : define} (require :nfnl.module)) +(local {: autoload : define} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (import-macros {: augroup : autocmd} :conjure.macros) diff --git a/fnl/nfnl/macros.fnl b/fnl/conjure/nfnl/macros.fnl similarity index 100% rename from fnl/nfnl/macros.fnl rename to fnl/conjure/nfnl/macros.fnl diff --git a/fnl/conjure/nfnl/macros/aniseed.fnl b/fnl/conjure/nfnl/macros/aniseed.fnl new file mode 100644 index 00000000..5c63adb1 --- /dev/null +++ b/fnl/conjure/nfnl/macros/aniseed.fnl @@ -0,0 +1,53 @@ +;; [nfnl-macro] + +;; Copied over from Aniseed. Contains all of the def* module macro systems. +;; https://github.com/Olical/aniseed + +;; This has been heavily slimmed down from the original implementation, the +;; `(module ...) macro can now ONLY define your module, it can not be used +;; to require dependencies. + +;; We had to slim things down because the Fennel compiler no longer supports +;; the weird tricks we were using. + +;; In nfnl they are not automatically required, you must use import-macros to +;; require them explicitly when migrating your Aniseed based projects. + +;; Avoids the compiler complaining that we're introducing locals without gensym. +(local mod-str :*module*) +(local mod-sym (sym mod-str)) + +;; Upserts the existence of the module for subsequent def forms. +;; +;; (module foo +;; {:some-optional-base :table-of-things +;; :to-base :the-module-off-of}) +(fn module [mod-name mod-base] + `(local + ,mod-sym + (let [pkg# (require :package)] + (tset pkg#.loaded ,(tostring mod-name) ,(or mod-base {})) + (. pkg#.loaded ,(tostring mod-name))))) + +(fn def- [name value] + `(local ,name ,value)) + +(fn def [name value] + `(local ,name (do (tset ,mod-sym ,(tostring name) ,value) (. ,mod-sym ,(tostring name))))) + +(fn defn- [name ...] + `(fn ,name ,...)) + +(fn defn [name ...] + `(def ,name (fn ,name ,...))) + +(fn defonce- [name value] + `(def- ,name (or ,name ,value))) + +(fn defonce [name value] + `(def ,name (or (. ,mod-sym ,(tostring name)) ,value))) + +{:module module + :def- def- :def def + :defn- defn- :defn defn + :defonce- defonce- :defonce defonce} diff --git a/fnl/conjure/process.fnl b/fnl/conjure/process.fnl index cb460760..89bfc68d 100644 --- a/fnl/conjure/process.fnl +++ b/fnl/conjure/process.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/promise.fnl b/fnl/conjure/promise.fnl index 5caacc31..45b268f7 100644 --- a/fnl/conjure/promise.fnl +++ b/fnl/conjure/promise.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) (local uuid (autoload :conjure.uuid)) diff --git a/fnl/conjure/remote/netrepl.fnl b/fnl/conjure/remote/netrepl.fnl index e8d3b755..f0e607fa 100644 --- a/fnl/conjure/remote/netrepl.fnl +++ b/fnl/conjure/remote/netrepl.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local log (autoload :conjure.log)) diff --git a/fnl/conjure/remote/nrepl.fnl b/fnl/conjure/remote/nrepl.fnl index 9e165f8a..78603753 100644 --- a/fnl/conjure/remote/nrepl.fnl +++ b/fnl/conjure/remote/nrepl.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local bencode (autoload :conjure.remote.transport.bencode)) (local client (autoload :conjure.client)) diff --git a/fnl/conjure/remote/socket.fnl b/fnl/conjure/remote/socket.fnl index 8f539bcb..fdde4814 100644 --- a/fnl/conjure/remote/socket.fnl +++ b/fnl/conjure/remote/socket.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local log (autoload :conjure.log)) diff --git a/fnl/conjure/remote/stdio-rt.fnl b/fnl/conjure/remote/stdio-rt.fnl index 137d889c..32bdedf3 100644 --- a/fnl/conjure/remote/stdio-rt.fnl +++ b/fnl/conjure/remote/stdio-rt.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local client (autoload :conjure.client)) diff --git a/fnl/conjure/remote/stdio.fnl b/fnl/conjure/remote/stdio.fnl index 7406ef07..11872b5a 100644 --- a/fnl/conjure/remote/stdio.fnl +++ b/fnl/conjure/remote/stdio.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local client (autoload :conjure.client)) diff --git a/fnl/conjure/remote/stdio2.fnl b/fnl/conjure/remote/stdio2.fnl index 7897c06b..1b0971fb 100644 --- a/fnl/conjure/remote/stdio2.fnl +++ b/fnl/conjure/remote/stdio2.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) (local client (autoload :conjure.client)) diff --git a/fnl/conjure/remote/swank.fnl b/fnl/conjure/remote/swank.fnl index 6820acd8..015358d5 100644 --- a/fnl/conjure/remote/swank.fnl +++ b/fnl/conjure/remote/swank.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local client (autoload :conjure.client)) (local net (autoload :conjure.net)) diff --git a/fnl/conjure/remote/transport/bencode/impl.fnl b/fnl/conjure/remote/transport/bencode/impl.fnl index 139f9330..a84d7c6e 100644 --- a/fnl/conjure/remote/transport/bencode/impl.fnl +++ b/fnl/conjure/remote/transport/bencode/impl.fnl @@ -1 +1 @@ -(include :deps.bencode.bencode) +(include "./deps/bencode/bencode") diff --git a/fnl/conjure/remote/transport/bencode/init.fnl b/fnl/conjure/remote/transport/bencode/init.fnl index 80e5cb27..51875059 100644 --- a/fnl/conjure/remote/transport/bencode/init.fnl +++ b/fnl/conjure/remote/transport/bencode/init.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local impl (autoload :conjure.remote.transport.bencode.impl)) (local a (autoload :conjure.aniseed.core)) diff --git a/fnl/conjure/remote/transport/elisp.fnl b/fnl/conjure/remote/transport/elisp.fnl index d5a4be61..4993594a 100644 --- a/fnl/conjure/remote/transport/elisp.fnl +++ b/fnl/conjure/remote/transport/elisp.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local stack (autoload :conjure.stack)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/remote/transport/netrepl.fnl b/fnl/conjure/remote/transport/netrepl.fnl index 01aba275..b0b83055 100644 --- a/fnl/conjure/remote/transport/netrepl.fnl +++ b/fnl/conjure/remote/transport/netrepl.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local bit (autoload :bit)) diff --git a/fnl/conjure/remote/transport/swank.fnl b/fnl/conjure/remote/transport/swank.fnl index 1a177645..142e9954 100644 --- a/fnl/conjure/remote/transport/swank.fnl +++ b/fnl/conjure/remote/transport/swank.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local log (autoload :conjure.log)) diff --git a/fnl/conjure/school.fnl b/fnl/conjure/school.fnl index 932ad90e..2680c38a 100644 --- a/fnl/conjure/school.fnl +++ b/fnl/conjure/school.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local buffer (autoload :conjure.buffer)) (local config (autoload :conjure.config)) @@ -57,7 +57,7 @@ (append (a.concat [ - "(local {: autoload} (require :nfnl.module))" + "(local {: autoload} (require :conjure.nfnl.module))" "(local school (require :conjure.school))" "" ";; Welcome to Conjure school!" diff --git a/fnl/conjure/stack.fnl b/fnl/conjure/stack.fnl index 64de65c5..c3f354d3 100644 --- a/fnl/conjure/stack.fnl +++ b/fnl/conjure/stack.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (fn push [s v] diff --git a/fnl/conjure/text.fnl b/fnl/conjure/text.fnl index 77a15011..d62a6a73 100644 --- a/fnl/conjure/text.fnl +++ b/fnl/conjure/text.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local str (autoload :conjure.aniseed.string)) diff --git a/fnl/conjure/timer.fnl b/fnl/conjure/timer.fnl index 1006eb3f..d6fb5dd3 100644 --- a/fnl/conjure/timer.fnl +++ b/fnl/conjure/timer.fnl @@ -1,4 +1,4 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload} (require :conjure.nfnl.module)) (local a (autoload :conjure.aniseed.core)) (local nvim (autoload :conjure.aniseed.nvim)) diff --git a/fnl/conjure/tree-sitter.fnl b/fnl/conjure/tree-sitter.fnl index 4b161bf0..d0f1d755 100644 --- a/fnl/conjure/tree-sitter.fnl +++ b/fnl/conjure/tree-sitter.fnl @@ -1,5 +1,5 @@ -(local {: autoload} (require :nfnl.module)) -(local a (autoload :nfnl.core)) +(local {: autoload} (require :conjure.nfnl.module)) +(local a (autoload :conjure.nfnl.core)) (local client (autoload :conjure.client)) (local config (autoload :conjure.config)) (local text (autoload :conjure.text)) diff --git a/fnl/conjure/uuid.fnl b/fnl/conjure/uuid.fnl index ae7cb788..fa705e3c 100644 --- a/fnl/conjure/uuid.fnl +++ b/fnl/conjure/uuid.fnl @@ -1,6 +1,6 @@ -(local {: autoload} (require :nfnl.module)) -(local a (autoload :nfnl.core)) -(local str (autoload :nfnl.string)) +(local {: autoload} (require :conjure.nfnl.module)) +(local a (autoload :conjure.nfnl.core)) +(local str (autoload :conjure.nfnl.string)) ;; Adapted from https://gist.github.com/jrus/3197011 diff --git a/lua/conjure/buffer.lua b/lua/conjure/buffer.lua index f1937ad0..6b9dd999 100644 --- a/lua/conjure/buffer.lua +++ b/lua/conjure/buffer.lua @@ -1,8 +1,8 @@ -- [nfnl] Compiled from fnl/conjure/buffer.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local nvim = autoload("conjure.aniseed.nvim") -local core = autoload("nfnl.core") +local core = autoload("conjure.nfnl.core") local text = autoload("conjure.text") local function unlist(buf) return nvim.buf_set_option(buf, "buflisted", false) diff --git a/lua/conjure/client.lua b/lua/conjure/client.lua index 1133ed56..1392d5d9 100644 --- a/lua/conjure/client.lua +++ b/lua/conjure/client.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/client/clojure/nrepl/action.lua b/lua/conjure/client/clojure/nrepl/action.lua index ca5e3ead..a998322e 100644 --- a/lua/conjure/client/clojure/nrepl/action.lua +++ b/lua/conjure/client/clojure/nrepl/action.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/action.fnl by https://github.com/Olical/nfnl, do not edit. -local autoload = require("nfnl.autoload") +local autoload = require("conjure.nfnl.autoload") local a = autoload("conjure.aniseed.core") local auto_repl = autoload("conjure.client.clojure.nrepl.auto-repl") local config = autoload("conjure.config") diff --git a/lua/conjure/client/clojure/nrepl/auto-repl.lua b/lua/conjure/client/clojure/nrepl/auto-repl.lua index 85abb7fb..1709a8e0 100644 --- a/lua/conjure/client/clojure/nrepl/auto-repl.lua +++ b/lua/conjure/client/clojure/nrepl/auto-repl.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/auto-repl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/client/clojure/nrepl/debugger.lua b/lua/conjure/client/clojure/nrepl/debugger.lua index 241d8e06..4c7c7de3 100644 --- a/lua/conjure/client/clojure/nrepl/debugger.lua +++ b/lua/conjure/client/clojure/nrepl/debugger.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/debugger.fnl by https://github.com/Olical/nfnl, do not edit. -local autoload = require("nfnl.autoload") +local autoload = require("conjure.nfnl.autoload") local a = autoload("conjure.aniseed.core") local elisp = autoload("conjure.remote.transport.elisp") local extract = autoload("conjure.extract") diff --git a/lua/conjure/client/clojure/nrepl/init.lua b/lua/conjure/client/clojure/nrepl/init.lua index 0e1b3627..0c0dffb8 100644 --- a/lua/conjure/client/clojure/nrepl/init.lua +++ b/lua/conjure/client/clojure/nrepl/init.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/init.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local action = autoload("conjure.client.clojure.nrepl.action") diff --git a/lua/conjure/client/clojure/nrepl/server.lua b/lua/conjure/client/clojure/nrepl/server.lua index aded0884..e0d36c80 100644 --- a/lua/conjure/client/clojure/nrepl/server.lua +++ b/lua/conjure/client/clojure/nrepl/server.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/server.fnl by https://github.com/Olical/nfnl, do not edit. -local autoload = require("nfnl.autoload") +local autoload = require("conjure.nfnl.autoload") local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") local config = autoload("conjure.config") @@ -12,7 +12,7 @@ local str = autoload("conjure.aniseed.string") local timer = autoload("conjure.timer") local ui = autoload("conjure.client.clojure.nrepl.ui") local uuid = autoload("conjure.uuid") -local fs = autoload("nfnl.fs") +local fs = autoload("conjure.nfnl.fs") local function with_conn_or_warn(f, opts) local conn = state.get("conn") if conn then diff --git a/lua/conjure/client/clojure/nrepl/state.lua b/lua/conjure/client/clojure/nrepl/state.lua index 25196c26..a171fc7c 100644 --- a/lua/conjure/client/clojure/nrepl/state.lua +++ b/lua/conjure/client/clojure/nrepl/state.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/state.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local client = autoload("conjure.client") local get diff --git a/lua/conjure/client/clojure/nrepl/ui.lua b/lua/conjure/client/clojure/nrepl/ui.lua index c415739a..4066658b 100644 --- a/lua/conjure/client/clojure/nrepl/ui.lua +++ b/lua/conjure/client/clojure/nrepl/ui.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/clojure/nrepl/ui.fnl by https://github.com/Olical/nfnl, do not edit. -local autoload = require("nfnl.autoload") +local autoload = require("conjure.nfnl.autoload") local a = autoload("conjure.aniseed.core") local config = autoload("conjure.config") local log = autoload("conjure.log") diff --git a/lua/conjure/client/common-lisp/swank.lua b/lua/conjure/client/common-lisp/swank.lua index e47a9658..04efe14d 100644 --- a/lua/conjure/client/common-lisp/swank.lua +++ b/lua/conjure/client/common-lisp/swank.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/common-lisp/swank.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/client/fennel/aniseed.lua b/lua/conjure/client/fennel/aniseed.lua index 6d547b0f..f55f093a 100644 --- a/lua/conjure/client/fennel/aniseed.lua +++ b/lua/conjure/client/fennel/aniseed.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/fennel/aniseed.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/client/fennel/nfnl.lua b/lua/conjure/client/fennel/nfnl.lua index 0a0c7dff..2d60b5ba 100644 --- a/lua/conjure/client/fennel/nfnl.lua +++ b/lua/conjure/client/fennel/nfnl.lua @@ -1,17 +1,17 @@ -- [nfnl] Compiled from fnl/conjure/client/fennel/nfnl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local define = _local_1_["define"] local ts = autoload("conjure.tree-sitter") local config = autoload("conjure.config") -local nfnl_config = autoload("nfnl.config") +local nfnl_config = autoload("conjure.nfnl.config") local text = autoload("conjure.text") local log = autoload("conjure.log") -local core = autoload("nfnl.core") -local fennel = autoload("nfnl.fennel") -local str = autoload("nfnl.string") -local repl = autoload("nfnl.repl") -local fs = autoload("nfnl.fs") +local core = autoload("conjure.nfnl.core") +local fennel = autoload("conjure.nfnl.fennel") +local str = autoload("conjure.nfnl.string") +local repl = autoload("conjure.nfnl.repl") +local fs = autoload("conjure.nfnl.fs") local M = define("conjure.client.fennel.nfnl", {["comment-node?"] = ts["lisp-comment-node?"], ["buf-suffix"] = ".fnl", ["comment-prefix"] = "; "}) M["form-node?"] = function(node) return ts["node-surrounded-by-form-pair-chars?"](node, {{"#(", ")"}}) diff --git a/lua/conjure/client/fennel/stdio.lua b/lua/conjure/client/fennel/stdio.lua index 32248bcf..d25ccef9 100644 --- a/lua/conjure/client/fennel/stdio.lua +++ b/lua/conjure/client/fennel/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/fennel/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local afs = autoload("conjure.aniseed.fs") diff --git a/lua/conjure/client/guile/nrepl.lua b/lua/conjure/client/guile/nrepl.lua index 3169ecb5..60c53188 100644 --- a/lua/conjure/client/guile/nrepl.lua +++ b/lua/conjure/client/guile/nrepl.lua @@ -1,120 +1,59 @@ -local _2afile_2a = "fnl/conjure/client/guile/nrepl.fnl" -local _2amodule_name_2a = "conjure.client.guile.nrepl" -local _2amodule_2a -do - package.loaded[_2amodule_name_2a] = {} - _2amodule_2a = package.loaded[_2amodule_name_2a] -end -local _2amodule_locals_2a -do - _2amodule_2a["aniseed/locals"] = {} - _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] -end -local autoload = (require("conjure.aniseed.autoload")).autoload -local a, client, config, eval, mapping, nvim, str, text, ts, util = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.eval"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter"), autoload("conjure.util") -do end (_2amodule_locals_2a)["a"] = a -_2amodule_locals_2a["client"] = client -_2amodule_locals_2a["config"] = config -_2amodule_locals_2a["eval"] = eval -_2amodule_locals_2a["mapping"] = mapping -_2amodule_locals_2a["nvim"] = nvim -_2amodule_locals_2a["str"] = str -_2amodule_locals_2a["text"] = text -_2amodule_locals_2a["ts"] = ts -_2amodule_locals_2a["util"] = util +-- [nfnl] Compiled from fnl/conjure/client/guile/nrepl.fnl by https://github.com/Olical/nfnl, do not edit. +module(conjure.client.guile.nrepl, {[autoload] = {[nvim] = conjure.aniseed.nvim, [a] = conjure.aniseed.core, [mapping] = conjure.mapping, [eval] = conjure.eval, [str] = conjure.aniseed.string, [text] = conjure.text, [config] = conjure.config, [client] = conjure.client, [util] = conjure.util, [ts] = conjure["tree-sitter"]}}) config.merge({client = {guile = {nrepl = {default_host = "localhost", port_files = {".nrepl-port"}}}}}) if config["get-in"]({"mapping", "enable_defaults"}) then config.merge({client = {guile = {nrepl = {mapping = {disconnect = "cd", connect_port_file = "cf", interrupt = "ei"}}}}}) else end -local cfg = config["get-in-fn"]({"client", "guile", "nrepl"}) -do end (_2amodule_locals_2a)["cfg"] = cfg -local state +__fnl_global__def_2d(cfg, config["get-in-fn"]({"client", "guile", "nrepl"})) local function _2_() return {repl = nil} end -state = ((_2amodule_2a).state or client["new-state"](_2_)) -do end (_2amodule_locals_2a)["state"] = state -local buf_suffix = ".scm" -_2amodule_2a["buf-suffix"] = buf_suffix -local comment_prefix = "; " -_2amodule_2a["comment-prefix"] = comment_prefix -local context_pattern = "%(define%-module%s+(%([%g%s]-%))" -_2amodule_2a["context-pattern"] = context_pattern -local form_node_3f = ts["node-surrounded-by-form-pair-chars?"] -_2amodule_2a["form-node?"] = form_node_3f -local comment_node_3f = ts["lisp-comment-node?"] -_2amodule_2a["comment-node?"] = comment_node_3f -local function symbol_node_3f(node) - return string.find(node:type(), "kwd") -end -_2amodule_2a["symbol-node?"] = symbol_node_3f -local function context(header) - local _3_ = header - if (nil ~= _3_) then - local _4_ = parse["strip-shebang"](_3_) - if (nil ~= _4_) then - local _5_ = parse["strip-meta"](_4_) - if (nil ~= _5_) then - local _6_ = parse["strip-comments"](_5_) - if (nil ~= _6_) then - local _7_ = string.match(_6_, "%(%s*ns%s+([^)]*)") - if (nil ~= _7_) then - local _8_ = str.split(_7_, "%s+") - if (nil ~= _8_) then - return a.first(_8_) +__fnl_global__defonce_2d(state, client["new-state"](_2_)) +def(__fnl_global__buf_2dsuffix, ".scm") +def(__fnl_global__comment_2dprefix, "; ") +def(__fnl_global__context_2dpattern, "%(define%-module%s+(%([%g%s]-%))") +def(__fnl_global__form_2dnode_3f, ts["node-surrounded-by-form-pair-chars?"]) +def(__fnl_global__comment_2dnode_3f, ts["lisp-comment-node?"]) +defn(__fnl_global__symbol_2dnode_3f, {node}, string.find(node:type(), "kwd")) +local function _8_(...) + if (nil ~= header) then + local tmp_3_auto = parse["strip-shebang"](header) + if (nil ~= tmp_3_auto) then + local tmp_3_auto0 = parse["strip-meta"](tmp_3_auto) + if (nil ~= tmp_3_auto0) then + local tmp_3_auto1 = parse["strip-comments"](tmp_3_auto0) + if (nil ~= tmp_3_auto1) then + local tmp_3_auto2 = string.match(tmp_3_auto1, "%(%s*ns%s+([^)]*)") + if (nil ~= tmp_3_auto2) then + local tmp_3_auto3 = str.split(tmp_3_auto2, "%s+") + if (nil ~= tmp_3_auto3) then + return a.first(tmp_3_auto3) else - return _8_ + return nil end else - return _7_ + return nil end else - return _6_ + return nil end else - return _5_ + return nil end else - return _4_ + return nil end else - return _3_ + return nil end end -_2amodule_2a["context"] = context -local function eval_file(opts) - return eval_file(opts) -end -_2amodule_2a["eval-file"] = eval_file -local function eval_str(opts) - return eval_str(opts) -end -_2amodule_2a["eval-str"] = eval_str -local function doc_str(opts) - return doc_str(opts) -end -_2amodule_2a["doc-str"] = doc_str -local function def_str(opts) - return def_str(opts) -end -_2amodule_2a["def-str"] = def_str -local function connect(opts) - return __fnl_global__connect_2dhost_2dport(opts) -end -_2amodule_2a["connect"] = connect -local function on_filetype() - mapping.buf("GuileDisconnect", cfg({"mapping", "disconnect"}), util["wrap-require-fn-call"]("conjure.client.guile.nrepl", "disconnect"), {desc = "Disconnect from the current nREPL"}) - mapping.buf("GuileConnectPortFile", cfg({"mapping", "connect_port_file"}), util["wrap-require-fn-call"]("conjure.client.guile.nrepl", "connect-port-file"), {desc = "Connect to port specified in .nrepl-port"}) - return mapping.buf("GuileInterrupt", cfg({"mapping", "interrupt"}), util["wrap-require-fn-call"]("conjure.client.guile.nrepl", "interrupt"), {desc = "Interrupt the current evaluation"}) -end -_2amodule_2a["on-filetype"] = on_filetype -local function on_load() - return __fnl_global__connect_2dport_2dfile() -end -_2amodule_2a["on-load"] = on_load -local function on_exit() - return disconnect() -end -_2amodule_2a["on-exit"] = on_exit -return _2amodule_2a \ No newline at end of file +defn(context, {header}, _8_(...)) +defn(__fnl_global__eval_2dfile, {opts}, __fnl_global__eval_2dfile(opts)) +defn(__fnl_global__eval_2dstr, {opts}, __fnl_global__eval_2dstr(opts)) +defn(__fnl_global__doc_2dstr, {opts}, __fnl_global__doc_2dstr(opts)) +defn(__fnl_global__def_2dstr, {opts}, __fnl_global__def_2dstr(opts)) +defn(connect, {opts}, __fnl_global__connect_2dhost_2dport(opts)) +defn(__fnl_global__on_2dfiletype, {}, mapping.buf("GuileDisconnect", cfg({"mapping", "disconnect"}), util["wrap-require-fn-call"]("conjure.client.guile.nrepl", "disconnect"), {desc = "Disconnect from the current nREPL"}), mapping.buf("GuileConnectPortFile", cfg({"mapping", "connect_port_file"}), util["wrap-require-fn-call"]("conjure.client.guile.nrepl", "connect-port-file"), {desc = "Connect to port specified in .nrepl-port"}), mapping.buf("GuileInterrupt", cfg({"mapping", "interrupt"}), util["wrap-require-fn-call"]("conjure.client.guile.nrepl", "interrupt"), {desc = "Interrupt the current evaluation"})) +defn(__fnl_global__on_2dload, {}, __fnl_global__connect_2dport_2dfile()) +return defn(__fnl_global__on_2dexit, {}, disconnect()) diff --git a/lua/conjure/client/guile/socket.lua b/lua/conjure/client/guile/socket.lua index 384d39b0..28b006ff 100644 --- a/lua/conjure/client/guile/socket.lua +++ b/lua/conjure/client/guile/socket.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/guile/socket.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/client/hy/stdio.lua b/lua/conjure/client/hy/stdio.lua index 1db2fcdd..03d5801f 100644 --- a/lua/conjure/client/hy/stdio.lua +++ b/lua/conjure/client/hy/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/hy/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local extract = autoload("conjure.extract") diff --git a/lua/conjure/client/janet/netrepl.lua b/lua/conjure/client/janet/netrepl.lua index 03a96c80..204ed443 100644 --- a/lua/conjure/client/janet/netrepl.lua +++ b/lua/conjure/client/janet/netrepl.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/janet/netrepl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/client/janet/stdio.lua b/lua/conjure/client/janet/stdio.lua index b26b11ac..6585a3d0 100644 --- a/lua/conjure/client/janet/stdio.lua +++ b/lua/conjure/client/janet/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/janet/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/client/julia/stdio.lua b/lua/conjure/client/julia/stdio.lua index a0805713..fc907b42 100644 --- a/lua/conjure/client/julia/stdio.lua +++ b/lua/conjure/client/julia/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/julia/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/client/lua/neovim.lua b/lua/conjure/client/lua/neovim.lua index 733b6044..cd9c0597 100644 --- a/lua/conjure/client/lua/neovim.lua +++ b/lua/conjure/client/lua/neovim.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/lua/neovim.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/client/python/stdio.lua b/lua/conjure/client/python/stdio.lua index a3d56258..6a76c948 100644 --- a/lua/conjure/client/python/stdio.lua +++ b/lua/conjure/client/python/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/python/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local extract = autoload("conjure.extract") diff --git a/lua/conjure/client/racket/stdio.lua b/lua/conjure/client/racket/stdio.lua index 62bc1f69..f0f3bcba 100644 --- a/lua/conjure/client/racket/stdio.lua +++ b/lua/conjure/client/racket/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/racket/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/client/rust/evcxr.lua b/lua/conjure/client/rust/evcxr.lua index d122ceb4..c714c6a8 100644 --- a/lua/conjure/client/rust/evcxr.lua +++ b/lua/conjure/client/rust/evcxr.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/rust/evcxr.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/client/scheme/stdio.lua b/lua/conjure/client/scheme/stdio.lua index 59530b8b..aaa97e68 100644 --- a/lua/conjure/client/scheme/stdio.lua +++ b/lua/conjure/client/scheme/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/scheme/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/client/snd-s7/stdio.lua b/lua/conjure/client/snd-s7/stdio.lua index 3c37e40e..0e179d30 100644 --- a/lua/conjure/client/snd-s7/stdio.lua +++ b/lua/conjure/client/snd-s7/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/snd-s7/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/client/sql/stdio.lua b/lua/conjure/client/sql/stdio.lua index 8d92021b..5ee8fd06 100644 --- a/lua/conjure/client/sql/stdio.lua +++ b/lua/conjure/client/sql/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/client/sql/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/config.lua b/lua/conjure/config.lua index 5d1ea9dd..78164cc4 100644 --- a/lua/conjure/config.lua +++ b/lua/conjure/config.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/config.fnl by https://github.com/Olical/nfnl, do not edit. -local autoload = require("nfnl.autoload") +local autoload = require("conjure.nfnl.autoload") local nvim = autoload("conjure.aniseed.nvim") local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/dynamic.lua b/lua/conjure/dynamic.lua index 3dd010a1..860b42c9 100644 --- a/lua/conjure/dynamic.lua +++ b/lua/conjure/dynamic.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/dynamic.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local get_stack_key = "conjure.dynamic/get-stack" diff --git a/lua/conjure/editor.lua b/lua/conjure/editor.lua index 695a5270..ff374300 100644 --- a/lua/conjure/editor.lua +++ b/lua/conjure/editor.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/editor.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local fs = autoload("conjure.fs") diff --git a/lua/conjure/eval.lua b/lua/conjure/eval.lua index 614eb735..89cdee26 100644 --- a/lua/conjure/eval.lua +++ b/lua/conjure/eval.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/eval.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/event.lua b/lua/conjure/event.lua index 9f83f2f4..f2225fe7 100644 --- a/lua/conjure/event.lua +++ b/lua/conjure/event.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/event.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local nvim = autoload("conjure.aniseed.nvim") local a = autoload("conjure.aniseed.core") diff --git a/lua/conjure/extract.lua b/lua/conjure/extract.lua index e71a345f..ac46eede 100644 --- a/lua/conjure/extract.lua +++ b/lua/conjure/extract.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/extract.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/extract/searchpair.lua b/lua/conjure/extract/searchpair.lua index ad6f5aa2..f12ca3e2 100644 --- a/lua/conjure/extract/searchpair.lua +++ b/lua/conjure/extract/searchpair.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/extract/searchpair.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/fs.lua b/lua/conjure/fs.lua index 5c9785e7..cd1e352f 100644 --- a/lua/conjure/fs.lua +++ b/lua/conjure/fs.lua @@ -1,10 +1,10 @@ -- [nfnl] Compiled from fnl/conjure/fs.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") local config = autoload("conjure.config") -local nfs = autoload("nfnl.fs") +local nfs = autoload("conjure.nfnl.fs") local path_sep = nfs["path-sep"]() local function env(k) local v = vim.fn.getenv(k) diff --git a/lua/conjure/hook.lua b/lua/conjure/hook.lua index 45e12f99..811e552a 100644 --- a/lua/conjure/hook.lua +++ b/lua/conjure/hook.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/hook.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/inline.lua b/lua/conjure/inline.lua index ade15d83..3f8c827e 100644 --- a/lua/conjure/inline.lua +++ b/lua/conjure/inline.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/inline.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local config = autoload("conjure.config") diff --git a/lua/conjure/linked-list.lua b/lua/conjure/linked-list.lua index 46667f4d..48984606 100644 --- a/lua/conjure/linked-list.lua +++ b/lua/conjure/linked-list.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/linked-list.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local function create(xs, prev) diff --git a/lua/conjure/log.lua b/lua/conjure/log.lua index bed48ae7..367d518d 100644 --- a/lua/conjure/log.lua +++ b/lua/conjure/log.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/log.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/main.lua b/lua/conjure/main.lua index eca41231..155faf97 100644 --- a/lua/conjure/main.lua +++ b/lua/conjure/main.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/main.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local mapping = autoload("conjure.mapping") local config = autoload("conjure.config") diff --git a/lua/conjure/mapping.lua b/lua/conjure/mapping.lua index 2f39c0b3..4dda77e9 100644 --- a/lua/conjure/mapping.lua +++ b/lua/conjure/mapping.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/mapping.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/net.lua b/lua/conjure/net.lua index 76474802..3aef34f3 100644 --- a/lua/conjure/net.lua +++ b/lua/conjure/net.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/net.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local define = _local_1_["define"] local a = autoload("conjure.aniseed.core") diff --git a/lua/nfnl/api.lua b/lua/conjure/nfnl/api.lua similarity index 83% rename from lua/nfnl/api.lua rename to lua/conjure/nfnl/api.lua index 66682c15..f8acdb42 100644 --- a/lua/nfnl/api.lua +++ b/lua/conjure/nfnl/api.lua @@ -1,11 +1,11 @@ -- [nfnl] Compiled from fnl/nfnl/api.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") -local compile = autoload("nfnl.compile") -local config = autoload("nfnl.config") -local notify = autoload("nfnl.notify") -local fs = autoload("nfnl.fs") +local core = autoload("conjure.nfnl.core") +local compile = autoload("conjure.nfnl.compile") +local config = autoload("conjure.nfnl.config") +local notify = autoload("conjure.nfnl.notify") +local fs = autoload("conjure.nfnl.fs") local mod = {} mod["compile-file"] = function(_2_) local path = _2_["path"] diff --git a/lua/nfnl/autoload.lua b/lua/conjure/nfnl/autoload.lua similarity index 100% rename from lua/nfnl/autoload.lua rename to lua/conjure/nfnl/autoload.lua diff --git a/lua/nfnl/callback.lua b/lua/conjure/nfnl/callback.lua similarity index 87% rename from lua/nfnl/callback.lua rename to lua/conjure/nfnl/callback.lua index 11330ba6..2d10ba97 100644 --- a/lua/nfnl/callback.lua +++ b/lua/conjure/nfnl/callback.lua @@ -1,14 +1,14 @@ -- [nfnl] Compiled from fnl/nfnl/callback.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") -local str = autoload("nfnl.string") -local fs = autoload("nfnl.fs") -local nvim = autoload("nfnl.nvim") -local compile = autoload("nfnl.compile") -local config = autoload("nfnl.config") -local api = autoload("nfnl.api") -local notify = autoload("nfnl.notify") +local core = autoload("conjure.nfnl.core") +local str = autoload("conjure.nfnl.string") +local fs = autoload("conjure.nfnl.fs") +local nvim = autoload("conjure.nfnl.nvim") +local compile = autoload("conjure.nfnl.compile") +local config = autoload("conjure.nfnl.config") +local api = autoload("conjure.nfnl.api") +local notify = autoload("conjure.nfnl.notify") local function fennel_buf_write_post_callback_fn(root_dir, cfg) local function _2_(ev) compile["into-file"]({["root-dir"] = root_dir, cfg = cfg, path = fs["full-path"](ev.file), source = nvim["get-buf-content-as-string"](ev.buf)}) diff --git a/lua/nfnl/compile.lua b/lua/conjure/nfnl/compile.lua similarity index 93% rename from lua/nfnl/compile.lua rename to lua/conjure/nfnl/compile.lua index f06d117c..a0f2bf41 100644 --- a/lua/nfnl/compile.lua +++ b/lua/conjure/nfnl/compile.lua @@ -1,11 +1,11 @@ -- [nfnl] Compiled from fnl/nfnl/compile.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") -local fs = autoload("nfnl.fs") -local fennel = autoload("nfnl.fennel") -local notify = autoload("nfnl.notify") -local config = autoload("nfnl.config") +local core = autoload("conjure.nfnl.core") +local fs = autoload("conjure.nfnl.fs") +local fennel = autoload("conjure.nfnl.fennel") +local notify = autoload("conjure.nfnl.notify") +local config = autoload("conjure.nfnl.config") local mod = {} local header_marker = "[nfnl]" local function with_header(file, src) diff --git a/lua/nfnl/config.lua b/lua/conjure/nfnl/config.lua similarity index 92% rename from lua/nfnl/config.lua rename to lua/conjure/nfnl/config.lua index 5e2fb1aa..899a8c4c 100644 --- a/lua/nfnl/config.lua +++ b/lua/conjure/nfnl/config.lua @@ -1,11 +1,11 @@ -- [nfnl] Compiled from fnl/nfnl/config.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") -local fs = autoload("nfnl.fs") -local str = autoload("nfnl.string") -local fennel = autoload("nfnl.fennel") -local notify = autoload("nfnl.notify") +local core = autoload("conjure.nfnl.core") +local fs = autoload("conjure.nfnl.fs") +local str = autoload("conjure.nfnl.string") +local fennel = autoload("conjure.nfnl.fennel") +local notify = autoload("conjure.nfnl.notify") local config_file_name = ".nfnl.fnl" local function find(dir) return fs.findfile(config_file_name, (dir .. ";")) diff --git a/lua/nfnl/core.lua b/lua/conjure/nfnl/core.lua similarity index 99% rename from lua/nfnl/core.lua rename to lua/conjure/nfnl/core.lua index fd0d381a..f875eea3 100644 --- a/lua/nfnl/core.lua +++ b/lua/conjure/nfnl/core.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/nfnl/core.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local fennel = autoload("nfnl.fennel") +local fennel = autoload("conjure.nfnl.fennel") local function rand(n) return (math.random() * (n or 1)) end diff --git a/lua/nfnl/fennel.lua b/lua/conjure/nfnl/fennel.lua similarity index 100% rename from lua/nfnl/fennel.lua rename to lua/conjure/nfnl/fennel.lua diff --git a/lua/nfnl/fs.lua b/lua/conjure/nfnl/fs.lua similarity index 95% rename from lua/nfnl/fs.lua rename to lua/conjure/nfnl/fs.lua index 198e7703..fde6b47c 100644 --- a/lua/nfnl/fs.lua +++ b/lua/conjure/nfnl/fs.lua @@ -1,8 +1,8 @@ -- [nfnl] Compiled from fnl/nfnl/fs.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") -local str = autoload("nfnl.string") +local core = autoload("conjure.nfnl.core") +local str = autoload("conjure.nfnl.string") local function basename(path) if path then return vim.fn.fnamemodify(path, ":h") diff --git a/lua/nfnl/init.lua b/lua/conjure/nfnl/init.lua similarity index 89% rename from lua/nfnl/init.lua rename to lua/conjure/nfnl/init.lua index 9183e272..92182314 100644 --- a/lua/nfnl/init.lua +++ b/lua/conjure/nfnl/init.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/nfnl/init.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local callback = autoload("nfnl.callback") +local callback = autoload("conjure.nfnl.callback") local minimum_neovim_version = "0.9.0" if vim then if (0 == vim.fn.has(("nvim-" .. minimum_neovim_version))) then diff --git a/lua/nfnl/module.lua b/lua/conjure/nfnl/module.lua similarity index 100% rename from lua/nfnl/module.lua rename to lua/conjure/nfnl/module.lua diff --git a/lua/nfnl/notify.lua b/lua/conjure/nfnl/notify.lua similarity index 87% rename from lua/nfnl/notify.lua rename to lua/conjure/nfnl/notify.lua index 37822361..2f94526c 100644 --- a/lua/nfnl/notify.lua +++ b/lua/conjure/nfnl/notify.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/nfnl/notify.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") +local core = autoload("conjure.nfnl.core") local function notify(level, ...) return vim.api.nvim_notify(core.str(...), level, {}) end diff --git a/lua/nfnl/nvim.lua b/lua/conjure/nfnl/nvim.lua similarity index 78% rename from lua/nfnl/nvim.lua rename to lua/conjure/nfnl/nvim.lua index 1c07cb04..19011f44 100644 --- a/lua/nfnl/nvim.lua +++ b/lua/conjure/nfnl/nvim.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/nfnl/nvim.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local str = autoload("nfnl.string") +local str = autoload("conjure.nfnl.string") local function get_buf_content_as_string(buf) return (str.join("\n", vim.api.nvim_buf_get_lines((buf or 0), 0, -1, false)) or "") end diff --git a/lua/nfnl/repl.lua b/lua/conjure/nfnl/repl.lua similarity index 87% rename from lua/nfnl/repl.lua rename to lua/conjure/nfnl/repl.lua index 480f80d4..52f48255 100644 --- a/lua/nfnl/repl.lua +++ b/lua/conjure/nfnl/repl.lua @@ -1,10 +1,10 @@ -- [nfnl] Compiled from fnl/nfnl/repl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") -local fennel = autoload("nfnl.fennel") -local notify = autoload("nfnl.notify") -local str = autoload("nfnl.string") +local core = autoload("conjure.nfnl.core") +local fennel = autoload("conjure.nfnl.fennel") +local notify = autoload("conjure.nfnl.notify") +local str = autoload("conjure.nfnl.string") local function new(opts) local results_to_return = nil local cfg diff --git a/lua/nfnl/string.lua b/lua/conjure/nfnl/string.lua similarity index 95% rename from lua/nfnl/string.lua rename to lua/conjure/nfnl/string.lua index 66b43894..c1084874 100644 --- a/lua/nfnl/string.lua +++ b/lua/conjure/nfnl/string.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/nfnl/string.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local core = autoload("nfnl.core") +local core = autoload("conjure.nfnl.core") local function join(...) local args = {...} local function _2_(...) diff --git a/lua/conjure/process.lua b/lua/conjure/process.lua index 326a76de..58aa37b1 100644 --- a/lua/conjure/process.lua +++ b/lua/conjure/process.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/process.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/promise.lua b/lua/conjure/promise.lua index e3ee5597..98d8577d 100644 --- a/lua/conjure/promise.lua +++ b/lua/conjure/promise.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/promise.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/remote/netrepl.lua b/lua/conjure/remote/netrepl.lua index 71cd1427..70a6c03d 100644 --- a/lua/conjure/remote/netrepl.lua +++ b/lua/conjure/remote/netrepl.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/netrepl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/remote/nrepl.lua b/lua/conjure/remote/nrepl.lua index 7f4e8dc2..ca1016da 100644 --- a/lua/conjure/remote/nrepl.lua +++ b/lua/conjure/remote/nrepl.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/nrepl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local bencode = autoload("conjure.remote.transport.bencode") diff --git a/lua/conjure/remote/socket.lua b/lua/conjure/remote/socket.lua index 3e3ff44f..bb742309 100644 --- a/lua/conjure/remote/socket.lua +++ b/lua/conjure/remote/socket.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/socket.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/remote/stdio-rt.lua b/lua/conjure/remote/stdio-rt.lua index 7417be2f..ad0d3e62 100644 --- a/lua/conjure/remote/stdio-rt.lua +++ b/lua/conjure/remote/stdio-rt.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/stdio-rt.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/remote/stdio.lua b/lua/conjure/remote/stdio.lua index 8bba612f..76202622 100644 --- a/lua/conjure/remote/stdio.lua +++ b/lua/conjure/remote/stdio.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/stdio.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/remote/stdio2.lua b/lua/conjure/remote/stdio2.lua index 58dfac15..fb1a6e12 100644 --- a/lua/conjure/remote/stdio2.lua +++ b/lua/conjure/remote/stdio2.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/stdio2.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/remote/swank.lua b/lua/conjure/remote/swank.lua index 53469bd9..47fdf8df 100644 --- a/lua/conjure/remote/swank.lua +++ b/lua/conjure/remote/swank.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/swank.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local client = autoload("conjure.client") diff --git a/lua/conjure/remote/transport/bencode/impl.lua b/lua/conjure/remote/transport/bencode/impl.lua index 09498a35..e34eab07 100644 --- a/lua/conjure/remote/transport/bencode/impl.lua +++ b/lua/conjure/remote/transport/bencode/impl.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/transport/bencode/impl.fnl by https://github.com/Olical/nfnl, do not edit. -package.preload["deps.bencode.bencode"] = package.preload["deps.bencode.bencode"] or function(...) +package.preload["./deps/bencode/bencode"] = package.preload["./deps/bencode/bencode"] or function(...) -- public domain lua-module for handling bittorrent-bencoded data. -- This module includes both a recursive decoder and a recursive encoder. @@ -179,4 +179,4 @@ package.preload["deps.bencode.bencode"] = package.preload["deps.bencode.bencode" return bencode end -return require("deps.bencode.bencode") +return require("./deps/bencode/bencode") diff --git a/lua/conjure/remote/transport/bencode/init.lua b/lua/conjure/remote/transport/bencode/init.lua index 4ca33e26..ab86d39a 100644 --- a/lua/conjure/remote/transport/bencode/init.lua +++ b/lua/conjure/remote/transport/bencode/init.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/transport/bencode/init.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local impl = autoload("conjure.remote.transport.bencode.impl") local a = autoload("conjure.aniseed.core") diff --git a/lua/conjure/remote/transport/elisp.lua b/lua/conjure/remote/transport/elisp.lua index 54c0c34d..a86fc899 100644 --- a/lua/conjure/remote/transport/elisp.lua +++ b/lua/conjure/remote/transport/elisp.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/transport/elisp.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local stack = autoload("conjure.stack") diff --git a/lua/conjure/remote/transport/netrepl.lua b/lua/conjure/remote/transport/netrepl.lua index 70c22fed..7b089b12 100644 --- a/lua/conjure/remote/transport/netrepl.lua +++ b/lua/conjure/remote/transport/netrepl.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/transport/netrepl.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local bit = autoload("bit") diff --git a/lua/conjure/remote/transport/swank.lua b/lua/conjure/remote/transport/swank.lua index c6e7fe76..20d2b9f5 100644 --- a/lua/conjure/remote/transport/swank.lua +++ b/lua/conjure/remote/transport/swank.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/remote/transport/swank.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local log = autoload("conjure.log") diff --git a/lua/conjure/school.lua b/lua/conjure/school.lua index 2f42e57c..f206fca7 100644 --- a/lua/conjure/school.lua +++ b/lua/conjure/school.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/school.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local buffer = autoload("conjure.buffer") @@ -67,7 +67,7 @@ local function start() else _8_ = {(";; Your is currently mapped to \"" .. nvim.g.maplocalleader .. "\"")} end - return append(a.concat({"(local {: autoload} (require :nfnl.module))", "(local school (require :conjure.school))", "", ";; Welcome to Conjure school!", ";; Grab yourself a nice beverage and let's get evaluating. I hope you enjoy!", "", ";; This language is Fennel, it's quite similar to Clojure.", ";; Conjure is written in Fennel, it's compiled to Lua and executed inside Neovim itself.", ";; This means we can work with a Lisp without installing or running anything else.", "", ";; Note: Some colorschemes will make the HUD unreadable, see here for more: https://git.io/JJ1Hl", "", ";; Let's learn how to evaluate it using Conjure's assortment of mappings.", ";; You can learn how to change these mappings with :help conjure-mappings", "", (";; Let's begin by evaluating the whole buffer using " .. map_str("eval_buf"))}, _8_, {"(school.lesson-1)"})) + return append(a.concat({"(local {: autoload} (require :conjure.nfnl.module))", "(local school (require :conjure.school))", "", ";; Welcome to Conjure school!", ";; Grab yourself a nice beverage and let's get evaluating. I hope you enjoy!", "", ";; This language is Fennel, it's quite similar to Clojure.", ";; Conjure is written in Fennel, it's compiled to Lua and executed inside Neovim itself.", ";; This means we can work with a Lisp without installing or running anything else.", "", ";; Note: Some colorschemes will make the HUD unreadable, see here for more: https://git.io/JJ1Hl", "", ";; Let's learn how to evaluate it using Conjure's assortment of mappings.", ";; You can learn how to change these mappings with :help conjure-mappings", "", (";; Let's begin by evaluating the whole buffer using " .. map_str("eval_buf"))}, _8_, {"(school.lesson-1)"})) end local function lesson_1() return append_or_warn(1, {"", ";; Good job!", ";; You'll notice the heads up display (HUD) appeared showing the result of the evaluation.", ";; All results are appended to a log buffer. If that log is not open, the HUD will appear.", ";; The HUD closes automatically when you move your cursor.", "", ";; You can open the log buffer in a few ways:", (";; * Horizontally - " .. map_str("log_split")), (";; * Vertically - " .. map_str("log_vsplit")), (";; * New tab - " .. map_str("log_tab")), "", (";; All visible log windows (including the HUD) can be closed with " .. map_str("log_close_visible")), ";; Try opening and closing the log window to get the hang of those key mappings.", ";; It's a regular window and buffer, so you can edit and close it however you want.", ";; Feel free to leave the log open in a split for the next lesson to see how it behaves.", "", ";; If you ever need to clear your log you can use the reset mappings:", (";; * Soft reset (leaves windows open) - " .. map_str("log_reset_soft")), (";; * Hard reset (closes windows, deletes the buffer) - " .. map_str("log_reset_hard")), "", ";; Next, we have a form inside a comment. We want to evaluate that inner form, not the comment.", (";; Place your cursor on the inner form (the one inside the comment) and use " .. map_str("eval_current_form") .. " to evaluate it."), "(comment", " (school.lesson-2))"}) diff --git a/lua/conjure/stack.lua b/lua/conjure/stack.lua index 52861e5b..a12733b6 100644 --- a/lua/conjure/stack.lua +++ b/lua/conjure/stack.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/stack.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local function push(s, v) diff --git a/lua/conjure/text.lua b/lua/conjure/text.lua index 3ebbb0ea..657c9181 100644 --- a/lua/conjure/text.lua +++ b/lua/conjure/text.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/text.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local str = autoload("conjure.aniseed.string") diff --git a/lua/conjure/timer.lua b/lua/conjure/timer.lua index 71eb8362..7427aeff 100644 --- a/lua/conjure/timer.lua +++ b/lua/conjure/timer.lua @@ -1,5 +1,5 @@ -- [nfnl] Compiled from fnl/conjure/timer.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] local a = autoload("conjure.aniseed.core") local nvim = autoload("conjure.aniseed.nvim") diff --git a/lua/conjure/tree-sitter.lua b/lua/conjure/tree-sitter.lua index 998d99fc..c28e0878 100644 --- a/lua/conjure/tree-sitter.lua +++ b/lua/conjure/tree-sitter.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/conjure/tree-sitter.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local a = autoload("nfnl.core") +local a = autoload("conjure.nfnl.core") local client = autoload("conjure.client") local config = autoload("conjure.config") local text = autoload("conjure.text") diff --git a/lua/conjure/uuid.lua b/lua/conjure/uuid.lua index 3871e5ee..7c2f3125 100644 --- a/lua/conjure/uuid.lua +++ b/lua/conjure/uuid.lua @@ -1,8 +1,8 @@ -- [nfnl] Compiled from fnl/conjure/uuid.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("nfnl.module") +local _local_1_ = require("conjure.nfnl.module") local autoload = _local_1_["autoload"] -local a = autoload("nfnl.core") -local str = autoload("nfnl.string") +local a = autoload("conjure.nfnl.core") +local str = autoload("conjure.nfnl.string") local function v4() local function _2_(_241) return string.format("%x", (((_241 == "x") and math.random(0, 15)) or math.random(8, 11)))