Update aniseed

lua/conjure-macroexpand/aniseed/compile.lua

@@ -54,14 +54,14 @@ do
       do
         local _3_ = a.get(opts, "filename")
         if _3_ then
-          filename = string.gsub(_3_, (nvim.fn.getcwd() .. "/"), "")
+          filename = string.gsub(_3_, (nvim.fn.getcwd() .. fs["path-sep"]), "")
         else
           filename = _3_
         end
       end
       local _4_
       if filename then
-        _4_ = ("\"" .. filename .. "\"")
+        _4_ = ("\"" .. string.gsub(filename, "\\", "\\\\") .. "\"")
       else
         _4_ = "nil"
       end

lua/conjure-macroexpand/aniseed/env.lua

@@ -45,7 +45,7 @@ local _2amodule_name_2a = "conjure-macroexpand.aniseed.env"
 do local _ = ({nil, _0_, nil, {{}, nil, nil, nil}})[2] end
 local config_dir
 do
-  local v_0_ = string.gsub(nvim.fn.stdpath("config"), "\\", "/")
+  local v_0_ = nvim.fn.stdpath("config")
   local t_0_ = (_0_)["aniseed/locals"]
   t_0_["config-dir"] = v_0_
   config_dir = v_0_
@@ -81,9 +81,9 @@ do
         opts0 = {}
       end
       local glob_expr = "**/*.fnl"
-      local fnl_dir = (opts0.input or (config_dir .. "/fnl"))
+      local fnl_dir = (opts0.input or (config_dir .. fs["path-sep"] .. "fnl"))
-      local lua_dir = (opts0.output or (config_dir .. "/lua"))
+      local lua_dir = (opts0.output or (config_dir .. fs["path-sep"] .. "lua"))
-      package.path = (package.path .. ";" .. lua_dir .. "/?.lua")
+      package.path = (package.path .. ";" .. lua_dir .. fs["path-sep"] .. "?.lua")
       local function _4_(path)
         if fs["macro-file-path?"](path) then
           return path
@@ -92,7 +92,7 @@ do
         end
       end
       if (((false ~= opts0.compile) or os.getenv("ANISEED_ENV_COMPILE")) and fs["glob-dir-newer?"](fnl_dir, lua_dir, glob_expr, _4_)) then
-        fennel["add-path"]((fnl_dir .. "/?.fnl"))
+        fennel["add-path"]((fnl_dir .. fs["path-sep"] .. "?.fnl"))
         compile.glob(glob_expr, fnl_dir, lua_dir, opts0)
       end
       return quiet_require((opts0.module or "init"))

lua/conjure-macroexpand/aniseed/fennel.lua

@@ -25,18 +25,19 @@ autoload = _1_
 local function _2_(...)
   local ok_3f_0_, val_0_ = nil, nil
   local function _2_()
-    return {autoload("conjure-macroexpand.aniseed.nvim")}
+    return {autoload("conjure-macroexpand.aniseed.fs"), autoload("conjure-macroexpand.aniseed.nvim")}
   end
   ok_3f_0_, val_0_ = pcall(_2_)
   if ok_3f_0_ then
-    _0_["aniseed/local-fns"] = {autoload = {nvim = "conjure-macroexpand.aniseed.nvim"}}
+    _0_["aniseed/local-fns"] = {autoload = {fs = "conjure-macroexpand.aniseed.fs", nvim = "conjure-macroexpand.aniseed.nvim"}}
     return val_0_
   else
     return print(val_0_)
   end
 end
 local _local_0_ = _2_(...)
-local nvim = _local_0_[1]
+local fs = _local_0_[1]
+local nvim = _local_0_[2]
 local _2amodule_2a = _0_
 local _2amodule_name_2a = "conjure-macroexpand.aniseed.fennel"
 do local _ = ({nil, _0_, nil, {{}, nil, nil, nil}})[2] end
@@ -46,10 +47,11 @@ do
   do
     local v_0_0
     local function sync_rtp0(compiler)
-      local fnl_suffix = "/fnl/?.fnl"
+      local sep = fs["path-sep"]
+      local fnl_suffix = (sep .. "fnl" .. sep .. "?.fnl")
       local rtp = nvim.o.runtimepath
       local fnl_path = (rtp:gsub(",", (fnl_suffix .. ";")) .. fnl_suffix)
-      local lua_path = fnl_path:gsub("/fnl/", "/lua/")
+      local lua_path = fnl_path:gsub((sep .. "fnl" .. sep), (sep .. "lua" .. sep))
       do end (compiler)["path"] = (fnl_path .. ";" .. lua_path)
       return nil
     end

lua/conjure-macroexpand/aniseed/fs.lua

@@ -41,6 +41,26 @@ local nvim = _local_0_[2]
 local _2amodule_2a = _0_
 local _2amodule_name_2a = "conjure-macroexpand.aniseed.fs"
 do local _ = ({nil, _0_, nil, {{}, nil, nil, nil}})[2] end
+local path_sep
+do
+  local v_0_
+  do
+    local v_0_0
+    do
+      local os = string.lower(jit.os)
+      if (("linux" == os) or ("osx" == os) or ("bsd" == os)) then
+        v_0_0 = "/"
+      else
+        v_0_0 = "\\"
+      end
+    end
+    _0_["path-sep"] = v_0_0
+    v_0_ = v_0_0
+  end
+  local t_0_ = (_0_)["aniseed/locals"]
+  t_0_["path-sep"] = v_0_
+  path_sep = v_0_
+end
 local basename
 do
   local v_0_

lua/conjure-macroexpand/aniseed/test.lua

@@ -25,11 +25,11 @@ autoload = _1_
 local function _2_(...)
   local ok_3f_0_, val_0_ = nil, nil
   local function _2_()
-    return {autoload("conjure-macroexpand.aniseed.core"), autoload("conjure-macroexpand.aniseed.nvim"), autoload("conjure-macroexpand.aniseed.string")}
+    return {autoload("conjure-macroexpand.aniseed.core"), autoload("conjure-macroexpand.aniseed.fs"), autoload("conjure-macroexpand.aniseed.nvim"), autoload("conjure-macroexpand.aniseed.string")}
   end
   ok_3f_0_, val_0_ = pcall(_2_)
   if ok_3f_0_ then
-    _0_["aniseed/local-fns"] = {autoload = {a = "conjure-macroexpand.aniseed.core", nvim = "conjure-macroexpand.aniseed.nvim", str = "conjure-macroexpand.aniseed.string"}}
+    _0_["aniseed/local-fns"] = {autoload = {a = "conjure-macroexpand.aniseed.core", fs = "conjure-macroexpand.aniseed.fs", nvim = "conjure-macroexpand.aniseed.nvim", str = "conjure-macroexpand.aniseed.string"}}
     return val_0_
   else
     return print(val_0_)
@@ -37,8 +37,9 @@ local function _2_(...)
 end
 local _local_0_ = _2_(...)
 local a = _local_0_[1]
-local nvim = _local_0_[2]
+local fs = _local_0_[2]
-local str = _local_0_[3]
+local nvim = _local_0_[3]
+local str = _local_0_[4]
 local _2amodule_2a = _0_
 local _2amodule_name_2a = "conjure-macroexpand.aniseed.test"
 do local _ = ({nil, _0_, nil, {{}, nil, nil, nil}})[2] end
@@ -210,10 +211,13 @@ do
   do
     local v_0_0
     local function suite0()
-      local function _3_(path)
+      do
-        return require(string.gsub(string.match(path, "^test/fnl/(.-).fnl$"), "/", "."))
+        local sep = fs["path-sep"]
+        local function _3_(path)
+          return require(string.gsub(string.match(path, ("^test" .. sep .. "fnl" .. sep .. "(.-).fnl$")), sep, "."))
+        end
+        a["run!"](_3_, nvim.fn.globpath(("test" .. sep .. "fnl"), "**/*-test.fnl", false, true))
       end
-      a["run!"](_3_, nvim.fn.globpath("test/fnl", "**/*-test.fnl", false, true))
       if ok_3f(run_all()) then
         return nvim.ex.q()
       else