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

@@ -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

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]

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))

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))

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))

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))

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))

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)]

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

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))

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))

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))

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

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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)

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))

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))

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))

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))

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))

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))
 

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))
 

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))
 

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]

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))

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))
 

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))

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)

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}

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))

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))

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))

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))

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))

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))

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))

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))

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))

fnl/conjure/remote/transport/bencode/impl.fnl

@@ -1 +1 @@
-(include :deps.bencode.bencode)
+(include "./deps/bencode/bencode")