Merge branch 'develop'

Author: Olical

README.adoc

@@ -54,7 +54,7 @@ Use your favourite plugin manager, mine is https://github.com/junegunn/vim-plug[
 
 [source,viml]
 ----
-Plug 'Olical/conjure', {'tag': 'v4.24.0'}
+Plug 'Olical/conjure', {'tag': 'v4.24.1'}
 ----
 
 You'll need to be on the latest stable Neovim for all of the features (such as floating windows) to work. If you see errors, please check your Neovim version before raising an issue.

lua/conjure/aniseed/compile.lua

@@ -40,16 +40,12 @@ local marker_prefix = "ANISEED_"
 _2amodule_2a["marker-prefix"] = marker_prefix
 local delete_marker = (marker_prefix .. "DELETE_ME")
 do end (_2amodule_2a)["delete-marker"] = delete_marker
-local replace_marker = (marker_prefix .. "REPLACE_ME")
-do end (_2amodule_2a)["replace-marker"] = replace_marker
 local delete_marker_pat = ("\n[^\n]-\"" .. delete_marker .. "\".-")
 do end (_2amodule_locals_2a)["delete-marker-pat"] = delete_marker_pat
-local replace_marker_pat = ("\n[^\n]-\"" .. replace_marker .. "\".-")
-do end (_2amodule_locals_2a)["replace-marker-pat"] = replace_marker_pat
 local function str(code, opts)
   local fnl = fennel.impl()
   local function _5_()
-    return string.gsub(string.gsub(string.gsub(string.gsub(fnl.compileString(macros_prefix(code, opts), a.merge({allowedGlobals = false, compilerEnv = _G}, opts)), (delete_marker_pat .. "\n"), "\n"), (delete_marker_pat .. "$"), ""), (replace_marker_pat .. "\n"), "*module*\n"), (replace_marker_pat .. "$"), "*module*")
+    return string.gsub(string.gsub(fnl.compileString(macros_prefix(code, opts), a.merge({allowedGlobals = false, compilerEnv = _G}, opts)), (delete_marker_pat .. "\n"), "\n"), (delete_marker_pat .. "$"), "")
   end
   return xpcall(_5_, fnl.traceback)
 end

lua/conjure/aniseed/deps/fennel.lua

@@ -1547,6 +1547,7 @@ package.preload["conjure.aniseed.fennel.specials"] = package.preload["conjure.an
     do
       local _451_ = utils.copy(utils.root.options)
       do end (_451_)["env"] = "_COMPILER"
+      _451_["requireAsInclude"] = false
       _451_["allowedGlobals"] = nil
       opts = _451_
     end
@@ -4181,7 +4182,7 @@ do
   Same as ->, except splices the value into the last position of each form
   rather than the first."
     (var x val)
-    (each [_ e (pairs [...])]
+    (each [_ e (ipairs [...])]
       (let [elt (if (list? e) e (list e))]
         (table.insert elt x)
         (set x elt)))
@@ -4234,7 +4235,7 @@ do
     "Evaluates val and splices it into the first argument of subsequent forms."
     (let [name (gensym)
           form `(let [,name ,val])]
-      (each [_ elt (pairs [...])]
+      (each [_ elt (ipairs [...])]
         (table.insert elt 2 name)
         (table.insert form elt))
       (table.insert form name)

lua/conjure/aniseed/macros.fnl

@@ -35,9 +35,6 @@
 ;; This marker can be used by a post-processor to delete a useless byproduct line.
 (local delete-marker :ANISEED_DELETE_ME)
 
-;; And this one replaces the given block with *module*!
-(local replace-marker :ANISEED_REPLACE_ME)
-
 ;; We store all locals under this for later splatting.
 (local locals-key :aniseed/locals)
 
@@ -67,9 +64,7 @@
 
         ;; The final result table that gets returned from the macro.
         ;; This is the best way I've found to introduce many (local ...) forms from one macro.
-        result `[,(if existing-mod
-                    replace-marker
-                    delete-marker)
+        result `[,delete-marker
 
                  ;; We can't refer to things like (local (foo bar) (10 foo)).
                  ;; So we need to define them in an earlier local.