Skip to content

Commit

Permalink
Update to Fennel 1.0.0! Fennelview is gone and now part of the core f…
Browse files Browse the repository at this point in the history
…ennel module
  • Loading branch information
Olical committed Dec 23, 2021
1 parent 71060cb commit 7968693
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 436 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lua/* linguist-generated
lua/aniseed/deps/fennel.lua linguist-vendored
lua/aniseed/deps/fennelview.lua linguist-vendored
lua/aniseed/deps/nvim.lua linguist-vendored
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SRC_FILES := $(basename $(shell find fnl -type f -name "*.fnl" ! -name "macros.f
default: deps compile test

deps:
scripts/dep.sh bakpakin Fennel a11d3658121296ee191cd0d5e3e66ba1a8abc099
scripts/dep.sh bakpakin Fennel 8d3c1c74e96fecb7a53620b536d2477b57546d07
scripts/dep.sh norcalli nvim.lua 5d57be0b6eea6c06977b1c5fe0752da909cf4154
cd deps/Fennel && make build

Expand All @@ -18,7 +18,6 @@ compile:
mkdir -p lua/aniseed/deps
cp fnl/aniseed/macros.fnl lua/aniseed
cp deps/Fennel/fennel.lua lua/aniseed/deps/fennel.lua
cp deps/Fennel/fennelview.lua lua/aniseed/deps/fennelview.lua
cp deps/nvim.lua/lua/nvim.lua lua/aniseed/deps/nvim.lua
sed -i "s/\"fennel\./\"aniseed.fennel./gI" lua/aniseed/deps/fennel.lua

Expand Down
1 change: 0 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ This will create some example Fennel source and tests as well as a `Makefile` to
The following files are excluded from my license and ownership:

* `lua/aniseed/deps/fennel.lua`
* `lua/aniseed/deps/fennelview.lua`
* `lua/aniseed/deps/nvim.lua`

These files come from https://fennel-lang.org/[Fennel] and https://github.com/norcalli/nvim.lua[nvim.lua], *I did not write them*, all other files are from me and unlicenced. The aforementioned files should be considered under their respective project licences. They are copied into this repo to allow the plugin to work with systems that don't support symlinks correctly.
Expand Down
5 changes: 3 additions & 2 deletions fnl/aniseed/view.fnl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(module aniseed.view)
(module aniseed.view
{require {fnl aniseed.fennel}})

(defn serialise [...]
((require :aniseed.deps.fennelview) ...))
((. (fnl.impl) :view) ...))
8 changes: 4 additions & 4 deletions lua/aniseed/deps/fennel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,10 @@ package.preload["aniseed.fennel.repl"] = package.preload["aniseed.fennel.repl"]
_571_ = _572_
end
end
if ((_G.type(_571_) == "table") and (nil ~= (_571_).source) and ((_571_).what == "Lua") and (nil ~= (_571_).linedefined) and (nil ~= (_571_).short_src)) then
local source = (_571_).source
local line = (_571_).linedefined
if ((_G.type(_571_) == "table") and (nil ~= (_571_).short_src) and (nil ~= (_571_).linedefined) and ((_571_).what == "Lua") and (nil ~= (_571_).source)) then
local src = (_571_).short_src
local line = (_571_).linedefined
local source = (_571_).source
local fnlsrc
do
local t_576_ = compiler.sourcemap
Expand Down Expand Up @@ -4150,7 +4150,7 @@ package.preload["aniseed.fennel.view"] = package.preload["aniseed.fennel.view"]
end
package.preload["aniseed.fennel.utils"] = package.preload["aniseed.fennel.utils"] or function(...)
local view = require("aniseed.fennel.view")
local version = "1.0.0-dev"
local version = "1.0.0"
local function warn(message)
if (_G.io and _G.io.stderr) then
return (_G.io.stderr):write(("--WARNING: %s\n"):format(tostring(message)))
Expand Down
Loading

0 comments on commit 7968693

Please sign in to comment.