From 86c9a696480ab0bf4f55c64eae2e6bb82a90ec60 Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Wed, 9 Feb 2022 21:12:50 -0500 Subject: [PATCH] Update to fennel 1.0, updated inspector --- editor/imgui.fnl | 389 +++++ editor/imstate.fnl | 217 --- editor/repl.fnl | 15 +- editor/replview.fnl | 43 +- inspector/debug.fnl | 30 + inspector/init.fnl | 58 +- lib/fennel.lua | 3722 +++++++++++++++++++++++++++---------------- lib/util.fnl | 41 +- 8 files changed, 2851 insertions(+), 1664 deletions(-) create mode 100644 editor/imgui.fnl delete mode 100644 editor/imstate.fnl create mode 100644 inspector/debug.fnl diff --git a/editor/imgui.fnl b/editor/imgui.fnl new file mode 100644 index 0000000..8c704f4 --- /dev/null +++ b/editor/imgui.fnl @@ -0,0 +1,389 @@ +(local core (require :core)) +(local config (require :core.config)) +(local command (require :core.command)) +(local keymap (require :core.keymap)) +(local style (require :core.style)) +(local lume (require :lib.lume)) + +(fn attach-imstate [view] + (set view.imstate {}) + (fn view.on_mouse_pressed [self button x y clicks] + (tset self.imstate button :pressed) + (self.__index.on_mouse_pressed self button x y clicks)) + (fn view.on_mouse_released [self button x y] + (tset self.imstate button :released) + (self.__index.on_mouse_released self button x y)) + (fn view.on_key_pressed [self key] + (when (= self.imstate.keys nil) + (set self.imstate.keys [])) + (table.insert self.imstate.keys key)) + (fn view.on_text_input [self text] + (set self.imstate.text (.. (or self.imstate.text "") text)) + (self.__index.on_text_input self text)) + (fn view.form [self ?overrides] + (lume.merge {:x (+ self.position.x style.padding.x (- self.scroll.x)) + :y (+ self.position.y style.padding.y (- self.scroll.y)) + :w (- self.size.x (* style.padding.x 2)) + :view self} + (or ?overrides {}))) + (fn view.end-scroll [self {: y : h}] + (let [pin-to-bottom (>= self.scroll.to.y (- self.scrollheight self.size.y))] + (set self.scrollheight (- (+ y (or h 0) style.padding.y) (+ self.position.y style.padding.y (- self.scroll.y)))) + (when pin-to-bottom (set self.scroll.to.y (- self.scrollheight self.size.y))))) + (fn view.draw [self] + (set self.cursor nil) + (self.__index.draw self) + (when self.imstate.postponed + (each [_ action (ipairs self.imstate.postponed)] + (action)) + (set self.imstate.postponed nil)) + (when (= self.cursor nil) (set self.cursor :arrow)) + (set self.imstate.keys nil) + (set self.imstate.text nil) + (when (= self.imstate.left :released) + (set self.imstate.active nil)) + (each [_ button (pairs [:left :middle :right])] + (tset self.imstate button + (match (. self.imstate button) + :pressed :down + :down :down + :released nil))))) + +(fn register-keys [keys] + (local commands {}) + (local keymaps {}) + (each [_ key (ipairs keys)] + (local command-name (.. "imstate:" key)) + (tset commands command-name #(core.active_view:on_key_pressed key)) + (tset keymaps key command-name)) + (command.add #(not= (-?> core.active_view.imstate (. :focus)) nil) commands) + (keymap.add keymaps)) + +(register-keys [:backspace :delete :left :right :shift+left :shift+right :home :end :shift+home :shift+end + :ctrl+left :ctrl+right :ctrl+shift+left :ctrl+shift+right :ctrl+c :ctrl+v]) + +(fn cmd-predicate [p] + (var p-fn p) + (when (= (type p-fn) :string) (set p-fn (require p-fn))) + (when (= (type p-fn) :table) + (local cls p-fn) + (set p-fn (fn [] (core.active_view:is cls)))) + (fn [] (when (= (-?> core.active_view.imstate (. :focus)) nil) + (p-fn)))) + +(fn postpone [view f] + (when (= view.imstate.postponed nil) + (set view.imstate.postponed [])) + (table.insert view.imstate.postponed f)) + +(fn make-tag [tag] + (match (type tag) + :string tag + :table (table.concat tag "::") + _ (tostring tag))) + +(fn mouse-inside [x y w h] + (local (mx my) (values (love.mouse.getX) (love.mouse.getY))) + (and (>= mx x) (<= mx (+ x w)) (>= my y) (<= my (+ y h)))) + +(fn consume-pressed [view button] + (when (= (. view.imstate button) :pressed) + (tset view.imstate button :down) + true)) + +(fn activate [{: view : tag : x : y : w : h}] + (when (and (mouse-inside x y w h) (consume-pressed view :left)) + (set view.imstate.active (make-tag tag)) + true)) + +(fn set-cursor [view cursor] + (when (= view.cursor nil) (set view.cursor cursor))) + +;; styling and layout +(fn form-defaults [form k v ...] + (when (= (. form k) nil) + (let [v (if (= (type v) :function) (v form) v)] + (tset form k v))) + (if (>= (select :# ...) 2) (form-defaults form ...) + (do (when form.tag (set form.tag (make-tag form.tag))) ; fix up tag + form))) + +(fn with-style [form ...] + (form-defaults form :font style.font :color style.text :xpad style.padding.x :ypad style.padding.y ...)) + +(local form-preserved-keys (collect [_ key (ipairs [:view :x :y :font :color :xpad :ypad])] key true)) +(fn reform [form overrides] + (if (and overrides overrides.into (not= overrides.into form)) + (reform (lume.extend (lume.clear overrides.into) form) overrides) + (do (each [key (pairs form)] + (when (= (. form-preserved-keys key) nil) + (tset form key nil))) + (lume.extend form (or overrides {}))))) + +(fn under [form overrides] (reform form (lume.merge (or overrides {}) {:y (+ form.y (or form.h 0) (or form.ypad 0))}))) +(fn right-of [form overrides] (reform form (lume.merge (or overrides {}) {:x (+ form.x (or form.w 0) (or form.xpad 0))}))) + +(fn group-wrapper [orig-form] + (let [group {} + update-dimension + (fn [form coord-key size-key] + (let [coord-group (. group coord-key) size-group (. group size-key) + coord-form (. form coord-key) size-form (. form size-key)] + (if (= size-form nil) ; tried to add an unsized value to the group, ignore + nil + + (= coord-group nil) ; container takes on the size of its first item + (do (tset group coord-key coord-form) + (tset group size-key size-form)) + + (> coord-group coord-form) ; we have an item that is outside the bounds to the left / up; reduce the starting point and extend the size + (do (tset group coord-key coord-form) + (tset group size-key (- (math.max (+ coord-form size-form) (+ coord-group size-group)) coord-form))) + + ; extend the size if the new item is outside the bounds to the right / down + (tset group size-key (- (math.max (+ coord-form size-form) (+ coord-group size-group)) coord-group))) + form)) + update-dimensions (fn [form] (update-dimension form :x :w) (update-dimension form :y :h))] + + (fn [?viewfn-or-form ?form ...] + (match [(type ?viewfn-or-form) ?viewfn-or-form] + [:function viewfn] (let [result [(viewfn ?form ...)]] + (update-dimensions ?form) + (table.unpack result)) + [:table form] (update-dimensions form) + [:nil] (lume.extend orig-form group))))) + +(fn horiz-wrapper [{:x orig-x :w orig-w}] + (fn [{: x : y : w : h : xpad : ypad &as form} overrides] + (if (> (+ x (or w 0) xpad (or w 0)) (+ orig-x orig-w)) + (reform form (lume.merge (or overrides {}) {:x orig-x :y (+ y (or h 0) (or ypad 0))})) + (right-of form overrides)))) + +;; widgets and widget helpers +(fn active? [view tag] (= view.imstate.active (make-tag tag))) +(fn button [{: view : tag : x : y : w : h &as form}] + (when (mouse-inside x y w h) (set-cursor view :hand)) + (activate form) + (and (active? view tag) (= view.imstate.left :released) (mouse-inside x y w h))) + +(fn label [form text] + (let [(_ newlines) (text:gsub "\n" "\n") + text-height (fn [font] (* (font:get_height) (+ newlines 1))) + {: x : y : w : h : halign : valign : font : color} + (with-style form + :w #($1.font:get_width text) + :h #(text-height $1.font) + :halign :left + :valign :center) + x (match halign :left x :center (+ x (/ (- w (font:get_width text)) 2)) :right (+ x w (- (font:get_width text)))) + y (match valign :top y :center (+ y (/ (- h (text-height font)) 2)) :bottom (+ y h (- (text-height font))))] + (renderer.draw_text font text x y color))) + +(fn textbutton [form label] + (let [{: x : y : w : h : xpad : ypad : font : color : bg} + (with-style form + :bg style.selection + :tag label + :w #(+ ($1.font:get_width label) $1.xpad) + :h #(+ ($1.font:get_height) $1.ypad))] + (renderer.draw_rect x y w h bg) + (renderer.draw_text font label (+ x (/ xpad 2)) (+ y (/ ypad 2)) color) + (button form))) + +(fn checkbox [form name isset] + (let [{: x : y : w : h : font : color : x-label} + (with-style form + :tag name + :h (* 12 SCALE) + :x-label #(+ $1.x $1.h $1.xpad) + :w #(+ $1.x-label ($1.font:get_width name)))] + (love.graphics.rectangle (if isset :fill :line) x y h h) + (renderer.draw_text font name x-label y color) + (love.graphics.setColor 1 1 1 1) + (button form))) ; whose idea was this?? should return (not isset) >:/ + +(fn focused? [view tag] (= (make-tag tag) (-?> view.imstate.focus (. :tag)))) +(fn focus [{: view : tag : x : y : w : h &as form} opts] + (if (activate form) + (set view.imstate.focus + (doto (lume.clone (or opts {})) + (tset :tag (make-tag tag)))) + + (and (= view.imstate.left :released) (focused? view tag) (not (mouse-inside x y w h))) + (set view.imstate.focus nil)) + (focused? view tag)) + + (local blink_period 0.8) +(fn x-from-i [s i xLeft font] + (if (or (<= i 1) (= s "")) xLeft + (x-from-i (s:sub 2) (- i 1) (+ xLeft (font:get_width (s:sub 1 1))) font))) +(fn i-from-x [s x xLeft font ?i] + (local i (or ?i 1)) + (local w (font:get_width (s:sub 1 1))) + (local xMid (+ xLeft (/ w 2))) + (if (or (<= x xMid) (= s "")) i + (i-from-x (s:sub 2) x (+ xLeft w) font (+ i 1)))) + +(fn next-match [text i di pred] + (local imax (+ (length text) 1)) + (local inext (+ i di)) + (if (<= inext 1) 1 + (> inext imax) imax + (pred (text:sub inext inext)) (if (< di 0) i inext) + (next-match text inext di pred))) +(fn is-nonword-char [char] (config.non_word_chars:find char nil true)) +(fn next-word [text i di] + (let [iwordboundary (next-match text i di #(is-nonword-char $1))] + (next-match text iwordboundary di #(not (is-nonword-char $1))))) + +(fn textnav [key i text] + (local imax (+ (length text) 1)) + (match key + :left (math.max 1 (- i 1)) + :right (math.min imax (+ i 1)) + :ctrl+left (next-word text i -1) + :ctrl+right (next-word text i 1) + :home 1 + :end imax)) + +(fn selection-span [view] + (let [f view.imstate.focus + iStart (math.min f.i f.iAnchor) + iLim (math.max f.i f.iAnchor)] + (values iStart iLim))) +(fn selection-text [view text] + (local (iStart iLim) (selection-span view)) + (text:sub iStart (- iLim 1))) + +(fn replace-selection [view s replacement ?iStart ?iLim] + (local (iStart iLim) (if ?iLim (values ?iStart ?iLim) (selection-span view))) + (local text + (.. (s:sub 1 (- iStart 1)) + replacement + (s:sub iLim))) + (local iNew (+ iStart (length replacement))) + (set view.imstate.focus.i iNew) + (set view.imstate.focus.iAnchor iNew) + text) + +(fn textbox [form text] + (local {: font : color : w : h : x : y : xpad : ypad : color : view : tag} + (with-style form :h #(+ ($1.font:get_height) $1.ypad))) + (var textNew (or text "")) + (local (hText xText yText) (values (font:get_height) (+ x (/ xpad 2)) (+ y (/ ypad 2)))) + (local initial-press (= view.imstate.left :pressed)) + + ; handle key events + (when (focus form {:i 1 :iAnchor 1 :blink (love.timer.getTime)}) + (local f view.imstate.focus) + (when (> f.i (+ (length textNew) 1)) (set f.i (+ (length textNew) 1))) + (when (> f.iAnchor (+ (length textNew) 1)) (set f.iAnchor (+ (length textNew) 1))) + (when view.imstate.text + (set textNew (replace-selection view textNew view.imstate.text))) + (each [_ key (ipairs (or view.imstate.keys []))] + (set view.imstate.focus.blink (love.timer.getTime)) + (if (= key :ctrl+c) (system.set_clipboard (selection-text view textNew)) + (= key :ctrl+v) (set textNew (replace-selection view textNew (system.get_clipboard))) + (key:find "shift%+") (set f.i (or (textnav (key:gsub "shift%+" "") f.i textNew) f.i)) + (let [iNav (textnav key f.i textNew)] + (when iNav + (set f.i iNav) + (set f.iAnchor iNav)) + (when (or (= key :delete) (= key :backspace)) + (local (iStartDel iLimDel) + (if (not= f.i f.iAnchor) (selection-span view) + (= key :delete) (values f.i (+ f.i 1)) + (= key :backspace) (values (math.max 1 (- f.i 1)) f.i))) + (set textNew (replace-selection view textNew "" iStartDel iLimDel))))))) + + ; handle mouse events + (when (mouse-inside x y w h) (set-cursor view :ibeam)) + (when (and (focused? view tag) (active? view tag) (mouse-inside x y w h)) + (local mouse-i (i-from-x textNew (love.mouse.getX) x style.font)) + (when initial-press + (set view.imstate.focus.iAnchor mouse-i)) + (set view.imstate.focus.i mouse-i)) + + ; draw box + (love.graphics.setLineWidth 1) + (love.graphics.rectangle :line x y w h) + (if (focused? view tag) + ; draw text with selection + caret + (let [(iStart iLim) (selection-span view) + xSelect (renderer.draw_text font (textNew:sub 1 (- iStart 1)) xText yText color) + sSelect (textNew:sub iStart (- iLim 1)) + wSelect (font:get_width sSelect) + xTail (+ xSelect wSelect)] + (when (> wSelect 0) + (renderer.draw_rect xSelect yText wSelect hText style.selection) + (renderer.draw_text font sSelect xSelect yText color)) + (renderer.draw_text font (textNew:sub iLim) xTail yText color) + (when (or (active? view tag) + (< (% (- (love.timer.getTime) view.imstate.focus.blink) (* blink_period 2)) blink_period)) + (renderer.draw_rect (x-from-i textNew view.imstate.focus.i xText font) yText style.caret_width hText style.caret))) + ; just draw the text + (renderer.draw_text font textNew xText yText color)) + (love.graphics.setColor 1 1 1) + textNew) + +(fn textfield [form label text] + (let [{: x : y : w : wlabel : wtext : font : color} + (with-style form :wlabel #(+ ($1.font:get_width label) $1.xpad) + :wtext (* 150 SCALE) + :w #(+ $1.wlabel $1.wtext) + :tag label) + form-textbox (lume.merge form {:w wtext :x (+ x wlabel)}) + _ (renderer.draw_text font label x y color) + text (textbox form-textbox text)] + (set form.h form-textbox.h) + text)) + +(fn option-text [option] + (match (type option) + :string option + :table (or option.label (tostring option)) + _ (tostring option))) + +(fn dropdown [form selection options] + (let [{: x : y : w :h row-h : font : color : bg : xpad : ypad : view : tag} + (with-style form :w (* 150 SCALE) + :h #(+ ($1.font:get_height) $1.ypad) + :bg style.selection)] + (var new-selection nil) + + (renderer.draw_rect x y w row-h bg) + (renderer.draw_text style.font (option-text selection) (+ x xpad) (+ y (/ ypad 2)) color) + (renderer.draw_text style.icon_font "-" (+ x w (- xpad)) (+ y (/ ypad 2)) color) + + (when (focused? view tag) + (var row-y (+ y row-h)) + (each [i option (ipairs options)] + (when (button (lume.merge form {:tag [(make-tag tag) i] :y row-y})) + (set new-selection option)) + (set row-y (+ row-y row-h))) + (postpone view (fn [] + (var row-y (+ y row-h)) + (each [i option (ipairs options)] + (renderer.draw_rect x row-y w row-h bg) + (renderer.draw_text font (option-text option) (+ x xpad) (+ row-y (/ ypad 2)) color) + (set row-y (+ row-y row-h)))))) + (focus form) + (or new-selection selection))) + +(fn labelled-dropdown [form label selection options] + (let [{: x : y : wlabel : wdropdown : font : color} + (with-style form :wlabel #(+ ($1.font:get_width label) $1.xpad) + :wdropdown (* 150 SCALE) + :w #(+ $1.wlabel $1.wdropdown) + :tag label) + form-dropdown (lume.merge form {:x (+ x wlabel) :w wdropdown}) + _ (renderer.draw_text font label x y color) + selection (dropdown form-dropdown selection options)] + (set form.h form-dropdown.h) + selection)) + +{: attach-imstate : cmd-predicate : postpone : mouse-inside : activate : active? + : button : checkbox : textbox : textfield : textbutton : dropdown : labelled-dropdown : label + : reform : under : right-of : horiz-wrapper : group-wrapper + : with-style : form-defaults} + diff --git a/editor/imstate.fnl b/editor/imstate.fnl deleted file mode 100644 index be539d5..0000000 --- a/editor/imstate.fnl +++ /dev/null @@ -1,217 +0,0 @@ -(local core (require :core)) -(local config (require :core.config)) -(local command (require :core.command)) -(local keymap (require :core.keymap)) -(local style (require :core.style)) -(local lume (require :lib.lume)) - -(fn attach-imstate [view] - (set view.imstate {}) - (fn view.on_mouse_pressed [self button x y clicks] - (tset self.imstate button :pressed) - (self.__index.on_mouse_pressed self button x y clicks)) - (fn view.on_mouse_released [self button x y] - (tset self.imstate button :released) - (self.__index.on_mouse_released self button x y)) - (fn view.on_key_pressed [self key] - (when (= self.imstate.keys nil) - (set self.imstate.keys [])) - (table.insert self.imstate.keys key)) - (fn view.on_text_input [self text] - (set self.imstate.text (.. (or self.imstate.text "") text)) - (self.__index.on_text_input self text)) - (fn view.draw [self] - (set self.cursor nil) - (self.__index.draw self) - (when (= self.cursor nil) (set self.cursor :arrow)) - (set self.imstate.keys nil) - (set self.imstate.text nil) - (when (= self.imstate.left :released) - (set self.imstate.active nil)) - (each [_ button (pairs [:left :middle :right])] - (tset self.imstate button - (match (. self.imstate button) - :pressed :down - :down :down - :released nil))))) - -(fn register-keys [keys] - (local commands {}) - (local keymaps {}) - (each [_ key (ipairs keys)] - (local command-name (.. "imstate:" key)) - (tset commands command-name #(core.active_view:on_key_pressed key)) - (tset keymaps key command-name)) - (command.add #(not= (-?> core.active_view.imstate (. :focus)) nil) commands) - (keymap.add keymaps)) - -(register-keys [:backspace :delete :left :right :shift+left :shift+right :home :end :shift+home :shift+end - :ctrl+left :ctrl+right :ctrl+shift+left :ctrl+shift+right :ctrl+c :ctrl+v]) - -(fn cmd-predicate [p] - (var p-fn p) - (when (= (type p-fn) :string) (set p-fn (require p-fn))) - (when (= (type p-fn) :table) - (local cls p-fn) - (set p-fn (fn [] (core.active_view:is cls)))) - (fn [] (when (= (-?> core.active_view.imstate (. :focus)) nil) - (p-fn)))) - -(fn make-tag [tag] - (match (type tag) - :string tag - :table (table.concat tag "::") - _ (tostring tag))) - -(fn mouse-inside [x y w h] - (local (mx my) (values (love.mouse.getX) (love.mouse.getY))) - (and (>= mx x) (<= mx (+ x w)) (>= my y) (<= my (+ y h)))) - -(fn activate [view tag x y w h] - (when (and (= view.imstate.left :pressed) (mouse-inside x y w h)) - (set view.imstate.active (make-tag tag)) - true)) -(fn active? [view tag] (= view.imstate.active (make-tag tag))) -(fn button [view tag x y w h] - (when (mouse-inside x y w h) (set view.cursor :hand)) - (activate view tag x y w h) - (and (active? view tag) (= view.imstate.left :released) (mouse-inside x y w h))) - -(fn textbutton [view label x y] - (local (w h) (values (+ (style.font:get_width label) 8) 24)) - (renderer.draw_rect x y w h style.selection) - (renderer.draw_text style.font label (+ x 4) (+ y 4) style.text) - (values (button view label x y w h) (+ y h))) - -(fn checkbox [view name isset x y ?tag] - (love.graphics.rectangle (if isset :fill :line) x y 12 12) - (local xEnd (renderer.draw_text style.font name (+ x 16) y style.text)) - (love.graphics.setColor 1 1 1 1) - (button view (or ?tag name) x y (- xEnd x) 12)) - -(fn focused? [view tag] (= tag (-?> view.imstate.focus (. :tag)))) -(fn focus [view tag x y w h opts] - (if (activate view tag x y w h) - (set view.imstate.focus - (doto (lume.clone (or opts {})) - (tset :tag tag))) - - (and (= view.imstate.left :released) (focused? view tag) (not (active? view tag))) - (set view.imstate.focus nil)) - (focused? view tag)) - -(local blink_period 0.8) -(fn x-from-i [s i xLeft font] - (if (or (<= i 1) (= s "")) xLeft - (x-from-i (s:sub 2) (- i 1) (+ xLeft (font:get_width (s:sub 1 1))) font))) -(fn i-from-x [s x xLeft font ?i] - (local i (or ?i 1)) - (local w (font:get_width (s:sub 1 1))) - (local xMid (+ xLeft (/ w 2))) - (if (or (<= x xMid) (= s "")) i - (i-from-x (s:sub 2) x (+ xLeft w) font (+ i 1)))) - -(fn next-match [text i di pred] - (local imax (+ (length text) 1)) - (local inext (+ i di)) - (if (<= inext 1) 1 - (> inext imax) imax - (pred (text:sub inext inext)) (if (< di 0) i inext) - (next-match text inext di pred))) -(fn is-nonword-char [char] (config.non_word_chars:find char nil true)) -(fn next-word [text i di] - (let [iwordboundary (next-match text i di #(is-nonword-char $1))] - (next-match text iwordboundary di #(not (is-nonword-char $1))))) - -(fn textnav [key i text] - (local imax (+ (length text) 1)) - (match key - :left (math.max 1 (- i 1)) - :right (math.min imax (+ i 1)) - :ctrl+left (next-word text i -1) - :ctrl+right (next-word text i 1) - :home 1 - :end imax)) - -(fn selection-span [view] - (let [f view.imstate.focus - iStart (math.min f.i f.iAnchor) - iLim (math.max f.i f.iAnchor)] - (values iStart iLim))) -(fn selection-text [view text] - (local (iStart iLim) (selection-span view)) - (text:sub iStart (- iLim 1))) - -(fn replace-selection [view s replacement ?iStart ?iLim] - (local (iStart iLim) (if ?iLim (values ?iStart ?iLim) (selection-span view))) - (local text - (.. (s:sub 1 (- iStart 1)) - replacement - (s:sub iLim))) - (local iNew (+ iStart (length replacement))) - (set view.imstate.focus.i iNew) - (set view.imstate.focus.iAnchor iNew) - text) - -(fn textbox [view tag text x y w] - (var textNew (or text "")) - (local (h hText xText yText) (values (+ (style.font:get_height) 4) (style.font:get_height) (+ x 2) (+ y 2))) - - ; handle key events - (when (focus view tag x y w h {:i 1 :iAnchor 1 :blink (love.timer.getTime)}) - (local f view.imstate.focus) - (when (> f.i (+ (length text) 1)) (set f.i (+ (length text) 1))) - (when (> f.iAnchor (+ (length text) 1)) (set f.iAnchor (+ (length text) 1))) - (when view.imstate.text - (set textNew (replace-selection view textNew view.imstate.text))) - (each [_ key (ipairs (or view.imstate.keys []))] - (set view.imstate.focus.blink (love.timer.getTime)) - (if (= key :ctrl+c) (system.set_clipboard (selection-text view textNew)) - (= key :ctrl+v) (set textNew (replace-selection view textNew (system.get_clipboard))) - (key:find "shift%+") (set f.i (or (textnav (key:gsub "shift%+" "") f.i textNew) f.i)) - (let [iNav (textnav key f.i textNew)] - (when iNav - (set f.i iNav) - (set f.iAnchor iNav)) - (when (or (= key :delete) (= key :backspace)) - (local (iStartDel iLimDel) - (if (not= f.i f.iAnchor) (selection-span view) - (= key :delete) (values f.i (+ f.i 1)) - (= key :backspace) (values (math.max 1 (- f.i 1)) f.i))) - (set textNew (replace-selection view textNew "" iStartDel iLimDel))))))) - - ; handle mouse events - (when (mouse-inside x y w h) (set view.cursor :ibeam)) - (when (and (focused? view tag) (active? view tag) (mouse-inside x y w h)) - (local mouse-i (i-from-x textNew (love.mouse.getX) x style.font)) - (when (= view.imstate.left :pressed) - (set view.imstate.focus.iAnchor mouse-i)) - (set view.imstate.focus.i mouse-i)) - - ; draw box - (love.graphics.setLineWidth 1) - (love.graphics.rectangle :line x y w h) - (if (focused? view tag) - ; draw text with selection + caret - (let [(iStart iLim) (selection-span view) - xSelect (renderer.draw_text style.font (textNew:sub 1 (- iStart 1)) xText yText style.text) - sSelect (textNew:sub iStart (- iLim 1)) - wSelect (style.font:get_width sSelect) - xTail (+ xSelect wSelect)] - (when (> wSelect 0) - (renderer.draw_rect xSelect yText wSelect hText style.selection) - (renderer.draw_text style.font sSelect xSelect yText style.text)) - (renderer.draw_text style.font (textNew:sub iLim) xTail yText style.text) - (when (or (active? view tag) - (< (% (- (love.timer.getTime) view.imstate.focus.blink) (* blink_period 2)) blink_period)) - (renderer.draw_rect (x-from-i textNew view.imstate.focus.i xText style.font) yText style.caret_width hText style.caret))) - ; just draw the text - (renderer.draw_text style.font textNew xText yText style.text)) - (love.graphics.setColor 1 1 1) - (values textNew (+ y h))) - -(fn textfield [view label text x y wLabel wText] - (renderer.draw_text style.font label x y style.text) - (textbox view label text (+ x wLabel) y wText)) - -{: attach-imstate : cmd-predicate : mouse-inside : activate : active? : button : checkbox : textbox : textfield : textbutton} diff --git a/editor/repl.fnl b/editor/repl.fnl index 90cd3f1..b84bca6 100644 --- a/editor/repl.fnl +++ b/editor/repl.fnl @@ -2,23 +2,22 @@ (local fennel (require :lib.fennel)) (local style (require :core.style)) (local lume (require :lib.lume)) -(local {: textbutton} (util.require :editor.imstate)) +(local {: textbutton : under : group-wrapper} (util.require :editor.imgui)) (local {: inspect} (util.require :inspector)) (local repl (util.hot-table ...)) -(fn repl.inspector [{: vals : states} view x y] - (var h 0) - (each [i v (ipairs vals)] - (set h (+ h (inspect (. states i) v view x (+ y h) view.size.x)))) - (+ h style.padding.y)) +(fn repl.inspector [{: w &as form} {: vals : states}] + (let [g (group-wrapper form)] + (each [i v (ipairs vals)] + (g #(inspect $...) (under (g) {: w}) (. states i) v)) + (g))) (fn repl.notify [listeners line] (each [_ listener (ipairs listeners)] (listener:append line))) (fn repl.mk-result [vals] - (local inspector #(repl.inspector $...)) - {:draw inspector : vals :states (icollect [_ (ipairs vals)] {})}) + {:draw repl.inspector : vals :states (icollect [_ (ipairs vals)] {})}) (fn repl.run [{: listeners}] (fennel.repl {:readChunk coroutine.yield diff --git a/editor/replview.fnl b/editor/replview.fnl index f7a2e6c..134ad54 100644 --- a/editor/replview.fnl +++ b/editor/replview.fnl @@ -1,5 +1,5 @@ (local util (require :lib.util)) -(local {: attach-imstate : textbox} (util.require :editor.imstate)) +(local {: attach-imstate : textbox : textbutton : label : under : reform : group-wrapper : mouse-inside} (util.require :editor.imgui)) (local View (require :core.view)) (local style (require :core.style)) @@ -13,6 +13,7 @@ (set self.cmd "") (set self.scrollheight math.huge) (set self.scrollable true) + (set self.title "REPL") (self.conn:listen self)) (fn ReplView.try_close [self do_close] @@ -24,38 +25,36 @@ (fn ReplView.append [self line] (table.insert self.log line)) -(fn ReplView.draw-cmd [{: cmd} view x y] - (renderer.draw_text style.font cmd x y style.text) - (+ (style.font:get_height) style.padding.y)) +(fn ReplView.draw-cmd [{: x : y : w : view &as form} {: cmd} iline] + (label form cmd) + (when (mouse-inside x y w form.h) + (when (textbutton (reform form {:x (+ x w -35) :into {}}) :X) + (table.remove view.log iline) + (table.remove view.log iline)) + (when (textbutton (reform form {:x (+ x w -60) :into {}}) :!) + (view:submit cmd)))) (fn ReplView.submit [self ?cmd] (local cmd (or ?cmd self.cmd)) (when (= ?cmd nil) (set self.cmd "")) - (self:append {:draw #(self.draw-cmd $...) : cmd}) + (self:append {:draw self.draw-cmd : cmd}) (self.conn:submit cmd)) (fn ReplView.draw [self] (self:draw_background style.background) (self:draw_scrollbar) - (var x (- self.position.x self.scroll.x)) - (var y (- self.position.y self.scroll.y)) - (var rendered-h 0) + (let [{: w &as form} (self:form) + g (group-wrapper form)] + ; todo: cache sizes and avoid drawing if offscreen? + ; note: then offscreen items can't be focussed without further effort + ; todo: draw line numbers + (each [i line (ipairs self.log)] + (g line.draw (under (g) {: w}) line i)) + (set self.cmd (g textbox (under (g) {: w :tag :command}) self.cmd)) + (self:end-scroll (g)))) - ; todo: cache sizes and avoid drawing if offscreen? - ; note: then offscreen items can't be focussed without further effort - ; todo: draw line numbers - (each [i line (ipairs self.log)] - (let [h (line:draw self x y)] - (set y (+ y h)) - (set rendered-h (+ rendered-h h)))) - - (set self.cmd (textbox self :command self.cmd x y self.size.x)) - - (local pin-to-bottom (>= self.scroll.to.y (- self.scrollheight self.size.y))) - (set self.scrollheight (+ rendered-h (style.font:get_height) 4)) - (when pin-to-bottom - (set self.scroll.to.y (- self.scrollheight self.size.y)))) +(fn ReplView.get_name [self] self.title) ReplView diff --git a/inspector/debug.fnl b/inspector/debug.fnl new file mode 100644 index 0000000..1ad75a2 --- /dev/null +++ b/inspector/debug.fnl @@ -0,0 +1,30 @@ +(local core (require :core)) +(local style (require :core.style)) +(local util (require :lib.util)) +(local repl (require :editor.repl)) +(local ReplView (require :editor.replview)) + +(local module (util.hot-table ...)) + +(fn find-existing-inspector-window [name] + (var result nil) + (each [_ view (ipairs (core.root_view.root_node:get_children)) :until result] + (when (= view.inspector-name name) + (set result view))) + result) + +(fn create-inspector-window [name ?value] + (let [node (core.root_view:get_active_node) + conn (repl.new) + view (ReplView conn)] + (set view.inspector-name name) + (set view.title name) + (view:append {:draw (fn [_ _ x y] (renderer.draw_text style.font name x y style.text) (+ (style.font:get_height) style.padding.y))}) + (view:append (repl.mk-result [?value])) + (node:add_view view))) + +(lambda module.show [name ?value] + (when (= (find-existing-inspector-window name) nil) + (create-inspector-window name ?value))) + +module.hot diff --git a/inspector/init.fnl b/inspector/init.fnl index 9d83900..3aa475c 100644 --- a/inspector/init.fnl +++ b/inspector/init.fnl @@ -1,7 +1,7 @@ (local util (require :lib.util)) (local style (require :core.style)) (local {: defmulti : defmethod} (util.require :lib.multimethod)) -(local {: textbutton} (util.require :editor.imstate)) +(local {: textbutton : label : under : right-of : reform : group-wrapper } (util.require :editor.imgui)) (local inspector (util.hot-table ...)) @@ -15,7 +15,7 @@ best-inspector) (set inspector.inspect - (defmulti (fn [state value view x y w] + (defmulti (fn [form state value] (when (= state.inspector nil) (set state.inspector (inspector.best-inspector value))) state.inspector) :inspect ...)) @@ -26,43 +26,29 @@ (tset inspector.inspectors name {: predicate : priority :inspector inspect-func}) (defmethod inspector.inspect name inspect-func)) -(fn inspector.text-height [text ?font] - (let [font (or ?font style.code_font) - (_ newlines) (text:gsub "\n" "\n")] - (* (font:get_height) (+ newlines 1)))) - -(fn inspector.draw-text [font text x y color] - (renderer.draw_text font text x y color) - (inspector.text-height text)) - -(inspector.register :default 0 #true (fn [state value view x y w] - (inspector.draw-text style.code_font (fv value) x y style.text))) +(inspector.register :default 0 #true (fn [form state value] + (label (reform form {:font style.code_font}) (fv value)))) (inspector.register :table 10 #(and (= (type $1) :table) (not= (next $1) nil)) - (fn [state tbl view x y w] - (local font style.code_font) - (var h 0) - ; todo: state assumes an .inspector key - ; todo: inspector swapping - ; todo: edit in place? - (fn get-kstate [tbl k state] - (when (= nil state.keys) (set state.keys {})) - (when (= nil (?. state.keys k)) - (util.nested-tset state [:keys k] {:collapsed (= (type (. tbl k)) :table) :children {}})) - (. state.keys k)) - (each [k v (pairs tbl)] - (let [kstate (get-kstate tbl k state) - kstr (fv k) - wk (font:get_width kstr) - xoffset (+ wk style.padding.x) - toggle-collapse (textbutton view kstr x (+ y h)) - hv (if kstate.collapsed - (inspector.draw-text font "..." (+ x xoffset) (+ y h) style.syntax.comment) - (inspector.inspect kstate.children v view (+ x xoffset) (+ y h) (- w xoffset)))] - (when toggle-collapse (set kstate.collapsed (not kstate.collapsed))) - (set h (+ h hv style.padding.y)))) - h)) + (fn [form state tbl] + (let [get-kstate (fn [tbl k state] + (when (= nil state.keys) (set state.keys {})) + (when (= nil (?. state.keys k)) + (util.nested-tset state [:keys k] {:collapsed (= (type (. tbl k)) :table) :children {}})) + (. state.keys k)) + g (group-wrapper form)] + (each [k v (pairs tbl)] + (let [kstate (get-kstate tbl k state)] + ; todo: state assumes an .inspector key + ; todo: inspector swapping + ; todo: edit in place? + (when (g textbutton (under form {:font style.code_font}) (fv k)) + (set kstate.collapsed (not kstate.collapsed))) + (if kstate.collapsed + (g label (right-of form {:color style.syntax.comment :into {}}) "...") + (g #(inspector.inspect $...) (right-of form {:into {}}) kstate.children v)) + (g)))))) inspector.hot diff --git a/lib/fennel.lua b/lib/fennel.lua index 4646342..5ae7c52 100644 --- a/lib/fennel.lua +++ b/lib/fennel.lua @@ -3,15 +3,17 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) local parser = require("fennel.parser") local compiler = require("fennel.compiler") local specials = require("fennel.specials") + local view = require("fennel.view") + local unpack = (table.unpack or _G.unpack) local function default_read_chunk(parser_state) - local function _0_() + local function _519_() if (0 < parser_state["stack-size"]) then return ".." else return ">> " end end - io.write(_0_()) + io.write(_519_()) io.flush() local input = io.read() return (input and (input .. "\n")) @@ -21,22 +23,23 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) return io.write("\n") end local function default_on_error(errtype, err, lua_source) - local function _1_() - local _0_0 = errtype - if (_0_0 == "Lua Compile") then + local function _521_() + local _520_ = errtype + if (_520_ == "Lua Compile") then return ("Bad code generated - likely a bug with the compiler:\n" .. "--- Generated Lua Start ---\n" .. lua_source .. "--- Generated Lua End ---\n") - elseif (_0_0 == "Runtime") then + elseif (_520_ == "Runtime") then return (compiler.traceback(tostring(err), 4) .. "\n") - else - local _ = _0_0 + elseif true then + local _ = _520_ return ("%s error: %s\n"):format(errtype, tostring(err)) + else + return nil end end - return io.write(_1_()) + return io.write(_521_()) end local save_source = table.concat({"local ___i___ = 1", "while true do", " local name, value = debug.getlocal(1, ___i___)", " if(name and name ~= \"___i___\") then", " ___replLocals___[name] = value", " ___i___ = ___i___ + 1", " else break end end"}, "\n") local function splice_save_locals(env, lua_source) - env.___replLocals___ = (env.___replLocals___ or {}) local spliced_source = {} local bind = "local %s = ___replLocals___['%s']" for line in lua_source:gmatch("([^\n]+)\n?") do @@ -47,37 +50,111 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) end if ((1 < #spliced_source) and (spliced_source[#spliced_source]):match("^ *return .*$")) then table.insert(spliced_source, #spliced_source, save_source) + else end return table.concat(spliced_source, "\n") end + local function completer(env, scope, text) + local matches = {} + local input_fragment = text:gsub(".*[%s)(]+", "") + local stop_looking_3f = false + local function add_partials(input, tbl, prefix, method_3f) + for k in utils.allpairs(tbl) do + local k0 + if ((tbl == env) or (tbl == env.___replLocals___)) then + k0 = scope.unmanglings[k] + else + k0 = k + end + if ((#matches < 2000) and (type(k0) == "string") and (input == k0:sub(0, #input)) and (not method_3f or ("function" == type(tbl[k0])))) then + local function _525_() + if method_3f then + return (prefix .. ":" .. k0) + else + return (prefix .. k0) + end + end + table.insert(matches, _525_()) + else + end + end + return nil + end + local function descend(input, tbl, prefix, add_matches, method_3f) + local splitter + if method_3f then + splitter = "^([^:]+):(.*)" + else + splitter = "^([^.]+)%.(.*)" + end + local head, tail = input:match(splitter) + local raw_head = (scope.manglings[head] or head) + if (type(tbl[raw_head]) == "table") then + stop_looking_3f = true + if method_3f then + return add_partials(tail, tbl[raw_head], (prefix .. head), true) + else + return add_matches(tail, tbl[raw_head], (prefix .. head)) + end + else + return nil + end + end + local function add_matches(input, tbl, prefix) + local prefix0 + if prefix then + prefix0 = (prefix .. ".") + else + prefix0 = "" + end + if (not input:find("%.") and input:find(":")) then + return descend(input, tbl, prefix0, add_matches, true) + elseif not input:find("%.") then + return add_partials(input, tbl, prefix0) + else + return descend(input, tbl, prefix0, add_matches, false) + end + end + for _, source in ipairs({scope.specials, scope.macros, (env.___replLocals___ or {}), env, env._G}) do + if stop_looking_3f then break end + add_matches(input_fragment, source) + end + return matches + end local commands = {} local function command_3f(input) return input:match("^%s*,") end local function command_docs() - local _0_ + local _532_ do - local tbl_0_ = {} + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto for name, f in pairs(commands) do - tbl_0_[(#tbl_0_ + 1)] = (" ,%s - %s"):format(name, ((compiler.metadata):get(f, "fnl/docstring") or "undocumented")) + local val_16_auto = (" ,%s - %s"):format(name, ((compiler.metadata):get(f, "fnl/docstring") or "undocumented")) + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end end - _0_ = tbl_0_ + _532_ = tbl_14_auto end - return table.concat(_0_, "\n") + return table.concat(_532_, "\n") end commands.help = function(_, _0, on_values) - return on_values({("Welcome to Fennel.\nThis is the REPL where you can enter code to be evaluated.\nYou can also run these repl commands:\n\n" .. command_docs() .. "\n ,exit - Leave the repl.\n\nUse (doc something) to see descriptions for individual macros and special forms.\n\nFor more information about the language, see https://fennel-lang.org/reference")}) + return on_values({("Welcome to Fennel.\nThis is the REPL where you can enter code to be evaluated.\nYou can also run these repl commands:\n\n" .. command_docs() .. "\n ,exit - Leave the repl.\n\nUse ,doc something to see descriptions for individual macros and special forms.\n\nFor more information about the language, see https://fennel-lang.org/reference")}) end do end (compiler.metadata):set(commands.help, "fnl/docstring", "Show this message.") local function reload(module_name, env, on_values, on_error) - local _0_0, _1_0 = pcall(specials["load-code"]("return require(...)", env), module_name) - if ((_0_0 == true) and (nil ~= _1_0)) then - local old = _1_0 - local _ = nil + local _534_, _535_ = pcall(specials["load-code"]("return require(...)", env), module_name) + if ((_534_ == true) and (nil ~= _535_)) then + local old = _535_ + local _ package.loaded[module_name] = nil _ = nil local ok, new = pcall(require, module_name) - local new0 = nil + local new0 if not ok then on_values({new}) new0 = old @@ -89,32 +166,42 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) old[k] = v end for k in pairs(old) do - if (nil == new0[k]) then + if (nil == (new0)[k]) then old[k] = nil + else end end package.loaded[module_name] = old + else end return on_values({"ok"}) - elseif ((_0_0 == false) and (nil ~= _1_0)) then - local msg = _1_0 - local function _3_() - local _2_0 = msg:gsub("\n.*", "") - return _2_0 + elseif ((_534_ == false) and (nil ~= _535_)) then + local msg = _535_ + local function _540_() + local _539_ = msg:gsub("\n.*", "") + return _539_ end - return on_error("Runtime", _3_()) + return on_error("Runtime", _540_()) + else + return nil + end + end + local function run_command(read, on_error, f) + local _542_, _543_, _544_ = pcall(read) + if ((_542_ == true) and (_543_ == true) and (nil ~= _544_)) then + local val = _544_ + return f(val) + elseif (_542_ == false) then + return on_error("Parse", "Couldn't parse input.") + else + return nil end end commands.reload = function(env, read, on_values, on_error) - local _0_0, _1_0, _2_0 = pcall(read) - if ((_0_0 == true) and (_1_0 == true) and (nil ~= _2_0)) then - local module_sym = _2_0 - return reload(tostring(module_sym), env, on_values, on_error) - elseif ((_0_0 == false) and true and true) then - local _3fparse_ok = _1_0 - local _3fmsg = _2_0 - return on_error("Parse", (_3fmsg or _3fparse_ok)) + local function _546_(_241) + return reload(tostring(_241), env, on_values, on_error) end + return run_command(read, on_error, _546_) end do end (compiler.metadata):set(commands.reload, "fnl/docstring", "Reload the specified module.") commands.reset = function(env, _, on_values) @@ -122,123 +209,285 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) return on_values({"ok"}) end do end (compiler.metadata):set(commands.reset, "fnl/docstring", "Erase all repl-local scope.") - local function load_plugin_commands() - if (utils.root and utils.root.options and utils.root.options.plugins) then - for _, plugin in ipairs(utils.root.options.plugins) do - for name, f in pairs(plugin) do - local _0_0 = name:match("^repl%-command%-(.*)") - if (nil ~= _0_0) then - local cmd_name = _0_0 - commands[cmd_name] = (commands[cmd_name] or f) + commands.complete = function(env, read, on_values, on_error, scope, chars) + local function _547_() + return on_values(completer(env, scope, string.char(unpack(chars)):gsub(",complete +", ""):sub(1, -2))) + end + return run_command(read, on_error, _547_) + end + do end (compiler.metadata):set(commands.complete, "fnl/docstring", "Print all possible completions for a given input symbol.") + local function apropos_2a(pattern, tbl, prefix, seen, names) + for name, subtbl in pairs(tbl) do + if (("string" == type(name)) and (package ~= subtbl)) then + local _548_ = type(subtbl) + if (_548_ == "function") then + if ((prefix .. name)):match(pattern) then + table.insert(names, (prefix .. name)) + else end + elseif (_548_ == "table") then + if not seen[subtbl] then + local _551_ + do + local _550_ = seen + _550_[subtbl] = true + _551_ = _550_ + end + apropos_2a(pattern, subtbl, (prefix .. name:gsub("%.", "/") .. "."), _551_, names) + else + end + else + end + else + end + end + return names + end + local function apropos(pattern) + local names = apropos_2a(pattern, package.loaded, "", {}, {}) + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for _, name in ipairs(names) do + local val_16_auto = name:gsub("^_G%.", "") + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end + end + return tbl_14_auto + end + commands.apropos = function(_env, read, on_values, on_error, _scope) + local function _556_(_241) + return on_values(apropos(tostring(_241))) + end + return run_command(read, on_error, _556_) + end + do end (compiler.metadata):set(commands.apropos, "fnl/docstring", "Print all functions matching a pattern in all loaded modules.") + local function apropos_follow_path(path) + local paths + do + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for p in path:gmatch("[^%.]+") do + local val_16_auto = p + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else end end - return nil + paths = tbl_14_auto end + local tgt = package.loaded + for _, path0 in ipairs(paths) do + if (nil == tgt) then break end + local _559_ + do + local _558_ = path0:gsub("%/", ".") + _559_ = _558_ + end + tgt = tgt[_559_] + end + return tgt end - local function run_command(input, read, loop, env, on_values, on_error) - load_plugin_commands() + local function apropos_doc(pattern) + local names = {} + for _, path in ipairs(apropos(".*")) do + local tgt = apropos_follow_path(path) + if ("function" == type(tgt)) then + local _560_ = (compiler.metadata):get(tgt, "fnl/docstring") + if (nil ~= _560_) then + local docstr = _560_ + if docstr:match(pattern) then + table.insert(names, path) + else + end + else + end + else + end + end + return names + end + commands["apropos-doc"] = function(_env, read, on_values, on_error, _scope) + local function _564_(_241) + return on_values(apropos_doc(tostring(_241))) + end + return run_command(read, on_error, _564_) + end + do end (compiler.metadata):set(commands["apropos-doc"], "fnl/docstring", "Print all functions that match the pattern in their docs") + local function apropos_show_docs(on_values, pattern) + for _, path in ipairs(apropos(pattern)) do + local tgt = apropos_follow_path(path) + if (("function" == type(tgt)) and (compiler.metadata):get(tgt, "fnl/docstring")) then + on_values(specials.doc(tgt, path)) + on_values() + else + end + end + return nil + end + commands["apropos-show-docs"] = function(_env, read, on_values, on_error) + local function _566_(_241) + return apropos_show_docs(on_values, tostring(_241)) + end + return run_command(read, on_error, _566_) + end + do end (compiler.metadata):set(commands["apropos-show-docs"], "fnl/docstring", "Print all documentations matching a pattern in function name") + local function resolve(identifier, _567_, scope) + local _arg_568_ = _567_ + local ___replLocals___ = _arg_568_["___replLocals___"] + local env = _arg_568_ + local e + local function _569_(_241, _242) + return (___replLocals___[_242] or env[_242]) + end + e = setmetatable({}, {__index = _569_}) + local code = compiler["compile-string"](tostring(identifier), {scope = scope}) + return specials["load-code"](code, e)() + end + commands.find = function(env, read, on_values, on_error, scope) + local function _570_(_241) + local _571_ + do + local _572_ = utils["sym?"](_241) + if (nil ~= _572_) then + local _573_ = resolve(_572_, env, scope) + if (nil ~= _573_) then + _571_ = debug.getinfo(_573_) + else + _571_ = _573_ + end + else + _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 + local src = (_571_).short_src + local fnlsrc + do + local t_576_ = compiler.sourcemap + if (nil ~= t_576_) then + t_576_ = (t_576_)[source] + else + end + if (nil ~= t_576_) then + t_576_ = (t_576_)[line] + else + end + if (nil ~= t_576_) then + t_576_ = (t_576_)[2] + else + end + fnlsrc = t_576_ + end + return on_values({string.format("%s:%s", src, (fnlsrc or line))}) + elseif (_571_ == nil) then + return on_error("Repl", "Unknown value") + elseif true then + local _ = _571_ + return on_error("Repl", "No source info") + else + return nil + end + end + return run_command(read, on_error, _570_) + end + do end (compiler.metadata):set(commands.find, "fnl/docstring", "Print the filename and line number for a given function") + commands.doc = function(env, read, on_values, on_error, scope) + local function _581_(_241) + local name = tostring(_241) + local target = (scope.specials[name] or scope.macros[name] or resolve(name, env, scope)) + return on_values({specials.doc(target, name)}) + end + return run_command(read, on_error, _581_) + end + do end (compiler.metadata):set(commands.doc, "fnl/docstring", "Print the docstring and arglist for a function, macro, or special form.") + local function load_plugin_commands(plugins) + for _, plugin in ipairs((plugins or {})) do + for name, f in pairs(plugin) do + local _582_ = name:match("^repl%-command%-(.*)") + if (nil ~= _582_) then + local cmd_name = _582_ + commands[cmd_name] = (commands[cmd_name] or f) + else + end + end + end + return nil + end + local function run_command_loop(input, read, loop, env, on_values, on_error, scope, chars) local command_name = input:match(",([^%s/]+)") do - local _0_0 = commands[command_name] - if (nil ~= _0_0) then - local command = _0_0 - command(env, read, on_values, on_error) - else - local _ = _0_0 + local _584_ = commands[command_name] + if (nil ~= _584_) then + local command = _584_ + command(env, read, on_values, on_error, scope, chars) + elseif true then + local _ = _584_ if ("exit" ~= command_name) then on_values({"Unknown command", command_name}) + else end + else end end if ("exit" ~= command_name) then return loop() - end - end - local function completer(env, scope, text) - local matches = {} - local input_fragment = text:gsub(".*[%s)(]+", "") - local function add_partials(input, tbl, prefix) - for k in utils.allpairs(tbl) do - local k0 = nil - if ((tbl == env) or (tbl == env.___replLocals___)) then - k0 = scope.unmanglings[k] - else - k0 = k - end - if ((#matches < 2000) and (type(k0) == "string") and (input == k0:sub(0, #input))) then - table.insert(matches, (prefix .. k0)) - end - end + else return nil end - local function add_matches(input, tbl, prefix) - local prefix0 = nil - if prefix then - prefix0 = (prefix .. ".") - else - prefix0 = "" - end - if not input:find("%.") then - return add_partials(input, tbl, prefix0) - else - local head, tail = input:match("^([^.]+)%.(.*)") - local raw_head = nil - if ((tbl == env) or (tbl == env.___replLocals___)) then - raw_head = scope.manglings[head] - else - raw_head = head - end - if (type(tbl[raw_head]) == "table") then - return add_matches(tail, tbl[raw_head], (prefix0 .. head)) - end - end - end - add_matches(input_fragment, (scope.specials or {})) - add_matches(input_fragment, (scope.macros or {})) - add_matches(input_fragment, (env.___replLocals___ or {})) - add_matches(input_fragment, env) - add_matches(input_fragment, (env._ENV or env._G or {})) - return matches end local function repl(options) local old_root_options = utils.root.options - local env = nil - if options.env then - env = specials["wrap-env"](options.env) - else - env = setmetatable({}, {__index = (rawget(_G, "_ENV") or _G)}) - end + local env = specials["wrap-env"]((options.env or (rawget(_G, "_ENV") or _G))) local save_locals_3f = ((options.saveLocals ~= false) and env.debug and env.debug.getlocal) - local opts = {} - local _ = nil - for k, v in pairs(options) do - opts[k] = v - end - _ = nil + local opts = utils.copy(options) local read_chunk = (opts.readChunk or default_read_chunk) local on_values = (opts.onValues or default_on_values) local on_error = (opts.onError or default_on_error) - local pp = (opts.pp or tostring) + local pp = (opts.pp or view) local byte_stream, clear_stream = parser.granulate(read_chunk) local chars = {} local read, reset = nil, nil - local function _1_(parser_state) + local function _588_(parser_state) local c = byte_stream(parser_state) table.insert(chars, c) return c end - read, reset = parser.parser(_1_) - local scope = compiler["make-scope"]() + read, reset = parser.parser(_588_) + opts.env, opts.scope = env, compiler["make-scope"]() opts.useMetadata = (options.useMetadata ~= false) if (opts.allowedGlobals == nil) then - opts.allowedGlobals = specials["current-global-names"](opts.env) + opts.allowedGlobals = specials["current-global-names"](env) + else end if opts.registerCompleter then - local function _3_(...) - return completer(env, scope, ...) + local function _592_() + local _590_ = env + local _591_ = opts.scope + local function _593_(...) + return completer(_590_, _591_, ...) + end + return _593_ end - opts.registerCompleter(_3_) + opts.registerCompleter(_592_()) + else + end + load_plugin_commands(opts.plugins) + if save_locals_3f then + local function newindex(t, k, v) + if opts.scope.unmanglings[k] then + return rawset(t, k, v) + else + return nil + end + end + env.___replLocals___ = setmetatable({}, {__newindex = newindex}) + else end local function print_values(...) local vals = {...} @@ -253,52 +502,64 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) for k in pairs(chars) do chars[k] = nil end + reset() local ok, parse_ok_3f, x = pcall(read) - local src_string = string.char((table.unpack or _G.unpack)(chars)) - utils.root.options = opts + local src_string = string.char(unpack(chars)) if not ok then on_error("Parse", parse_ok_3f) clear_stream() - reset() return loop() elseif command_3f(src_string) then - return run_command(src_string, read, loop, env, on_values, on_error) + return run_command_loop(src_string, read, loop, env, on_values, on_error, opts.scope, chars) else if parse_ok_3f then do - local _4_0, _5_0 = pcall(compiler.compile, x, {["assert-compile"] = opts["assert-compile"], ["parse-error"] = opts["parse-error"], correlate = opts.correlate, moduleName = opts.moduleName, scope = scope, source = src_string, useMetadata = opts.useMetadata}) - if ((_4_0 == false) and (nil ~= _5_0)) then - local msg = _5_0 + local _597_, _598_ = nil, nil + local function _600_() + local _599_ = opts + _599_["source"] = src_string + return _599_ + end + _597_, _598_ = pcall(compiler.compile, x, _600_()) + if ((_597_ == false) and (nil ~= _598_)) then + local msg = _598_ clear_stream() on_error("Compile", msg) - elseif ((_4_0 == true) and (nil ~= _5_0)) then - local src = _5_0 - local src0 = nil + elseif ((_597_ == true) and (nil ~= _598_)) then + local src = _598_ + local src0 if save_locals_3f then - src0 = splice_save_locals(env, src) + src0 = splice_save_locals(env, src, opts.scope) else src0 = src end - local _7_0, _8_0 = pcall(specials["load-code"], src0, env) - if ((_7_0 == false) and (nil ~= _8_0)) then - local msg = _8_0 + local _602_, _603_ = pcall(specials["load-code"], src0, env) + if ((_602_ == false) and (nil ~= _603_)) then + local msg = _603_ clear_stream() on_error("Lua Compile", msg, src0) - elseif (true and (nil ~= _8_0)) then - local _0 = _7_0 - local chunk = _8_0 - local function _9_() + elseif (true and (nil ~= _603_)) then + local _ = _602_ + local chunk = _603_ + local function _604_() return print_values(chunk()) end - local function _10_(...) - return on_error("Runtime", ...) + local function _605_() + local function _606_(...) + return on_error("Runtime", ...) + end + return _606_ end - xpcall(_9_, _10_) + xpcall(_604_, _605_()) + else end + else end end utils.root.options = old_root_options return loop() + else + return nil end end end @@ -306,390 +567,6 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...) end return repl end -package.preload["fennel.view"] = package.preload["fennel.view"] or function(...) - local type_order = {["function"] = 5, boolean = 2, number = 1, string = 3, table = 4, thread = 7, userdata = 6} - local function sort_keys(_0_0, _1_0) - local _1_ = _0_0 - local a = _1_[1] - local _2_ = _1_0 - local b = _2_[1] - local ta = type(a) - local tb = type(b) - if ((ta == tb) and ((ta == "string") or (ta == "number"))) then - return (a < b) - else - local dta = type_order[ta] - local dtb = type_order[tb] - if (dta and dtb) then - return (dta < dtb) - elseif dta then - return true - elseif dtb then - return false - else - return (ta < tb) - end - end - end - local function table_kv_pairs(t) - local assoc_3f = false - local i = 1 - local kv = {} - local insert = table.insert - for k, v in pairs(t) do - if ((type(k) ~= "number") or (k ~= i)) then - assoc_3f = true - end - i = (i + 1) - insert(kv, {k, v}) - end - table.sort(kv, sort_keys) - if (#kv == 0) then - return kv, "empty" - else - local function _2_() - if assoc_3f then - return "table" - else - return "seq" - end - end - return kv, _2_() - end - end - local function count_table_appearances(t, appearances) - if (type(t) == "table") then - if not appearances[t] then - appearances[t] = 1 - for k, v in pairs(t) do - count_table_appearances(k, appearances) - count_table_appearances(v, appearances) - end - else - appearances[t] = ((appearances[t] or 0) + 1) - end - end - return appearances - end - local function save_table(t, seen) - local seen0 = (seen or {len = 0}) - local id = (seen0.len + 1) - if not seen0[t] then - seen0[t] = id - seen0.len = id - end - return seen0 - end - local function detect_cycle(t, seen, _3fk) - if ("table" == type(t)) then - seen[t] = true - local _2_0, _3_0 = next(t, _3fk) - if ((nil ~= _2_0) and (nil ~= _3_0)) then - local k = _2_0 - local v = _3_0 - return (seen[k] or detect_cycle(k, seen) or seen[v] or detect_cycle(v, seen) or detect_cycle(t, seen, k)) - end - end - end - local function visible_cycle_3f(t, options) - return (options["detect-cycles?"] and detect_cycle(t, {}) and save_table(t, options.seen) and (1 < (options.appearances[t] or 0))) - end - local function table_indent(t, indent, id) - local opener_length = nil - if id then - opener_length = (#tostring(id) + 2) - else - opener_length = 1 - end - return (indent + opener_length) - end - local pp = nil - local function concat_table_lines(elements, options, multiline_3f, indent, table_type, prefix) - local indent_str = ("\n" .. string.rep(" ", indent)) - local open = nil - local function _2_() - if ("seq" == table_type) then - return "[" - else - return "{" - end - end - open = ((prefix or "") .. _2_()) - local close = nil - if ("seq" == table_type) then - close = "]" - else - close = "}" - end - local oneline = (open .. table.concat(elements, " ") .. close) - if (not options["one-line?"] and (multiline_3f or ((indent + #oneline) > options["line-length"]))) then - return (open .. table.concat(elements, indent_str) .. close) - else - return oneline - end - end - local function pp_associative(t, kv, options, indent, key_3f) - local multiline_3f = false - local id = options.seen[t] - if (options.level >= options.depth) then - return "{...}" - elseif (id and options["detect-cycles?"]) then - return ("@" .. id .. "{...}") - else - local visible_cycle_3f0 = visible_cycle_3f(t, options) - local id0 = (visible_cycle_3f0 and options.seen[t]) - local indent0 = table_indent(t, indent, id0) - local slength = nil - local function _3_() - local _2_0 = rawget(_G, "utf8") - if _2_0 then - return _2_0.len - else - return _2_0 - end - end - local function _4_(_241) - return #_241 - end - slength = ((options["utf8?"] and _3_()) or _4_) - local prefix = nil - if visible_cycle_3f0 then - prefix = ("@" .. id0) - else - prefix = "" - end - local items = nil - do - local tbl_0_ = {} - for _, _6_0 in pairs(kv) do - local _7_ = _6_0 - local k = _7_[1] - local v = _7_[2] - local _8_ - do - local k0 = pp(k, options, (indent0 + 1), true) - local v0 = pp(v, options, (indent0 + slength(k0) + 1)) - multiline_3f = (multiline_3f or k0:find("\n") or v0:find("\n")) - _8_ = (k0 .. " " .. v0) - end - tbl_0_[(#tbl_0_ + 1)] = _8_ - end - items = tbl_0_ - end - return concat_table_lines(items, options, multiline_3f, indent0, "table", prefix) - end - end - local function pp_sequence(t, kv, options, indent) - local multiline_3f = false - local id = options.seen[t] - if (options.level >= options.depth) then - return "[...]" - elseif (id and options["detect-cycles?"]) then - return ("@" .. id .. "[...]") - else - local visible_cycle_3f0 = visible_cycle_3f(t, options) - local id0 = (visible_cycle_3f0 and options.seen[t]) - local indent0 = table_indent(t, indent, id0) - local prefix = nil - if visible_cycle_3f0 then - prefix = ("@" .. id0) - else - prefix = "" - end - local items = nil - do - local tbl_0_ = {} - for _, _3_0 in pairs(kv) do - local _4_ = _3_0 - local _0 = _4_[1] - local v = _4_[2] - local _5_ - do - local v0 = pp(v, options, indent0) - multiline_3f = (multiline_3f or v0:find("\n")) - _5_ = v0 - end - tbl_0_[(#tbl_0_ + 1)] = _5_ - end - items = tbl_0_ - end - return concat_table_lines(items, options, multiline_3f, indent0, "seq", prefix) - end - end - local function concat_lines(lines, options, indent, force_multi_line_3f) - if (#lines == 0) then - if options["empty-as-sequence?"] then - return "[]" - else - return "{}" - end - else - local oneline = nil - local _2_ - do - local tbl_0_ = {} - for _, line in ipairs(lines) do - tbl_0_[(#tbl_0_ + 1)] = line:gsub("^%s+", "") - end - _2_ = tbl_0_ - end - oneline = table.concat(_2_, " ") - if (not options["one-line?"] and (force_multi_line_3f or oneline:find("\n") or ((indent + #oneline) > options["line-length"]))) then - return table.concat(lines, ("\n" .. string.rep(" ", indent))) - else - return oneline - end - end - end - local function pp_metamethod(t, metamethod, options, indent) - if (options.level >= options.depth) then - if options["empty-as-sequence?"] then - return "[...]" - else - return "{...}" - end - else - local _ = nil - local function _2_(_241) - return visible_cycle_3f(_241, options) - end - options["visible-cycle?"] = _2_ - _ = nil - local lines, force_multi_line_3f = metamethod(t, pp, options, indent) - options["visible-cycle?"] = nil - local _3_0 = type(lines) - if (_3_0 == "string") then - return lines - elseif (_3_0 == "table") then - return concat_lines(lines, options, indent, force_multi_line_3f) - else - local _0 = _3_0 - return error("__fennelview metamethod must return a table of lines") - end - end - end - local function pp_table(x, options, indent) - options.level = (options.level + 1) - local x0 = nil - do - local _2_0 = nil - if options["metamethod?"] then - local _3_0 = x - if _3_0 then - local _4_0 = getmetatable(_3_0) - if _4_0 then - _2_0 = _4_0.__fennelview - else - _2_0 = _4_0 - end - else - _2_0 = _3_0 - end - else - _2_0 = nil - end - if (nil ~= _2_0) then - local metamethod = _2_0 - x0 = pp_metamethod(x, metamethod, options, indent) - else - local _ = _2_0 - local _4_0, _5_0 = table_kv_pairs(x) - if (true and (_5_0 == "empty")) then - local _0 = _4_0 - if options["empty-as-sequence?"] then - x0 = "[]" - else - x0 = "{}" - end - elseif ((nil ~= _4_0) and (_5_0 == "table")) then - local kv = _4_0 - x0 = pp_associative(x, kv, options, indent) - elseif ((nil ~= _4_0) and (_5_0 == "seq")) then - local kv = _4_0 - x0 = pp_sequence(x, kv, options, indent) - else - x0 = nil - end - end - end - options.level = (options.level - 1) - return x0 - end - local function number__3estring(n) - local _2_0 = string.gsub(tostring(n), ",", ".") - return _2_0 - end - local function colon_string_3f(s) - return s:find("^[-%w?^_!$%&*+./@|<=>]+$") - end - local function pp_string(str, options, indent) - local escs = nil - local _2_ - if (options["escape-newlines?"] and (#str < (options["line-length"] - indent))) then - _2_ = "\\n" - else - _2_ = "\n" - end - local function _4_(_241, _242) - return ("\\%03d"):format(_242:byte()) - end - escs = setmetatable({["\""] = "\\\"", ["\11"] = "\\v", ["\12"] = "\\f", ["\13"] = "\\r", ["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\\"] = "\\\\", ["\n"] = _2_}, {__index = _4_}) - return ("\"" .. str:gsub("[%c\\\"]", escs) .. "\"") - end - local function make_options(t, options) - local defaults = {["detect-cycles?"] = true, ["empty-as-sequence?"] = false, ["escape-newlines?"] = false, ["line-length"] = 80, ["metamethod?"] = true, ["one-line?"] = false, ["prefer-colon?"] = false, ["utf8?"] = true, depth = 128} - local overrides = {appearances = count_table_appearances(t, {}), level = 0, seen = {len = 0}} - for k, v in pairs((options or {})) do - defaults[k] = v - end - for k, v in pairs(overrides) do - defaults[k] = v - end - return defaults - end - local function _2_(x, options, indent, colon_3f) - local indent0 = (indent or 0) - local options0 = (options or make_options(x)) - local tv = type(x) - local function _4_() - local _3_0 = getmetatable(x) - if _3_0 then - return _3_0.__fennelview - else - return _3_0 - end - end - if ((tv == "table") or ((tv == "userdata") and _4_())) then - return pp_table(x, options0, indent0) - elseif (tv == "number") then - return number__3estring(x) - else - local function _5_() - if (colon_3f ~= nil) then - return colon_3f - elseif ("function" == type(options0["prefer-colon?"])) then - return options0["prefer-colon?"](x) - else - return options0["prefer-colon?"] - end - end - if ((tv == "string") and colon_string_3f(x) and _5_()) then - return (":" .. x) - elseif (tv == "string") then - return pp_string(x, options0, indent0) - elseif ((tv == "boolean") or (tv == "nil")) then - return tostring(x) - else - return ("#<" .. tostring(x) .. ">") - end - end - end - pp = _2_ - local function view(x, options) - return pp(x, make_options(x, options), 0) - end - return view -end package.preload["fennel.specials"] = package.preload["fennel.specials"] or function(...) local utils = require("fennel.utils") local view = require("fennel.view") @@ -698,14 +575,14 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local unpack = (table.unpack or _G.unpack) local SPECIALS = compiler.scopes.global.specials local function wrap_env(env) - local function _0_(_, key) + local function _345_(_, key) if (type(key) == "string") then return env[compiler["global-unmangling"](key)] else return env[key] end end - local function _1_(_, key, value) + local function _347_(_, key, value) if (type(key) == "string") then env[compiler["global-unmangling"](key)] = value return nil @@ -714,31 +591,54 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return nil end end - local function _2_() + local function _349_() local function putenv(k, v) - local _3_ + local _350_ if (type(k) == "string") then - _3_ = compiler["global-unmangling"](k) + _350_ = compiler["global-unmangling"](k) else - _3_ = k + _350_ = k end - return _3_, v + return _350_, v end return next, utils.kvmap(env, putenv), nil end - return setmetatable({}, {__index = _0_, __newindex = _1_, __pairs = _2_}) + return setmetatable({}, {__index = _345_, __newindex = _347_, __pairs = _349_}) end - local function current_global_names(env) - return utils.kvmap((env or _G), compiler["global-unmangling"]) + local function current_global_names(_3fenv) + local mt + do + local _352_ = getmetatable(_3fenv) + if ((_G.type(_352_) == "table") and (nil ~= (_352_).__pairs)) then + local mtpairs = (_352_).__pairs + local tbl_11_auto = {} + for k, v in mtpairs(_3fenv) do + local _353_, _354_ = k, v + if ((nil ~= _353_) and (nil ~= _354_)) then + local k_12_auto = _353_ + local v_13_auto = _354_ + tbl_11_auto[k_12_auto] = v_13_auto + else + end + end + mt = tbl_11_auto + elseif (_352_ == nil) then + mt = (_3fenv or _G) + else + mt = nil + end + end + return (mt and utils.kvmap(mt, compiler["global-unmangling"])) end - local function load_code(code, environment, filename) - local environment0 = (environment or rawget(_G, "_ENV") or _G) + local function load_code(code, _3fenv, _3ffilename) + local env = (_3fenv or rawget(_G, "_ENV") or _G) if (rawget(_G, "setfenv") and rawget(_G, "loadstring")) then - local f = assert(_G.loadstring(code, filename)) - _G.setfenv(f, environment0) - return f + local f = assert(_G.loadstring(code, _3ffilename)) + local _357_ = f + setfenv(_357_, env) + return _357_ else - return assert(load(code, filename, "t", environment0)) + return assert(load(code, _3ffilename, "t", env)) end end local function doc_2a(tgt, name) @@ -749,52 +649,54 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local mt = getmetatable(tgt) if ((type(tgt) == "function") or ((type(mt) == "table") and (type(mt.__call) == "function"))) then local arglist = table.concat(((compiler.metadata):get(tgt, "fnl/arglist") or {"#"}), " ") - local _0_ + local _359_ if (#arglist > 0) then - _0_ = " " + _359_ = " " else - _0_ = "" + _359_ = "" end - return string.format("(%s%s%s)\n %s", name, _0_, arglist, docstring) + return string.format("(%s%s%s)\n %s", name, _359_, arglist, docstring) else return string.format("%s\n %s", name, docstring) end end end - local function doc_special(name, arglist, docstring) - compiler.metadata[SPECIALS[name]] = {["fnl/arglist"] = arglist, ["fnl/docstring"] = docstring} + local function doc_special(name, arglist, docstring, body_form_3f) + compiler.metadata[SPECIALS[name]] = {["fnl/arglist"] = arglist, ["fnl/docstring"] = docstring, ["fnl/body-form?"] = body_form_3f} return nil end - local function compile_do(ast, scope, parent, start) - local start0 = (start or 2) + local function compile_do(ast, scope, parent, _3fstart) + local start = (_3fstart or 2) local len = #ast local sub_scope = compiler["make-scope"](scope) - for i = start0, len do + for i = start, len do compiler.compile1(ast[i], sub_scope, parent, {nval = 0}) end return nil end - SPECIALS["do"] = function(ast, scope, parent, opts, start, chunk, sub_scope, pre_syms) - local start0 = (start or 2) - local sub_scope0 = (sub_scope or compiler["make-scope"](scope)) - local chunk0 = (chunk or {}) + SPECIALS["do"] = function(ast, scope, parent, opts, _3fstart, _3fchunk, _3fsub_scope, _3fpre_syms) + local start = (_3fstart or 2) + local sub_scope = (_3fsub_scope or compiler["make-scope"](scope)) + local chunk = (_3fchunk or {}) local len = #ast local retexprs = {returned = true} local function compile_body(outer_target, outer_tail, outer_retexprs) - if (len < start0) then - compiler.compile1(nil, sub_scope0, chunk0, {tail = outer_tail, target = outer_target}) + if (len < start) then + compiler.compile1(nil, sub_scope, chunk, {tail = outer_tail, target = outer_target}) else - for i = start0, len do + for i = start, len do local subopts = {nval = (((i ~= len) and 0) or opts.nval), tail = (((i == len) and outer_tail) or nil), target = (((i == len) and outer_target) or nil)} local _ = utils["propagate-options"](opts, subopts) - local subexprs = compiler.compile1(ast[i], sub_scope0, chunk0, subopts) + local subexprs = compiler.compile1(ast[i], sub_scope, chunk, subopts) if (i ~= len) then compiler["keep-side-effects"](subexprs, parent, nil, ast[i]) + else end end end - compiler.emit(parent, chunk0, ast) + compiler.emit(parent, chunk, ast) compiler.emit(parent, "end", ast) + utils.hook("do", ast, sub_scope) return (outer_retexprs or retexprs) end if (opts.target or (opts.nval == 0) or opts.tail) then @@ -803,8 +705,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct elseif opts.nval then local syms = {} for i = 1, opts.nval do - local s = ((pre_syms and pre_syms[i]) or compiler.gensym(scope)) - syms[i] = s + local s = ((_3fpre_syms and (_3fpre_syms)[i]) or compiler.gensym(scope)) + do end (syms)[i] = s retexprs[i] = utils.expr(s, "sym") end local outer_target = table.concat(syms, ", ") @@ -813,18 +715,17 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return compile_body(outer_target, opts.tail) else local fname = compiler.gensym(scope) - local fargs = nil + local fargs if scope.vararg then fargs = "..." else fargs = "" end compiler.emit(parent, string.format("local function %s(%s)", fname, fargs), ast) - utils.hook("do", ast, sub_scope0) return compile_body(nil, true, utils.expr((fname .. "(" .. fargs .. ")"), "statement")) end end - doc_special("do", {"..."}, "Evaluate multiple forms; return last value.") + doc_special("do", {"..."}, "Evaluate multiple forms; return last value.", true) SPECIALS.values = function(ast, scope, parent) local len = #ast local exprs = {} @@ -835,33 +736,45 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct for j = 2, #subexprs do table.insert(exprs, subexprs[j]) end + else end end return exprs end doc_special("values", {"..."}, "Return multiple values from a function. Must be in tail position.") local function deep_tostring(x, key_3f) - local elems = {} if utils["sequence?"](x) then - local _0_ + local _368_ do - local tbl_0_ = {} + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto for _, v in ipairs(x) do - tbl_0_[(#tbl_0_ + 1)] = deep_tostring(v) + local val_16_auto = deep_tostring(v) + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end end - _0_ = tbl_0_ + _368_ = tbl_14_auto end - return ("[" .. table.concat(_0_, " ") .. "]") + return ("[" .. table.concat(_368_, " ") .. "]") elseif utils["table?"](x) then - local _0_ + local _370_ do - local tbl_0_ = {} + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto for k, v in pairs(x) do - tbl_0_[(#tbl_0_ + 1)] = (deep_tostring(k, true) .. " " .. deep_tostring(v)) + local val_16_auto = (deep_tostring(k, true) .. " " .. deep_tostring(v)) + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end end - _0_ = tbl_0_ + _370_ = tbl_14_auto end - return ("{" .. table.concat(_0_, " ") .. "}") + return ("{" .. table.concat(_370_, " ") .. "}") elseif (key_3f and (type(x) == "string") and x:find("^[-%w?\\^_!$%&*+./@:|<=>]+$")) then return (":" .. x) elseif (type(x) == "string") then @@ -872,29 +785,32 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end local function set_fn_metadata(arg_list, docstring, parent, fn_name) if utils.root.options.useMetadata then - local args = nil - local function _0_(_241) + local args + local function _373_(_241) return ("\"%s\""):format(deep_tostring(_241)) end - args = utils.map(arg_list, _0_) + args = utils.map(arg_list, _373_) local meta_fields = {"\"fnl/arglist\"", ("{" .. table.concat(args, ", ") .. "}")} if docstring then table.insert(meta_fields, "\"fnl/docstring\"") table.insert(meta_fields, ("\"" .. docstring:gsub("%s+$", ""):gsub("\\", "\\\\"):gsub("\n", "\\n"):gsub("\"", "\\\"") .. "\"")) + else end local meta_str = ("require(\"%s\").metadata"):format((utils.root.options.moduleName or "fennel")) return compiler.emit(parent, ("pcall(function() %s:setall(%s, %s) end)"):format(meta_str, fn_name, table.concat(meta_fields, ", "))) + else + return nil end end local function get_fn_name(ast, scope, fn_name, multi) if (fn_name and (fn_name[1] ~= "nil")) then - local _0_ + local _376_ if not multi then - _0_ = compiler["declare-local"](fn_name, {}, scope, ast) + _376_ = compiler["declare-local"](fn_name, {}, scope, ast) else - _0_ = compiler["symbol-to-expression"](fn_name, scope)[1] + _376_ = (compiler["symbol-to-expression"](fn_name, scope))[1] end - return _0_, not multi, 3 + return _376_, not multi, 3 else return nil, true, 2 end @@ -903,13 +819,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct for i = (index + 1), #ast do compiler.compile1(ast[i], f_scope, f_chunk, {nval = (((i ~= #ast) and 0) or nil), tail = (i == #ast)}) end - local _0_ + local _379_ if local_3f then - _0_ = "local function %s(%s)" + _379_ = "local function %s(%s)" else - _0_ = "%s = function(%s)" + _379_ = "%s = function(%s)" end - compiler.emit(parent, string.format(_0_, fn_name, table.concat(arg_name_list, ", ")), ast) + compiler.emit(parent, string.format(_379_, fn_name, table.concat(arg_name_list, ", ")), ast) compiler.emit(parent, f_chunk, ast) compiler.emit(parent, "end", ast) set_fn_metadata(arg_list, docstring, parent, fn_name) @@ -921,11 +837,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, true, arg_name_list, arg_list, docstring) end SPECIALS.fn = function(ast, scope, parent) - local f_scope = nil + local f_scope do - local _0_0 = compiler["make-scope"](scope) - _0_0["vararg"] = false - f_scope = _0_0 + local _381_ = compiler["make-scope"](scope) + do end (_381_)["vararg"] = false + f_scope = _381_ end local f_chunk = {} local fn_sym = utils["sym?"](ast[2]) @@ -938,7 +854,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct compiler.assert((arg == arg_list[#arg_list]), "expected vararg as last parameter", ast) f_scope.vararg = true return "..." - elseif (utils["sym?"](arg) and (utils.deref(arg) ~= "nil") and not utils["multi-sym?"](utils.deref(arg))) then + elseif (utils["sym?"](arg) and (tostring(arg) ~= "nil") and not utils["multi-sym?"](tostring(arg))) then return compiler["declare-local"](arg, {}, f_scope, ast) elseif utils["table?"](arg) then local raw = utils.sym(compiler.gensym(scope)) @@ -946,7 +862,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct compiler.destructure(arg, raw, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"}) return declared else - return compiler.assert(false, ("expected symbol for function parameter: %s"):format(tostring(arg)), ast[2]) + return compiler.assert(false, ("expected symbol for function parameter: %s"):format(tostring(arg)), ast[index]) end end local arg_name_list = utils.map(arg_list, get_arg_name) @@ -962,35 +878,42 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return compile_anonymous_fn(ast, f_scope, f_chunk, parent, index0, arg_name_list, arg_list, docstring, scope) end end - doc_special("fn", {"name?", "args", "docstring?", "..."}, "Function syntax. May optionally include a name and docstring.\nIf a name is provided, the function will be bound in the current scope.\nWhen called with the wrong number of args, excess args will be discarded\nand lacking args will be nil, use lambda for arity-checked functions.") + doc_special("fn", {"name?", "args", "docstring?", "..."}, "Function syntax. May optionally include a name and docstring.\nIf a name is provided, the function will be bound in the current scope.\nWhen called with the wrong number of args, excess args will be discarded\nand lacking args will be nil, use lambda for arity-checked functions.", true) SPECIALS.lua = function(ast, _, parent) compiler.assert(((#ast == 2) or (#ast == 3)), "expected 1 or 2 arguments", ast) - if (ast[2] ~= nil) then + local _386_ + do + local _385_ = utils["sym?"](ast[2]) + if (nil ~= _385_) then + _386_ = tostring(_385_) + else + _386_ = _385_ + end + end + if ("nil" ~= _386_) then table.insert(parent, {ast = ast, leaf = tostring(ast[2])}) - end - if (ast[3] ~= nil) then - return tostring(ast[3]) - end - end - SPECIALS.doc = function(ast, scope, parent) - assert(utils.root.options.useMetadata, "can't look up doc with metadata disabled.") - compiler.assert((#ast == 2), "expected one argument", ast) - local target = utils.deref(ast[2]) - local special_or_macro = (scope.specials[target] or scope.macros[target]) - if special_or_macro then - return ("print(%q)"):format(doc_2a(special_or_macro, target)) else - local _0_ = compiler.compile1(ast[2], scope, parent, {nval = 1}) - local value = _0_[1] - return ("print(require('%s').doc(%s, '%s'))"):format((utils.root.options.moduleName or "fennel"), tostring(value), tostring(ast[2])) + end + local _390_ + do + local _389_ = utils["sym?"](ast[3]) + if (nil ~= _389_) then + _390_ = tostring(_389_) + else + _390_ = _389_ + end + end + if ("nil" ~= _390_) then + return tostring(ast[3]) + else + return nil end end - doc_special("doc", {"x"}, "Print the docstring and arglist for a function, macro, or special form.") local function dot(ast, scope, parent) compiler.assert((1 < #ast), "expected table argument", ast) local len = #ast - local _0_ = compiler.compile1(ast[2], scope, parent, {nval = 1}) - local lhs = _0_[1] + local _let_393_ = compiler.compile1(ast[2], scope, parent, {nval = 1}) + local lhs = _let_393_[1] if (len == 2) then return tostring(lhs) else @@ -1000,8 +923,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct if ((type(index) == "string") and utils["valid-lua-identifier?"](index)) then table.insert(indices, ("." .. index)) else - local _1_ = compiler.compile1(index, scope, parent, {nval = 1}) - local index0 = _1_[1] + local _let_394_ = compiler.compile1(index, scope, parent, {nval = 1}) + local index0 = _let_394_[1] table.insert(indices, ("[" .. tostring(index0) .. "]")) end end @@ -1045,10 +968,32 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return nil end doc_special("var", {"name", "val"}, "Introduce new mutable local.") + local function kv_3f(t) + local _398_ + do + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for k in pairs(t) do + local val_16_auto + if not ("number" == type(k)) then + val_16_auto = k + else + val_16_auto = nil + end + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end + end + _398_ = tbl_14_auto + end + return (_398_)[1] + end SPECIALS.let = function(ast, scope, parent, opts) local bindings = ast[2] local pre_syms = {} - compiler.assert((utils["list?"](bindings) or utils["table?"](bindings)), "expected binding table", ast) + compiler.assert((utils["table?"](bindings) and not kv_3f(bindings)), "expected binding sequence", bindings) compiler.assert(((#bindings % 2) == 0), "expected even number of name/value bindings", ast[2]) compiler.assert((#ast >= 3), "expected body expression", ast[1]) for _ = 1, (opts.nval or 0) do @@ -1061,25 +1006,44 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end return SPECIALS["do"](ast, scope, parent, opts, 3, sub_chunk, sub_scope, pre_syms) end - doc_special("let", {"[name1 val1 ... nameN valN]", "..."}, "Introduces a new scope in which a given set of local bindings are used.") + doc_special("let", {"[name1 val1 ... nameN valN]", "..."}, "Introduces a new scope in which a given set of local bindings are used.", true) + local function get_prev_line(parent) + if ("table" == type(parent)) then + return get_prev_line((parent.leaf or parent[#parent])) + else + return (parent or "") + end + end + local function disambiguate_3f(rootstr, parent) + local function _403_() + local _402_ = get_prev_line(parent) + if (nil ~= _402_) then + local prev_line = _402_ + return prev_line:match("%)$") + else + return nil + end + end + return (rootstr:match("^{") or _403_()) + end SPECIALS.tset = function(ast, scope, parent) compiler.assert((#ast > 3), "expected table, key, and value arguments", ast) - local root = compiler.compile1(ast[2], scope, parent, {nval = 1})[1] + local root = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1] local keys = {} for i = 3, (#ast - 1) do - local _0_ = compiler.compile1(ast[i], scope, parent, {nval = 1}) - local key = _0_[1] + local _let_405_ = compiler.compile1(ast[i], scope, parent, {nval = 1}) + local key = _let_405_[1] table.insert(keys, tostring(key)) end - local value = compiler.compile1(ast[#ast], scope, parent, {nval = 1})[1] + local value = (compiler.compile1(ast[#ast], scope, parent, {nval = 1}))[1] local rootstr = tostring(root) - local fmtstr = nil - if rootstr:match("^{") then + local fmtstr + if disambiguate_3f(rootstr, parent) then fmtstr = "do end (%s)[%s] = %s" else fmtstr = "%s[%s] = %s" end - return compiler.emit(parent, fmtstr:format(tostring(root), table.concat(keys, "]["), tostring(value)), ast) + return compiler.emit(parent, fmtstr:format(rootstr, table.concat(keys, "]["), tostring(value)), ast) end doc_special("tset", {"tbl", "key1", "...", "keyN", "val"}, "Set the value of a table field. Can take additional keys to set\nnested values, but all parents must contain an existing table.") local function calculate_target(scope, opts) @@ -1090,7 +1054,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local target_exprs = {} for i = 1, opts.nval do local s = compiler.gensym(scope) - accum[i] = s + do end (accum)[i] = s target_exprs[i] = utils.expr(s, "sym") end return "target", opts.tail, table.concat(accum, ", "), target_exprs @@ -1099,6 +1063,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end end local function if_2a(ast, scope, parent, opts) + compiler.assert((2 < #ast), "expected condition and body", ast) local do_scope = compiler["make-scope"](scope) local branches = {} local wrapper, inner_tail, inner_target, target_exprs = calculate_target(scope, opts) @@ -1109,6 +1074,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct compiler["keep-side-effects"](compiler.compile1(ast[i], cscope, chunk, body_opts), chunk, nil, ast[i]) return {chunk = chunk, scope = cscope} end + if (1 == (#ast % 2)) then + table.insert(ast, utils.sym("nil")) + else + end for i = 2, (#ast - 1), 2 do local condchunk = {} local res = compiler.compile1(ast[i], do_scope, condchunk, {nval = 1}) @@ -1119,26 +1088,20 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct branch.nested = ((i ~= 2) and (next(condchunk, nil) == nil)) table.insert(branches, branch) end - local has_else_3f = ((#ast > 3) and ((#ast % 2) == 0)) - local else_branch = (has_else_3f and compile_body(#ast)) + local else_branch = compile_body(#ast) local s = compiler.gensym(scope) local buffer = {} local last_buffer = buffer for i = 1, #branches do local branch = branches[i] - local fstr = nil + local fstr if not branch.nested then fstr = "if %s then" else fstr = "elseif %s then" end local cond = tostring(branch.cond) - local cond_line = nil - if ((cond == "true") and branch.nested and (i == #branches) and not has_else_3f) then - cond_line = "else" - else - cond_line = fstr:format(cond) - end + local cond_line = fstr:format(cond) if branch.nested then compiler.emit(last_buffer, branch.condchunk, ast) else @@ -1149,20 +1112,16 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct compiler.emit(last_buffer, cond_line, ast) compiler.emit(last_buffer, branch.chunk, ast) if (i == #branches) then - if has_else_3f then - compiler.emit(last_buffer, "else", ast) - compiler.emit(last_buffer, else_branch.chunk, ast) - elseif (inner_target and (cond_line ~= "else")) then - compiler.emit(last_buffer, "else", ast) - compiler.emit(last_buffer, ("%s = nil"):format(inner_target), ast) - end + compiler.emit(last_buffer, "else", ast) + compiler.emit(last_buffer, else_branch.chunk, ast) compiler.emit(last_buffer, "end", ast) - elseif not branches[(i + 1)].nested then + elseif not (branches[(i + 1)]).nested then local next_buffer = {} compiler.emit(last_buffer, "else", ast) compiler.emit(last_buffer, next_buffer, ast) compiler.emit(last_buffer, "end", ast) last_buffer = next_buffer + else end end if (wrapper == "iife") then @@ -1190,34 +1149,40 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct if ("until" == bindings[(#bindings - 1)]) then table.remove(bindings, (#bindings - 1)) return table.remove(bindings) + else + return nil end end local function compile_until(condition, scope, chunk) if condition then - local _0_ = compiler.compile1(condition, scope, chunk, {nval = 1}) - local condition_lua = _0_[1] - return compiler.emit(chunk, ("if %s then break end"):format(tostring(condition_lua)), condition) + local _let_414_ = compiler.compile1(condition, scope, chunk, {nval = 1}) + local condition_lua = _let_414_[1] + return compiler.emit(chunk, ("if %s then break end"):format(tostring(condition_lua)), utils.expr(condition, "expression")) + else + return nil end end SPECIALS.each = function(ast, scope, parent) compiler.assert((#ast >= 3), "expected body expression", ast[1]) local binding = compiler.assert(utils["table?"](ast[2]), "expected binding table", ast) + local _ = compiler.assert((2 <= #binding), "expected binding and iterator", binding) local until_condition = remove_until_condition(binding) local iter = table.remove(binding, #binding) local destructures = {} local new_manglings = {} local sub_scope = compiler["make-scope"](scope) local function destructure_binding(v) + compiler.assert(("string" ~= type(v)), ("unexpected iterator clause " .. tostring(v)), binding) if utils["sym?"](v) then return compiler["declare-local"](v, {}, sub_scope, ast, new_manglings) else local raw = utils.sym(compiler.gensym(sub_scope)) - destructures[raw] = v + do end (destructures)[raw] = v return compiler["declare-local"](raw, {}, sub_scope, ast) end end local bind_vars = utils.map(binding, destructure_binding) - local vals = compiler.compile1(iter, sub_scope, parent) + local vals = compiler.compile1(iter, scope, parent) local val_names = utils.map(vals, tostring) local chunk = {} compiler.emit(parent, ("for %s in %s do"):format(table.concat(bind_vars, ", "), table.concat(val_names, ", ")), ast) @@ -1230,16 +1195,16 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct compiler.emit(parent, chunk, ast) return compiler.emit(parent, "end", ast) end - doc_special("each", {"[key value (iterator)]", "..."}, "Runs the body once for each set of values provided by the given iterator.\nMost commonly used with ipairs for sequential tables or pairs for undefined\norder, but can be used with any iterator.") + doc_special("each", {"[key value (iterator)]", "..."}, "Runs the body once for each set of values provided by the given iterator.\nMost commonly used with ipairs for sequential tables or pairs for undefined\norder, but can be used with any iterator.", true) local function while_2a(ast, scope, parent) local len1 = #parent - local condition = compiler.compile1(ast[2], scope, parent, {nval = 1})[1] + local condition = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1] local len2 = #parent local sub_chunk = {} if (len1 ~= len2) then for i = (len1 + 1), len2 do table.insert(sub_chunk, parent[i]) - parent[i] = nil + do end (parent)[i] = nil end compiler.emit(parent, "while true do", ast) compiler.emit(sub_chunk, ("if not %s then break end"):format(condition[1]), ast) @@ -1251,7 +1216,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return compiler.emit(parent, "end", ast) end SPECIALS["while"] = while_2a - doc_special("while", {"condition", "..."}, "The classic while loop. Evaluates body until a condition is non-truthy.") + doc_special("while", {"condition", "..."}, "The classic while loop. Evaluates body until a condition is non-truthy.", true) local function for_2a(ast, scope, parent) local ranges = compiler.assert(utils["table?"](ast[2]), "expected binding table", ast) local until_condition = remove_until_condition(ast[2]) @@ -1261,8 +1226,9 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local chunk = {} compiler.assert(utils["sym?"](binding_sym), ("unable to bind %s %s"):format(type(binding_sym), tostring(binding_sym)), ast[2]) compiler.assert((#ast >= 3), "expected body expression", ast[1]) + compiler.assert((#ranges <= 3), "unexpected arguments", ranges[4]) for i = 1, math.min(#ranges, 3) do - range_args[i] = tostring(compiler.compile1(ranges[i], sub_scope, parent, {nval = 1})[1]) + range_args[i] = tostring((compiler.compile1(ranges[i], scope, parent, {nval = 1}))[1]) end compiler.emit(parent, ("for %s = %s do"):format(compiler["declare-local"](binding_sym, {}, sub_scope, ast), table.concat(range_args, ", ")), ast) compile_until(until_condition, sub_scope, chunk) @@ -1271,14 +1237,14 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return compiler.emit(parent, "end", ast) end SPECIALS["for"] = for_2a - doc_special("for", {"[index start stop step?]", "..."}, "Numeric loop construct.\nEvaluates body once for each value between start and stop (inclusive).") + doc_special("for", {"[index start stop step?]", "..."}, "Numeric loop construct.\nEvaluates body once for each value between start and stop (inclusive).", true) local function native_method_call(ast, _scope, _parent, target, args) - local _0_ = ast - local _ = _0_[1] - local _0 = _0_[2] - local method_string = _0_[3] - local call_string = nil - if ((target.type == "literal") or (target.type == "expression")) then + local _let_418_ = ast + local _ = _let_418_[1] + local _0 = _let_418_[2] + local method_string = _let_418_[3] + local call_string + if ((target.type == "literal") or (target.type == "varg") or (target.type == "expression")) then call_string = "(%s):%s(%s)" else call_string = "%s:%s(%s)" @@ -1286,30 +1252,30 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct return utils.expr(string.format(call_string, tostring(target), method_string, table.concat(args, ", ")), "statement") end local function nonnative_method_call(ast, scope, parent, target, args) - local method_string = tostring(compiler.compile1(ast[3], scope, parent, {nval = 1})[1]) + local method_string = tostring((compiler.compile1(ast[3], scope, parent, {nval = 1}))[1]) local args0 = {tostring(target), unpack(args)} return utils.expr(string.format("%s[%s](%s)", tostring(target), method_string, table.concat(args0, ", ")), "statement") end local function double_eval_protected_method_call(ast, scope, parent, target, args) - local method_string = tostring(compiler.compile1(ast[3], scope, parent, {nval = 1})[1]) + local method_string = tostring((compiler.compile1(ast[3], scope, parent, {nval = 1}))[1]) local call = "(function(tgt, m, ...) return tgt[m](tgt, ...) end)(%s, %s)" table.insert(args, 1, method_string) return utils.expr(string.format(call, tostring(target), table.concat(args, ", ")), "statement") end local function method_call(ast, scope, parent) compiler.assert((2 < #ast), "expected at least 2 arguments", ast) - local _0_ = compiler.compile1(ast[2], scope, parent, {nval = 1}) - local target = _0_[1] + local _let_420_ = compiler.compile1(ast[2], scope, parent, {nval = 1}) + local target = _let_420_[1] local args = {} for i = 4, #ast do - local subexprs = nil - local _1_ + local subexprs + local _421_ if (i ~= #ast) then - _1_ = 1 + _421_ = 1 else - _1_ = nil + _421_ = nil end - subexprs = compiler.compile1(ast[i], scope, parent, {nval = _1_}) + subexprs = compiler.compile1(ast[i], scope, parent, {nval = _421_}) utils.map(subexprs, tostring, args) end if ((type(ast[3]) == "string") and utils["valid-lua-identifier?"](ast[3])) then @@ -1325,17 +1291,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct SPECIALS.comment = function(ast, _, parent) local els = {} for i = 2, #ast do - local function _1_() - local _0_0 = tostring(ast[i]):gsub("\n", " ") - return _0_0 - end - table.insert(els, _1_()) + table.insert(els, view(ast[i], {["one-line?"] = true})) end - return compiler.emit(parent, ("-- " .. table.concat(els, " ")), ast) + return compiler.emit(parent, ("--[[ " .. table.concat(els, " ") .. " ]]--"), ast) end - doc_special("comment", {"..."}, "Comment which will be emitted in Lua output.") + doc_special("comment", {"..."}, "Comment which will be emitted in Lua output.", true) local function hashfn_max_used(f_scope, i, max) - local max0 = nil + local max0 if f_scope.symmeta[("$" .. i)].used then max0 = i else @@ -1349,12 +1311,12 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end SPECIALS.hashfn = function(ast, scope, parent) compiler.assert((#ast == 2), "expected one argument", ast) - local f_scope = nil + local f_scope do - local _0_0 = compiler["make-scope"](scope) - _0_0["vararg"] = false - _0_0["hashfn"] = true - f_scope = _0_0 + local _426_ = compiler["make-scope"](scope) + do end (_426_)["vararg"] = false + _426_["hashfn"] = true + f_scope = _426_ end local f_chunk = {} local name = compiler.gensym(scope) @@ -1365,7 +1327,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct args[i] = compiler["declare-local"](utils.sym(("$" .. i)), {}, f_scope, ast) end local function walker(idx, node, parent_node) - if (utils["sym?"](node) and (utils.deref(node) == "$...")) then + if (utils["sym?"](node) and (tostring(node) == "$...")) then parent_node[idx] = utils.varg() f_scope.vararg = true return nil @@ -1378,10 +1340,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local max_used = hashfn_max_used(f_scope, 1, 0) if f_scope.vararg then compiler.assert((max_used == 0), "$ and $... in hashfn are mutually exclusive", ast) + else end - local arg_str = nil + local arg_str if f_scope.vararg then - arg_str = utils.deref(utils.varg()) + arg_str = tostring(utils.varg()) else arg_str = table.concat(args, ", ", 1, max_used) end @@ -1393,39 +1356,50 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct doc_special("hashfn", {"..."}, "Function literal shorthand; args are either $... OR $1, $2, etc.") local function arithmetic_special(name, zero_arity, unary_prefix, ast, scope, parent) local len = #ast - if (len == 1) then - compiler.assert(zero_arity, "Expected more than 0 arguments", ast) - return utils.expr(zero_arity, "literal") - else - local operands = {} - local padded_op = (" " .. name .. " ") - for i = 2, len do - local subexprs = nil - local _0_ - if (i ~= len) then - _0_ = 1 - else - _0_ = nil - end - subexprs = compiler.compile1(ast[i], scope, parent, {nval = _0_}) + local operands = {} + local padded_op = (" " .. name .. " ") + for i = 2, len do + local subexprs = compiler.compile1(ast[i], scope, parent) + if (i == len) then utils.map(subexprs, tostring, operands) - end - if (#operands == 1) then - if unary_prefix then - return ("(" .. unary_prefix .. padded_op .. operands[1] .. ")") - else - return operands[1] - end else - return ("(" .. table.concat(operands, padded_op) .. ")") + table.insert(operands, tostring(subexprs[1])) end end + local _431_ = #operands + if (_431_ == 0) then + local _433_ + do + local _432_ = zero_arity + compiler.assert(_432_, "Expected more than 0 arguments", ast) + _433_ = _432_ + end + return utils.expr(_433_, "literal") + elseif (_431_ == 1) then + if unary_prefix then + return ("(" .. unary_prefix .. padded_op .. operands[1] .. ")") + else + return operands[1] + end + elseif true then + local _ = _431_ + return ("(" .. table.concat(operands, padded_op) .. ")") + else + return nil + end end - local function define_arithmetic_special(name, zero_arity, unary_prefix, lua_name) - local function _0_(...) - return arithmetic_special((lua_name or name), zero_arity, unary_prefix, ...) + local function define_arithmetic_special(name, zero_arity, unary_prefix, _3flua_name) + local _439_ + do + local _436_ = (_3flua_name or name) + local _437_ = zero_arity + local _438_ = unary_prefix + local function _440_(...) + return arithmetic_special(_436_, _437_, _438_, ...) + end + _439_ = _440_ end - SPECIALS[name] = _0_ + SPECIALS[name] = _439_ return doc_special(name, {"a", "b", "..."}, "Arithmetic operator; works the same as Lua but accepts more arguments.") end define_arithmetic_special("+", "0") @@ -1436,6 +1410,14 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct define_arithmetic_special("%") define_arithmetic_special("/", nil, "1") define_arithmetic_special("//", nil, "1") + SPECIALS["or"] = function(ast, scope, parent) + return arithmetic_special("or", "false", nil, ast, scope, parent) + end + SPECIALS["and"] = function(ast, scope, parent) + return arithmetic_special("and", "true", nil, ast, scope, parent) + end + doc_special("and", {"a", "b", "..."}, "Boolean operator; works the same as Lua but accepts more arguments.") + doc_special("or", {"a", "b", "..."}, "Boolean operator; works the same as Lua but accepts more arguments.") local function bitop_special(native_name, lib_name, zero_arity, unary_prefix, ast, scope, parent) if (#ast == 1) then return compiler.assert(zero_arity, "Expected more than 0 arguments.", ast) @@ -1445,14 +1427,14 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local padded_native_name = (" " .. native_name .. " ") local prefixed_lib_name = ("bit." .. lib_name) for i = 2, len do - local subexprs = nil - local _0_ + local subexprs + local _441_ if (i ~= len) then - _0_ = 1 + _441_ = 1 else - _0_ = nil + _441_ = nil end - subexprs = compiler.compile1(ast[i], scope, parent, {nval = _0_}) + subexprs = compiler.compile1(ast[i], scope, parent, {nval = _441_}) utils.map(subexprs, tostring, operands) end if (#operands == 1) then @@ -1471,10 +1453,18 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end end local function define_bitop_special(name, zero_arity, unary_prefix, native) - local function _0_(...) - return bitop_special(native, name, zero_arity, unary_prefix, ...) + local _451_ + do + local _447_ = native + local _448_ = name + local _449_ = zero_arity + local _450_ = unary_prefix + local function _452_(...) + return bitop_special(_447_, _448_, _449_, _450_, ...) + end + _451_ = _452_ end - SPECIALS[name] = _0_ + SPECIALS[name] = _451_ return nil end define_bitop_special("lshift", nil, "1", "<<") @@ -1487,20 +1477,16 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct doc_special("band", {"x1", "x2", "..."}, "Bitwise AND of any number of arguments.\nOnly works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.") doc_special("bor", {"x1", "x2", "..."}, "Bitwise OR of any number of arguments.\nOnly works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.") doc_special("bxor", {"x1", "x2", "..."}, "Bitwise XOR of any number of arguments.\nOnly works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.") - define_arithmetic_special("or", "false") - define_arithmetic_special("and", "true") - doc_special("and", {"a", "b", "..."}, "Boolean operator; works the same as Lua but accepts more arguments.") - doc_special("or", {"a", "b", "..."}, "Boolean operator; works the same as Lua but accepts more arguments.") doc_special("..", {"a", "b", "..."}, "String concatenation operator; works the same as Lua but accepts more arguments.") - local function native_comparator(op, _0_0, scope, parent) - local _1_ = _0_0 - local _ = _1_[1] - local lhs_ast = _1_[2] - local rhs_ast = _1_[3] - local _2_ = compiler.compile1(lhs_ast, scope, parent, {nval = 1}) - local lhs = _2_[1] - local _3_ = compiler.compile1(rhs_ast, scope, parent, {nval = 1}) - local rhs = _3_[1] + local function native_comparator(op, _453_, scope, parent) + local _arg_454_ = _453_ + local _ = _arg_454_[1] + local lhs_ast = _arg_454_[2] + local rhs_ast = _arg_454_[3] + local _let_455_ = compiler.compile1(lhs_ast, scope, parent, {nval = 1}) + local lhs = _let_455_[1] + local _let_456_ = compiler.compile1(rhs_ast, scope, parent, {nval = 1}) + local rhs = _let_456_[1] return string.format("(%s %s %s)", tostring(lhs), op, tostring(rhs)) end local function double_eval_protected_comparator(op, chain_op, ast, scope, parent) @@ -1510,22 +1496,22 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local chain = string.format(" %s ", (chain_op or "and")) for i = 2, #ast do table.insert(arglist, tostring(compiler.gensym(scope))) - table.insert(vals, tostring(compiler.compile1(ast[i], scope, parent, {nval = 1})[1])) + table.insert(vals, tostring((compiler.compile1(ast[i], scope, parent, {nval = 1}))[1])) end for i = 1, (#arglist - 1) do table.insert(comparisons, string.format("(%s %s %s)", arglist[i], op, arglist[(i + 1)])) end return string.format("(function(%s) return %s end)(%s)", table.concat(arglist, ","), table.concat(comparisons, chain), table.concat(vals, ",")) end - local function define_comparator_special(name, lua_op, chain_op) + local function define_comparator_special(name, _3flua_op, _3fchain_op) do - local op = (lua_op or name) + local op = (_3flua_op or name) local function opfn(ast, scope, parent) compiler.assert((2 < #ast), "expected at least two arguments", ast) if (3 == #ast) then return native_comparator(op, ast, scope, parent) else - return double_eval_protected_comparator(op, chain_op, ast, scope, parent) + return double_eval_protected_comparator(op, _3fchain_op, ast, scope, parent) end end SPECIALS[name] = opfn @@ -1538,11 +1524,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct define_comparator_special("<=") define_comparator_special("=", "==") define_comparator_special("not=", "~=", "or") - local function define_unary_special(op, realop) + local function define_unary_special(op, _3frealop) local function opfn(ast, scope, parent) compiler.assert((#ast == 2), "expected one argument", ast) local tail = compiler.compile1(ast[2], scope, parent, {nval = 1}) - return ((realop or op) .. tostring(tail[1])) + return ((_3frealop or op) .. tostring(tail[1])) end SPECIALS[op] = opfn return nil @@ -1553,196 +1539,281 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct doc_special("bnot", {"x"}, "Bitwise negation; only works in Lua 5.3+ or LuaJIT with the --use-bit-lib flag.") define_unary_special("length", "#") doc_special("length", {"x"}, "Returns the length of a table or string.") - SPECIALS["~="] = SPECIALS["not="] + do end (SPECIALS)["~="] = SPECIALS["not="] SPECIALS["#"] = SPECIALS.length SPECIALS.quote = function(ast, scope, parent) - compiler.assert((#ast == 2), "expected one argument") + compiler.assert((#ast == 2), "expected one argument", ast) local runtime, this_scope = true, scope while this_scope do this_scope = this_scope.parent if (this_scope == compiler.scopes.compiler) then runtime = false + else end end return compiler["do-quote"](ast[2], scope, parent, runtime) end doc_special("quote", {"x"}, "Quasiquote the following form. Only works in macro/compiler scope.") - local already_warned_3f = {} - local compile_env_warning = table.concat({"WARNING: Attempting to %s %s in compile scope.", "In future versions of Fennel this will not be allowed without the", "--no-compiler-sandbox flag or passing a :compilerEnv globals table", "in the options.\n"}, "\n") - local function compiler_env_warn(_, key) - local v = _G[key] - if (v and io and io.stderr and not already_warned_3f[key]) then - already_warned_3f[key] = true - do end (io.stderr):write(compile_env_warning:format("use global", key)) - end - return v - end + local macro_loaded = {} local function safe_getmetatable(tbl) local mt = getmetatable(tbl) assert((mt ~= getmetatable("")), "Illegal metatable access!") return mt end local safe_require = nil - local function safe_compiler_env(strict_3f) - local _1_ - if strict_3f then - _1_ = nil - else - _1_ = compiler_env_warn - end - return setmetatable({assert = assert, bit = rawget(_G, "bit"), error = error, getmetatable = safe_getmetatable, ipairs = ipairs, math = utils.copy(math), next = next, pairs = pairs, pcall = pcall, print = print, rawequal = rawequal, rawget = rawget, rawlen = rawget(_G, "rawlen"), rawset = rawset, require = safe_require, select = select, setmetatable = setmetatable, string = utils.copy(string), table = utils.copy(table), tonumber = tonumber, tostring = tostring, type = type, xpcall = xpcall}, {__index = _1_}) + local function safe_compiler_env() + return {table = utils.copy(table), math = utils.copy(math), string = utils.copy(string), pairs = pairs, ipairs = ipairs, select = select, tostring = tostring, tonumber = tonumber, bit = rawget(_G, "bit"), pcall = pcall, xpcall = xpcall, next = next, print = print, type = type, assert = assert, error = error, setmetatable = setmetatable, getmetatable = safe_getmetatable, require = safe_require, rawlen = rawget(_G, "rawlen"), rawget = rawget, rawset = rawset, rawequal = rawequal, _VERSION = _VERSION} end - local function make_compiler_env(ast, scope, parent, strict_3f) - local function _1_() + local function combined_mt_pairs(env) + local combined = {} + local _let_459_ = getmetatable(env) + local __index = _let_459_["__index"] + if ("table" == type(__index)) then + for k, v in pairs(__index) do + combined[k] = v + end + else + end + for k, v in next, env, nil do + combined[k] = v + end + return next, combined, nil + end + local function make_compiler_env(ast, scope, parent, _3fopts) + local provided + do + local _461_ = (_3fopts or utils.root.options) + if ((_G.type(_461_) == "table") and ((_461_)["compiler-env"] == "strict")) then + provided = safe_compiler_env() + elseif ((_G.type(_461_) == "table") and (nil ~= (_461_).compilerEnv)) then + local compilerEnv = (_461_).compilerEnv + provided = compilerEnv + elseif ((_G.type(_461_) == "table") and (nil ~= (_461_)["compiler-env"])) then + local compiler_env = (_461_)["compiler-env"] + provided = compiler_env + elseif true then + local _ = _461_ + provided = safe_compiler_env(false) + else + provided = nil + end + end + local env + local function _463_(base) + return utils.sym(compiler.gensym((compiler.scopes.macro or scope), base)) + end + local function _464_() return compiler.scopes.macro end - local function _2_(symbol) + local function _465_(symbol) compiler.assert(compiler.scopes.macro, "must call from macro", ast) return compiler.scopes.macro.manglings[tostring(symbol)] end - local function _3_(base) - return utils.sym(compiler.gensym((compiler.scopes.macro or scope), base)) - end - local function _4_(form) + local function _466_(form) compiler.assert(compiler.scopes.macro, "must call from macro", ast) return compiler.macroexpand(form, compiler.scopes.macro) end - local _6_ - do - local _5_0 = utils.root.options - if ((type(_5_0) == "table") and (_5_0["compiler-env"] == "strict")) then - _6_ = safe_compiler_env(true) - elseif ((type(_5_0) == "table") and (nil ~= _5_0.compilerEnv)) then - local compilerEnv = _5_0.compilerEnv - _6_ = compilerEnv - elseif ((type(_5_0) == "table") and (nil ~= _5_0["compiler-env"])) then - local compiler_env = _5_0["compiler-env"] - _6_ = compiler_env + env = {_AST = ast, _CHUNK = parent, _IS_COMPILER = true, _SCOPE = scope, _SPECIALS = compiler.scopes.global.specials, _VARARG = utils.varg(), ["macro-loaded"] = macro_loaded, unpack = unpack, ["assert-compile"] = compiler.assert, view = view, version = utils.version, metadata = compiler.metadata, list = utils.list, ["list?"] = utils["list?"], ["table?"] = utils["table?"], sequence = utils.sequence, ["sequence?"] = utils["sequence?"], sym = utils.sym, ["sym?"] = utils["sym?"], ["multi-sym?"] = utils["multi-sym?"], comment = utils.comment, ["comment?"] = utils["comment?"], ["varg?"] = utils["varg?"], gensym = _463_, ["get-scope"] = _464_, ["in-scope?"] = _465_, macroexpand = _466_} + env._G = env + return setmetatable(env, {__index = provided, __newindex = provided, __pairs = combined_mt_pairs}) + end + local function _468_(...) + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for c in string.gmatch((package.config or ""), "([^\n]+)") do + local val_16_auto = c + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto else - local _ = _5_0 - _6_ = safe_compiler_env(false) end end - return setmetatable({["assert-compile"] = compiler.assert, ["get-scope"] = _1_, ["in-scope?"] = _2_, ["list?"] = utils["list?"], ["multi-sym?"] = utils["multi-sym?"], ["sequence?"] = utils["sequence?"], ["sym?"] = utils["sym?"], ["table?"] = utils["table?"], ["varg?"] = utils["varg?"], _AST = ast, _CHUNK = parent, _IS_COMPILER = true, _SCOPE = scope, _SPECIALS = compiler.scopes.global.specials, _VARARG = utils.varg(), gensym = _3_, list = utils.list, macroexpand = _4_, sequence = utils.sequence, sym = utils.sym, unpack = unpack, view = view}, {__index = _6_}) + return tbl_14_auto end - local cfg = string.gmatch(package.config, "([^\n]+)") - local dirsep, pathsep, pathmark = (cfg() or "/"), (cfg() or ";"), (cfg() or "?") - local pkg_config = {dirsep = dirsep, pathmark = pathmark, pathsep = pathsep} + local _local_467_ = _468_(...) + local dirsep = _local_467_[1] + local pathsep = _local_467_[2] + local pathmark = _local_467_[3] + local pkg_config = {dirsep = (dirsep or "/"), pathmark = (pathmark or ";"), pathsep = (pathsep or "?")} local function escapepat(str) return string.gsub(str, "[^%w]", "%%%1") end - local function search_module(modulename, pathstring) + local function search_module(modulename, _3fpathstring) local pathsepesc = escapepat(pkg_config.pathsep) local pattern = ("([^%s]*)%s"):format(pathsepesc, pathsepesc) local no_dot_module = modulename:gsub("%.", pkg_config.dirsep) - local fullpath = ((pathstring or utils["fennel-module"].path) .. pkg_config.pathsep) + local fullpath = ((_3fpathstring or utils["fennel-module"].path) .. pkg_config.pathsep) local function try_path(path) local filename = path:gsub(escapepat(pkg_config.pathmark), no_dot_module) local filename2 = path:gsub(escapepat(pkg_config.pathmark), modulename) - local _1_0 = (io.open(filename) or io.open(filename2)) - if (nil ~= _1_0) then - local file = _1_0 + local _470_ = (io.open(filename) or io.open(filename2)) + if (nil ~= _470_) then + local file = _470_ file:close() return filename + else + return nil end end local function find_in_path(start) - local _1_0 = fullpath:match(pattern, start) - if (nil ~= _1_0) then - local path = _1_0 + local _472_ = fullpath:match(pattern, start) + if (nil ~= _472_) then + local path = _472_ return (try_path(path) or find_in_path((start + #path + 1))) + else + return nil end end return find_in_path(1) end - local function make_searcher(options) - local function _1_(module_name) + local function make_searcher(_3foptions) + local function _474_(module_name) local opts = utils.copy(utils.root.options) - for k, v in pairs((options or {})) do + for k, v in pairs((_3foptions or {})) do opts[k] = v end opts["module-name"] = module_name - local _2_0 = search_module(module_name) - if (nil ~= _2_0) then - local filename = _2_0 - local function _3_(...) - return utils["fennel-module"].dofile(filename, opts, ...) + local _475_ = search_module(module_name) + if (nil ~= _475_) then + local filename = _475_ + local _478_ + do + local _476_ = filename + local _477_ = opts + local function _479_(...) + return utils["fennel-module"].dofile(_476_, _477_, ...) + end + _478_ = _479_ end - return _3_, filename - end - end - return _1_ - end - local function macro_globals(env, globals) - local allowed = current_global_names(env) - for _, k in pairs((globals or {})) do - table.insert(allowed, k) - end - return allowed - end - local function default_macro_searcher(module_name) - local _1_0 = search_module(module_name) - if (nil ~= _1_0) then - local filename = _1_0 - local function _2_(...) - return utils["fennel-module"].dofile(filename, {env = "_COMPILER"}, ...) - end - return _2_, filename - end - end - local macro_searchers = {default_macro_searcher} - local function search_macro_module(modname, n) - local _1_0 = macro_searchers[n] - if (nil ~= _1_0) then - local f = _1_0 - local _2_0, _3_0 = f(modname) - if ((nil ~= _2_0) and true) then - local loader = _2_0 - local _3ffilename = _3_0 - return loader, _3ffilename + return _478_, filename else - local _ = _2_0 - return search_macro_module(modname, (n + 1)) + return nil end end + return _474_ + end + local function fennel_macro_searcher(module_name) + local opts + do + local _481_ = utils.copy(utils.root.options) + do end (_481_)["env"] = "_COMPILER" + _481_["requireAsInclude"] = false + _481_["allowedGlobals"] = nil + opts = _481_ + end + local _482_ = search_module(module_name, utils["fennel-module"]["macro-path"]) + if (nil ~= _482_) then + local filename = _482_ + local _485_ + do + local _483_ = filename + local _484_ = opts + local function _486_(...) + return utils["fennel-module"].dofile(_483_, _484_, ...) + end + _485_ = _486_ + end + return _485_, filename + else + return nil + end + end + local function lua_macro_searcher(module_name) + local _488_ = search_module(module_name, package.path) + if (nil ~= _488_) then + local filename = _488_ + local code + do + local f = io.open(filename) + local function close_handlers_8_auto(ok_9_auto, ...) + f:close() + if ok_9_auto then + return ... + else + return error(..., 0) + end + end + local function _490_() + return assert(f:read("*a")) + end + code = close_handlers_8_auto(_G.xpcall(_490_, (package.loaded.fennel or debug).traceback)) + end + local chunk = load_code(code, make_compiler_env(), filename) + return chunk, filename + else + return nil + end + end + local macro_searchers = {fennel_macro_searcher, lua_macro_searcher} + local function search_macro_module(modname, n) + local _492_ = macro_searchers[n] + if (nil ~= _492_) then + local f = _492_ + local _493_, _494_ = f(modname) + if ((nil ~= _493_) and true) then + local loader = _493_ + local _3ffilename = _494_ + return loader, _3ffilename + elseif true then + local _ = _493_ + return search_macro_module(modname, (n + 1)) + else + return nil + end + else + return nil + end end - local macro_loaded = {} local function metadata_only_fennel(modname) if ((modname == "fennel.macros") or (package and package.loaded and ("table" == type(package.loaded[modname])) and (package.loaded[modname].metadata == compiler.metadata))) then return {metadata = compiler.metadata} + else + return nil end end - local function _1_(modname) - local function _2_() + local function _498_(modname) + local function _499_() local loader, filename = search_macro_module(modname, 1) compiler.assert(loader, (modname .. " module not found.")) - macro_loaded[modname] = loader(modname, filename) + do end (macro_loaded)[modname] = loader(modname, filename) return macro_loaded[modname] end - return (macro_loaded[modname] or metadata_only_fennel(modname) or _2_()) + return (macro_loaded[modname] or metadata_only_fennel(modname) or _499_()) end - safe_require = _1_ + safe_require = _498_ local function add_macros(macros_2a, ast, scope) compiler.assert(utils["table?"](macros_2a), "expected macros to be table", ast) for k, v in pairs(macros_2a) do compiler.assert((type(v) == "function"), "expected each macro to be function", ast) - scope.macros[k] = v + do end (scope.macros)[k] = v end return nil end - SPECIALS["require-macros"] = function(ast, scope, parent, real_ast) - compiler.assert((#ast == 2), "Expected one module name argument", (real_ast or ast)) - local filename = (ast[2].filename or ast.filename) - local modname_chunk = load_code(compiler.compile(ast[2]), nil, filename) - local modname = modname_chunk(utils.root.options["module-name"], filename) - compiler.assert((type(modname) == "string"), "module name must compile to string", (real_ast or ast)) + local function resolve_module_name(_500_, _scope, _parent, opts) + local _arg_501_ = _500_ + local filename = _arg_501_["filename"] + local second = _arg_501_[2] + local filename0 = (filename or (utils["table?"](second) and second.filename)) + local module_name = utils.root.options["module-name"] + local modexpr = compiler.compile(second, opts) + local modname_chunk = load_code(modexpr) + return modname_chunk(module_name, filename0) + end + SPECIALS["require-macros"] = function(ast, scope, parent, _3freal_ast) + compiler.assert((#ast == 2), "Expected one module name argument", (_3freal_ast or ast)) + local modname = resolve_module_name(ast, scope, parent, {}) + compiler.assert(("string" == type(modname)), "module name must compile to string", (_3freal_ast or ast)) if not macro_loaded[modname] then - local env = make_compiler_env(ast, scope, parent) - local loader, filename0 = search_macro_module(modname, 1) + local loader, filename = search_macro_module(modname, 1) compiler.assert(loader, (modname .. " module not found."), ast) - macro_loaded[modname] = loader(modname, filename0) + do end (macro_loaded)[modname] = loader(modname, filename) + else + end + if ("import-macros" == tostring(ast[1])) then + return macro_loaded[modname] + else + return add_macros(macro_loaded[modname], ast, scope, parent) end - return add_macros(macro_loaded[modname], ast, scope, parent) end doc_special("require-macros", {"macro-module-name"}, "Load given module and use its contents as macro definitions in current scope.\nMacro module should return a table of macro functions with string keys.\nConsider using import-macros instead as it is more flexible.") local function emit_included_fennel(src, path, opts, sub_chunk) @@ -1750,12 +1821,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local forms = {} if utils.root.options.requireAsInclude then subscope.specials.require = compiler["require-include"] + else end for _, val in parser.parser(parser["string-stream"](src), path) do table.insert(forms, val) end for i = 1, #forms do - local subopts = nil + local subopts if (i == #forms) then subopts = {tail = true} else @@ -1768,21 +1840,21 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end local function include_path(ast, opts, path, mod, fennel_3f) utils.root.scope.includes[mod] = "fnl/loading" - local src = nil + local src do local f = assert(io.open(path)) - local function close_handlers_0_(ok_0_, ...) + local function close_handlers_8_auto(ok_9_auto, ...) f:close() - if ok_0_ then + if ok_9_auto then return ... else return error(..., 0) end end - local function _2_() + local function _507_() return f:read("*all"):gsub("[\13\n]*$", "") end - src = close_handlers_0_(xpcall(_2_, (package.loaded.fennel or debug).traceback)) + src = close_handlers_8_auto(_G.xpcall(_507_, (package.loaded.fennel or debug).traceback)) end local ret = utils.expr(("require(\"" .. mod .. "\")"), "statement") local target = ("package.preload[%q]"):format(mod) @@ -1806,11 +1878,25 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct if (utils.root.scope.includes[mod] == "fnl/loading") then compiler.assert(fallback, "circular include detected", ast) return fallback(modexpr) + else + return nil end end SPECIALS.include = function(ast, scope, parent, opts) compiler.assert((#ast == 2), "expected one argument", ast) - local modexpr = compiler.compile1(ast[2], scope, parent, {nval = 1})[1] + local modexpr + do + local _510_, _511_ = pcall(resolve_module_name, ast, scope, parent, opts) + if ((_510_ == true) and (nil ~= _511_)) then + local modname = _511_ + modexpr = utils.expr(string.format("%q", modname), "literal") + elseif true then + local _ = _510_ + modexpr = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1] + else + modexpr = nil + end + end if ((modexpr.type ~= "literal") or ((modexpr[1]):byte() ~= 34)) then if opts.fallback then return opts.fallback(modexpr) @@ -1819,13 +1905,18 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct end else local mod = load_code(("return " .. modexpr[1]))() - local function _3_() - local _2_0 = search_module(mod) - if (nil ~= _2_0) then - local fennel_path = _2_0 + local oldmod = utils.root.options["module-name"] + local _ + utils.root.options["module-name"] = mod + _ = nil + local res + local function _515_() + local _514_ = search_module(mod) + if (nil ~= _514_) then + local fennel_path = _514_ return include_path(ast, opts, fennel_path, mod, true) - else - local _ = _2_0 + elseif true then + local _0 = _514_ local lua_path = search_module(mod, package.path) if lua_path then return include_path(ast, opts, lua_path, mod, false) @@ -1834,9 +1925,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct else return compiler.assert(false, ("module not found " .. mod), ast) end + else + return nil end end - return (include_circular_fallback(mod, modexpr, opts.fallback, ast) or utils.root.scope.includes[mod] or _3_()) + res = ((utils["member?"](mod, (utils.root.options.skipInclude or {})) and utils.expr("nil --[[SKIPPED INCLUDE]]--", "literal")) or include_circular_fallback(mod, modexpr, opts.fallback, ast) or utils.root.scope.includes[mod] or _515_()) + utils.root.options["module-name"] = oldmod + return res end end doc_special("include", {"module-name-literal"}, "Like require but load the target module during compilation and embed it in the\nLua output. The module must be a string literal and resolvable at compile time.") @@ -1844,7 +1939,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local env = make_compiler_env(ast, scope, parent) local opts = utils.copy(utils.root.options) opts.scope = compiler["make-scope"](compiler.scopes.compiler) - opts.allowedGlobals = macro_globals(env, current_global_names()) + opts.allowedGlobals = current_global_names(env) return load_code(compiler.compile(ast, opts), wrap_env(env))(opts["module-name"], ast.filename) end SPECIALS.macros = function(ast, scope, parent) @@ -1856,11 +1951,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct local old_first = ast[1] ast[1] = utils.sym("do") local val = eval_compiler_2a(ast, scope, parent) - ast[1] = old_first + do end (ast)[1] = old_first return val end - doc_special("eval-compiler", {"..."}, "Evaluate the body at compile-time. Use the macro system instead if possible.") - return {["current-global-names"] = current_global_names, ["load-code"] = load_code, ["macro-loaded"] = macro_loaded, ["macro-searchers"] = macro_searchers, ["make-compiler-env"] = make_compiler_env, ["make-searcher"] = make_searcher, ["search-module"] = search_module, ["wrap-env"] = wrap_env, doc = doc_2a} + doc_special("eval-compiler", {"..."}, "Evaluate the body at compile-time. Use the macro system instead if possible.", true) + return {doc = doc_2a, ["current-global-names"] = current_global_names, ["load-code"] = load_code, ["macro-loaded"] = macro_loaded, ["macro-searchers"] = macro_searchers, ["make-compiler-env"] = make_compiler_env, ["search-module"] = search_module, ["make-searcher"] = make_searcher, ["wrap-env"] = wrap_env} end package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or function(...) local utils = require("fennel.utils") @@ -1868,18 +1963,18 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local friend = require("fennel.friend") local unpack = (table.unpack or _G.unpack) local scopes = {} - local function make_scope(parent) - local parent0 = (parent or scopes.global) - local _0_ - if parent0 then - _0_ = ((parent0.depth or 0) + 1) + local function make_scope(_3fparent) + local parent = (_3fparent or scopes.global) + local _203_ + if parent then + _203_ = ((parent.depth or 0) + 1) else - _0_ = 0 + _203_ = 0 end - return {autogensyms = {}, depth = _0_, hashfn = (parent0 and parent0.hashfn), includes = setmetatable({}, {__index = (parent0 and parent0.includes)}), macros = setmetatable({}, {__index = (parent0 and parent0.macros)}), manglings = setmetatable({}, {__index = (parent0 and parent0.manglings)}), parent = parent0, refedglobals = setmetatable({}, {__index = (parent0 and parent0.refedglobals)}), specials = setmetatable({}, {__index = (parent0 and parent0.specials)}), symmeta = setmetatable({}, {__index = (parent0 and parent0.symmeta)}), unmanglings = setmetatable({}, {__index = (parent0 and parent0.unmanglings)}), vararg = (parent0 and parent0.vararg)} + return {includes = setmetatable({}, {__index = (parent and parent.includes)}), macros = setmetatable({}, {__index = (parent and parent.macros)}), manglings = setmetatable({}, {__index = (parent and parent.manglings)}), specials = setmetatable({}, {__index = (parent and parent.specials)}), symmeta = setmetatable({}, {__index = (parent and parent.symmeta)}), unmanglings = setmetatable({}, {__index = (parent and parent.unmanglings)}), gensyms = setmetatable({}, {__index = (parent and parent.gensyms)}), autogensyms = setmetatable({}, {__index = (parent and parent.autogensyms)}), vararg = (parent and parent.vararg), depth = _203_, hashfn = (parent and parent.hashfn), refedglobals = {}, parent = parent} end local function assert_msg(ast, msg) - local ast_tbl = nil + local ast_tbl if ("table" == type(ast)) then ast_tbl = ast else @@ -1888,28 +1983,24 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local m = getmetatable(ast) local filename = ((m and m.filename) or ast_tbl.filename or "unknown") local line = ((m and m.line) or ast_tbl.line or "?") - local target = nil - local function _1_() - if utils["sym?"](ast_tbl[1]) then - return utils.deref(ast_tbl[1]) - else - return (ast_tbl[1] or "()") - end - end - target = tostring(_1_()) - return string.format("Compile error in '%s' %s:%s: %s", target, filename, line, msg) + local target = tostring((utils["sym?"](ast_tbl[1]) or ast_tbl[1] or "()")) + return string.format("%s:%s: Compile error in '%s': %s", filename, line, target, msg) end local function assert_compile(condition, msg, ast) if not condition then - local _0_ = (utils.root.options or {}) - local source = _0_["source"] - local unfriendly = _0_["unfriendly"] - utils.root.reset() - if unfriendly then - error(assert_msg(ast, msg), 0) + local _let_206_ = (utils.root.options or {}) + local source = _let_206_["source"] + local unfriendly = _let_206_["unfriendly"] + if (nil == utils.hook("assert-compile", condition, msg, ast, utils.root.reset)) then + utils.root.reset() + if (unfriendly or not friend or not _G.io or not _G.io.read) then + error(assert_msg(ast, msg), 0) + else + friend["assert-compile"](condition, msg, ast, source) + end else - friend["assert-compile"](condition, msg, ast, source) end + else end return condition end @@ -1917,74 +2008,76 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct scopes.global.vararg = true scopes.compiler = make_scope(scopes.global) scopes.macro = scopes.global - local serialize_subst = {["\11"] = "\\v", ["\12"] = "\\f", ["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\n"] = "n"} + local serialize_subst = {["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\n"] = "n", ["\11"] = "\\v", ["\12"] = "\\f"} local function serialize_string(str) - local function _0_(_241) + local function _210_(_241) return ("\\" .. _241:byte()) end - return string.gsub(string.gsub(string.format("%q", str), ".", serialize_subst), "[\128-\255]", _0_) + return string.gsub(string.gsub(string.format("%q", str), ".", serialize_subst), "[\128-\255]", _210_) end local function global_mangling(str) if utils["valid-lua-identifier?"](str) then return str else - local function _0_(_241) + local function _211_(_241) return string.format("_%02x", _241:byte()) end - return ("__fnl_global__" .. str:gsub("[^%w]", _0_)) + return ("__fnl_global__" .. str:gsub("[^%w]", _211_)) end end local function global_unmangling(identifier) - local _0_0 = string.match(identifier, "^__fnl_global__(.*)$") - if (nil ~= _0_0) then - local rest = _0_0 - local _1_0 = nil - local function _2_(_241) + local _213_ = string.match(identifier, "^__fnl_global__(.*)$") + if (nil ~= _213_) then + local rest = _213_ + local _214_ + local function _215_(_241) return string.char(tonumber(_241:sub(2), 16)) end - _1_0 = string.gsub(rest, "_[%da-f][%da-f]", _2_) - return _1_0 - else - local _ = _0_0 + _214_ = string.gsub(rest, "_[%da-f][%da-f]", _215_) + return _214_ + elseif true then + local _ = _213_ return identifier + else + return nil end end local allowed_globals = nil - local function global_allowed(name) + local function global_allowed_3f(name) return (not allowed_globals or utils["member?"](name, allowed_globals)) end local function unique_mangling(original, mangling, scope, append) - if scope.unmanglings[mangling] then + if (scope.unmanglings[mangling] and not scope.gensyms[mangling]) then return unique_mangling(original, (original .. append), scope, (append + 1)) else return mangling end end - local function local_mangling(str, scope, ast, temp_manglings) + local function local_mangling(str, scope, ast, _3ftemp_manglings) assert_compile(not utils["multi-sym?"](str), ("unexpected multi symbol " .. str), ast) - local raw = nil - if (utils["lua-keywords"][str] or str:match("^%d")) then + local raw + if ((utils["lua-keywords"])[str] or str:match("^%d")) then raw = ("_" .. str) else raw = str end - local mangling = nil - local function _1_(_241) + local mangling + local function _219_(_241) return string.format("_%02x", _241:byte()) end - mangling = string.gsub(string.gsub(raw, "-", "_"), "[^%w_]", _1_) + mangling = string.gsub(string.gsub(raw, "-", "_"), "[^%w_]", _219_) local unique = unique_mangling(mangling, mangling, scope, 0) - scope.unmanglings[unique] = str + do end (scope.unmanglings)[unique] = str do - local manglings = (temp_manglings or scope.manglings) - manglings[str] = unique + local manglings = (_3ftemp_manglings or scope.manglings) + do end (manglings)[str] = unique end return unique end local function apply_manglings(scope, new_manglings, ast) for raw, mangled in pairs(new_manglings) do assert_compile(not scope.refedglobals[mangled], ("use of global " .. raw .. " is aliased by a local"), ast) - scope.manglings[raw] = mangled + do end (scope.manglings)[raw] = mangled end return nil end @@ -2003,47 +2096,49 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct end return ret end - local function gensym(scope, base) - local append, mangling = 0, ((base or "") .. "_0_") + local function next_append() + utils.root.scope["gensym-append"] = ((utils.root.scope["gensym-append"] or 0) + 1) + return ("_" .. utils.root.scope["gensym-append"] .. "_") + end + local function gensym(scope, _3fbase, _3fsuffix) + local mangling = ((_3fbase or "") .. next_append() .. (_3fsuffix or "")) while scope.unmanglings[mangling] do - mangling = ((base or "") .. "_" .. append .. "_") - append = (append + 1) + mangling = ((_3fbase or "") .. next_append() .. (_3fsuffix or "")) end - scope.unmanglings[mangling] = (base or true) + scope.unmanglings[mangling] = (_3fbase or true) + do end (scope.gensyms)[mangling] = true return mangling end local function autogensym(base, scope) - local _0_0 = utils["multi-sym?"](base) - if (nil ~= _0_0) then - local parts = _0_0 + local _222_ = utils["multi-sym?"](base) + if (nil ~= _222_) then + local parts = _222_ parts[1] = autogensym(parts[1], scope) return table.concat(parts, ((parts["multi-sym-method-call"] and ":") or ".")) - else - local _ = _0_0 - local function _1_() - local mangling = gensym(scope, base:sub(1, ( - 2))) - scope.autogensyms[base] = mangling + elseif true then + local _ = _222_ + local function _223_() + local mangling = gensym(scope, base:sub(1, ( - 2)), "auto") + do end (scope.autogensyms)[base] = mangling return mangling end - return (scope.autogensyms[base] or _1_()) + return (scope.autogensyms[base] or _223_()) + else + return nil end end - local already_warned = {} local function check_binding_valid(symbol, scope, ast) - local name = utils.deref(symbol) - if (io and io.stderr and name:find("&") and not already_warned[symbol]) then - already_warned[symbol] = true - do end (io.stderr):write(("-- Warning: & will not be allowed in identifier names in " .. "future versions: " .. (symbol.filename or "unknown") .. ":" .. (symbol.line or "?") .. "\n")) - end + local name = tostring(symbol) + assert_compile(not name:find("&"), "illegal character &") assert_compile(not (scope.specials[name] or scope.macros[name]), ("local %s was overshadowed by a special form or macro"):format(name), ast) return assert_compile(not utils["quoted?"](symbol), string.format("macro tried to bind %s without gensym", name), symbol) end - local function declare_local(symbol, meta, scope, ast, temp_manglings) + local function declare_local(symbol, meta, scope, ast, _3ftemp_manglings) check_binding_valid(symbol, scope, ast) - local name = utils.deref(symbol) + local name = tostring(symbol) assert_compile(not utils["multi-sym?"](name), ("unexpected multi symbol " .. name), ast) - scope.symmeta[name] = meta - return local_mangling(name, scope, ast, temp_manglings) + do end (scope.symmeta)[name] = meta + return local_mangling(name, scope, ast, _3ftemp_manglings) end local function hashfn_arg_name(name, multi_sym_parts, scope) if not scope.hashfn then @@ -2053,12 +2148,15 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct elseif multi_sym_parts then if (multi_sym_parts and (multi_sym_parts[1] == "$")) then multi_sym_parts[1] = "$1" + else end return table.concat(multi_sym_parts, ".") + else + return nil end end - local function symbol_to_expression(symbol, scope, reference_3f) - utils.hook("symbol-to-expression", symbol, scope, reference_3f) + local function symbol_to_expression(symbol, scope, _3freference_3f) + utils.hook("symbol-to-expression", symbol, scope, _3freference_3f) local name = symbol[1] local multi_sym_parts = utils["multi-sym?"](name) local name0 = (hashfn_arg_name(name, multi_sym_parts, scope) or name) @@ -2067,24 +2165,27 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local local_3f = scope.manglings[parts[1]] if (local_3f and scope.symmeta[parts[1]]) then scope.symmeta[parts[1]]["used"] = true + else end - assert_compile((not reference_3f or local_3f or global_allowed(parts[1])), ("unknown global in strict mode: " .. tostring(parts[1])), symbol) - if (allowed_globals and not local_3f) then - utils.root.scope.refedglobals[parts[1]] = true + assert_compile(not scope.macros[parts[1]], "tried to reference a macro at runtime", symbol) + assert_compile((not _3freference_3f or local_3f or ("_ENV" == parts[1]) or global_allowed_3f(parts[1])), ("unknown identifier in strict mode: " .. tostring(parts[1])), symbol) + if (allowed_globals and not local_3f and scope.parent) then + scope.parent.refedglobals[parts[1]] = true + else end return utils.expr(combine_parts(parts, scope), etype) end - local function emit(chunk, out, ast) + local function emit(chunk, out, _3fast) if (type(out) == "table") then return table.insert(chunk, out) else - return table.insert(chunk, {ast = ast, leaf = out}) + return table.insert(chunk, {ast = _3fast, leaf = out}) end end local function peephole(chunk) if chunk.leaf then return chunk - elseif ((#chunk >= 3) and (chunk[(#chunk - 2)].leaf == "do") and not chunk[(#chunk - 1)].leaf and (chunk[#chunk].leaf == "end")) then + elseif ((#chunk >= 3) and ((chunk[(#chunk - 2)]).leaf == "do") and not (chunk[(#chunk - 1)]).leaf and (chunk[#chunk].leaf == "end")) then local kid = peephole(chunk[(#chunk - 1)]) local new_chunk = {ast = chunk.ast} for i = 1, (#chunk - 3) do @@ -2098,11 +2199,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct return utils.map(chunk, peephole) end end - local function ast_source(ast) - local m = getmetatable(ast) - return ((m and m.line and m) or (("table" == type(ast)) and ast) or {}) - end - local function flatten_chunk_correlated(main_chunk) + local function flatten_chunk_correlated(main_chunk, options) local function flatten(chunk, out, last_line, file) local last_line0 = last_line if chunk.leaf then @@ -2110,21 +2207,24 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct else for _, subchunk in ipairs(chunk) do if (subchunk.leaf or (#subchunk > 0)) then - local source = ast_source(subchunk.ast) - if (file == source.file) then + local source = utils["ast-source"](subchunk.ast) + if (file == source.filename) then last_line0 = math.max(last_line0, (source.line or 0)) + else end last_line0 = flatten(subchunk, out, last_line0, file) + else end end end return last_line0 end local out = {} - local last = flatten(main_chunk, out, 1, main_chunk.file) + local last = flatten(main_chunk, out, 1, options.filename) for i = 1, last do if (out[i] == nil) then out[i] = "" + else end end return table.concat(out, "\n") @@ -2135,22 +2235,23 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local info = chunk.ast if sm then table.insert(sm, {(info and info.filename), (info and info.line)}) + else end return code else - local tab0 = nil + local tab0 do - local _0_0 = tab - if (_0_0 == true) then + local _236_ = tab + if (_236_ == true) then tab0 = " " - elseif (_0_0 == false) then + elseif (_236_ == false) then tab0 = "" - elseif (_0_0 == tab) then + elseif (_236_ == tab) then tab0 = tab - elseif (_0_0 == nil) then + elseif (_236_ == nil) then tab0 = "" else - tab0 = nil + tab0 = nil end end local function parter(c) @@ -2161,12 +2262,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct else return sub end + else + return nil end end return table.concat(utils.map(chunk, parter), "\n") end end - local fennel_sourcemap = {} + local sourcemap = {} local function make_short_src(source) local source0 = source:gsub("\n", " ") if (#source0 <= 49) then @@ -2178,7 +2281,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local function flatten(chunk, options) local chunk0 = peephole(chunk) if options.correlate then - return flatten_chunk_correlated(chunk0), {} + return flatten_chunk_correlated(chunk0, options), {} else local sm = {} local ret = flatten_chunk(sm, chunk0, options.indent, 0) @@ -2189,27 +2292,31 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct else sm.key = ret end - fennel_sourcemap[sm.key] = sm + sourcemap[sm.key] = sm + else end return ret, sm end end local function make_metadata() - local function _0_(self, tgt, key) + local function _245_(self, tgt, key) if self[tgt] then return self[tgt][key] + else + return nil end end - local function _1_(self, tgt, key, value) + local function _247_(self, tgt, key, value) self[tgt] = (self[tgt] or {}) - self[tgt][key] = value + do end (self[tgt])[key] = value return tgt end - local function _2_(self, tgt, ...) + local function _248_(self, tgt, ...) local kv_len = select("#", ...) local kvs = {...} if ((kv_len % 2) ~= 0) then error("metadata:setall() expected even number of k/v pairs") + else end self[tgt] = (self[tgt] or {}) for i = 1, kv_len, 2 do @@ -2217,25 +2324,27 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct end return tgt end - return setmetatable({}, {__index = {get = _0_, set = _1_, setall = _2_}, __mode = "k"}) + return setmetatable({}, {__index = {get = _245_, set = _247_, setall = _248_}, __mode = "k"}) end local function exprs1(exprs) - return table.concat(utils.map(exprs, 1), ", ") - end - local function disambiguate_parens(code, chunk) - if ((code:byte() == 40) and (1 < #chunk)) then - return ("; " .. code) - else - return code - end + return table.concat(utils.map(exprs, tostring), ", ") end local function keep_side_effects(exprs, chunk, start, ast) - for j = (start or 1), #exprs do + local start0 = (start or 1) + for j = start0, #exprs do local se = exprs[j] if ((se.type == "expression") and (se[1] ~= "nil")) then emit(chunk, string.format("do local _ = %s end", tostring(se)), ast) elseif (se.type == "statement") then - emit(chunk, disambiguate_parens(tostring(se), chunk), ast) + local code = tostring(se) + local disambiguated + if (code:byte() == 40) then + disambiguated = ("do end " .. code) + else + disambiguated = code + end + emit(chunk, disambiguated, ast) + else end end return nil @@ -2255,28 +2364,32 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct exprs[i] = utils.expr("nil", "literal") end end + else end + else end if opts.tail then emit(parent, string.format("return %s", exprs1(exprs)), ast) + else end if opts.target then local result = exprs1(exprs) - local function _2_() + local function _256_() if (result == "") then return "nil" else return result end end - emit(parent, string.format("%s = %s", opts.target, _2_()), ast) + emit(parent, string.format("%s = %s", opts.target, _256_()), ast) + else end if (opts.tail or opts.target) then return {returned = true} else - local _3_0 = exprs - _3_0["returned"] = true - return _3_0 + local _258_ = exprs + _258_["returned"] = true + return _258_ end end local function find_macro(ast, scope, multi_sym_parts) @@ -2287,7 +2400,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct return t end end - local macro_2a = (utils["sym?"](ast[1]) and scope.macros[utils.deref(ast[1])]) + local macro_2a = (utils["sym?"](ast[1]) and scope.macros[tostring(ast[1])]) if (not macro_2a and multi_sym_parts) then local nested_macro = find_in_table(scope.macros, 1) assert_compile((not scope.macros[multi_sym_parts[1]] or (type(nested_macro) == "function")), "macro not found in imported macro module", ast) @@ -2296,47 +2409,71 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct return macro_2a end end - local function macroexpand_2a(ast, scope, once) - local _0_0 = nil - if utils["list?"](ast) then - _0_0 = find_macro(ast, scope, utils["multi-sym?"](ast[1])) + local function propagate_trace_info(_262_, _index, node) + local _arg_263_ = _262_ + local filename = _arg_263_["filename"] + local line = _arg_263_["line"] + local bytestart = _arg_263_["bytestart"] + local byteend = _arg_263_["byteend"] + if (("table" == type(node)) and (filename ~= node.filename)) then + local src = utils["ast-source"](node) + src.filename, src.line = filename, line + src.bytestart, src.byteend = bytestart, byteend else - _0_0 = nil end - if (_0_0 == false) then + return ("table" == type(node)) + end + local function macroexpand_2a(ast, scope, _3fonce) + local _265_ + if utils["list?"](ast) then + _265_ = find_macro(ast, scope, utils["multi-sym?"](ast[1])) + else + _265_ = nil + end + if (_265_ == false) then return ast - elseif (nil ~= _0_0) then - local macro_2a = _0_0 + elseif (nil ~= _265_) then + local macro_2a = _265_ local old_scope = scopes.macro - local _ = nil + local _ scopes.macro = scope _ = nil local ok, transformed = nil, nil - local function _2_() + local function _267_() return macro_2a(unpack(ast, 2)) end - ok, transformed = xpcall(_2_, debug.traceback) + ok, transformed = xpcall(_267_, debug.traceback) + local function _269_() + local _268_ = ast + local function _270_(...) + return propagate_trace_info(_268_, ...) + end + return _270_ + end + utils["walk-tree"](transformed, _269_()) scopes.macro = old_scope assert_compile(ok, transformed, ast) - if (once or not transformed) then + if (_3fonce or not transformed) then return transformed else return macroexpand_2a(transformed, scope) end - else - local _ = _0_0 + elseif true then + local _ = _265_ return ast + else + return nil end end local function compile_special(ast, scope, parent, opts, special) local exprs = (special(ast, scope, parent, opts) or utils.expr("nil", "literal")) - local exprs0 = nil - if (type(exprs) == "string") then + local exprs0 + if ("table" ~= type(exprs)) then exprs0 = utils.expr(exprs, "expression") else exprs0 = exprs end - local exprs2 = nil + local exprs2 if utils["expr?"](exprs0) then exprs2 = {exprs0} else @@ -2352,17 +2489,17 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct end local function compile_function_call(ast, scope, parent, opts, compile1, len) local fargs = {} - local fcallee = compile1(ast[1], scope, parent, {nval = 1})[1] - assert_compile((fcallee.type ~= "literal"), ("cannot call literal value " .. tostring(ast[1])), ast) + local fcallee = (compile1(ast[1], scope, parent, {nval = 1}))[1] + assert_compile((("string" == type(ast[1])) or (fcallee.type ~= "literal")), ("cannot call literal value " .. tostring(ast[1])), ast) for i = 2, len do - local subexprs = nil - local _0_ + local subexprs + local _276_ if (i ~= len) then - _0_ = 1 + _276_ = 1 else - _0_ = nil + _276_ = nil end - subexprs = compile1(ast[i], scope, parent, {nval = _0_}) + subexprs = compile1(ast[i], scope, parent, {nval = _276_}) table.insert(fargs, (subexprs[1] or utils.expr("nil", "literal"))) if (i == len) then for j = 2, #subexprs do @@ -2372,7 +2509,13 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct keep_side_effects(subexprs, parent, 2, ast[i]) end end - local call = string.format("%s(%s)", tostring(fcallee), exprs1(fargs)) + local pat + if ("string" == type(ast[1])) then + pat = "(%s)(%s)" + else + pat = "%s(%s)" + end + local call = string.format(pat, tostring(fcallee), exprs1(fargs)) return handle_compile_opts({utils.expr(call, "statement")}, parent, opts, ast) end local function compile_call(ast, scope, parent, opts, compile1) @@ -2380,7 +2523,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local len = #ast local first = ast[1] local multi_sym_parts = utils["multi-sym?"](first) - local special = (utils["sym?"](first) and scope.specials[utils.deref(first)]) + local special = (utils["sym?"](first) and scope.specials[tostring(first)]) assert_compile((len > 0), "expected a function, macro, or special to call", ast) if special then return compile_special(ast, scope, parent, opts, special) @@ -2400,7 +2543,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local function compile_sym(ast, scope, parent, opts) local multi_sym_parts = utils["multi-sym?"](ast) assert_compile(not (multi_sym_parts and multi_sym_parts["multi-sym-method-call"]), "multisym method calls may only be in call position", ast) - local e = nil + local e if (ast[1] == "nil") then e = utils.expr("nil", "literal") else @@ -2409,94 +2552,101 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct return handle_compile_opts({e}, parent, opts, ast) end local function serialize_number(n) - local _0_0 = string.gsub(tostring(n), ",", ".") - return _0_0 + local _282_ = string.gsub(tostring(n), ",", ".") + return _282_ end local function compile_scalar(ast, _scope, parent, opts) - local serialize = nil + local serialize do - local _0_0 = type(ast) - if (_0_0 == "nil") then + local _283_ = type(ast) + if (_283_ == "nil") then serialize = tostring - elseif (_0_0 == "boolean") then + elseif (_283_ == "boolean") then serialize = tostring - elseif (_0_0 == "string") then + elseif (_283_ == "string") then serialize = serialize_string - elseif (_0_0 == "number") then + elseif (_283_ == "number") then serialize = serialize_number else - serialize = nil + serialize = nil end end return handle_compile_opts({utils.expr(serialize(ast), "literal")}, parent, opts) end local function compile_table(ast, scope, parent, opts, compile1) local buffer = {} - for i = 1, #ast do - local nval = ((i ~= #ast) and 1) - table.insert(buffer, exprs1(compile1(ast[i], scope, parent, {nval = nval}))) - end local function write_other_values(k) if ((type(k) ~= "number") or (math.floor(k) ~= k) or (k < 1) or (k > #ast)) then if ((type(k) == "string") and utils["valid-lua-identifier?"](k)) then return {k, k} else - local _0_ = compile1(k, scope, parent, {nval = 1}) - local compiled = _0_[1] + local _let_285_ = compile1(k, scope, parent, {nval = 1}) + local compiled = _let_285_[1] local kstr = ("[" .. tostring(compiled) .. "]") return {kstr, k} end + else + return nil end end do - local keys = nil + local keys do - local _0_0 = utils.kvmap(ast, write_other_values) - local function _1_(a, b) - return (a[1] < b[1]) + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for k, v in utils.stablepairs(ast) do + local val_16_auto = write_other_values(k, v) + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end end - table.sort(_0_0, _1_) - keys = _0_0 + keys = tbl_14_auto end - local function _1_(_2_0) - local _3_ = _2_0 - local k1 = _3_[1] - local k2 = _3_[2] - local _4_ = compile1(ast[k2], scope, parent, {nval = 1}) - local v = _4_[1] + local function _291_(_289_) + local _arg_290_ = _289_ + local k1 = _arg_290_[1] + local k2 = _arg_290_[2] + local _let_292_ = compile1(ast[k2], scope, parent, {nval = 1}) + local v = _let_292_[1] return string.format("%s = %s", k1, tostring(v)) end - utils.map(keys, _1_, buffer) + utils.map(keys, _291_, buffer) + end + for i = 1, #ast do + local nval = ((i ~= #ast) and 1) + table.insert(buffer, exprs1(compile1(ast[i], scope, parent, {nval = nval}))) end return handle_compile_opts({utils.expr(("{" .. table.concat(buffer, ", ") .. "}"), "expression")}, parent, opts, ast) end - local function compile1(ast, scope, parent, opts) - local opts0 = (opts or {}) + local function compile1(ast, scope, parent, _3fopts) + local opts = (_3fopts or {}) local ast0 = macroexpand_2a(ast, scope) if utils["list?"](ast0) then - return compile_call(ast0, scope, parent, opts0, compile1) + return compile_call(ast0, scope, parent, opts, compile1) elseif utils["varg?"](ast0) then - return compile_varg(ast0, scope, parent, opts0) + return compile_varg(ast0, scope, parent, opts) elseif utils["sym?"](ast0) then - return compile_sym(ast0, scope, parent, opts0) + return compile_sym(ast0, scope, parent, opts) elseif (type(ast0) == "table") then - return compile_table(ast0, scope, parent, opts0, compile1) + return compile_table(ast0, scope, parent, opts, compile1) elseif ((type(ast0) == "nil") or (type(ast0) == "boolean") or (type(ast0) == "number") or (type(ast0) == "string")) then - return compile_scalar(ast0, scope, parent, opts0) + return compile_scalar(ast0, scope, parent, opts) else return assert_compile(false, ("could not compile value of type " .. type(ast0)), ast0) end end local function destructure(to, from, ast, scope, parent, opts) local opts0 = (opts or {}) - local _0_ = opts0 - local declaration = _0_["declaration"] - local forceglobal = _0_["forceglobal"] - local forceset = _0_["forceset"] - local isvar = _0_["isvar"] - local symtype = _0_["symtype"] + local _let_294_ = opts0 + local isvar = _let_294_["isvar"] + local declaration = _let_294_["declaration"] + local forceglobal = _let_294_["forceglobal"] + local forceset = _let_294_["forceset"] + local symtype = _let_294_["symtype"] local symtype0 = ("_" .. (symtype or "dst")) - local setter = nil + local setter if declaration then setter = "local %s = %s" else @@ -2511,32 +2661,36 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct else local parts = (utils["multi-sym?"](raw) or {raw}) local meta = scope.symmeta[parts[1]] + assert_compile(not raw:find(":"), "cannot set method sym", symbol) if ((#parts == 1) and not forceset) then assert_compile(not (forceglobal and meta), string.format("global %s conflicts with local", tostring(symbol)), symbol) assert_compile(not (meta and not meta.var), ("expected var " .. raw), symbol) assert_compile((meta or not opts0.noundef), ("expected local " .. parts[1]), symbol) + else end if forceglobal then assert_compile(not scope.symmeta[scope.unmanglings[raw]], ("global " .. raw .. " conflicts with local"), symbol) - scope.manglings[raw] = global_mangling(raw) - scope.unmanglings[global_mangling(raw)] = raw + do end (scope.manglings)[raw] = global_mangling(raw) + do end (scope.unmanglings)[global_mangling(raw)] = raw if allowed_globals then table.insert(allowed_globals, raw) + else end + else end return symbol_to_expression(symbol, scope)[1] end end local function compile_top_target(lvalues) - local inits = nil - local function _2_(_241) + local inits + local function _300_(_241) if scope.manglings[_241] then return _241 else return "nil" end end - inits = utils.map(lvalues, _2_) + inits = utils.map(lvalues, _300_) local init = table.concat(inits, ", ") local lvalue = table.concat(lvalues, ", ") local plen, plast = #parent, parent[#parent] @@ -2545,6 +2699,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct for pi = plen, #parent do if (parent[pi] == plast) then plen = pi + else end end if ((#parent == (plen + 1)) and parent[#parent].leaf) then @@ -2554,6 +2709,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct else table.insert(parent, (plen + 1), {ast = ast, leaf = ("local " .. lvalue .. " = " .. init)}) end + else end return ret end @@ -2566,46 +2722,48 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct emit(parent, setter:format(lname, exprs1(rightexprs)), left) end if declaration then - scope.symmeta[utils.deref(left)] = {var = isvar} + scope.symmeta[tostring(left)] = {var = isvar} + return nil + else return nil end end local function destructure_table(left, rightexprs, top_3f, destructure1) local s = gensym(scope, symtype0) - local right = nil + local right do - local _2_0 = nil + local _307_ if top_3f then - _2_0 = exprs1(compile1(from, scope, parent)) + _307_ = exprs1(compile1(from, scope, parent)) else - _2_0 = exprs1(rightexprs) + _307_ = exprs1(rightexprs) end - if (_2_0 == "") then + if (_307_ == "") then right = "nil" - elseif (nil ~= _2_0) then - local right0 = _2_0 + elseif (nil ~= _307_) then + local right0 = _307_ right = right0 else - right = nil + right = nil end end emit(parent, string.format("local %s = %s", s, right), left) for k, v in utils.stablepairs(left) do if not (("number" == type(k)) and tostring(left[(k - 1)]):find("^&")) then - if (utils["sym?"](v) and (utils.deref(v) == "&")) then - local unpack_str = "{(table.unpack or unpack)(%s, %s)}" - local formatted = string.format(unpack_str, s, k) + if (utils["sym?"](v) and (tostring(v) == "&")) then + local unpack_str = "(function (t, k)\n local mt = getmetatable(t)\n if \"table\" == type(mt) and mt.__fennelrest then\n return mt.__fennelrest(t, k)\n else\n return {(table.unpack or unpack)(t, k)}\n end\n end)(%s, %s)" + local formatted = string.format(string.gsub(unpack_str, "\n%s*", " "), s, k) local subexpr = utils.expr(formatted, "expression") assert_compile((utils["sequence?"](left) and (nil == left[(k + 2)])), "expected rest argument before last parameter", left) destructure1(left[(k + 1)], {subexpr}, left) - elseif (utils["sym?"](k) and (utils.deref(k) == "&as")) then + elseif (utils["sym?"](k) and (tostring(k) == "&as")) then destructure_sym(v, {utils.expr(tostring(s))}, left) - elseif (utils["sequence?"](left) and (utils.deref(v) == "&as")) then + elseif (utils["sequence?"](left) and (tostring(v) == "&as")) then local _, next_sym, trailing = select(k, unpack(left)) assert_compile((nil == trailing), "expected &as argument before last parameter", left) destructure_sym(next_sym, {utils.expr(tostring(s))}, left) else - local key = nil + local key if (type(k) == "string") then key = serialize_string(k) else @@ -2614,6 +2772,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local subexpr = utils.expr(string.format("%s[%s]", s, key), "expression") destructure1(v, {subexpr}, left) end + else end end return nil @@ -2626,15 +2785,19 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct else local symname = gensym(scope, symtype0) table.insert(left_names, symname) - tables[i] = {name, utils.expr(symname, "sym")} + do end (tables)[i] = {name, utils.expr(symname, "sym")} end end assert_compile(top_3f, "can't nest multi-value destructuring", left) compile_top_target(left_names) if declaration then for _, sym in ipairs(left) do - scope.symmeta[utils.deref(sym)] = {var = isvar} + if utils["sym?"](sym) then + scope.symmeta[tostring(sym)] = {var = isvar} + else + end end + else end for _, pair in utils.stablepairs(tables) do destructure1(pair[1], {pair[2]}, left) @@ -2649,10 +2812,12 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct elseif utils["list?"](left) then destructure_values(left, up1, top_3f, destructure1) else - assert_compile(false, string.format("unable to bind %s %s", type(left), tostring(left)), (((type(up1[2]) == "table") and up1[2]) or up1)) + assert_compile(false, string.format("unable to bind %s %s", type(left), tostring(left)), (((type((up1)[2]) == "table") and (up1)[2]) or up1)) end if top_3f then return {returned = true} + else + return nil end end local ret = destructure1(to, nil, ast, true) @@ -2662,6 +2827,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct end local function require_include(ast, scope, parent, opts) opts.fallback = function(e) + utils.warn(("include module not found, falling back to require: %s"):format(tostring(e))) return utils.expr(string.format("require(%s)", tostring(e)), "statement") end return scopes.global.specials.include(ast, scope, parent, opts) @@ -2672,14 +2838,15 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local scope = (opts.scope or make_scope(scopes.global)) local vals = {} local chunk = {} - local _0_ = utils.root - _0_["set-reset"](_0_) + do end (function(tgt, m, ...) return tgt[m](tgt, ...) end)(utils.root, "set-reset") allowed_globals = opts.allowedGlobals if (opts.indent == nil) then opts.indent = " " + else end if opts.requireAsInclude then scope.specials.require = require_include + else end utils.root.chunk, utils.root.scope, utils.root.options = chunk, scope, opts for _, val in parser.parser(strm, opts.filename, opts) do @@ -2688,6 +2855,10 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct for i = 1, #vals do local exprs = compile1(vals[i], scope, chunk, {nval = (((i < #vals) and 0) or nil), tail = (i == #vals)}) keep_side_effects(exprs, chunk, nil, vals[i]) + if (i == #vals) then + utils.hook("chunk", vals[i], scope) + else + end end allowed_globals = old_globals utils.root.reset() @@ -2701,18 +2872,20 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local old_globals = allowed_globals local chunk = {} local scope = (opts0.scope or make_scope(scopes.global)) - local _0_ = utils.root - _0_["set-reset"](_0_) + do end (function(tgt, m, ...) return tgt[m](tgt, ...) end)(utils.root, "set-reset") allowed_globals = opts0.allowedGlobals if (opts0.indent == nil) then opts0.indent = " " + else end if opts0.requireAsInclude then scope.specials.require = require_include + else end utils.root.chunk, utils.root.scope, utils.root.options = chunk, scope, opts0 local exprs = compile1(ast, scope, chunk, {tail = true}) keep_side_effects(exprs, chunk, nil, ast) + utils.hook("chunk", ast, scope) allowed_globals = old_globals utils.root.reset() return flatten(chunk, opts0) @@ -2723,24 +2896,25 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct elseif (info.what == "C") then return " [C]: in ?" else - local remap = fennel_sourcemap[info.source] + local remap = sourcemap[info.source] if (remap and remap[info.currentline]) then if remap[info.currentline][1] then - info.short_src = fennel_sourcemap[("@" .. remap[info.currentline][1])].short_src + info.short_src = sourcemap[("@" .. remap[info.currentline][1])].short_src else info.short_src = remap.short_src end info.currentline = (remap[info.currentline][2] or -1) + else end if (info.what == "Lua") then - local function _1_() + local function _325_() if info.name then return ("'" .. info.name .. "'") else return "?" end end - return string.format(" %s:%d: in function %s", info.short_src, info.currentline, _1_()) + return string.format(" %s:%d: in function %s", info.short_src, info.currentline, _325_()) elseif (info.short_src == "(tail call)") then return " (tail call)" else @@ -2749,12 +2923,12 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct end end local function traceback(msg, start) - local msg0 = (msg or "") + local msg0 = tostring((msg or "")) if ((msg0:find("^Compile error") or msg0:find("^Parse error")) and not utils["debug-on?"]("trace")) then return msg0 else local lines = {} - if (msg0:find("^Compile error") or msg0:find("^Parse error")) then + if (msg0:find(":%d+: Compile error") or msg0:find(":%d+: Parse error")) then table.insert(lines, msg0) else local newmsg = msg0:gsub("^[^:]*:%d+:%s+", "runtime error: ") @@ -2764,12 +2938,13 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct local done_3f, level = false, (start or 2) while not done_3f do do - local _1_0 = debug.getinfo(level, "Sln") - if (_1_0 == nil) then + local _329_ = debug.getinfo(level, "Sln") + if (_329_ == nil) then done_3f = true - elseif (nil ~= _1_0) then - local info = _1_0 + elseif (nil ~= _329_) then + local info = _329_ table.insert(lines, traceback_frame(info)) + else end end level = (level + 1) @@ -2778,14 +2953,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct end end local function entry_transform(fk, fv) - local function _0_(k, v) + local function _332_(k, v) if (type(k) == "number") then return k, fv(v) else return fk(k), fv(v) end end - return _0_ + return _332_ end local function mixed_concat(t, joiner) local seen = {} @@ -2799,6 +2974,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct if not seen[k] then ret = (ret .. s .. "[" .. k .. "]" .. "=" .. v) s = joiner + else end end return ret @@ -2811,30 +2987,30 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct assert_compile(not runtime_3f, "quoted ... may only be used at compile time", form) return "_VARARG" elseif utils["sym?"](form) then - local filename = nil + local filename if form.filename then filename = string.format("%q", form.filename) else filename = "nil" end - local symstr = utils.deref(form) + local symstr = tostring(form) assert_compile(not runtime_3f, "symbols may only be used at compile time", form) if (symstr:find("#$") or symstr:find("#[:.]")) then return string.format("sym('%s', {filename=%s, line=%s})", autogensym(symstr, scope), filename, (form.line or "nil")) else return string.format("sym('%s', {quoted=true, filename=%s, line=%s})", symstr, filename, (form.line or "nil")) end - elseif (utils["list?"](form) and utils["sym?"](form[1]) and (utils.deref(form[1]) == "unquote")) then + elseif (utils["list?"](form) and utils["sym?"](form[1]) and (tostring(form[1]) == "unquote")) then local payload = form[2] local res = unpack(compile1(payload, scope, parent)) return res[1] elseif utils["list?"](form) then - local mapped = nil - local function _0_() + local mapped + local function _337_() return nil end - mapped = utils.kvmap(form, entry_transform(_0_, q)) - local filename = nil + mapped = utils.kvmap(form, entry_transform(_337_, q)) + local filename if form.filename then filename = string.format("%q", form.filename) else @@ -2845,50 +3021,47 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct elseif utils["sequence?"](form) then local mapped = utils.kvmap(form, entry_transform(q, q)) local source = getmetatable(form) - local filename = nil + local filename if source.filename then filename = string.format("%q", source.filename) else filename = "nil" end - local _1_ + local _340_ if source then - _1_ = source.line + _340_ = source.line else - _1_ = "nil" + _340_ = "nil" end - return string.format("setmetatable({%s}, {filename=%s, line=%s, sequence=%s})", mixed_concat(mapped, ", "), filename, _1_, "(getmetatable(sequence()))['sequence']") + return string.format("setmetatable({%s}, {filename=%s, line=%s, sequence=%s})", mixed_concat(mapped, ", "), filename, _340_, "(getmetatable(sequence()))['sequence']") elseif (type(form) == "table") then local mapped = utils.kvmap(form, entry_transform(q, q)) local source = getmetatable(form) - local filename = nil + local filename if source.filename then filename = string.format("%q", source.filename) else filename = "nil" end - local function _1_() + local function _343_() if source then return source.line else return "nil" end end - return string.format("setmetatable({%s}, {filename=%s, line=%s})", mixed_concat(mapped, ", "), filename, _1_()) + return string.format("setmetatable({%s}, {filename=%s, line=%s})", mixed_concat(mapped, ", "), filename, _343_()) elseif (type(form) == "string") then return serialize_string(form) else return tostring(form) end end - return {["apply-manglings"] = apply_manglings, ["compile-stream"] = compile_stream, ["compile-string"] = compile_string, ["declare-local"] = declare_local, ["do-quote"] = do_quote, ["global-mangling"] = global_mangling, ["global-unmangling"] = global_unmangling, ["keep-side-effects"] = keep_side_effects, ["make-scope"] = make_scope, ["require-include"] = require_include, ["symbol-to-expression"] = symbol_to_expression, assert = assert_compile, autogensym = autogensym, compile = compile, compile1 = compile1, destructure = destructure, emit = emit, gensym = gensym, macroexpand = macroexpand_2a, metadata = make_metadata(), scopes = scopes, traceback = traceback} + return {compile = compile, compile1 = compile1, ["compile-stream"] = compile_stream, ["compile-string"] = compile_string, emit = emit, destructure = destructure, ["require-include"] = require_include, autogensym = autogensym, gensym = gensym, ["do-quote"] = do_quote, ["global-mangling"] = global_mangling, ["global-unmangling"] = global_unmangling, ["apply-manglings"] = apply_manglings, macroexpand = macroexpand_2a, ["declare-local"] = declare_local, ["make-scope"] = make_scope, ["keep-side-effects"] = keep_side_effects, ["symbol-to-expression"] = symbol_to_expression, assert = assert_compile, scopes = scopes, traceback = traceback, metadata = make_metadata(), sourcemap = sourcemap} end package.preload["fennel.friend"] = package.preload["fennel.friend"] or function(...) - local function ast_source(ast) - local m = getmetatable(ast) - return ((m and m.line and m) or (("table" == type(ast)) and ast) or {}) - end - local suggestions = {["$ and $... in hashfn are mutually exclusive"] = {"modifying the hashfn so it only contains $... or $, $1, $2, $3, etc"}, ["can't start multisym segment with a digit"] = {"removing the digit", "adding a non-digit before the digit"}, ["cannot call literal value"] = {"checking for typos", "checking for a missing function name"}, ["could not compile value of type "] = {"debugging the macro you're calling to return a list or table"}, ["could not read number (.*)"] = {"removing the non-digit character", "beginning the identifier with a non-digit if it is not meant to be a number"}, ["expected a function.* to call"] = {"removing the empty parentheses", "using square brackets if you want an empty table"}, ["expected binding table"] = {"placing a table here in square brackets containing identifiers to bind"}, ["expected body expression"] = {"putting some code in the body of this form after the bindings"}, ["expected each macro to be function"] = {"ensuring that the value for each key in your macros table contains a function", "avoid defining nested macro tables"}, ["expected even number of name/value bindings"] = {"finding where the identifier or value is missing"}, ["expected even number of values in table literal"] = {"removing a key", "adding a value"}, ["expected local"] = {"looking for a typo", "looking for a local which is used out of its scope"}, ["expected macros to be table"] = {"ensuring your macro definitions return a table"}, ["expected parameters"] = {"adding function parameters as a list of identifiers in brackets"}, ["expected rest argument before last parameter"] = {"moving & to right before the final identifier when destructuring"}, ["expected symbol for function parameter: (.*)"] = {"changing %s to an identifier instead of a literal value"}, ["expected var (.*)"] = {"declaring %s using var instead of let/local", "introducing a new local instead of changing the value of %s"}, ["expected vararg as last parameter"] = {"moving the \"...\" to the end of the parameter list"}, ["expected whitespace before opening delimiter"] = {"adding whitespace"}, ["global (.*) conflicts with local"] = {"renaming local %s"}, ["illegal character: (.)"] = {"deleting or replacing %s", "avoiding reserved characters like \", \\, ', ~, ;, @, `, and comma"}, ["local (.*) was overshadowed by a special form or macro"] = {"renaming local %s"}, ["macro not found in macro module"] = {"checking the keys of the imported macro module's returned table"}, ["macro tried to bind (.*) without gensym"] = {"changing to %s# when introducing identifiers inside macros"}, ["malformed multisym"] = {"ensuring each period or colon is not followed by another period or colon"}, ["may only be used at compile time"] = {"moving this to inside a macro if you need to manipulate symbols/lists", "using square brackets instead of parens to construct a table"}, ["method must be last component"] = {"using a period instead of a colon for field access", "removing segments after the colon", "making the method call, then looking up the field on the result"}, ["mismatched closing delimiter (.), expected (.)"] = {"replacing %s with %s", "deleting %s", "adding matching opening delimiter earlier"}, ["multisym method calls may only be in call position"] = {"using a period instead of a colon to reference a table's fields", "putting parens around this"}, ["unable to bind (.*)"] = {"replacing the %s with an identifier"}, ["unexpected closing delimiter (.)"] = {"deleting %s", "adding matching opening delimiter earlier"}, ["unexpected multi symbol (.*)"] = {"removing periods or colons from %s"}, ["unexpected vararg"] = {"putting \"...\" at the end of the fn parameters if the vararg was intended"}, ["unknown global in strict mode: (.*)"] = {"looking to see if there's a typo", "using the _G table instead, eg. _G.%s if you really want a global", "moving this code to somewhere that %s is in scope", "binding %s as a local in the scope of this code"}, ["unused local (.*)"] = {"fixing a typo so %s is used", "renaming the local to _%s"}, ["use of global (.*) is aliased by a local"] = {"renaming local %s", "refer to the global using _G.%s instead of directly"}} + local utils = require("fennel.utils") + local suggestions = {["unexpected multi symbol (.*)"] = {"removing periods or colons from %s"}, ["use of global (.*) is aliased by a local"] = {"renaming local %s", "refer to the global using _G.%s instead of directly"}, ["local (.*) was overshadowed by a special form or macro"] = {"renaming local %s"}, ["global (.*) conflicts with local"] = {"renaming local %s"}, ["expected var (.*)"] = {"declaring %s using var instead of let/local", "introducing a new local instead of changing the value of %s"}, ["expected macros to be table"] = {"ensuring your macro definitions return a table"}, ["expected each macro to be function"] = {"ensuring that the value for each key in your macros table contains a function", "avoid defining nested macro tables"}, ["macro not found in macro module"] = {"checking the keys of the imported macro module's returned table"}, ["macro tried to bind (.*) without gensym"] = {"changing to %s# when introducing identifiers inside macros"}, ["unknown identifier in strict mode: (.*)"] = {"looking to see if there's a typo", "using the _G table instead, eg. _G.%s if you really want a global", "moving this code to somewhere that %s is in scope", "binding %s as a local in the scope of this code"}, ["expected a function.* to call"] = {"removing the empty parentheses", "using square brackets if you want an empty table"}, ["cannot call literal value"] = {"checking for typos", "checking for a missing function name"}, ["unexpected vararg"] = {"putting \"...\" at the end of the fn parameters if the vararg was intended"}, ["multisym method calls may only be in call position"] = {"using a period instead of a colon to reference a table's fields", "putting parens around this"}, ["unused local (.*)"] = {"renaming the local to _%s if it is meant to be unused", "fixing a typo so %s is used", "disabling the linter which checks for unused locals"}, ["expected parameters"] = {"adding function parameters as a list of identifiers in brackets"}, ["unable to bind (.*)"] = {"replacing the %s with an identifier"}, ["expected rest argument before last parameter"] = {"moving & to right before the final identifier when destructuring"}, ["expected vararg as last parameter"] = {"moving the \"...\" to the end of the parameter list"}, ["expected symbol for function parameter: (.*)"] = {"changing %s to an identifier instead of a literal value"}, ["could not compile value of type "] = {"debugging the macro you're calling to return a list or table"}, ["expected local"] = {"looking for a typo", "looking for a local which is used out of its scope"}, ["expected body expression"] = {"putting some code in the body of this form after the bindings"}, ["expected binding and iterator"] = {"making sure you haven't omitted a local name or iterator"}, ["expected binding sequence"] = {"placing a table here in square brackets containing identifiers to bind"}, ["expected even number of name/value bindings"] = {"finding where the identifier or value is missing"}, ["may only be used at compile time"] = {"moving this to inside a macro if you need to manipulate symbols/lists", "using square brackets instead of parens to construct a table"}, ["unexpected closing delimiter (.)"] = {"deleting %s", "adding matching opening delimiter earlier"}, ["mismatched closing delimiter (.), expected (.)"] = {"replacing %s with %s", "deleting %s", "adding matching opening delimiter earlier"}, ["expected even number of values in table literal"] = {"removing a key", "adding a value"}, ["expected whitespace before opening delimiter"] = {"adding whitespace"}, ["illegal character: (.)"] = {"deleting or replacing %s", "avoiding reserved characters like \", \\, ', ~, ;, @, `, and comma"}, ["could not read number (.*)"] = {"removing the non-digit character", "beginning the identifier with a non-digit if it is not meant to be a number"}, ["can't start multisym segment with a digit"] = {"removing the digit", "adding a non-digit before the digit"}, ["malformed multisym"] = {"ensuring each period or colon is not followed by another period or colon"}, ["method must be last component"] = {"using a period instead of a colon for field access", "removing segments after the colon", "making the method call, then looking up the field on the result"}, ["$ and $... in hashfn are mutually exclusive"] = {"modifying the hashfn so it only contains $... or $, $1, $2, $3, etc"}, ["tried to reference a macro at runtime"] = {"renaming the macro so as not to conflict with locals"}, ["expected even number of pattern/body pairs"] = {"checking that every pattern has a body to go with it", "adding _ before the final body"}, ["unexpected arguments"] = {"removing an argument", "checking for typos"}, ["unexpected iterator clause"] = {"removing an argument", "checking for typos"}} local unpack = (table.unpack or _G.unpack) local function suggest(msg) local suggestion = nil @@ -2904,6 +3077,7 @@ package.preload["fennel.friend"] = package.preload["fennel.friend"] or function( else suggestion = sug(matches) end + else end end return suggestion @@ -2911,7 +3085,7 @@ package.preload["fennel.friend"] = package.preload["fennel.friend"] or function( local function read_line_from_file(filename, line) local bytes = 0 local f = assert(io.open(filename)) - local _ = nil + local _ for _0 = 1, (line - 1) do bytes = (bytes + 1 + #f:read()) end @@ -2925,9 +3099,11 @@ package.preload["fennel.friend"] = package.preload["fennel.friend"] or function( local current_line = (_3fcurrent_line or 1) local bytes = ((_3fbytes or 0) + #this_line + #newline) if (target_line == current_line) then - return this_line, bytes + return this_line, (bytes - #this_line - 1) elseif this_line then return read_line_from_string(matcher, target_line, (current_line + 1), bytes) + else + return nil end end local function read_line(filename, line, source) @@ -2937,43 +3113,48 @@ package.preload["fennel.friend"] = package.preload["fennel.friend"] or function( return read_line_from_file(filename, line) end end - local function friendly_msg(msg, _0_0, source) - local _1_ = _0_0 - local byteend = _1_["byteend"] - local bytestart = _1_["bytestart"] - local filename = _1_["filename"] - local line = _1_["line"] + local function friendly_msg(msg, _142_, source) + local _arg_143_ = _142_ + local filename = _arg_143_["filename"] + local line = _arg_143_["line"] + local bytestart = _arg_143_["bytestart"] + local byteend = _arg_143_["byteend"] local ok, codeline, bol = pcall(read_line, filename, line, source) local suggestions0 = suggest(msg) local out = {msg, ""} if (ok and codeline) then table.insert(out, codeline) + else end if (ok and codeline and bytestart and byteend) then table.insert(out, (string.rep(" ", (bytestart - bol - 1)) .. "^" .. string.rep("^", math.min((byteend - bytestart), ((bol + #codeline) - bytestart))))) + else end if (ok and codeline and bytestart and not byteend) then table.insert(out, (string.rep("-", (bytestart - bol - 1)) .. "^")) table.insert(out, "") + else end if suggestions0 then for _, suggestion in ipairs(suggestions0) do table.insert(out, ("* Try %s."):format(suggestion)) end + else end return table.concat(out, "\n") end local function assert_compile(condition, msg, ast, source) if not condition then - local _1_ = ast_source(ast) - local filename = _1_["filename"] - local line = _1_["line"] - error(friendly_msg(("Compile error in %s:%s\n %s"):format((filename or "unknown"), (line or "?"), msg), ast_source(ast), source), 0) + local _let_148_ = utils["ast-source"](ast) + local filename = _let_148_["filename"] + local line = _let_148_["line"] + error(friendly_msg(("Compile error in %s:%s\n %s"):format((filename or "unknown"), (line or "?"), msg), utils["ast-source"](ast), source), 0) + else end return condition end local function parse_error(msg, filename, line, bytestart, source) - return error(friendly_msg(("Parse error in %s:%s\n %s"):format(filename, line, msg), {bytestart = bytestart, filename = filename, line = line}, source), 0) + return error(friendly_msg(("Parse error in %s:%s\n %s"):format(filename, line, msg), {filename = filename, line = line, bytestart = bytestart}, source), 0) end return {["assert-compile"] = assert_compile, ["parse-error"] = parse_error} end @@ -2983,54 +3164,57 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( local unpack = (table.unpack or _G.unpack) local function granulate(getchunk) local c, index, done_3f = "", 1, false - local function _0_(parser_state) + local function _150_(parser_state) if not done_3f then if (index <= #c) then local b = c:byte(index) index = (index + 1) return b else - local _1_0, _2_0, _3_0 = getchunk(parser_state) - local _4_ - do - local char = _1_0 - _4_ = ((nil ~= _1_0) and (char ~= "")) + local _151_ = getchunk(parser_state) + local function _152_() + local char = _151_ + return (char ~= "") end - if _4_ then - local char = _1_0 + if ((nil ~= _151_) and _152_()) then + local char = _151_ c = char index = 2 return c:byte() - else - local _ = _1_0 + elseif true then + local _ = _151_ done_3f = true return nil + else + return nil end end + else + return nil end end - local function _1_() + local function _156_() c = "" return nil end - return _0_, _1_ + return _150_, _156_ end local function string_stream(str) local str0 = str:gsub("^#!", ";;") local index = 1 - local function _0_() + local function _157_() local r = str0:byte(index) index = (index + 1) return r end - return _0_ + return _157_ end - local delims = {[123] = 125, [125] = true, [40] = 41, [41] = true, [91] = 93, [93] = true} + local delims = {[40] = 41, [41] = true, [91] = 93, [93] = true, [123] = 125, [125] = true} local function whitespace_3f(b) return ((b == 32) or ((b >= 9) and (b <= 13))) end local function sym_char_3f(b) - local b0 = nil + local b0 if ("number" == type(b)) then b0 = b else @@ -3039,7 +3223,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( return ((b0 > 32) and not delims[b0] and (b0 ~= 127) and (b0 ~= 34) and (b0 ~= 39) and (b0 ~= 126) and (b0 ~= 59) and (b0 ~= 44) and (b0 ~= 64) and (b0 ~= 96)) end local prefixes = {[35] = "hashfn", [39] = "quote", [44] = "unquote", [96] = "quote"} - local function parser(getbyte, filename, options) + local function parser(getbyte, _3ffilename, _3foptions) local stack = {} local line = 1 local byteindex = 0 @@ -3047,6 +3231,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( local function ungetb(ub) if (ub == 10) then line = (line - 1) + else end byteindex = (byteindex - 1) lastb = ub @@ -3062,56 +3247,63 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( byteindex = (byteindex + 1) if (r == 10) then line = (line + 1) + else end return r end - assert(((nil == filename) or ("string" == type(filename))), "expected filename as second argument to parser") + assert(((nil == _3ffilename) or ("string" == type(_3ffilename))), "expected filename as second argument to parser") local function parse_error(msg, byteindex_override) - local _0_ = (options or utils.root.options or {}) - local source = _0_["source"] - local unfriendly = _0_["unfriendly"] - utils.root.reset() - if unfriendly then - return error(string.format("Parse error in %s:%s: %s", (filename or "unknown"), (line or "?"), msg), 0) + local _let_162_ = (_3foptions or utils.root.options or {}) + local source = _let_162_["source"] + local unfriendly = _let_162_["unfriendly"] + if (nil == utils.hook("parse-error", msg, (_3ffilename or "unknown"), (line or "?"), (byteindex_override or byteindex), source, utils.root.reset)) then + utils.root.reset() + if (unfriendly or not friend or not _G.io or not _G.io.read) then + return error(string.format("%s:%s: Parse error: %s", (_3ffilename or "unknown"), (line or "?"), msg), 0) + else + return friend["parse-error"](msg, (_3ffilename or "unknown"), (line or "?"), (byteindex_override or byteindex), source) + end else - return friend["parse-error"](msg, (filename or "unknown"), (line or "?"), (byteindex_override or byteindex), source) + return nil end end local function parse_stream() local whitespace_since_dispatch, done_3f, retval = true local function dispatch(v) - local _0_0 = stack[#stack] - if (_0_0 == nil) then + local _165_ = stack[#stack] + if (_165_ == nil) then retval, done_3f, whitespace_since_dispatch = v, true, false return nil - elseif ((type(_0_0) == "table") and (nil ~= _0_0.prefix)) then - local prefix = _0_0.prefix - local source = nil + elseif ((_G.type(_165_) == "table") and (nil ~= (_165_).prefix)) then + local prefix = (_165_).prefix + local source do - local _1_0 = table.remove(stack) - _1_0["byteend"] = byteindex - source = _1_0 + local _166_ = table.remove(stack) + do end (_166_)["byteend"] = byteindex + source = _166_ end local list = utils.list(utils.sym(prefix, source), v) for k, v0 in pairs(source) do list[k] = v0 end return dispatch(list) - elseif (nil ~= _0_0) then - local top = _0_0 + elseif (nil ~= _165_) then + local top = _165_ whitespace_since_dispatch = false return table.insert(top, v) + else + return nil end end local function badend() local accum = utils.map(stack, "closer") - local _0_ + local _168_ if (#stack == 1) then - _0_ = "" + _168_ = "" else - _0_ = "s" + _168_ = "s" end - return parse_error(string.format("expected closing delimiter%s %s", _0_, string.char(unpack(accum)))) + return parse_error(string.format("expected closing delimiter%s %s", _168_, string.char(unpack(accum)))) end local function skip_whitespace(b) if (b and whitespace_3f(b)) then @@ -3125,14 +3317,14 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( end local function parse_comment(b, contents) if (b and (10 ~= b)) then - local function _1_() - local _0_0 = contents - table.insert(_0_0, string.char(b)) - return _0_0 + local function _172_() + local _171_ = contents + table.insert(_171_, string.char(b)) + return _171_ end - return parse_comment(getb(), _1_()) - elseif (options and options.comments) then - return dispatch(utils.comment(table.concat(contents), {filename = filename, line = (line - 1)})) + return parse_comment(getb(), _172_()) + elseif (_3foptions and _3foptions.comments) then + return dispatch(utils.comment(table.concat(contents), {line = (line - 1), filename = _3ffilename})) else return b end @@ -3140,8 +3332,9 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( local function open_table(b) if not whitespace_since_dispatch then parse_error(("expected whitespace before opening delimiter " .. string.char(b))) + else end - return table.insert(stack, {bytestart = byteindex, closer = delims[b], filename = filename, line = line}) + return table.insert(stack, {bytestart = byteindex, closer = delims[b], filename = _3ffilename, line = line}) end local function close_list(list) return dispatch(setmetatable(list, getmetatable(utils.list()))) @@ -3154,14 +3347,16 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( return dispatch(val) end local function add_comment_at(comments, index, node) - local _0_0 = comments[index] - if (nil ~= _0_0) then - local existing = _0_0 + local _175_ = comments[index] + if (nil ~= _175_) then + local existing = _175_ return table.insert(existing, node) - else - local _ = _0_0 + elseif true then + local _ = _175_ comments[index] = {node} return nil + else + return nil end end local function next_noncomment(tbl, i) @@ -3172,7 +3367,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( end end local function extract_comments(tbl) - local comments = {keys = {}, last = {}, values = {}} + local comments = {keys = {}, values = {}, last = {}} while utils["comment?"](tbl[#tbl]) do table.insert(comments.last, 1, table.remove(tbl)) end @@ -3189,6 +3384,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( for i = #tbl, 1, -1 do if utils["comment?"](tbl[i]) then table.remove(tbl, i) + else end end return comments @@ -3200,11 +3396,13 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( if ((#tbl % 2) ~= 0) then byteindex = (byteindex - 1) parse_error("expected even number of values in table literal") + else end setmetatable(val, tbl) for i = 1, #tbl, 2 do if ((tostring(tbl[i]) == ":") and utils["sym?"](tbl[(i + 1)]) and utils["sym?"](tbl[i])) then tbl[i] = tostring(tbl[(i + 1)]) + else end val[tbl[i]] = tbl[(i + 1)] table.insert(keys, tbl[i]) @@ -3217,9 +3415,11 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( local top = table.remove(stack) if (top == nil) then parse_error(("unexpected closing delimiter " .. string.char(b))) + else end if (top.closer and (top.closer ~= b)) then parse_error(("mismatched closing delimiter " .. string.char(b) .. ", expected " .. string.char(top.closer))) + else end top.byteend = byteindex if (b == 41) then @@ -3232,16 +3432,21 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( end local function parse_string_loop(chars, b, state) table.insert(chars, b) - local state0 = nil + local state0 do - local _0_0 = {state, b} - if ((type(_0_0) == "table") and (_0_0[1] == "base") and (_0_0[2] == 92)) then + local _185_ = {state, b} + if ((_G.type(_185_) == "table") and ((_185_)[1] == "base") and ((_185_)[2] == 92)) then state0 = "backslash" - elseif ((type(_0_0) == "table") and (_0_0[1] == "base") and (_0_0[2] == 34)) then + elseif ((_G.type(_185_) == "table") and ((_185_)[1] == "base") and ((_185_)[2] == 34)) then state0 = "done" - else - local _ = _0_0 + elseif ((_G.type(_185_) == "table") and ((_185_)[1] == "backslash") and ((_185_)[2] == 10)) then + table.remove(chars, (#chars - 1)) state0 = "base" + elseif true then + local _ = _185_ + state0 = "base" + else + state0 = nil end end if (b and (state0 ~= "done")) then @@ -3251,29 +3456,39 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( end end local function escape_char(c) - return ({[10] = "\\n", [11] = "\\v", [12] = "\\f", [13] = "\\r", [7] = "\\a", [8] = "\\b", [9] = "\\t"})[c:byte()] + return ({[7] = "\\a", [8] = "\\b", [9] = "\\t", [10] = "\\n", [11] = "\\v", [12] = "\\f", [13] = "\\r"})[c:byte()] end local function parse_string() table.insert(stack, {closer = 34}) local chars = {34} if not parse_string_loop(chars, getb(), "base") then badend() + else end table.remove(stack) local raw = string.char(unpack(chars)) local formatted = raw:gsub("[\7-\13]", escape_char) - local load_fn = (rawget(_G, "loadstring") or load)(("return " .. formatted)) - return dispatch(load_fn()) + local _189_ = (rawget(_G, "loadstring") or load)(("return " .. formatted)) + if (nil ~= _189_) then + local load_fn = _189_ + return dispatch(load_fn()) + elseif (_189_ == nil) then + return parse_error(("Invalid string: " .. raw)) + else + return nil + end end local function parse_prefix(b) - table.insert(stack, {bytestart = byteindex, filename = filename, line = line, prefix = prefixes[b]}) + table.insert(stack, {prefix = prefixes[b], filename = _3ffilename, line = line, bytestart = byteindex}) local nextb = getb() if (whitespace_3f(nextb) or (true == delims[nextb])) then if (b ~= 35) then parse_error("invalid whitespace after quoting prefix") + else end table.remove(stack) dispatch(utils.sym("#")) + else end return ungetb(nextb) end @@ -3284,6 +3499,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( else if b then ungetb(b) + else end return chars end @@ -3294,14 +3510,16 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( dispatch((tonumber(number_with_stripped_underscores) or parse_error(("could not read number \"" .. rawstr .. "\"")))) return true else - local _0_0 = tonumber(number_with_stripped_underscores) - if (nil ~= _0_0) then - local x = _0_0 + local _195_ = tonumber(number_with_stripped_underscores) + if (nil ~= _195_) then + local x = _195_ dispatch(x) return true - else - local _ = _0_0 + elseif true then + local _ = _195_ return false + else + return nil end end end @@ -3312,6 +3530,8 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( return parse_error(("can't start multisym segment with a digit: " .. rawstr), (((byteindex - #rawstr) + rawstr:find("%.[0-9]")) + 1)) elseif (rawstr:match("[%.:][%.:]") and (rawstr ~= "..") and (rawstr ~= "$...")) then return parse_error(("malformed multisym: " .. rawstr), ((byteindex - #rawstr) + 1 + rawstr:find("[%.:][%.:]"))) + elseif ((rawstr ~= ":") and rawstr:match(":$")) then + return parse_error(("malformed multisym: " .. rawstr), ((byteindex - #rawstr) + 1 + rawstr:find(":$"))) elseif rawstr:match(":.+[%.:]") then return parse_error(("method must be last component of multisym: " .. rawstr), ((byteindex - #rawstr) + rawstr:find(":.+[%.:]"))) else @@ -3330,7 +3550,9 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( elseif rawstr:match("^:.+$") then return dispatch(rawstr:sub(2)) elseif not parse_number(rawstr) then - return dispatch(utils.sym(check_malformed_sym(rawstr), {byteend = byteindex, bytestart = bytestart, filename = filename, line = line})) + return dispatch(utils.sym(check_malformed_sym(rawstr), {byteend = byteindex, bytestart = bytestart, filename = _3ffilename, line = line})) + else + return nil end end local function parse_loop(b) @@ -3347,8 +3569,9 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( parse_prefix(b) elseif (sym_char_3f(b) or (b == string.byte("~"))) then parse_sym(b) - else + elseif not utils.hook("illegal-char", b, getb, ungetb, dispatch) then parse_error(("illegal character: " .. string.char(b))) + else end if not b then return nil @@ -3360,37 +3583,619 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function( end return parse_loop(skip_whitespace(getb())) end - local function _0_() - stack = {} + local function _202_() + stack, line, byteindex, lastb = {}, 1, 0, nil return nil end - return parse_stream, _0_ + return parse_stream, _202_ end - return {["string-stream"] = string_stream, ["sym-char?"] = sym_char_3f, granulate = granulate, parser = parser} + return {granulate = granulate, parser = parser, ["string-stream"] = string_stream, ["sym-char?"] = sym_char_3f} +end +local utils +package.preload["fennel.view"] = package.preload["fennel.view"] or function(...) + local type_order = {number = 1, boolean = 2, string = 3, table = 4, ["function"] = 5, userdata = 6, thread = 7} + local lua_pairs = pairs + local lua_ipairs = ipairs + local function pairs(t) + local _1_ = getmetatable(t) + if ((_G.type(_1_) == "table") and (nil ~= (_1_).__pairs)) then + local p = (_1_).__pairs + return p(t) + elseif true then + local _ = _1_ + return lua_pairs(t) + else + return nil + end + end + local function ipairs(t) + local _3_ = getmetatable(t) + if ((_G.type(_3_) == "table") and (nil ~= (_3_).__ipairs)) then + local i = (_3_).__ipairs + return i(t) + elseif true then + local _ = _3_ + return lua_ipairs(t) + else + return nil + end + end + local function length_2a(t) + local _5_ = getmetatable(t) + if ((_G.type(_5_) == "table") and (nil ~= (_5_).__len)) then + local l = (_5_).__len + return l(t) + elseif true then + local _ = _5_ + return #t + else + return nil + end + end + local function sort_keys(_7_, _9_) + local _arg_8_ = _7_ + local a = _arg_8_[1] + local _arg_10_ = _9_ + local b = _arg_10_[1] + local ta = type(a) + local tb = type(b) + if ((ta == tb) and ((ta == "string") or (ta == "number"))) then + return (a < b) + else + local dta = type_order[ta] + local dtb = type_order[tb] + if (dta and dtb) then + return (dta < dtb) + elseif dta then + return true + elseif dtb then + return false + else + return (ta < tb) + end + end + end + local function max_index_gap(kv) + local gap = 0 + if (length_2a(kv) > 0) then + local i = 0 + for _, _13_ in ipairs(kv) do + local _each_14_ = _13_ + local k = _each_14_[1] + if ((k - i) > gap) then + gap = (k - i) + else + end + i = k + end + else + end + return gap + end + local function fill_gaps(kv) + local missing_indexes = {} + local i = 0 + for _, _17_ in ipairs(kv) do + local _each_18_ = _17_ + local j = _each_18_[1] + i = (i + 1) + while (i < j) do + table.insert(missing_indexes, i) + i = (i + 1) + end + end + for _, k in ipairs(missing_indexes) do + table.insert(kv, k, {k}) + end + return nil + end + local function table_kv_pairs(t, options) + local assoc_3f = false + local kv = {} + local insert = table.insert + for k, v in pairs(t) do + if ((type(k) ~= "number") or (k < 1)) then + assoc_3f = true + else + end + insert(kv, {k, v}) + end + table.sort(kv, sort_keys) + if not assoc_3f then + if (max_index_gap(kv) > options["max-sparse-gap"]) then + assoc_3f = true + else + fill_gaps(kv) + end + else + end + if (length_2a(kv) == 0) then + return kv, "empty" + else + local function _22_() + if assoc_3f then + return "table" + else + return "seq" + end + end + return kv, _22_() + end + end + local function count_table_appearances(t, appearances) + if (type(t) == "table") then + if not appearances[t] then + appearances[t] = 1 + for k, v in pairs(t) do + count_table_appearances(k, appearances) + count_table_appearances(v, appearances) + end + else + appearances[t] = ((appearances[t] or 0) + 1) + end + else + end + return appearances + end + local function save_table(t, seen) + local seen0 = (seen or {len = 0}) + local id = (seen0.len + 1) + if not (seen0)[t] then + seen0[t] = id + seen0.len = id + else + end + return seen0 + end + local function detect_cycle(t, seen, _3fk) + if ("table" == type(t)) then + seen[t] = true + local _27_, _28_ = next(t, _3fk) + if ((nil ~= _27_) and (nil ~= _28_)) then + local k = _27_ + local v = _28_ + return (seen[k] or detect_cycle(k, seen) or seen[v] or detect_cycle(v, seen) or detect_cycle(t, seen, k)) + else + return nil + end + else + return nil + end + end + local function visible_cycle_3f(t, options) + return (options["detect-cycles?"] and detect_cycle(t, {}) and save_table(t, options.seen) and (1 < (options.appearances[t] or 0))) + end + local function table_indent(indent, id) + local opener_length + if id then + opener_length = (length_2a(tostring(id)) + 2) + else + opener_length = 1 + end + return (indent + opener_length) + end + local pp = nil + local function concat_table_lines(elements, options, multiline_3f, indent, table_type, prefix) + local indent_str = ("\n" .. string.rep(" ", indent)) + local open + local function _32_() + if ("seq" == table_type) then + return "[" + else + return "{" + end + end + open = ((prefix or "") .. _32_()) + local close + if ("seq" == table_type) then + close = "]" + else + close = "}" + end + local oneline = (open .. table.concat(elements, " ") .. close) + if (not options["one-line?"] and (multiline_3f or ((indent + length_2a(oneline)) > options["line-length"]))) then + return (open .. table.concat(elements, indent_str) .. close) + else + return oneline + end + end + local function utf8_len(x) + local n = 0 + for _ in string.gmatch(x, "[%z\1-\127\192-\247]") do + n = (n + 1) + end + return n + end + local function pp_associative(t, kv, options, indent) + local multiline_3f = false + local id = options.seen[t] + if (options.level >= options.depth) then + return "{...}" + elseif (id and options["detect-cycles?"]) then + return ("@" .. id .. "{...}") + else + local visible_cycle_3f0 = visible_cycle_3f(t, options) + local id0 = (visible_cycle_3f0 and options.seen[t]) + local indent0 = table_indent(indent, id0) + local slength + if options["utf8?"] then + slength = utf8_len + else + local function _35_(_241) + return #_241 + end + slength = _35_ + end + local prefix + if visible_cycle_3f0 then + prefix = ("@" .. id0) + else + prefix = "" + end + local items + do + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for _, _38_ in pairs(kv) do + local _each_39_ = _38_ + local k = _each_39_[1] + local v = _each_39_[2] + local val_16_auto + do + local k0 = pp(k, options, (indent0 + 1), true) + local v0 = pp(v, options, (indent0 + slength(k0) + 1)) + multiline_3f = (multiline_3f or k0:find("\n") or v0:find("\n")) + val_16_auto = (k0 .. " " .. v0) + end + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end + end + items = tbl_14_auto + end + return concat_table_lines(items, options, multiline_3f, indent0, "table", prefix) + end + end + local function pp_sequence(t, kv, options, indent) + local multiline_3f = false + local id = options.seen[t] + if (options.level >= options.depth) then + return "[...]" + elseif (id and options["detect-cycles?"]) then + return ("@" .. id .. "[...]") + else + local visible_cycle_3f0 = visible_cycle_3f(t, options) + local id0 = (visible_cycle_3f0 and options.seen[t]) + local indent0 = table_indent(indent, id0) + local prefix + if visible_cycle_3f0 then + prefix = ("@" .. id0) + else + prefix = "" + end + local items + do + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for _, _43_ in pairs(kv) do + local _each_44_ = _43_ + local _0 = _each_44_[1] + local v = _each_44_[2] + local val_16_auto + do + local v0 = pp(v, options, indent0) + multiline_3f = (multiline_3f or v0:find("\n")) + val_16_auto = v0 + end + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end + end + items = tbl_14_auto + end + return concat_table_lines(items, options, multiline_3f, indent0, "seq", prefix) + end + end + local function concat_lines(lines, options, indent, force_multi_line_3f) + if (length_2a(lines) == 0) then + if options["empty-as-sequence?"] then + return "[]" + else + return "{}" + end + else + local oneline + local _48_ + do + local tbl_14_auto = {} + local i_15_auto = #tbl_14_auto + for _, line in ipairs(lines) do + local val_16_auto = line:gsub("^%s+", "") + if (nil ~= val_16_auto) then + i_15_auto = (i_15_auto + 1) + do end (tbl_14_auto)[i_15_auto] = val_16_auto + else + end + end + _48_ = tbl_14_auto + end + oneline = table.concat(_48_, " ") + if (not options["one-line?"] and (force_multi_line_3f or oneline:find("\n") or ((indent + length_2a(oneline)) > options["line-length"]))) then + return table.concat(lines, ("\n" .. string.rep(" ", indent))) + else + return oneline + end + end + end + local function pp_metamethod(t, metamethod, options, indent) + if (options.level >= options.depth) then + if options["empty-as-sequence?"] then + return "[...]" + else + return "{...}" + end + else + local _ + local function _53_(_241) + return visible_cycle_3f(_241, options) + end + options["visible-cycle?"] = _53_ + _ = nil + local lines, force_multi_line_3f = metamethod(t, pp, options, indent) + options["visible-cycle?"] = nil + local _54_ = type(lines) + if (_54_ == "string") then + return lines + elseif (_54_ == "table") then + return concat_lines(lines, options, indent, force_multi_line_3f) + elseif true then + local _0 = _54_ + return error("__fennelview metamethod must return a table of lines") + else + return nil + end + end + end + local function pp_table(x, options, indent) + options.level = (options.level + 1) + local x0 + do + local _57_ + if options["metamethod?"] then + local _58_ = x + if (nil ~= _58_) then + local _59_ = getmetatable(_58_) + if (nil ~= _59_) then + _57_ = (_59_).__fennelview + else + _57_ = _59_ + end + else + _57_ = _58_ + end + else + _57_ = nil + end + if (nil ~= _57_) then + local metamethod = _57_ + x0 = pp_metamethod(x, metamethod, options, indent) + elseif true then + local _ = _57_ + local _63_, _64_ = table_kv_pairs(x, options) + if (true and (_64_ == "empty")) then + local _0 = _63_ + if options["empty-as-sequence?"] then + x0 = "[]" + else + x0 = "{}" + end + elseif ((nil ~= _63_) and (_64_ == "table")) then + local kv = _63_ + x0 = pp_associative(x, kv, options, indent) + elseif ((nil ~= _63_) and (_64_ == "seq")) then + local kv = _63_ + x0 = pp_sequence(x, kv, options, indent) + else + x0 = nil + end + else + x0 = nil + end + end + options.level = (options.level - 1) + return x0 + end + local function number__3estring(n) + local _68_ = string.gsub(tostring(n), ",", ".") + return _68_ + end + local function colon_string_3f(s) + return s:find("^[-%w?^_!$%&*+./@|<=>]+$") + end + local utf8_inits = {{["min-byte"] = 0, ["max-byte"] = 127, ["min-code"] = 0, ["max-code"] = 127, len = 1}, {["min-byte"] = 192, ["max-byte"] = 223, ["min-code"] = 128, ["max-code"] = 2047, len = 2}, {["min-byte"] = 224, ["max-byte"] = 239, ["min-code"] = 2048, ["max-code"] = 65535, len = 3}, {["min-byte"] = 240, ["max-byte"] = 247, ["min-code"] = 65536, ["max-code"] = 1114111, len = 4}} + local function utf8_escape(str) + local function validate_utf8(str0, index) + local inits = utf8_inits + local byte = string.byte(str0, index) + local init + do + local ret = nil + for _, init0 in ipairs(inits) do + if ret then break end + ret = (byte and (function(_69_,_70_,_71_) return (_69_ >= _70_) and (_70_ >= _71_) end)(init0["max-byte"],byte,init0["min-byte"]) and init0) + end + init = ret + end + local code + local function _72_() + local code0 + if init then + code0 = (byte - init["min-byte"]) + else + code0 = nil + end + for i = (index + 1), (index + init.len + -1) do + local byte0 = string.byte(str0, i) + code0 = (byte0 and code0 and (function(_74_,_75_,_76_) return (_74_ >= _75_) and (_75_ >= _76_) end)(191,byte0,128) and ((code0 * 64) + (byte0 - 128))) + end + return code0 + end + code = (init and _72_()) + if (code and (function(_77_,_78_,_79_) return (_77_ >= _78_) and (_78_ >= _79_) end)(init["max-code"],code,init["min-code"]) and not (function(_80_,_81_,_82_) return (_80_ >= _81_) and (_81_ >= _82_) end)(57343,code,55296)) then + return init.len + else + return nil + end + end + local index = 1 + local output = {} + while (index <= #str) do + local nexti = (string.find(str, "[\128-\255]", index) or (#str + 1)) + local len = validate_utf8(str, nexti) + table.insert(output, string.sub(str, index, (nexti + (len or 0) + -1))) + if (not len and (nexti <= #str)) then + table.insert(output, string.format("\\%03d", string.byte(str, nexti))) + else + end + if len then + index = (nexti + len) + else + index = (nexti + 1) + end + end + return table.concat(output) + end + local function pp_string(str, options, indent) + local escs + local _86_ + if (options["escape-newlines?"] and (length_2a(str) < (options["line-length"] - indent))) then + _86_ = "\\n" + else + _86_ = "\n" + end + local function _88_(_241, _242) + return ("\\%03d"):format(_242:byte()) + end + escs = setmetatable({["\7"] = "\\a", ["\8"] = "\\b", ["\12"] = "\\f", ["\11"] = "\\v", ["\13"] = "\\r", ["\9"] = "\\t", ["\\"] = "\\\\", ["\""] = "\\\"", ["\n"] = _86_}, {__index = _88_}) + local str0 = ("\"" .. str:gsub("[%c\\\"]", escs) .. "\"") + if options["utf8?"] then + return utf8_escape(str0) + else + return str0 + end + end + local function make_options(t, options) + local defaults = {["line-length"] = 80, ["one-line?"] = false, depth = 128, ["detect-cycles?"] = true, ["empty-as-sequence?"] = false, ["metamethod?"] = true, ["prefer-colon?"] = false, ["escape-newlines?"] = false, ["utf8?"] = true, ["max-sparse-gap"] = 10} + local overrides = {level = 0, appearances = count_table_appearances(t, {}), seen = {len = 0}} + for k, v in pairs((options or {})) do + defaults[k] = v + end + for k, v in pairs(overrides) do + defaults[k] = v + end + return defaults + end + local function _90_(x, options, indent, colon_3f) + local indent0 = (indent or 0) + local options0 = (options or make_options(x)) + local x0 + if options0.preprocess then + x0 = options0.preprocess(x, options0) + else + x0 = x + end + local tv = type(x0) + local function _93_() + local _92_ = getmetatable(x0) + if (nil ~= _92_) then + return (_92_).__fennelview + else + return _92_ + end + end + if ((tv == "table") or ((tv == "userdata") and _93_())) then + return pp_table(x0, options0, indent0) + elseif (tv == "number") then + return number__3estring(x0) + else + local function _95_() + if (colon_3f ~= nil) then + return colon_3f + elseif ("function" == type(options0["prefer-colon?"])) then + return options0["prefer-colon?"](x0) + else + return options0["prefer-colon?"] + end + end + if ((tv == "string") and colon_string_3f(x0) and _95_()) then + return (":" .. x0) + elseif (tv == "string") then + return pp_string(x0, options0, indent0) + elseif ((tv == "boolean") or (tv == "nil")) then + return tostring(x0) + else + return ("#<" .. tostring(x0) .. ">") + end + end + end + pp = _90_ + local function view(x, _3foptions) + return pp(x, make_options(x, _3foptions), 0) + end + return view end -local utils = nil package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(...) + local view = require("fennel.view") + 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))) + else + return nil + end + end local function stablepairs(t) local keys = {} + local used_keys = {} local succ = {} - for k in pairs(t) do - table.insert(keys, k) + if (getmetatable(t) and getmetatable(t).keys) then + for _, k in ipairs(getmetatable(t).keys) do + if used_keys[k] then + for i = #keys, 1, -1 do + if (keys[i] == k) then + table.remove(keys, i) + else + end + end + else + end + used_keys[k] = true + table.insert(keys, k) + end + else + for k in pairs(t) do + table.insert(keys, k) + end + local function _100_(_241, _242) + return (tostring(_241) < tostring(_242)) + end + table.sort(keys, _100_) end - local function _0_(_241, _242) - return (tostring(_241) < tostring(_242)) - end - table.sort(keys, _0_) for i, k in ipairs(keys) do succ[k] = keys[(i + 1)] end local function stablenext(tbl, idx) - local key = nil + local key if (idx == nil) then key = keys[1] else key = succ[idx] end - local value = nil + local value if (key == nil) then value = nil else @@ -3400,66 +4205,70 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. end return stablenext, t, nil end - local function map(t, f, out) - local out0 = (out or {}) - local f0 = nil + local function map(t, f, _3fout) + local out = (_3fout or {}) + local f0 if (type(f) == "function") then f0 = f else - local function _0_(_241) - return _241[f] + local function _104_(_241) + return (_241)[f] end - f0 = _0_ + f0 = _104_ end for _, x in ipairs(t) do - local _1_0 = f0(x) - if (nil ~= _1_0) then - local v = _1_0 - table.insert(out0, v) + local _106_ = f0(x) + if (nil ~= _106_) then + local v = _106_ + table.insert(out, v) + else end end - return out0 + return out end - local function kvmap(t, f, out) - local out0 = (out or {}) - local f0 = nil + local function kvmap(t, f, _3fout) + local out = (_3fout or {}) + local f0 if (type(f) == "function") then f0 = f else - local function _0_(_241) - return _241[f] + local function _108_(_241) + return (_241)[f] end - f0 = _0_ + f0 = _108_ end for k, x in stablepairs(t) do - local _1_0, _2_0 = f0(k, x) - if ((nil ~= _1_0) and (nil ~= _2_0)) then - local key = _1_0 - local value = _2_0 - out0[key] = value - elseif (nil ~= _1_0) then - local value = _1_0 - table.insert(out0, value) + local _110_, _111_ = f0(k, x) + if ((nil ~= _110_) and (nil ~= _111_)) then + local key = _110_ + local value = _111_ + out[key] = value + elseif (nil ~= _110_) then + local value = _110_ + table.insert(out, value) + else end end - return out0 + return out end - local function copy(from, to) - local to0 = (to or {}) + local function copy(from, _3fto) + local to = (_3fto or {}) for k, v in pairs((from or {})) do - to0[k] = v + to[k] = v end - return to0 + return to end - local function member_3f(x, tbl, n) - local _0_0 = tbl[(n or 1)] - if (_0_0 == x) then + local function member_3f(x, tbl, _3fn) + local _113_ = tbl[(_3fn or 1)] + if (_113_ == x) then return true - elseif (_0_0 == nil) then - return false + elseif (_113_ == nil) then + return nil + elseif true then + local _ = _113_ + return member_3f(x, tbl, ((_3fn or 1) + 1)) else - local _ = _0_0 - return member_3f(x, tbl, ((n or 1) + 1)) + return nil end end local function allpairs(tbl) @@ -3474,10 +4283,17 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. seen[next_state] = true return next_state, value else - local meta = getmetatable(t) - if (meta and meta.__index) then - t = meta.__index - return allpairs_next(t) + local _115_ = getmetatable(t) + if ((_G.type(_115_) == "table") and true) then + local __index = (_115_).__index + if ("table" == type(__index)) then + t = __index + return allpairs_next(t) + else + return nil + end + else + return nil end end end @@ -3487,17 +4303,18 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. return self[1] end local nil_sym = nil - local function list__3estring(self, tostring2) + local function list__3estring(self, _3ftostring2) local safe, max = {}, 0 for k in pairs(self) do if ((type(k) == "number") and (k > max)) then max = k + else end end for i = 1, max do safe[i] = (((self[i] == nil) and nil_sym) or self[i]) end - return ("(" .. table.concat(map(safe, (tostring2 or tostring)), " ", 1, max) .. ")") + return ("(" .. table.concat(map(safe, (_3ftostring2 or view)), " ", 1, max) .. ")") end local function comment_view(c) return c, true @@ -3508,17 +4325,21 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. local function sym_3c(a, b) return (a[1] < tostring(b)) end - local symbol_mt = {"SYMBOL", __eq = sym_3d, __fennelview = deref, __lt = sym_3c, __tostring = deref} - local expr_mt = {"EXPR", __tostring = deref} - local list_mt = {"LIST", __fennelview = list__3estring, __tostring = list__3estring} - local comment_mt = {"COMMENT", __eq = sym_3d, __fennelview = comment_view, __lt = sym_3c, __tostring = deref} + local symbol_mt = {__fennelview = deref, __tostring = deref, __eq = sym_3d, __lt = sym_3c, "SYMBOL"} + local expr_mt + local function _120_(x) + return tostring(deref(x)) + end + expr_mt = {__tostring = _120_, "EXPR"} + local list_mt = {__fennelview = list__3estring, __tostring = list__3estring, "LIST"} + local comment_mt = {__fennelview = comment_view, __tostring = deref, __eq = sym_3d, __lt = sym_3c, "COMMENT"} local sequence_marker = {"SEQUENCE"} - local vararg = setmetatable({"..."}, {"VARARG", __fennelview = deref, __tostring = deref}) - local getenv = nil - local function _0_() + local vararg = setmetatable({"..."}, {__fennelview = deref, __tostring = deref, "VARARG"}) + local getenv + local function _121_() return nil end - getenv = ((os and os.getenv) or _0_) + getenv = ((os and os.getenv) or _121_) local function debug_on_3f(flag) local level = (getenv("FENNEL_DEBUG") or "") return ((level == "all") or level:find(flag)) @@ -3527,10 +4348,11 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. return setmetatable({...}, list_mt) end local function sym(str, _3fsource, _3fscope) - local s = {str, ["?scope"] = _3fscope} + local s = {["?scope"] = _3fscope, str} for k, v in pairs((_3fsource or {})) do if (type(k) == "string") then s[k] = v + else end end return setmetatable(s, symbol_mt) @@ -3540,13 +4362,13 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. return setmetatable({...}, {sequence = sequence_marker}) end local function expr(strcode, etype) - return setmetatable({strcode, type = etype}, expr_mt) + return setmetatable({type = etype, strcode}, expr_mt) end local function comment_2a(contents, _3fsource) - local _1_ = (_3fsource or {}) - local filename = _1_["filename"] - local line = _1_["line"] - return setmetatable({contents, filename = filename, line = line}, comment_mt) + local _let_123_ = (_3fsource or {}) + local filename = _let_123_["filename"] + local line = _let_123_["line"] + return setmetatable({filename = filename, line = line, contents}, comment_mt) end local function varg() return vararg @@ -3584,6 +4406,7 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. local last_char = part:sub(( - 1)) if (last_char == ":") then parts["multi-sym-method-call"] = true + else end if ((last_char == ":") or (last_char == ".")) then parts[(#parts + 1)] = part:sub(1, ( - 2)) @@ -3597,16 +4420,27 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. local function quoted_3f(symbol) return symbol.quoted end - local function walk_tree(root, f, custom_iterator) + local function ast_source(ast) + if table_3f(ast) then + return (getmetatable(ast) or {}) + elseif ("table" == type(ast)) then + return ast + else + return {} + end + end + local function walk_tree(root, f, _3fcustom_iterator) local function walk(iterfn, parent, idx, node) if f(idx, node, parent) then for k, v in iterfn(node) do walk(iterfn, node, k, v) end return nil + else + return nil end end - walk((custom_iterator or pairs), nil, nil, root) + walk((_3fcustom_iterator or pairs), nil, nil, root) return root end local lua_keywords = {"and", "break", "do", "else", "elseif", "end", "false", "for", "function", "if", "in", "local", "nil", "not", "or", "repeat", "return", "then", "true", "until", "while", "goto"} @@ -3623,35 +4457,53 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(.. end return subopts end - local root = nil - local function _1_() + local root + local function _129_() end - root = {chunk = nil, options = nil, reset = _1_, scope = nil} - root["set-reset"] = function(_2_0) - local _3_ = _2_0 - local chunk = _3_["chunk"] - local options = _3_["options"] - local reset = _3_["reset"] - local scope = _3_["scope"] + root = {chunk = nil, scope = nil, options = nil, reset = _129_} + root["set-reset"] = function(_130_) + local _arg_131_ = _130_ + local chunk = _arg_131_["chunk"] + local scope = _arg_131_["scope"] + local options = _arg_131_["options"] + local reset = _arg_131_["reset"] root.reset = function() root.chunk, root.scope, root.options, root.reset = chunk, scope, options, reset return nil end return root.reset end - local function hook(event, ...) - if (root.options and root.options.plugins) then - for _, plugin in ipairs(root.options.plugins) do - local _3_0 = plugin[event] - if (nil ~= _3_0) then - local f = _3_0 - f(...) - end - end + local warned = {} + local function check_plugin_version(_132_) + local _arg_133_ = _132_ + local name = _arg_133_["name"] + local versions = _arg_133_["versions"] + local plugin = _arg_133_ + if (not member_3f(version:gsub("-dev", ""), (versions or {})) and not warned[plugin]) then + warned[plugin] = true + return warn(string.format("plugin %s does not support Fennel version %s", (name or "unknown"), version)) + else return nil end end - return {["comment?"] = comment_3f, ["debug-on?"] = debug_on_3f, ["expr?"] = expr_3f, ["list?"] = list_3f, ["lua-keywords"] = lua_keywords, ["member?"] = member_3f, ["multi-sym?"] = multi_sym_3f, ["propagate-options"] = propagate_options, ["quoted?"] = quoted_3f, ["sequence?"] = sequence_3f, ["sym?"] = sym_3f, ["table?"] = table_3f, ["valid-lua-identifier?"] = valid_lua_identifier_3f, ["varg?"] = varg_3f, ["walk-tree"] = walk_tree, allpairs = allpairs, comment = comment_2a, copy = copy, deref = deref, expr = expr, hook = hook, kvmap = kvmap, list = list, map = map, path = table.concat({"./?.fnl", "./?/init.fnl", getenv("FENNEL_PATH")}, ";"), root = root, sequence = sequence, stablepairs = stablepairs, sym = sym, varg = varg} + local function hook(event, ...) + local result = nil + if (root.options and root.options.plugins) then + for _, plugin in ipairs(root.options.plugins) do + if result then break end + check_plugin_version(plugin) + local _135_ = plugin[event] + if (nil ~= _135_) then + local f = _135_ + result = f(...) + else + end + end + else + end + return result + end + return {warn = warn, allpairs = allpairs, stablepairs = stablepairs, copy = copy, kvmap = kvmap, map = map, ["walk-tree"] = walk_tree, ["member?"] = member_3f, list = list, sequence = sequence, sym = sym, varg = varg, expr = expr, comment = comment_2a, ["comment?"] = comment_3f, ["expr?"] = expr_3f, ["list?"] = list_3f, ["multi-sym?"] = multi_sym_3f, ["sequence?"] = sequence_3f, ["sym?"] = sym_3f, ["table?"] = table_3f, ["varg?"] = varg_3f, ["quoted?"] = quoted_3f, ["valid-lua-identifier?"] = valid_lua_identifier_3f, ["lua-keywords"] = lua_keywords, hook = hook, ["propagate-options"] = propagate_options, root = root, ["debug-on?"] = debug_on_3f, ["ast-source"] = ast_source, version = version, path = table.concat({"./?.fnl", "./?/init.fnl", getenv("FENNEL_PATH")}, ";"), ["macro-path"] = table.concat({"./?.fnl", "./?/init-macros.fnl", "./?/init.fnl", getenv("FENNEL_MACRO_PATH")}, ";")} end utils = require("fennel.utils") local parser = require("fennel.parser") @@ -3659,11 +4511,13 @@ local compiler = require("fennel.compiler") local specials = require("fennel.specials") local repl = require("fennel.repl") local view = require("fennel.view") -local function eval_env(env) +local function eval_env(env, opts) if (env == "_COMPILER") then - local env0 = specials["make-compiler-env"](nil, compiler.scopes.compiler, {}) - local mt = getmetatable(env0) - mt.__index = _G + local env0 = specials["make-compiler-env"](nil, compiler.scopes.compiler, {}, opts) + if (opts.allowedGlobals == nil) then + opts.allowedGlobals = specials["current-global-names"](env0) + else + end return specials["wrap-env"](env0) else return (env and specials["wrap-env"](env)) @@ -3671,30 +4525,33 @@ local function eval_env(env) end local function eval_opts(options, str) local opts = utils.copy(options) - if ((opts.allowedGlobals == nil) and not getmetatable(opts.env)) then + if (opts.allowedGlobals == nil) then opts.allowedGlobals = specials["current-global-names"](opts.env) + else end if (not opts.filename and not opts.source) then opts.source = str + else end if (opts.env == "_COMPILER") then opts.scope = compiler["make-scope"](compiler.scopes.compiler) + else end return opts end local function eval(str, options, ...) local opts = eval_opts(options, str) - local env = eval_env(opts.env) + local env = eval_env(opts.env, opts) local lua_source = compiler["compile-string"](str, opts) - local loader = nil - local function _0_(...) + local loader + local function _616_(...) if opts.filename then return ("@" .. opts.filename) else return str end end - loader = specials["load-code"](lua_source, env, _0_(...)) + loader = specials["load-code"](lua_source, env, _616_(...)) opts.filename = nil return loader(...) end @@ -3706,7 +4563,36 @@ local function dofile_2a(filename, options, ...) opts.filename = filename return eval(source, opts, ...) end -local mod = {["comment?"] = utils["comment?"], ["compile-stream"] = compiler["compile-stream"], ["compile-string"] = compiler["compile-string"], ["list?"] = utils["list?"], ["load-code"] = specials["load-code"], ["macro-loaded"] = specials["macro-loaded"], ["macro-searchers"] = specials["macro-searchers"], ["make-searcher"] = specials["make-searcher"], ["search-module"] = specials["search-module"], ["sequence?"] = utils["sequence?"], ["string-stream"] = parser["string-stream"], ["sym-char?"] = parser["sym-char?"], ["sym?"] = utils["sym?"], comment = utils.comment, compile = compiler.compile, compile1 = compiler.compile1, compileStream = compiler["compile-stream"], compileString = compiler["compile-string"], doc = specials.doc, dofile = dofile_2a, eval = eval, gensym = compiler.gensym, granulate = parser.granulate, list = utils.list, loadCode = specials["load-code"], macroLoaded = specials["macro-loaded"], makeSearcher = specials["make-searcher"], make_searcher = specials["make-searcher"], mangle = compiler["global-mangling"], metadata = compiler.metadata, parser = parser.parser, path = utils.path, repl = repl, scope = compiler["make-scope"], searchModule = specials["search-module"], searcher = specials["make-searcher"](), sequence = utils.sequence, stringStream = parser["string-stream"], sym = utils.sym, traceback = compiler.traceback, unmangle = compiler["global-unmangling"], varg = utils.varg, version = "0.9.1-dev", view = view} +local function syntax() + local body_3f = {"when", "with-open", "collect", "icollect", "lambda", "\206\187", "macro", "match", "accumulate"} + local binding_3f = {"collect", "icollect", "each", "for", "let", "with-open", "accumulate"} + local define_3f = {"fn", "lambda", "\206\187", "var", "local", "macro", "macros", "global"} + local out = {} + for k, v in pairs(compiler.scopes.global.specials) do + local metadata = (compiler.metadata[v] or {}) + do end (out)[k] = {["special?"] = true, ["body-form?"] = metadata["fnl/body-form?"], ["binding-form?"] = utils["member?"](k, binding_3f), ["define?"] = utils["member?"](k, define_3f)} + end + for k, v in pairs(compiler.scopes.global.macros) do + out[k] = {["macro?"] = true, ["body-form?"] = utils["member?"](k, body_3f), ["binding-form?"] = utils["member?"](k, binding_3f), ["define?"] = utils["member?"](k, define_3f)} + end + for k, v in pairs(_G) do + local _617_ = type(v) + if (_617_ == "function") then + out[k] = {["global?"] = true, ["function?"] = true} + elseif (_617_ == "table") then + for k2, v2 in pairs(v) do + if (("function" == type(v2)) and (k ~= "_G")) then + out[(k .. "." .. k2)] = {["function?"] = true, ["global?"] = true} + else + end + end + out[k] = {["global?"] = true} + else + end + end + return out +end +local mod = {list = utils.list, ["list?"] = utils["list?"], sym = utils.sym, ["sym?"] = utils["sym?"], sequence = utils.sequence, ["sequence?"] = utils["sequence?"], comment = utils.comment, ["comment?"] = utils["comment?"], varg = utils.varg, path = utils.path, ["macro-path"] = utils["macro-path"], ["sym-char?"] = parser["sym-char?"], parser = parser.parser, granulate = parser.granulate, ["string-stream"] = parser["string-stream"], compile = compiler.compile, ["compile-string"] = compiler["compile-string"], ["compile-stream"] = compiler["compile-stream"], compile1 = compiler.compile1, traceback = compiler.traceback, mangle = compiler["global-mangling"], unmangle = compiler["global-unmangling"], metadata = compiler.metadata, scope = compiler["make-scope"], gensym = compiler.gensym, ["load-code"] = specials["load-code"], ["macro-loaded"] = specials["macro-loaded"], ["macro-searchers"] = specials["macro-searchers"], ["search-module"] = specials["search-module"], ["make-searcher"] = specials["make-searcher"], makeSearcher = specials["make-searcher"], searcher = specials["make-searcher"](), doc = specials.doc, view = view, eval = eval, dofile = dofile_2a, version = utils.version, repl = repl, syntax = syntax, loadCode = specials["load-code"], make_searcher = specials["make-searcher"], searchModule = specials["search-module"], macroLoaded = specials["macro-loaded"], compileStream = compiler["compile-stream"], compileString = compiler["compile-string"], stringStream = parser["string-stream"]} utils["fennel-module"] = mod do local builtin_macros = [===[;; This module contains all the built-in Fennel macros. Unlike all the other @@ -3735,7 +4621,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))) @@ -3752,7 +4638,7 @@ do tmp (gensym)] (table.insert el 2 tmp) `(let [,tmp ,val] - (if ,tmp + (if (not= nil ,tmp) (-?> ,el ,(unpack els)) ,tmp))))) @@ -3767,24 +4653,31 @@ do tmp (gensym)] (table.insert el tmp) `(let [,tmp ,val] - (if ,tmp + (if (not= ,tmp nil) (-?>> ,el ,(unpack els)) ,tmp))))) - (fn ?dot [tbl k ...] + (fn ?dot [tbl ...] "Nil-safe table look up. Same as . (dot), except will short-circuit with nil when it encounters a nil value in any of subsequent keys." - (if (= nil k) tbl `(let [res# (. ,tbl ,k)] - (and res# (?. res# ,...))))) + (let [head (gensym :t) + lookups `(do (var ,head ,tbl) ,head)] + (each [_ k (ipairs [...])] + ;; Kinda gnarly to reassign in place like this, but it emits the best lua. + ;; With this impl, it emits a flat, concise, and readable set of if blocks. + (table.insert lookups (# lookups) `(if (not= nil ,head) + (set ,head (. ,head ,k))))) + lookups)) (fn doto* [val ...] "Evaluates val and splices it into the first argument of subsequent forms." (let [name (gensym) form `(let [,name ,val])] - (each [_ elt (pairs [...])] - (table.insert elt 2 name) - (table.insert form elt)) + (each [_ elt (ipairs [...])] + (let [elt (if (list? elt) elt (list elt))] + (table.insert elt 2 name) + (table.insert form elt))) (table.insert form name) form)) @@ -3811,56 +4704,126 @@ do (table.insert closer 4 `(: ,(. closable-bindings i) :close))) `(let ,closable-bindings ,closer - (close-handlers# (xpcall ,bodyfn ,traceback))))) + (close-handlers# (_G.xpcall ,bodyfn ,traceback))))) - (fn collect* [iter-tbl key-value-expr ...] - "Returns a table made by running an iterator and evaluating an expression - that returns key-value pairs to be inserted sequentially into the table. - This can be thought of as a \"table comprehension\". The provided key-value - expression must return either 2 values, or nil. + (fn into-val [iter-tbl] + (var into nil) + (for [i (length iter-tbl) 2 -1] + (if (= :into (. iter-tbl i)) + (do (assert (not into) "expected only one :into clause") + (set into (table.remove iter-tbl (+ i 1))) + (table.remove iter-tbl i)))) + (assert (or (not into) + (sym? into) + (table? into) + (list? into)) + "expected table, function call, or symbol in :into clause") + (or into [])) + + (fn collect* [iter-tbl key-expr value-expr ...] + "Returns a table made by running an iterator and evaluating an expression that + returns key-value pairs to be inserted sequentially into the table. This can + be thought of as a table comprehension. The body should provide two + expressions (used as key and value) or nil, which causes it to be omitted from + the resulting table. For example, (collect [k v (pairs {:apple \"red\" :orange \"orange\"})] - (values v k)) + v k) returns - {:red \"apple\" :orange \"orange\"}" + {:red \"apple\" :orange \"orange\"} + + Supports an :into clause after the iterator to put results in an existing table. + Supports early termination with an :until clause." (assert (and (sequence? iter-tbl) (>= (length iter-tbl) 2)) "expected iterator binding table") - (assert (not= nil key-value-expr) "expected key-value expression") + (assert (not= nil key-expr) "expected key and value expression") (assert (= nil ...) - "expected exactly one body expression. Wrap multiple expressions with do") - `(let [tbl# {}] - (each ,iter-tbl - (match ,key-value-expr - (k# v#) (tset tbl# k# v#))) - tbl#)) + "expected 1 or 2 body expressions; wrap multiple expressions with do") + (let [kv-expr (if (= nil value-expr) key-expr `(values ,key-expr ,value-expr))] + `(let [tbl# ,(into-val iter-tbl)] + (each ,iter-tbl + (match ,kv-expr + (k# v#) (tset tbl# k# v#))) + tbl#))) (fn icollect* [iter-tbl value-expr ...] "Returns a sequential table made by running an iterator and evaluating an expression that returns values to be inserted sequentially into the table. - This can be thought of as a \"list comprehension\". + This can be thought of as a \"list comprehension\". If the body returns nil + that element is omitted from the resulting table. For example, - (icollect [_ v (ipairs [1 2 3 4 5])] (when (> v 2) (* v v))) + (icollect [_ v (ipairs [1 2 3 4 5])] (when (not= v 3) (* v v))) returns - [9 16 25]" + [1 4 16 25] + + Supports an :into clause after the iterator to put results in an existing table. + Supports early termination with an :until clause." (assert (and (sequence? iter-tbl) (>= (length iter-tbl) 2)) "expected iterator binding table") (assert (not= nil value-expr) "expected table value expression") (assert (= nil ...) "expected exactly one body expression. Wrap multiple expressions with do") - `(let [tbl# []] + `(let [tbl# ,(into-val iter-tbl)] + ;; believe it or not, using a var here has a pretty good performance boost: + ;; https://p.hagelb.org/icollect-performance.html + (var i# (length tbl#)) (each ,iter-tbl - (tset tbl# (+ (length tbl#) 1) ,value-expr)) + (let [val# ,value-expr] + (when (not= nil val#) + (set i# (+ i# 1)) + (tset tbl# i# val#)))) tbl#)) + (fn accumulate* [iter-tbl accum-expr ...] + "Accumulation macro. + It takes a binding table and an expression as its arguments. + In the binding table, the first symbol is bound to the second value, being an + initial accumulator variable. The rest are an iterator binding table in the + format `each` takes. + It runs through the iterator in each step of which the given expression is + evaluated, and its returned value updates the accumulator variable. + It eventually returns the final value of the accumulator variable. + + For example, + (accumulate [total 0 + _ n (pairs {:apple 2 :orange 3})] + (+ total n)) + returns + 5" + (assert (and (sequence? iter-tbl) (>= (length iter-tbl) 4)) + "expected initial value and iterator binding table") + (assert (not= nil accum-expr) "expected accumulating expression") + (assert (= nil ...) + "expected exactly one body expression. Wrap multiple expressions with do") + (let [accum-var (table.remove iter-tbl 1) + accum-init (table.remove iter-tbl 1)] + `(do (var ,accum-var ,accum-init) + (each ,iter-tbl + (set ,accum-var ,accum-expr)) + ,accum-var))) + (fn partial* [f ...] "Returns a function with all arguments partially applied to f." (assert f "expected a function to partially apply") - (let [body (list f ...)] - (table.insert body _VARARG) - `(fn [,_VARARG] - ,body))) + (let [bindings [] + args []] + (each [_ arg (ipairs [...])] + (if (or (= :number (type arg)) + (= :string (type arg)) + (= :boolean (type arg)) + (= `nil arg)) + (table.insert args arg) + (let [name (gensym)] + (table.insert bindings name) + (table.insert bindings arg) + (table.insert args name)))) + (let [body (list f (unpack args))] + (table.insert body _VARARG) + `(let ,bindings + (fn [,_VARARG] + ,body))))) (fn pick-args* [n f] "Creates a function of arity n that applies its arguments to f. @@ -3869,6 +4832,9 @@ do (pick-args 2 func) expands to (fn [_0_ _1_] (func _0_ _1_))" + (if (and _G.io _G.io.stderr) + (_G.io.stderr:write + "-- WARNING: pick-args is deprecated and will be removed in the future.\n")) (assert (and (= (type n) :number) (= n (math.floor n)) (>= n 0)) (.. "Expected n to be an integer literal >= 0, got " (tostring n))) (let [bindings []] @@ -3896,9 +4862,9 @@ do (values ,(unpack let-syms)))))) (fn lambda* [...] - "Function literal with arity checking. - Will throw an exception if a declared argument is passed in as nil, unless - that argument name begins with ?." + "Function literal with nil-checked arguments. + Like `fn`, but will throw an exception if a declared argument is passed in as + nil, unless that argument's name begins with a question mark." (let [args [...] has-internal-name? (sym? (. args 1)) arglist (if has-internal-name? (. args 2) (. args 1)) @@ -3914,13 +4880,13 @@ do (check! a)) (let [as (tostring a)] (and (not (as:match "^?")) (not= as "&") (not= as "_") - (not= as "..."))) + (not= as "...") (not= as "&as"))) (table.insert args arity-check-position - `(assert (not= nil ,a) - (string.format "Missing argument %s on %s:%s" - ,(tostring a) - ,(or a.filename :unknown) - ,(or a.line "?")))))) + `(_G.assert (not= nil ,a) + ,(: "Missing argument %s on %s:%s" :format + (tostring a) + (or a.filename :unknown) + (or a.line "?")))))) (assert (= :table (type arglist)) "expected arg list") (each [_ a (ipairs arglist)] @@ -3950,26 +4916,23 @@ do (assert (and binding1 module-name1 (= 0 (% (select "#" ...) 2))) "expected even number of binding/modulename pairs") (for [i 1 (select "#" binding1 module-name1 ...) 2] + ;; delegate the actual loading of the macros to the require-macros + ;; special which already knows how to set up the compiler env and stuff. + ;; this is weird because require-macros is deprecated but it works. (let [(binding modname) (select i binding1 module-name1 ...) - ;; generate a subscope of current scope, use require-macros - ;; to bring in macro module. after that, we just copy the - ;; macros from subscope to scope. scope (get-scope) - subscope (fennel.scope scope)] - (_SPECIALS.require-macros `(require-macros ,modname) subscope {} ast) + macros* (_SPECIALS.require-macros `(import-macros ,modname) + scope {} binding1)] (if (sym? binding) ;; bind whole table of macros to table bound to symbol - (do - (tset scope.macros (. binding 1) {}) - (each [k v (pairs subscope.macros)] - (tset (. scope.macros (. binding 1)) k v))) + (tset scope.macros (. binding 1) macros*) ;; 1-level table destructuring for importing individual macros (table? binding) (each [macro-name [import-key] (pairs binding)] - (assert (= :function (type (. subscope.macros macro-name))) + (assert (= :function (type (. macros* macro-name))) (.. "macro " macro-name " not found in module " (tostring modname))) - (tset scope.macros import-key (. subscope.macros macro-name)))))) + (tset scope.macros import-key (. macros* macro-name)))))) nil) ;;; Pattern matching @@ -3986,16 +4949,20 @@ do (values condition bindings))) (fn match-table [val pattern unifications match-pattern] - (let [condition `(and (= (type ,val) :table)) + (let [condition `(and (= (_G.type ,val) :table)) bindings []] (each [k pat (pairs pattern)] (if (= pat `&) - (do + (let [rest-pat (. pattern (+ k 1)) + rest-val `(select ,k ((or table.unpack _G.unpack) ,val)) + subcondition (match-table `(pick-values 1 ,rest-val) + rest-pat unifications match-pattern)] + (if (not (sym? rest-pat)) + (table.insert condition subcondition)) (assert (= nil (. pattern (+ k 2))) "expected & rest argument before last parameter") - (table.insert bindings (. pattern (+ k 1))) - (table.insert bindings - [`(select ,k ((or table.unpack _G.unpack) ,val))])) + (table.insert bindings rest-pat) + (table.insert bindings [rest-val])) (= k `&as) (do (table.insert bindings pat) @@ -4043,11 +5010,10 @@ do (and (list? pattern) (= (. pattern 2) `?)) (let [(pcondition bindings) (match-pattern vals (. pattern 1) unifications) - condition `(and ,pcondition)] - (for [i 3 (length pattern)] ; splice in guard clauses - (table.insert condition (. pattern i))) - (values `(let ,bindings - ,condition) bindings)) + condition `(and ,(unpack pattern 3))] + (values `(and ,pcondition + (let ,bindings + ,condition)) bindings)) ;; multi-valued patterns (represented as lists) (list? pattern) (match-values vals pattern unifications match-pattern) @@ -4075,10 +5041,13 @@ do "How many multi-valued clauses are there? return a list of that many gensyms." (let [syms (list (gensym))] (for [i 1 (length clauses) 2] - (if (list? (. clauses i)) - (each [valnum (ipairs (. clauses i))] - (if (not (. syms valnum)) - (tset syms valnum (gensym)))))) + (let [clause (if (and (list? (. clauses i)) (= `? (. clauses i 2))) + (. clauses i 1) + (. clauses i))] + (if (list? clause) + (each [valnum (ipairs clause)] + (if (not (. syms valnum)) + (tset syms valnum (gensym))))))) syms)) (fn match* [val ...] @@ -4087,6 +5056,8 @@ do ;; which simply generates old syntax and feeds it to `match*'. (let [clauses [...] vals (match-val-syms clauses)] + (assert (= 0 (math.fmod (length clauses) 2)) + "expected even number of pattern/body pairs") ;; protect against multiple evaluation of the value, bind against as ;; many values as we ever match against in the clauses. (list `let [vals val] (match-condition vals clauses)))) @@ -4168,6 +5139,7 @@ do :with-open with-open* :collect collect* :icollect icollect* + :accumulate accumulate* :partial partial* :lambda lambda* :pick-args pick-args* @@ -4178,20 +5150,20 @@ do :match match-where} ]===] local module_name = "fennel.macros" - local _ = nil - local function _0_() + local _ + local function _620_() return mod end - package.preload[module_name] = _0_ + package.preload[module_name] = _620_ _ = nil - local env = nil + local env do - local _1_0 = specials["make-compiler-env"](nil, compiler.scopes.compiler, {}) - _1_0["utils"] = utils - _1_0["fennel"] = mod - env = _1_0 + local _621_ = specials["make-compiler-env"](nil, compiler.scopes.compiler, {}) + do end (_621_)["utils"] = utils + _621_["fennel"] = mod + env = _621_ end - local built_ins = eval(builtin_macros, {allowedGlobals = false, env = env, filename = "src/fennel/macros.fnl", moduleName = module_name, scope = compiler.scopes.compiler, useMetadata = true}) + local built_ins = eval(builtin_macros, {env = env, scope = compiler.scopes.compiler, allowedGlobals = false, useMetadata = true, filename = "src/fennel/macros.fnl", moduleName = module_name}) for k, v in pairs(built_ins) do compiler.scopes.global.macros[k] = v end diff --git a/lib/util.fnl b/lib/util.fnl index 8095c6c..9330292 100644 --- a/lib/util.fnl +++ b/lib/util.fnl @@ -9,20 +9,28 @@ (fn lo [v] (bit.band v 0xff)) (fn hi [v] (bit.band (bit.rshift v 8) 0xff)) +(fn loword [v] (bit.band v 0xffff)) +(fn hiword [v] (bit.band (bit.rshift v 16) 0xffff)) + (fn int8-to-bytes [i] (string.char (lo i))) (fn int16-to-bytes [i] (string.char (lo i) (hi i))) (fn int24-to-bytes [i] - (string.char (lo i) (hi i) (bit.band (bit.rshift i 16) 0xff))) + (string.char (lo i) (hi i) (lo (bit.rshift i 16)))) +(fn int32-to-bytes [i] + (string.char (lo i) (hi i) (lo (bit.rshift i 16)) (hi (bit.rshift i 16)))) (fn bytes-to-uint8 [b ?offset] (string.byte b (+ 1 (or ?offset 0)) (+ 1 (or ?offset 0)))) (fn bytes-to-uint16 [b ?offset] - (local (lo hi) (string.byte b (+ 1 (or ?offset 0)) (+ 2 (or ?offset 0)))) + (local (lo hi) (string.byte b (+ 1 (or ?offset 0)) (+ 2 (or ?offset 0)))) (bit.bor lo (bit.lshift hi 8))) (fn bytes-to-uint24 [b ?offset] (local (lo mid hi) (string.byte b (+ 1 (or ?offset 0)) (+ 3 (or ?offset 0)))) (bit.bor lo (bit.lshift mid 8) (bit.lshift hi 16))) +(fn bytes-to-uint32 [b ?offset] + (local [lo hi] [(bytes-to-uint16 b ?offset) (bytes-to-uint16 b (+ 2 (or ?offset 0)))]) + (bit.bor lo (bit.lshift hi 16))) (fn splice [bytes offset str] (.. (bytes:sub 1 offset) @@ -106,8 +114,29 @@ (tset t next-key {})) (nested-tset (. t next-key) (lume.slice keys 2) value))))) -{: int8-to-bytes : int16-to-bytes : int24-to-bytes : bytes-to-uint8 : bytes-to-uint16 : bytes-to-uint24 - : splice : lo : hi - : reload : hotswap : swappable :require swappable-require : hot-table : nested-tset - : readjson : writejson : waitfor : in-coro : multival} +(fn file-exists [name] + (let [f (io.open name :r)] + (when (not= f nil) (io.close f)) + (not= f nil))) + +(fn pairoff [l] + (fn [_ iprev] (let [i (if iprev (+ iprev 2) 1)] + (when (< i (length l)) (values i (. l i) (. l (+ i 1))))))) + +(fn countiter [minmax ?max ?step] + (let [min (if ?max minmax 1) + max (or ?max minmax) + step (or ?step 1)] + (fn [_ iprev] + (let [i (if iprev (+ iprev step) min)] + (when (if (> step 0) (<= i max) (>= i max)) i))))) + +(fn condlist [...] (let [l []] (lume.push l ...) l)) + +(fn prototype [base] (setmetatable {} {:__index base})) + +{: int8-to-bytes : int16-to-bytes : int24-to-bytes : int32-to-bytes : bytes-to-uint8 : bytes-to-uint16 : bytes-to-uint24 : bytes-to-uint32 + : splice : lo : hi : loword : hiword : condlist : prototype + : reload : hotswap : swappable :require swappable-require : hot-table : nested-tset : pairoff : countiter + : readjson : writejson : file-exists : waitfor : in-coro : multival}