From 4f40b3851b4bfc6e0718a1962d6962c46d624e48 Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Mon, 20 Feb 2023 19:50:02 -0500
Subject: [PATCH] Upgrade to Fennel 1.3.0, z80 assembly support

---
 asm/6502.fnl                     |    5 +-
 asm/65816.fnl                    |    5 +-
 asm/asm.fnl                      |    5 +-
 asm/z80.fnl                      |  240 ++
 lib/fennel.lua                   | 3908 +++++++++++++++++++-----------
 lib/stdio.fnl                    |    3 +-
 vendor/lite/data/core/strict.lua |    2 +-
 7 files changed, 2744 insertions(+), 1424 deletions(-)
 create mode 100644 asm/z80.fnl

diff --git a/asm/6502.fnl b/asm/6502.fnl
index 49d33f5..3adcd04 100644
--- a/asm/6502.fnl
+++ b/asm/6502.fnl
@@ -81,6 +81,9 @@
     [_] [nil nil]
     _ (error (.. "Unrecognized syntax" (fv op)))))
 
+(fn parse-op [op]
+  (let [[mode arg] (parse-mode-arg op)] {: mode : arg}))
+
 (local op-pdat {})
 
 (fn is-zp? [env name]
@@ -122,4 +125,4 @@
     ""))
 
 
-{: opcodes : op-pdat : parse-mode-arg}
+{: opcodes : op-pdat : parse-op}
diff --git a/asm/65816.fnl b/asm/65816.fnl
index bd36279..0c85017 100644
--- a/asm/65816.fnl
+++ b/asm/65816.fnl
@@ -96,6 +96,9 @@
     [_] [nil nil]
     _ (error (.. "Unrecognized syntax" (fv op)))))
 
+(fn parse-op [op]
+  (let [[mode arg] (parse-mode-arg op)] {: mode : arg}))
+
 ; abl = $000000
 ; alx = $000000,X
 (local op-pdat {})
@@ -143,4 +146,4 @@
         (error (.. op.opcode " doesn't support mode " op.mode))))
     ""))
 
-{: opcodes : parse-mode-arg : op-pdat : addr-parser}
+{: opcodes : parse-op : op-pdat : addr-parser}
diff --git a/asm/asm.fnl b/asm/asm.fnl
index b1f37fc..f42e95f 100644
--- a/asm/asm.fnl
+++ b/asm/asm.fnl
@@ -29,7 +29,7 @@
        (self.parent:lookup-addr name)))})
 
 (fn program [prg-base ?processor]
-  (local {: opcodes : op-pdat : parse-mode-arg : addr-parser} (require (.. :asm. (or ?processor :6502))))
+  (local {: opcodes : op-pdat : parse-op : addr-parser} (require (.. :asm. (or ?processor :6502))))
   ; dat - anything that takes up space in the assembled output (op, dw, db, etc)
   ;   takes the form [:op args]
   ; pdat - a parsed dat; takes the form {:type type :addr addr ...}
@@ -68,8 +68,7 @@
     block)
 
   (fn dat-parser.op [op]
-    (let [[mode arg] (parse-mode-arg op)]
-      {:type :op :opcode (. op 1) : mode : arg}))
+    (lume.extend {:type :op :opcode (. op 1)} (parse-op op)))
 
   (fn dat-parser.block [block]
     (let [dats (lume.clone block)]
diff --git a/asm/z80.fnl b/asm/z80.fnl
new file mode 100644
index 0000000..028522c
--- /dev/null
+++ b/asm/z80.fnl
@@ -0,0 +1,240 @@
+(local {: int8-to-bytes : int16-to-bytes} (require :lib.util))
+(local lume (require :lib.lume))
+(local fennel (require :lib.fennel))
+
+(local opcodes {})
+; http://www.z80.info/decoding.htm
+(fn argmatch [matcher arg]
+  (case (type matcher)
+    :function (matcher arg)
+    :table    (when (= (type arg) :table)
+                (accumulate [result {} i child (ipairs matcher) &until (= result nil)]
+                  (case (argmatch child (. arg i))
+                    argresult (lume.extend result argresult))))
+    _         (when (= matcher arg) {})))
+
+(fn comp-matchers [m1 m2] (fn [arg] (or (argmatch m1 arg) (argmatch m2 arg))))
+(fn rekey [matcher k knew]
+  (fn [arg] (match (matcher arg) {k val} {knew val})))
+
+(fn try-parse-op [op matchers prefixgen]
+  (when (= (length matchers) (- (length op) 1))
+    (let [params
+          (accumulate [result {} i matcher (ipairs matchers) &until (= result nil)]
+            (let [arg (. op (+ i 1))
+                  argresult (argmatch matcher arg)]
+              (when (not= argresult nil)
+                (lume.extend result argresult))))]
+      (when (not= params nil)
+        (case (prefixgen params)
+          prefix (lume.extend {: prefix} params))))))
+
+(fn chain-op [opcode f]
+  (let [prev (or (. opcodes opcode) #nil)]
+    (tset opcodes opcode
+      (fn [op] (case (prev op)
+                 result result
+                 nil    (f op))))))
+
+(fn opform [opcode matchers prefixgen]
+  (chain-op opcode #(try-parse-op $1 matchers prefixgen)))
+
+(fn is-addr? [param] (= (type param) :string))
+(fn addr [param] (when (is-addr? param) {:addr param}))
+(fn rel-addr [param] (when (is-addr? param) {:rel8 param}))
+(fn num [param] (when (= (type param) :number) {:num param}))
+(fn imm16 [param] (when (= (type param) :number) {:imm16 param}))
+(fn imm8 [param] (when (= (type param) :number) {:imm8 param}))
+
+(fn table-matcher [tbl key]
+  (let [lookup (collect [i val (ipairs tbl)] val (- i 1))]
+    (fn [param] (case (. lookup param) octet {key octet}))))
+
+(local cc (table-matcher [:nz :z :nc :c :po :pe :p :m] :cc))
+(local reg (comp-matchers (table-matcher [:b :c :d :e :h :l :*hl :a] :reg)
+                        #(when (argmatch [:hl] $1) {:reg 6})))
+(local rp (table-matcher [:bc :de :hl :sp] :rp))
+(local rp2 (table-matcher [:bc :de :hl :af] :rp))
+(fn im [arg] (match arg
+                0 {:im 0}
+                1 {:im 2}
+                2 {:im 3}
+                _ nil))
+
+(fn ix [arg]
+  (case arg
+    :ix {:ixprefix "\xdd"}
+    :iy {:ixprefix "\xfd"}))
+
+(fn def-alu [f]
+  (each [i opcode (ipairs [:add :adc :sub :sbc :and :xor :or :cp])]
+    (f opcode (- i 1))))
+(fn def-rot [f]
+  (each [i opcode (ipairs [:rlc :rrc :rl :rr :sla :sra :sll :srl])]
+    (f opcode (- i 1))))
+
+(fn xyz [x y z] (int8-to-bytes (bit.bor (bit.lshift x 6) (bit.lshift y 3) z)))
+(fn xpqz [x p q z] (int8-to-bytes (bit.bor (bit.lshift x 6) (bit.lshift p 4) (bit.lshift q 3) z)))
+
+(opform :nop [] #(xyz 0 0 0))
+(opform :ex [:af :af_] #(xyz 0 1 0))
+(opform :djnz [rel-addr] #(xyz 0 2 0))
+(opform :jr [rel-addr] #(xyz 0 3 0))
+(opform :jr [cc rel-addr] #(when (< $1.cc 4) (xyz 0 (+ $1.cc 4) 0)))
+(opform :ld [rp imm16] #(xpqz 0 $1.rp 0 1))
+(opform :add [:hl rp] #(xpqz 0 $1.rp 1 1))
+(opform :ld [[:bc] :a] #(xpqz 0 0 0 2))
+(opform :ld [[:de] :a] #(xpqz 0 1 0 2))
+(opform :ld [[addr] :hl] #(xpqz 0 2 0 2))
+(opform :ld [[addr] :a] #(xpqz 0 3 0 2))
+(opform :ld [:a [:bc]] #(xpqz 0 0 1 2))
+(opform :ld [:a [:de]] #(xpqz 0 1 1 2))
+(opform :ld [:hl [addr]] #(xpqz 0 2 1 2))
+(opform :ld [:a [addr]] #(xpqz 0 3 1 2))
+(opform :inc [rp] #(xpqz 0 $1.rp 0 3))
+(opform :dec [rp] #(xpqz 0 $1.rp 1 3))
+(opform :inc [reg] #(xyz 0 $1.reg 4))
+(opform :dec [reg] #(xyz 0 $1.reg 5))
+(opform :ld [reg imm8] #(xyz 0 $1.reg 6))
+(opform :rlca [] #(xyz 0 0 7))
+(opform :rrca [] #(xyz 1 0 7))
+(opform :rla [] #(xyz 2 0 7))
+(opform :rra [] #(xyz 3 0 7))
+(opform :daa [] #(xyz 4 0 7))
+(opform :cpl [] #(xyz 5 0 7))
+(opform :scf [] #(xyz 6 0 7))
+(opform :ccf [] #(xyz 7 0 7))
+(opform :ld [reg (rekey reg :reg :reg2)] #(when (or (not= $1.reg 6) (not= $1.reg 6))
+                                            (xyz 1 $1.reg $1.reg2)))
+(opform :halt [] #(xyz 1 6 6))
+(def-alu (fn [opcode alu] (opform opcode [reg] #(xyz 2 alu $1.reg))))
+(opform :ret [cc] #(xyz 3 $1.cc 0))
+(opform :pop [rp2] #(xpqz 3 $1.rp 0 1))
+(opform :ret [] #(xpqz 3 0 1 1))
+(opform :jp [:hl] #(xpqz 3 1 1 1))
+(opform :exx [] #(xpqz 3 2 1 1))
+(opform :ld [:sp :hl] #(xpqz 3 3 1 1))
+(opform :jp [cc addr] #(xyz 3 $1.cc 2))
+(opform :jp [addr] #(xyz 3 0 3))
+(opform :out [[imm8] :a] #(xyz 3 2 3))
+(opform :in [:a [imm8]] #(xyz 3 3 3))
+(opform :ex [[:sp] :hl] #(xyz 3 4 3))
+(opform :ex [:de :hl] #(xyz 3 5 3))
+(opform :di [] #(xyz 3 6 3))
+(opform :ei [] #(xyz 3 7 3))
+(opform :call [cc addr] #(xyz 3 $1.cc 4))
+(opform :push [rp2] #(xpqz 3 $1.rp 0 5))
+(opform :call [addr] #(xpqz 3 0 1 5))
+(def-alu (fn [opcode alu] (opform opcode [imm8] #(xyz 3 alu 6))))
+(opform :rst [num] #(xyz 3 (/ $1.num 8) 7))
+
+; DD / FD prefix
+(each [opcode prev (pairs opcodes)]
+  (tset opcodes opcode
+    (fn [op]
+      (case op
+        [:ex :de :ix] (error "EX DI, IX does not exist")
+        [:ex :de :iy] (error "EX DI, IY does not exist"))
+      (var prefix nil)
+      (var rel8 nil)
+      (fn rewrite [new-prefix new-val ?rel8]
+        (if (= prefix nil) (set prefix new-prefix)
+            (not= prefix new-prefix) (error "Can't mix IX and IY in one op"))
+        (if (and ?rel8 rel8) (error "Only one displacement is allowed")
+            ?rel8 (set rel8 ?rel8))
+        new-val)
+      (let [op-new (icollect [_ arg (ipairs op)]
+                      (case arg
+                        :ix (rewrite "\xdd" :hl)
+                        :iy (rewrite "\xfd" :hl)
+                        :ixl (rewrite "\xdd" :l)
+                        :iyl (rewrite "\xfd" :l)
+                        :ixh (rewrite "\xdd" :h)
+                        :iyh (rewrite "\xfd" :h)
+                        [:ix rel8] (rewrite "\xdd" [:hl] rel8)
+                        [:iy rel8] (rewrite "\xfd" [:hl] rel8)
+                        _ arg))
+            result (prev op-new)]
+        (if (= prefix nil) result
+            (= result nil) nil
+          (lume.extend result {: rel8 :prefix (.. prefix result.prefix)}))))))
+
+; CB prefix
+(def-rot (fn [opcode rot] (opform opcode [reg] #(.. "\xcb" (xyz 0 rot $1.reg)))))
+(opform :bit [num reg] #(.. "\xcb" (xyz 1 $1.num $1.reg)))
+(opform :res [num reg] #(.. "\xcb" (xyz 2 $1.num $1.reg)))
+(opform :set [num reg] #(.. "\xcb" (xyz 3 $1.num $1.reg)))
+; ED prefix
+(opform :in [reg [:c]] #(when (not= $1.reg 6) (.. "\xed" (xyz 1 $1.reg 0))))
+(opform :in [[:c]] #(.. "\xed" (xyz 1 6 0)))
+(opform :out [reg [:c]] #(when (not= $1.reg 6) (.. "\xed" (xyz 1 $1.reg 1))))
+(opform :out [[:c]] #(.. "\xed" (xyz 1 6 1)))
+(opform :sbc [:hl rp] #(.. "\xed" (xpqz 1 $1.rp 0 2)))
+(opform :adc [:hl rp] #(.. "\xed" (xpqz 1 $1.rp 1 2)))
+(opform :ld [[addr] rp] #(.. "\xed" (xpqz 1 $1.rp 0 3)))
+(opform :ld [rp [addr]] #(.. "\xed" (xpqz 1 $1.rp 1 3)))
+(opform :neg [] #(.. "\xed" (xyz 1 0 4)))
+(opform :retn [] #(.. "\xed" (xyz 1 0 5)))
+(opform :reti [] #(.. "\xed" (xyz 1 1 5)))
+(opform :im [im] #(.. "\xed" (xyz 1 $1.im 6)))
+(opform :ld [:i :a] #(.. "\xed" (xyz 1 0 7)))
+(opform :ld [:r :a] #(.. "\xed" (xyz 1 1 7)))
+(opform :ld [:a :i] #(.. "\xed" (xyz 1 2 7)))
+(opform :ld [:a :r] #(.. "\xed" (xyz 1 3 7)))
+(opform :rrd [] #(.. "\xed" (xyz 1 4 7)))
+(opform :rld [] #(.. "\xed" (xyz 1 5 7)))
+(opform :ldi [] #(.. "\xed" (xyz 2 4 0)))
+(opform :cpi [] #(.. "\xed" (xyz 2 4 1)))
+(opform :ini [] #(.. "\xed" (xyz 2 4 2)))
+(opform :outi [] #(.. "\xed" (xyz 2 4 3)))
+(opform :ldd [] #(.. "\xed" (xyz 2 5 0)))
+(opform :cpd [] #(.. "\xed" (xyz 2 5 1)))
+(opform :ind [] #(.. "\xed" (xyz 2 5 2)))
+(opform :outd [] #(.. "\xed" (xyz 2 5 3)))
+(opform :ldir [] #(.. "\xed" (xyz 2 6 0)))
+(opform :cpir [] #(.. "\xed" (xyz 2 6 1)))
+(opform :inir [] #(.. "\xed" (xyz 2 6 2)))
+(opform :otir [] #(.. "\xed" (xyz 2 6 3)))
+(opform :lddr [] #(.. "\xed" (xyz 2 7 0)))
+(opform :cpdr [] #(.. "\xed" (xyz 2 7 1)))
+(opform :indr [] #(.. "\xed" (xyz 2 7 2)))
+(opform :otdr [] #(.. "\xed" (xyz 2 7 3)))
+
+; DDCB / FDCB prefix
+(def-rot (fn [opcode rot]
+  (opform :ld [reg opcode [ix rel-addr]]
+          #(when (not= $1.reg 6) (.. $1.ixprefix "\xcb" (xyz 0 rot $1.reg))))
+  (opform opcode [[ix rel-addr]] #(.. $1.ixprefix "\xcb" (xyz 0 rot 6)))))
+(opform :bit [num [ix rel-addr]] #(.. $1.ixprefix "\xcb" (xyz 1 $1.num 0)))
+(opform :ld [reg :res num [ix rel-addr]]
+        #(when (not= $1.reg 6) (.. $1.ixprefix "\xcb" (xyz 2 $1.num $1.reg))))
+(opform :res [num [ix rel-addr]] #(.. $1.ixprefix "\xcb" (xyz 2 $1.num 6)))
+(opform :ld [reg :set num [ix rel-addr]]
+        #(when (not= $1.reg 6) (.. $1.ixprefix "\xcb" (xyz 3 $1.num $1.reg))))
+(opform :set [num [ix rel-addr]] #(.. $1.ixprefix "\xcb" (xyz 3 $1.num 6)))
+
+(fn parse-op [[opcode &as op]]
+  (let [result ((. opcodes opcode) op)]
+    (if (= result nil) (error (.. "no such opcode " (fennel.view op)))
+        result)))
+
+(local op-pdat {})
+(fn op-pdat.size [op env]
+  (+ (length op.prefix)
+     (case op
+       {: addr}  2
+       {: rel8}  1
+       {: imm16} 2
+       {: imm8}  1
+       _         0)))
+
+(fn op-pdat.bytes [op env]
+  (.. op.prefix
+      (case op
+        {: addr}  (int16-to-bytes (env:lookup-addr addr))
+        {: rel8}  (int8-to-bytes (- (env:lookup-addr rel8) op.addr))
+        {: imm16} (int16-to-bytes imm16)
+        {: imm8}  (int8-to-bytes imm8)
+        _         "")))
+
+{: opcodes : parse-op : op-pdat : try-parse-op}
diff --git a/lib/fennel.lua b/lib/fennel.lua
index 5ae7c52..08dd0a4 100644
--- a/lib/fennel.lua
+++ b/lib/fennel.lua
@@ -6,14 +6,14 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
   local view = require("fennel.view")
   local unpack = (table.unpack or _G.unpack)
   local function default_read_chunk(parser_state)
-    local function _519_()
+    local function _631_()
       if (0 < parser_state["stack-size"]) then
         return ".."
       else
         return ">> "
       end
     end
-    io.write(_519_())
+    io.write(_631_())
     io.flush()
     local input = io.read()
     return (input and (input .. "\n"))
@@ -23,62 +23,124 @@ 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 _521_()
-      local _520_ = errtype
-      if (_520_ == "Lua Compile") then
+    local function _633_()
+      local _632_ = errtype
+      if (_632_ == "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 (_520_ == "Runtime") then
+      elseif (_632_ == "Runtime") then
         return (compiler.traceback(tostring(err), 4) .. "\n")
       elseif true then
-        local _ = _520_
+        local _ = _632_
         return ("%s error: %s\n"):format(errtype, tostring(err))
       else
         return nil
       end
     end
-    return io.write(_521_())
+    return io.write(_633_())
   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)
-    local spliced_source = {}
-    local bind = "local %s = ___replLocals___['%s']"
-    for line in lua_source:gmatch("([^\n]+)\n?") do
-      table.insert(spliced_source, line)
-    end
-    for name in pairs(env.___replLocals___) do
-      table.insert(spliced_source, 1, bind:format(name, name))
-    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_())
+  local function splice_save_locals(env, lua_source, scope)
+    local saves
+    do
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
+      for name in pairs(env.___replLocals___) do
+        local val_18_auto = ("local %s = ___replLocals___['%s']"):format(name, name)
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
         else
         end
       end
-      return nil
+      saves = tbl_16_auto
+    end
+    local binds
+    do
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
+      for _, name in pairs(scope.manglings) do
+        local val_18_auto
+        if not scope.gensyms[name] then
+          val_18_auto = ("___replLocals___['%s'] = %s"):format(name, name)
+        else
+          val_18_auto = nil
+        end
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
+      binds = tbl_16_auto
+    end
+    local gap
+    if lua_source:find("\n") then
+      gap = "\n"
+    else
+      gap = " "
+    end
+    local function _639_()
+      if next(saves) then
+        return (table.concat(saves, " ") .. gap)
+      else
+        return ""
+      end
+    end
+    local function _642_()
+      local _640_, _641_ = lua_source:match("^(.*)[\n ](return .*)$")
+      if ((nil ~= _640_) and (nil ~= _641_)) then
+        local body = _640_
+        local _return = _641_
+        return (body .. gap .. table.concat(binds, " ") .. gap .. _return)
+      elseif true then
+        local _ = _640_
+        return lua_source
+      else
+        return nil
+      end
+    end
+    return (_639_() .. _642_())
+  end
+  local function completer(env, scope, text)
+    local max_items = 2000
+    local seen = {}
+    local matches = {}
+    local input_fragment = text:gsub(".*[%s)(]+", "")
+    local stop_looking_3f = false
+    local function add_partials(input, tbl, prefix)
+      local scope_first_3f = ((tbl == env) or (tbl == env.___replLocals___))
+      local tbl_16_auto = matches
+      local i_17_auto = #tbl_16_auto
+      local function _644_()
+        if scope_first_3f then
+          return scope.manglings
+        else
+          return tbl
+        end
+      end
+      for k, is_mangled in utils.allpairs(_644_()) do
+        if (max_items <= #matches) then break end
+        local val_18_auto
+        do
+          local lookup_k
+          if scope_first_3f then
+            lookup_k = is_mangled
+          else
+            lookup_k = k
+          end
+          if ((type(k) == "string") and (input == k:sub(0, #input)) and not seen[k] and ((":" ~= prefix:sub(-1)) or ("function" == type(tbl[lookup_k])))) then
+            seen[k] = true
+            val_18_auto = (prefix .. k)
+          else
+            val_18_auto = nil
+          end
+        end
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
+      return tbl_16_auto
     end
     local function descend(input, tbl, prefix, add_matches, method_3f)
       local splitter
@@ -92,7 +154,7 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
       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)
+          return add_partials(tail, tbl[raw_head], (prefix .. head .. ":"))
         else
           return add_matches(tail, tbl[raw_head], (prefix .. head))
         end
@@ -126,30 +188,30 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
     return input:match("^%s*,")
   end
   local function command_docs()
-    local _532_
+    local _653_
     do
-      local tbl_14_auto = {}
-      local i_15_auto = #tbl_14_auto
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
       for name, f in pairs(commands) do
-        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
+        local val_18_auto = ("  ,%s - %s"):format(name, ((compiler.metadata):get(f, "fnl/docstring") or "undocumented"))
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
         else
         end
       end
-      _532_ = tbl_14_auto
+      _653_ = tbl_16_auto
     end
-    return table.concat(_532_, "\n")
+    return table.concat(_653_, "\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")})
   end
   do end (compiler.metadata):set(commands.help, "fnl/docstring", "Show this message.")
   local function reload(module_name, env, on_values, on_error)
-    local _534_, _535_ = pcall(specials["load-code"]("return require(...)", env), module_name)
-    if ((_534_ == true) and (nil ~= _535_)) then
-      local old = _535_
+    local _655_, _656_ = pcall(specials["load-code"]("return require(...)", env), module_name)
+    if ((_655_ == true) and (nil ~= _656_)) then
+      local old = _656_
       local _
       package.loaded[module_name] = nil
       _ = nil
@@ -161,6 +223,7 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
       else
         new0 = new
       end
+      specials["macro-loaded"][module_name] = nil
       if ((type(old) == "table") and (type(new0) == "table")) then
         for k, v in pairs(new0) do
           old[k] = v
@@ -175,33 +238,41 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
       else
       end
       return on_values({"ok"})
-    elseif ((_534_ == false) and (nil ~= _535_)) then
-      local msg = _535_
-      local function _540_()
-        local _539_ = msg:gsub("\n.*", "")
-        return _539_
+    elseif ((_655_ == false) and (nil ~= _656_)) then
+      local msg = _656_
+      if msg:match("loop or previous error loading module") then
+        package.loaded[module_name] = nil
+        return reload(module_name, env, on_values, on_error)
+      elseif (specials["macro-loaded"])[module_name] then
+        specials["macro-loaded"][module_name] = nil
+        return nil
+      else
+        local function _661_()
+          local _660_ = msg:gsub("\n.*", "")
+          return _660_
+        end
+        return on_error("Runtime", _661_())
       end
-      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_
+    local _664_, _665_, _666_ = pcall(read)
+    if ((_664_ == true) and (_665_ == true) and (nil ~= _666_)) then
+      local val = _666_
       return f(val)
-    elseif (_542_ == false) then
+    elseif (_664_ == 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 function _546_(_241)
+    local function _668_(_241)
       return reload(tostring(_241), env, on_values, on_error)
     end
-    return run_command(read, on_error, _546_)
+    return run_command(read, on_error, _668_)
   end
   do end (compiler.metadata):set(commands.reload, "fnl/docstring", "Reload the specified module.")
   commands.reset = function(env, _, on_values)
@@ -210,30 +281,30 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
   end
   do end (compiler.metadata):set(commands.reset, "fnl/docstring", "Erase all repl-local scope.")
   commands.complete = function(env, read, on_values, on_error, scope, chars)
-    local function _547_()
+    local function _669_()
       return on_values(completer(env, scope, string.char(unpack(chars)):gsub(",complete +", ""):sub(1, -2)))
     end
-    return run_command(read, on_error, _547_)
+    return run_command(read, on_error, _669_)
   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
+        local _670_ = type(subtbl)
+        if (_670_ == "function") then
           if ((prefix .. name)):match(pattern) then
             table.insert(names, (prefix .. name))
           else
           end
-        elseif (_548_ == "table") then
+        elseif (_670_ == "table") then
           if not seen[subtbl] then
-            local _551_
+            local _673_
             do
-              local _550_ = seen
-              _550_[subtbl] = true
-              _551_ = _550_
+              local _672_ = seen
+              _672_[subtbl] = true
+              _673_ = _672_
             end
-            apropos_2a(pattern, subtbl, (prefix .. name:gsub("%.", "/") .. "."), _551_, names)
+            apropos_2a(pattern, subtbl, (prefix .. name:gsub("%.", "/") .. "."), _673_, names)
           else
           end
         else
@@ -245,76 +316,84 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
   end
   local function apropos(pattern)
     local names = apropos_2a(pattern, package.loaded, "", {}, {})
-    local tbl_14_auto = {}
-    local i_15_auto = #tbl_14_auto
+    local tbl_16_auto = {}
+    local i_17_auto = #tbl_16_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
+      local val_18_auto = name:gsub("^_G%.", "")
+      if (nil ~= val_18_auto) then
+        i_17_auto = (i_17_auto + 1)
+        do end (tbl_16_auto)[i_17_auto] = val_18_auto
       else
       end
     end
-    return tbl_14_auto
+    return tbl_16_auto
   end
   commands.apropos = function(_env, read, on_values, on_error, _scope)
-    local function _556_(_241)
+    local function _678_(_241)
       return on_values(apropos(tostring(_241)))
     end
-    return run_command(read, on_error, _556_)
+    return run_command(read, on_error, _678_)
   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
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_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
+        local val_18_auto = p
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
         else
         end
       end
-      paths = tbl_14_auto
+      paths = tbl_16_auto
     end
     local tgt = package.loaded
     for _, path0 in ipairs(paths) do
       if (nil == tgt) then break end
-      local _559_
+      local _681_
       do
-        local _558_ = path0:gsub("%/", ".")
-        _559_ = _558_
+        local _680_ = path0:gsub("%/", ".")
+        _681_ = _680_
       end
-      tgt = tgt[_559_]
+      tgt = tgt[_681_]
     end
     return tgt
   end
   local function apropos_doc(pattern)
-    local names = {}
+    local tbl_16_auto = {}
+    local i_17_auto = #tbl_16_auto
     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)
+      local val_18_auto
+      do
+        local tgt = apropos_follow_path(path)
+        if ("function" == type(tgt)) then
+          local _682_ = (compiler.metadata):get(tgt, "fnl/docstring")
+          if (nil ~= _682_) then
+            local docstr = _682_
+            val_18_auto = (docstr:match(pattern) and path)
           else
+            val_18_auto = nil
           end
         else
+          val_18_auto = nil
         end
+      end
+      if (nil ~= val_18_auto) then
+        i_17_auto = (i_17_auto + 1)
+        do end (tbl_16_auto)[i_17_auto] = val_18_auto
       else
       end
     end
-    return names
+    return tbl_16_auto
   end
   commands["apropos-doc"] = function(_env, read, on_values, on_error, _scope)
-    local function _564_(_241)
+    local function _686_(_241)
       return on_values(apropos_doc(tostring(_241)))
     end
-    return run_command(read, on_error, _564_)
+    return run_command(read, on_error, _686_)
   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)
@@ -329,89 +408,116 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
     return nil
   end
   commands["apropos-show-docs"] = function(_env, read, on_values, on_error)
-    local function _566_(_241)
+    local function _688_(_241)
       return apropos_show_docs(on_values, tostring(_241))
     end
-    return run_command(read, on_error, _566_)
+    return run_command(read, on_error, _688_)
   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 function resolve(identifier, _689_, scope)
+    local _arg_690_ = _689_
+    local ___replLocals___ = _arg_690_["___replLocals___"]
+    local env = _arg_690_
     local e
-    local function _569_(_241, _242)
+    local function _691_(_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)()
+    e = setmetatable({}, {__index = _691_})
+    local _692_, _693_ = pcall(compiler["compile-string"], tostring(identifier), {scope = scope})
+    if ((_692_ == true) and (nil ~= _693_)) then
+      local code = _693_
+      return specials["load-code"](code, e)()
+    else
+      return nil
+    end
   end
   commands.find = function(env, read, on_values, on_error, scope)
-    local function _570_(_241)
-      local _571_
+    local function _695_(_241)
+      local _696_
       do
-        local _572_ = utils["sym?"](_241)
-        if (nil ~= _572_) then
-          local _573_ = resolve(_572_, env, scope)
-          if (nil ~= _573_) then
-            _571_ = debug.getinfo(_573_)
+        local _697_ = utils["sym?"](_241)
+        if (nil ~= _697_) then
+          local _698_ = resolve(_697_, env, scope)
+          if (nil ~= _698_) then
+            _696_ = debug.getinfo(_698_)
           else
-            _571_ = _573_
+            _696_ = _698_
           end
         else
-          _571_ = _572_
+          _696_ = _697_
         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
+      if ((_G.type(_696_) == "table") and ((_696_).what == "Lua") and (nil ~= (_696_).source) and (nil ~= (_696_).linedefined) and (nil ~= (_696_).short_src)) then
+        local source = (_696_).source
+        local line = (_696_).linedefined
+        local src = (_696_).short_src
         local fnlsrc
         do
-          local t_576_ = compiler.sourcemap
-          if (nil ~= t_576_) then
-            t_576_ = (t_576_)[source]
+          local t_701_ = compiler.sourcemap
+          if (nil ~= t_701_) then
+            t_701_ = (t_701_)[source]
           else
           end
-          if (nil ~= t_576_) then
-            t_576_ = (t_576_)[line]
+          if (nil ~= t_701_) then
+            t_701_ = (t_701_)[line]
           else
           end
-          if (nil ~= t_576_) then
-            t_576_ = (t_576_)[2]
+          if (nil ~= t_701_) then
+            t_701_ = (t_701_)[2]
           else
           end
-          fnlsrc = t_576_
+          fnlsrc = t_701_
         end
         return on_values({string.format("%s:%s", src, (fnlsrc or line))})
-      elseif (_571_ == nil) then
+      elseif (_696_ == nil) then
         return on_error("Repl", "Unknown value")
       elseif true then
-        local _ = _571_
+        local _ = _696_
         return on_error("Repl", "No source info")
       else
         return nil
       end
     end
-    return run_command(read, on_error, _570_)
+    return run_command(read, on_error, _695_)
   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 function _706_(_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)})
+      local path = (utils["multi-sym?"](name) or {name})
+      local ok_3f, target = nil, nil
+      local function _707_()
+        return (utils["get-in"](scope.specials, path) or utils["get-in"](scope.macros, path) or resolve(name, env, scope))
+      end
+      ok_3f, target = pcall(_707_)
+      if ok_3f then
+        return on_values({specials.doc(target, name)})
+      else
+        return on_error("Repl", "Could not resolve value for docstring lookup")
+      end
     end
-    return run_command(read, on_error, _581_)
+    return run_command(read, on_error, _706_)
   end
   do end (compiler.metadata):set(commands.doc, "fnl/docstring", "Print the docstring and arglist for a function, macro, or special form.")
+  commands.compile = function(env, read, on_values, on_error, scope)
+    local function _709_(_241)
+      local allowedGlobals = specials["current-global-names"](env)
+      local ok_3f, result = pcall(compiler.compile, _241, {env = env, scope = scope, allowedGlobals = allowedGlobals})
+      if ok_3f then
+        return on_values({result})
+      else
+        return on_error("Repl", ("Error compiling expression: " .. result))
+      end
+    end
+    return run_command(read, on_error, _709_)
+  end
+  do end (compiler.metadata):set(commands.compile, "fnl/docstring", "compiles the expression into lua and prints the result.")
   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_
+        local _711_ = name:match("^repl%-command%-(.*)")
+        if (nil ~= _711_) then
+          local cmd_name = _711_
           commands[cmd_name] = (commands[cmd_name] or f)
         else
         end
@@ -422,12 +528,12 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
   local function run_command_loop(input, read, loop, env, on_values, on_error, scope, chars)
     local command_name = input:match(",([^%s/]+)")
     do
-      local _584_ = commands[command_name]
-      if (nil ~= _584_) then
-        local command = _584_
+      local _713_ = commands[command_name]
+      if (nil ~= _713_) then
+        local command = _713_
         command(env, read, on_values, on_error, scope, chars)
       elseif true then
-        local _ = _584_
+        local _ = _713_
         if ("exit" ~= command_name) then
           on_values({"Unknown command", command_name})
         else
@@ -441,11 +547,66 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
       return nil
     end
   end
-  local function repl(options)
+  local function try_readline_21(opts, ok, readline)
+    if ok then
+      if readline.set_readline_name then
+        readline.set_readline_name("fennel")
+      else
+      end
+      readline.set_options({keeplines = 1000, histfile = ""})
+      opts.readChunk = function(parser_state)
+        local prompt
+        if (0 < parser_state["stack-size"]) then
+          prompt = ".. "
+        else
+          prompt = ">> "
+        end
+        local str = readline.readline(prompt)
+        if str then
+          return (str .. "\n")
+        else
+          return nil
+        end
+      end
+      local completer0 = nil
+      opts.registerCompleter = function(repl_completer)
+        completer0 = repl_completer
+        return nil
+      end
+      local function repl_completer(text, from, to)
+        if completer0 then
+          readline.set_completion_append_character("")
+          return completer0(text:sub(from, to))
+        else
+          return {}
+        end
+      end
+      readline.set_complete_function(repl_completer)
+      return readline
+    else
+      return nil
+    end
+  end
+  local function should_use_readline_3f(opts)
+    return (("dumb" ~= os.getenv("TERM")) and not opts.readChunk and not opts.registerCompleter)
+  end
+  local function repl(_3foptions)
     local old_root_options = utils.root.options
-    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 = utils.copy(options)
+    local _let_722_ = utils.copy(_3foptions)
+    local _3ffennelrc = _let_722_["fennelrc"]
+    local opts = _let_722_
+    local _
+    opts.fennelrc = nil
+    _ = nil
+    local readline = (should_use_readline_3f(opts) and try_readline_21(opts, pcall(require, "readline")))
+    local _0
+    if _3ffennelrc then
+      _0 = _3ffennelrc()
+    else
+      _0 = nil
+    end
+    local env = specials["wrap-env"]((opts.env or rawget(_G, "_ENV") or _G))
+    local save_locals_3f = (opts.saveLocals ~= false)
     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)
@@ -453,28 +614,28 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
     local byte_stream, clear_stream = parser.granulate(read_chunk)
     local chars = {}
     local read, reset = nil, nil
-    local function _588_(parser_state)
+    local function _724_(parser_state)
       local c = byte_stream(parser_state)
       table.insert(chars, c)
       return c
     end
-    read, reset = parser.parser(_588_)
+    read, reset = parser.parser(_724_)
     opts.env, opts.scope = env, compiler["make-scope"]()
-    opts.useMetadata = (options.useMetadata ~= false)
+    opts.useMetadata = (opts.useMetadata ~= false)
     if (opts.allowedGlobals == nil) then
       opts.allowedGlobals = specials["current-global-names"](env)
     else
     end
     if opts.registerCompleter then
-      local function _592_()
-        local _590_ = env
-        local _591_ = opts.scope
-        local function _593_(...)
-          return completer(_590_, _591_, ...)
+      local function _728_()
+        local _726_ = env
+        local _727_ = opts.scope
+        local function _729_(...)
+          return completer(_726_, _727_, ...)
         end
-        return _593_
+        return _729_
       end
-      opts.registerCompleter(_592_())
+      opts.registerCompleter(_728_())
     else
     end
     load_plugin_commands(opts.plugins)
@@ -503,54 +664,56 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
         chars[k] = nil
       end
       reset()
-      local ok, parse_ok_3f, x = pcall(read)
+      local ok, parser_not_eof_3f, x = pcall(read)
       local src_string = string.char(unpack(chars))
+      local readline_not_eof_3f = (not readline or (src_string ~= "(null)"))
+      local not_eof_3f = (readline_not_eof_3f and parser_not_eof_3f)
       if not ok then
-        on_error("Parse", parse_ok_3f)
+        on_error("Parse", not_eof_3f)
         clear_stream()
         return loop()
       elseif command_3f(src_string) then
         return run_command_loop(src_string, read, loop, env, on_values, on_error, opts.scope, chars)
       else
-        if parse_ok_3f then
+        if not_eof_3f then
           do
-            local _597_, _598_ = nil, nil
-            local function _600_()
-              local _599_ = opts
-              _599_["source"] = src_string
-              return _599_
+            local _733_, _734_ = nil, nil
+            local function _736_()
+              local _735_ = opts
+              _735_["source"] = src_string
+              return _735_
             end
-            _597_, _598_ = pcall(compiler.compile, x, _600_())
-            if ((_597_ == false) and (nil ~= _598_)) then
-              local msg = _598_
+            _733_, _734_ = pcall(compiler.compile, x, _736_())
+            if ((_733_ == false) and (nil ~= _734_)) then
+              local msg = _734_
               clear_stream()
               on_error("Compile", msg)
-            elseif ((_597_ == true) and (nil ~= _598_)) then
-              local src = _598_
+            elseif ((_733_ == true) and (nil ~= _734_)) then
+              local src = _734_
               local src0
               if save_locals_3f then
                 src0 = splice_save_locals(env, src, opts.scope)
               else
                 src0 = src
               end
-              local _602_, _603_ = pcall(specials["load-code"], src0, env)
-              if ((_602_ == false) and (nil ~= _603_)) then
-                local msg = _603_
+              local _738_, _739_ = pcall(specials["load-code"], src0, env)
+              if ((_738_ == false) and (nil ~= _739_)) then
+                local msg = _739_
                 clear_stream()
                 on_error("Lua Compile", msg, src0)
-              elseif (true and (nil ~= _603_)) then
-                local _ = _602_
-                local chunk = _603_
-                local function _604_()
+              elseif (true and (nil ~= _739_)) then
+                local _1 = _738_
+                local chunk = _739_
+                local function _740_()
                   return print_values(chunk())
                 end
-                local function _605_()
-                  local function _606_(...)
+                local function _741_()
+                  local function _742_(...)
                     return on_error("Runtime", ...)
                   end
-                  return _606_
+                  return _742_
                 end
-                xpcall(_604_, _605_())
+                xpcall(_740_, _741_())
               else
               end
             else
@@ -563,7 +726,12 @@ package.preload["fennel.repl"] = package.preload["fennel.repl"] or function(...)
         end
       end
     end
-    return loop()
+    loop()
+    if readline then
+      return readline.save_history()
+    else
+      return nil
+    end
   end
   return repl
 end
@@ -575,15 +743,15 @@ 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 _345_(_, key)
-      if (type(key) == "string") then
+    local function _424_(_, key)
+      if utils["string?"](key) then
         return env[compiler["global-unmangling"](key)]
       else
         return env[key]
       end
     end
-    local function _347_(_, key, value)
-      if (type(key) == "string") then
+    local function _426_(_, key, value)
+      if utils["string?"](key) then
         env[compiler["global-unmangling"](key)] = value
         return nil
       else
@@ -591,38 +759,36 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
         return nil
       end
     end
-    local function _349_()
+    local function _428_()
       local function putenv(k, v)
-        local _350_
-        if (type(k) == "string") then
-          _350_ = compiler["global-unmangling"](k)
+        local _429_
+        if utils["string?"](k) then
+          _429_ = compiler["global-unmangling"](k)
         else
-          _350_ = k
+          _429_ = k
         end
-        return _350_, v
+        return _429_, v
       end
       return next, utils.kvmap(env, putenv), nil
     end
-    return setmetatable({}, {__index = _345_, __newindex = _347_, __pairs = _349_})
+    return setmetatable({}, {__index = _424_, __newindex = _426_, __pairs = _428_})
   end
   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 = {}
+      local _431_ = getmetatable(_3fenv)
+      if ((_G.type(_431_) == "table") and (nil ~= (_431_).__pairs)) then
+        local mtpairs = (_431_).__pairs
+        local tbl_13_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
+          local k_14_auto, v_15_auto = k, v
+          if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+            tbl_13_auto[k_14_auto] = v_15_auto
           else
           end
         end
-        mt = tbl_11_auto
-      elseif (_352_ == nil) then
+        mt = tbl_13_auto
+      elseif (_431_ == nil) then
         mt = (_3fenv or _G)
       else
         mt = nil
@@ -632,13 +798,19 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   end
   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, _3ffilename))
-      local _357_ = f
-      setfenv(_357_, env)
-      return _357_
-    else
+    local _434_, _435_ = rawget(_G, "setfenv"), rawget(_G, "loadstring")
+    if ((nil ~= _434_) and (nil ~= _435_)) then
+      local setfenv = _434_
+      local loadstring = _435_
+      local f = assert(loadstring(code, _3ffilename))
+      local _436_ = f
+      setfenv(_436_, env)
+      return _436_
+    elseif true then
+      local _ = _434_
       return assert(load(code, _3ffilename, "t", env))
+    else
+      return nil
     end
   end
   local function doc_2a(tgt, name)
@@ -649,13 +821,13 @@ 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 {"#<unknown-arguments>"}), " ")
-        local _359_
-        if (#arglist > 0) then
-          _359_ = " "
+        local _438_
+        if (0 < #arglist) then
+          _438_ = " "
         else
-          _359_ = ""
+          _438_ = ""
         end
-        return string.format("(%s%s%s)\n  %s", name, _359_, arglist, docstring)
+        return string.format("(%s%s%s)\n  %s", name, _438_, arglist, docstring)
       else
         return string.format("%s\n  %s", name, docstring)
       end
@@ -742,59 +914,77 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     return exprs
   end
   doc_special("values", {"..."}, "Return multiple values from a function. Must be in tail position.")
-  local function deep_tostring(x, key_3f)
-    if utils["sequence?"](x) then
-      local _368_
-      do
-        local tbl_14_auto = {}
-        local i_15_auto = #tbl_14_auto
-        for _, v in ipairs(x) do
-          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
-        _368_ = tbl_14_auto
-      end
-      return ("[" .. table.concat(_368_, " ") .. "]")
-    elseif utils["table?"](x) then
-      local _370_
-      do
-        local tbl_14_auto = {}
-        local i_15_auto = #tbl_14_auto
-        for k, v in pairs(x) do
-          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
-        _370_ = tbl_14_auto
-      end
-      return ("{" .. table.concat(_370_, " ") .. "}")
-    elseif (key_3f and (type(x) == "string") and x:find("^[-%w?\\^_!$%&*+./@:|<=>]+$")) then
-      return (":" .. x)
-    elseif (type(x) == "string") then
-      return string.format("%q", x):gsub("\\\"", "\\\\\""):gsub("\"", "\\\"")
-    else
-      return tostring(x)
+  local function __3estack(stack, tbl)
+    for k, v in pairs(tbl) do
+      local _447_ = stack
+      table.insert(_447_, k)
+      table.insert(_447_, v)
     end
+    return stack
   end
-  local function set_fn_metadata(arg_list, docstring, parent, fn_name)
-    if utils.root.options.useMetadata then
-      local args
-      local function _373_(_241)
-        return ("\"%s\""):format(deep_tostring(_241))
+  local function literal_3f(val)
+    local res = true
+    if utils["list?"](val) then
+      res = false
+    elseif utils["table?"](val) then
+      local stack = __3estack({}, val)
+      for _, elt in ipairs(stack) do
+        if not res then break end
+        if utils["list?"](elt) then
+          res = false
+        elseif utils["table?"](elt) then
+          __3estack(stack, elt)
+        else
+        end
       end
-      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
+    return res
+  end
+  local function compile_value(v)
+    local opts = {nval = 1, tail = false}
+    local scope = compiler["make-scope"]()
+    local chunk = {}
+    local _let_450_ = compiler.compile1(v, scope, chunk, opts)
+    local _let_451_ = _let_450_[1]
+    local v0 = _let_451_[1]
+    return v0
+  end
+  local function insert_meta(meta, k, v)
+    local view_opts = {["escape-newlines?"] = true, ["line-length"] = math.huge, ["one-line?"] = true}
+    compiler.assert((type(k) == "string"), ("expected string keys in metadata table, got: %s"):format(view(k, view_opts)))
+    compiler.assert(literal_3f(v), ("expected literal value in metadata table, got: %s %s"):format(view(k, view_opts), view(v, view_opts)))
+    local _452_ = meta
+    table.insert(_452_, view(k))
+    local function _453_()
+      if ("string" == type(v)) then
+        return view(v, view_opts)
       else
+        return compile_value(v)
+      end
+    end
+    table.insert(_452_, _453_())
+    return _452_
+  end
+  local function insert_arglist(meta, arg_list)
+    local view_opts = {["one-line?"] = true, ["escape-newlines?"] = true, ["line-length"] = math.huge}
+    local _454_ = meta
+    table.insert(_454_, "\"fnl/arglist\"")
+    local function _455_(_241)
+      return view(view(_241, view_opts))
+    end
+    table.insert(_454_, ("{" .. table.concat(utils.map(arg_list, _455_), ", ") .. "}"))
+    return _454_
+  end
+  local function set_fn_metadata(f_metadata, parent, fn_name)
+    if utils.root.options.useMetadata then
+      local meta_fields = {}
+      for k, v in utils.stablepairs(f_metadata) do
+        if (k == "fnl/arglist") then
+          insert_arglist(meta_fields, v)
+        else
+          insert_meta(meta_fields, k, v)
+        end
       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, ", ")))
@@ -804,44 +994,86 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   end
   local function get_fn_name(ast, scope, fn_name, multi)
     if (fn_name and (fn_name[1] ~= "nil")) then
-      local _376_
+      local _458_
       if not multi then
-        _376_ = compiler["declare-local"](fn_name, {}, scope, ast)
+        _458_ = compiler["declare-local"](fn_name, {}, scope, ast)
       else
-        _376_ = (compiler["symbol-to-expression"](fn_name, scope))[1]
+        _458_ = (compiler["symbol-to-expression"](fn_name, scope))[1]
       end
-      return _376_, not multi, 3
+      return _458_, not multi, 3
     else
       return nil, true, 2
     end
   end
-  local function compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, local_3f, arg_name_list, arg_list, docstring)
+  local function compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, local_3f, arg_name_list, f_metadata)
     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 _379_
+    local _461_
     if local_3f then
-      _379_ = "local function %s(%s)"
+      _461_ = "local function %s(%s)"
     else
-      _379_ = "%s = function(%s)"
+      _461_ = "%s = function(%s)"
     end
-    compiler.emit(parent, string.format(_379_, fn_name, table.concat(arg_name_list, ", ")), ast)
+    compiler.emit(parent, string.format(_461_, 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)
+    set_fn_metadata(f_metadata, parent, fn_name)
     utils.hook("fn", ast, f_scope)
     return utils.expr(fn_name, "sym")
   end
-  local function compile_anonymous_fn(ast, f_scope, f_chunk, parent, index, arg_name_list, arg_list, docstring, scope)
+  local function compile_anonymous_fn(ast, f_scope, f_chunk, parent, index, arg_name_list, f_metadata, scope)
     local fn_name = compiler.gensym(scope)
-    return compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, true, arg_name_list, arg_list, docstring)
+    return compile_named_fn(ast, f_scope, f_chunk, parent, index, fn_name, true, arg_name_list, f_metadata)
+  end
+  local function assoc_table_3f(t)
+    local len = #t
+    local nxt, t0, k = pairs(t)
+    local function _463_()
+      if (len == 0) then
+        return k
+      else
+        return len
+      end
+    end
+    return (nil ~= nxt(t0, _463_()))
+  end
+  local function get_function_metadata(ast, arg_list, index)
+    local f_metadata = {["fnl/arglist"] = arg_list}
+    local index_2a = (index + 1)
+    local expr = ast[index_2a]
+    if (utils["string?"](expr) and (index_2a < #ast)) then
+      local _465_
+      do
+        local _464_ = f_metadata
+        _464_["fnl/docstring"] = expr
+        _465_ = _464_
+      end
+      return _465_, index_2a
+    elseif (utils["table?"](expr) and (index_2a < #ast) and assoc_table_3f(expr)) then
+      local _466_
+      do
+        local tbl_13_auto = f_metadata
+        for k, v in pairs(expr) do
+          local k_14_auto, v_15_auto = k, v
+          if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+            tbl_13_auto[k_14_auto] = v_15_auto
+          else
+          end
+        end
+        _466_ = tbl_13_auto
+      end
+      return _466_, index_2a
+    else
+      return f_metadata, index
+    end
   end
   SPECIALS.fn = function(ast, scope, parent)
     local f_scope
     do
-      local _381_ = compiler["make-scope"](scope)
-      do end (_381_)["vararg"] = false
-      f_scope = _381_
+      local _469_ = compiler["make-scope"](scope)
+      do end (_469_)["vararg"] = false
+      f_scope = _469_
     end
     local f_chunk = {}
     local fn_sym = utils["sym?"](ast[2])
@@ -849,61 +1081,82 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     local fn_name, local_3f, index = get_fn_name(ast, scope, fn_sym, multi)
     local arg_list = compiler.assert(utils["table?"](ast[index]), "expected parameters table", ast)
     compiler.assert((not multi or not multi["multi-sym-method-call"]), ("unexpected multi symbol " .. tostring(fn_name)), fn_sym)
-    local function get_arg_name(arg)
-      if utils["varg?"](arg) then
+    local function destructure_arg(arg)
+      local raw = utils.sym(compiler.gensym(scope))
+      local declared = compiler["declare-local"](raw, {}, f_scope, ast)
+      compiler.destructure(arg, raw, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"})
+      return declared
+    end
+    local function destructure_amp(i)
+      compiler.assert((i == (#arg_list - 1)), "expected rest argument before last parameter", arg_list[(i + 1)], arg_list)
+      f_scope.vararg = true
+      compiler.destructure(arg_list[#arg_list], {utils.varg()}, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"})
+      return "..."
+    end
+    local function get_arg_name(arg, i)
+      if f_scope.vararg then
+        return nil
+      elseif utils["varg?"](arg) then
         compiler.assert((arg == arg_list[#arg_list]), "expected vararg as last parameter", ast)
         f_scope.vararg = true
         return "..."
+      elseif (utils.sym("&") == arg) then
+        return destructure_amp(i)
       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))
-        local declared = compiler["declare-local"](raw, {}, f_scope, ast)
-        compiler.destructure(arg, raw, ast, f_scope, f_chunk, {declaration = true, nomulti = true, symtype = "arg"})
-        return declared
+        return destructure_arg(arg)
       else
         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)
-    local index0, docstring = nil, nil
-    if ((type(ast[(index + 1)]) == "string") and ((index + 1) < #ast)) then
-      index0, docstring = (index + 1), ast[(index + 1)]
-    else
-      index0, docstring = index, nil
+    local arg_name_list
+    do
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
+      for i, a in ipairs(arg_list) do
+        local val_18_auto = get_arg_name(a, i)
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
+      arg_name_list = tbl_16_auto
     end
+    local f_metadata, index0 = get_function_metadata(ast, arg_list, index)
     if fn_name then
-      return compile_named_fn(ast, f_scope, f_chunk, parent, index0, fn_name, local_3f, arg_name_list, arg_list, docstring)
+      return compile_named_fn(ast, f_scope, f_chunk, parent, index0, fn_name, local_3f, arg_name_list, f_metadata)
     else
-      return compile_anonymous_fn(ast, f_scope, f_chunk, parent, index0, arg_name_list, arg_list, docstring, scope)
+      return compile_anonymous_fn(ast, f_scope, f_chunk, parent, index0, arg_name_list, f_metadata, 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.", true)
+  doc_special("fn", {"name?", "args", "docstring?", "..."}, "Function syntax. May optionally include a name and docstring or a metadata table.\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)
-    local _386_
+    local _474_
     do
-      local _385_ = utils["sym?"](ast[2])
-      if (nil ~= _385_) then
-        _386_ = tostring(_385_)
+      local _473_ = utils["sym?"](ast[2])
+      if (nil ~= _473_) then
+        _474_ = tostring(_473_)
       else
-        _386_ = _385_
+        _474_ = _473_
       end
     end
-    if ("nil" ~= _386_) then
+    if ("nil" ~= _474_) then
       table.insert(parent, {ast = ast, leaf = tostring(ast[2])})
     else
     end
-    local _390_
+    local _478_
     do
-      local _389_ = utils["sym?"](ast[3])
-      if (nil ~= _389_) then
-        _390_ = tostring(_389_)
+      local _477_ = utils["sym?"](ast[3])
+      if (nil ~= _477_) then
+        _478_ = tostring(_477_)
       else
-        _390_ = _389_
+        _478_ = _477_
       end
     end
-    if ("nil" ~= _390_) then
+    if ("nil" ~= _478_) then
       return tostring(ast[3])
     else
       return nil
@@ -912,19 +1165,19 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   local function dot(ast, scope, parent)
     compiler.assert((1 < #ast), "expected table argument", ast)
     local len = #ast
-    local _let_393_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
-    local lhs = _let_393_[1]
+    local _let_481_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
+    local lhs = _let_481_[1]
     if (len == 2) then
       return tostring(lhs)
     else
       local indices = {}
       for i = 3, len do
         local index = ast[i]
-        if ((type(index) == "string") and utils["valid-lua-identifier?"](index)) then
+        if (utils["string?"](index) and utils["valid-lua-identifier?"](index)) then
           table.insert(indices, ("." .. index))
         else
-          local _let_394_ = compiler.compile1(index, scope, parent, {nval = 1})
-          local index0 = _let_394_[1]
+          local _let_482_ = compiler.compile1(index, scope, parent, {nval = 1})
+          local index0 = _let_482_[1]
           table.insert(indices, ("[" .. tostring(index0) .. "]"))
         end
       end
@@ -969,33 +1222,33 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   end
   doc_special("var", {"name", "val"}, "Introduce new mutable local.")
   local function kv_3f(t)
-    local _398_
+    local _486_
     do
-      local tbl_14_auto = {}
-      local i_15_auto = #tbl_14_auto
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
       for k in pairs(t) do
-        local val_16_auto
-        if not ("number" == type(k)) then
-          val_16_auto = k
+        local val_18_auto
+        if ("number" ~= type(k)) then
+          val_18_auto = k
         else
-          val_16_auto = nil
+          val_18_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
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
         else
         end
       end
-      _398_ = tbl_14_auto
+      _486_ = tbl_16_auto
     end
-    return (_398_)[1]
+    return (_486_)[1]
   end
   SPECIALS.let = function(ast, scope, parent, opts)
     local bindings = ast[2]
     local pre_syms = {}
     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])
+    compiler.assert((3 <= #ast), "expected body expression", ast[1])
     for _ = 1, (opts.nval or 0) do
       table.insert(pre_syms, compiler.gensym(scope))
     end
@@ -1015,24 +1268,24 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     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_
+    local function _491_()
+      local _490_ = get_prev_line(parent)
+      if (nil ~= _490_) then
+        local prev_line = _490_
         return prev_line:match("%)$")
       else
         return nil
       end
     end
-    return (rootstr:match("^{") or _403_())
+    return (rootstr:match("^{") or _491_())
   end
   SPECIALS.tset = function(ast, scope, parent)
-    compiler.assert((#ast > 3), "expected table, key, and value arguments", ast)
+    compiler.assert((3 < #ast), "expected table, key, and value arguments", ast)
     local root = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1]
     local keys = {}
     for i = 3, (#ast - 1) do
-      local _let_405_ = compiler.compile1(ast[i], scope, parent, {nval = 1})
-      local key = _let_405_[1]
+      local _let_493_ = compiler.compile1(ast[i], scope, parent, {nval = 1})
+      local key = _let_493_[1]
       table.insert(keys, tostring(key))
     end
     local value = (compiler.compile1(ast[#ast], scope, parent, {nval = 1}))[1]
@@ -1146,7 +1399,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   SPECIALS["if"] = if_2a
   doc_special("if", {"cond1", "body1", "...", "condN", "bodyN"}, "Conditional form.\nTakes any number of condition/body pairs and evaluates the first body where\nthe condition evaluates to truthy. Similar to cond in other lisps.")
   local function remove_until_condition(bindings)
-    if ("until" == bindings[(#bindings - 1)]) then
+    local last_item = bindings[(#bindings - 1)]
+    if ((utils["sym?"](last_item) and (tostring(last_item) == "&until")) or ("until" == last_item)) then
       table.remove(bindings, (#bindings - 1))
       return table.remove(bindings)
     else
@@ -1155,15 +1409,15 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   end
   local function compile_until(condition, scope, chunk)
     if condition then
-      local _let_414_ = compiler.compile1(condition, scope, chunk, {nval = 1})
-      local condition_lua = _let_414_[1]
+      local _let_502_ = compiler.compile1(condition, scope, chunk, {nval = 1})
+      local condition_lua = _let_502_[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])
+    compiler.assert((3 <= #ast), "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)
@@ -1172,7 +1426,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     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)
+      compiler.assert(not utils["string?"](v), ("unexpected iterator clause " .. tostring(v)), binding)
       if utils["sym?"](v) then
         return compiler["declare-local"](v, {}, sub_scope, ast, new_manglings)
       else
@@ -1225,7 +1479,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     local range_args = {}
     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((3 <= #ast), "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], scope, parent, {nval = 1}))[1])
@@ -1239,10 +1493,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   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).", true)
   local function native_method_call(ast, _scope, _parent, target, args)
-    local _let_418_ = ast
-    local _ = _let_418_[1]
-    local _0 = _let_418_[2]
-    local method_string = _let_418_[3]
+    local _let_506_ = ast
+    local _ = _let_506_[1]
+    local _0 = _let_506_[2]
+    local method_string = _let_506_[3]
     local call_string
     if ((target.type == "literal") or (target.type == "varg") or (target.type == "expression")) then
       call_string = "(%s):%s(%s)"
@@ -1264,21 +1518,21 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   end
   local function method_call(ast, scope, parent)
     compiler.assert((2 < #ast), "expected at least 2 arguments", ast)
-    local _let_420_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
-    local target = _let_420_[1]
+    local _let_508_ = compiler.compile1(ast[2], scope, parent, {nval = 1})
+    local target = _let_508_[1]
     local args = {}
     for i = 4, #ast do
       local subexprs
-      local _421_
+      local _509_
       if (i ~= #ast) then
-        _421_ = 1
+        _509_ = 1
       else
-        _421_ = nil
+        _509_ = nil
       end
-      subexprs = compiler.compile1(ast[i], scope, parent, {nval = _421_})
+      subexprs = compiler.compile1(ast[i], scope, parent, {nval = _509_})
       utils.map(subexprs, tostring, args)
     end
-    if ((type(ast[3]) == "string") and utils["valid-lua-identifier?"](ast[3])) then
+    if (utils["string?"](ast[3]) and utils["valid-lua-identifier?"](ast[3])) then
       return native_method_call(ast, scope, parent, target, args)
     elseif (target.type == "sym") then
       return nonnative_method_call(ast, scope, parent, target, args)
@@ -1293,7 +1547,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     for i = 2, #ast do
       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.", true)
   local function hashfn_max_used(f_scope, i, max)
@@ -1313,10 +1567,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     compiler.assert((#ast == 2), "expected one argument", ast)
     local f_scope
     do
-      local _426_ = compiler["make-scope"](scope)
-      do end (_426_)["vararg"] = false
-      _426_["hashfn"] = true
-      f_scope = _426_
+      local _514_ = compiler["make-scope"](scope)
+      do end (_514_)["vararg"] = false
+      _514_["hashfn"] = true
+      f_scope = _514_
     end
     local f_chunk = {}
     local name = compiler.gensym(scope)
@@ -1332,7 +1586,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
         f_scope.vararg = true
         return nil
       else
-        return (utils["list?"](node) or utils["table?"](node))
+        return (("table" == type(node)) and (utils.sym("hashfn") ~= node[1]) and (utils["list?"](node) or utils["table?"](node)))
       end
     end
     utils["walk-tree"](ast[2], walker)
@@ -1354,52 +1608,63 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     return utils.expr(name, "sym")
   end
   doc_special("hashfn", {"..."}, "Function literal shorthand; args are either $... OR $1, $2, etc.")
+  local function maybe_short_circuit_protect(ast, i, name, _518_)
+    local _arg_519_ = _518_
+    local mac = _arg_519_["macros"]
+    local call = (utils["list?"](ast) and tostring(ast[1]))
+    if ((("or" == name) or ("and" == name)) and (1 < i) and (mac[call] or ("set" == call) or ("tset" == call) or ("global" == call))) then
+      return utils.list(utils.sym("do"), ast)
+    else
+      return ast
+    end
+  end
   local function arithmetic_special(name, zero_arity, unary_prefix, ast, scope, parent)
     local len = #ast
     local operands = {}
     local padded_op = (" " .. name .. " ")
     for i = 2, len do
-      local subexprs = compiler.compile1(ast[i], scope, parent)
+      local subast = maybe_short_circuit_protect(ast[i], i, name, scope)
+      local subexprs = compiler.compile1(subast, scope, parent)
       if (i == len) then
         utils.map(subexprs, tostring, operands)
       else
         table.insert(operands, tostring(subexprs[1]))
       end
     end
-    local _431_ = #operands
-    if (_431_ == 0) then
-      local _433_
+    local _522_ = #operands
+    if (_522_ == 0) then
+      local _524_
       do
-        local _432_ = zero_arity
-        compiler.assert(_432_, "Expected more than 0 arguments", ast)
-        _433_ = _432_
+        local _523_ = zero_arity
+        compiler.assert(_523_, "Expected more than 0 arguments", ast)
+        _524_ = _523_
       end
-      return utils.expr(_433_, "literal")
-    elseif (_431_ == 1) then
+      return utils.expr(_524_, "literal")
+    elseif (_522_ == 1) then
       if unary_prefix then
         return ("(" .. unary_prefix .. padded_op .. operands[1] .. ")")
       else
         return operands[1]
       end
     elseif true then
-      local _ = _431_
+      local _ = _522_
       return ("(" .. table.concat(operands, padded_op) .. ")")
     else
       return nil
     end
   end
   local function define_arithmetic_special(name, zero_arity, unary_prefix, _3flua_name)
-    local _439_
+    local _530_
     do
-      local _436_ = (_3flua_name or name)
-      local _437_ = zero_arity
-      local _438_ = unary_prefix
-      local function _440_(...)
-        return arithmetic_special(_436_, _437_, _438_, ...)
+      local _527_ = (_3flua_name or name)
+      local _528_ = zero_arity
+      local _529_ = unary_prefix
+      local function _531_(...)
+        return arithmetic_special(_527_, _528_, _529_, ...)
       end
-      _439_ = _440_
+      _530_ = _531_
     end
-    SPECIALS[name] = _439_
+    SPECIALS[name] = _530_
     return doc_special(name, {"a", "b", "..."}, "Arithmetic operator; works the same as Lua but accepts more arguments.")
   end
   define_arithmetic_special("+", "0")
@@ -1428,13 +1693,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
       local prefixed_lib_name = ("bit." .. lib_name)
       for i = 2, len do
         local subexprs
-        local _441_
+        local _532_
         if (i ~= len) then
-          _441_ = 1
+          _532_ = 1
         else
-          _441_ = nil
+          _532_ = nil
         end
-        subexprs = compiler.compile1(ast[i], scope, parent, {nval = _441_})
+        subexprs = compiler.compile1(ast[i], scope, parent, {nval = _532_})
         utils.map(subexprs, tostring, operands)
       end
       if (#operands == 1) then
@@ -1453,18 +1718,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 _451_
+    local _542_
     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_, ...)
+      local _538_ = native
+      local _539_ = name
+      local _540_ = zero_arity
+      local _541_ = unary_prefix
+      local function _543_(...)
+        return bitop_special(_538_, _539_, _540_, _541_, ...)
       end
-      _451_ = _452_
+      _542_ = _543_
     end
-    SPECIALS[name] = _451_
+    SPECIALS[name] = _542_
     return nil
   end
   define_bitop_special("lshift", nil, "1", "<<")
@@ -1478,17 +1743,49 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   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.")
   doc_special("..", {"a", "b", "..."}, "String concatenation operator; works the same as Lua but accepts more arguments.")
-  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]
+  local function native_comparator(op, _544_, scope, parent)
+    local _arg_545_ = _544_
+    local _ = _arg_545_[1]
+    local lhs_ast = _arg_545_[2]
+    local rhs_ast = _arg_545_[3]
+    local _let_546_ = compiler.compile1(lhs_ast, scope, parent, {nval = 1})
+    local lhs = _let_546_[1]
+    local _let_547_ = compiler.compile1(rhs_ast, scope, parent, {nval = 1})
+    local rhs = _let_547_[1]
     return string.format("(%s %s %s)", tostring(lhs), op, tostring(rhs))
   end
+  local function idempotent_comparator(op, chain_op, ast, scope, parent)
+    local vals
+    do
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
+      for i = 2, #ast do
+        local val_18_auto = tostring((compiler.compile1(ast[i], scope, parent, {nval = 1}))[1])
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
+      vals = tbl_16_auto
+    end
+    local comparisons
+    do
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
+      for i = 1, (#vals - 1) do
+        local val_18_auto = string.format("(%s %s %s)", vals[i], op, vals[(i + 1)])
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
+      comparisons = tbl_16_auto
+    end
+    local chain = string.format(" %s ", (chain_op or "and"))
+    return table.concat(comparisons, chain)
+  end
   local function double_eval_protected_comparator(op, chain_op, ast, scope, parent)
     local arglist = {}
     local comparisons = {}
@@ -1498,8 +1795,17 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
       table.insert(arglist, tostring(compiler.gensym(scope)))
       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)]))
+    do
+      local tbl_16_auto = comparisons
+      local i_17_auto = #tbl_16_auto
+      for i = 1, (#arglist - 1) do
+        local val_18_auto = string.format("(%s %s %s)", arglist[i], op, arglist[(i + 1)])
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
     end
     return string.format("(function(%s) return %s end)(%s)", table.concat(arglist, ","), table.concat(comparisons, chain), table.concat(vals, ","))
   end
@@ -1510,6 +1816,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
         compiler.assert((2 < #ast), "expected at least two arguments", ast)
         if (3 == #ast) then
           return native_comparator(op, ast, scope, parent)
+        elseif utils["every?"](utils["idempotent-expr?"], {unpack(ast, 2)}) then
+          return idempotent_comparator(op, _3fchain_op, ast, scope, parent)
         else
           return double_eval_protected_comparator(op, _3fchain_op, ast, scope, parent)
         end
@@ -1562,12 +1870,21 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   end
   local safe_require = nil
   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}
+    local _554_
+    do
+      local _553_ = rawget(_G, "utf8")
+      if (nil ~= _553_) then
+        _554_ = utils.copy(_553_)
+      else
+        _554_ = _553_
+      end
+    end
+    return {table = utils.copy(table), math = utils.copy(math), string = utils.copy(string), pairs = utils.stablepairs, 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, utf8 = _554_}
   end
   local function combined_mt_pairs(env)
     local combined = {}
-    local _let_459_ = getmetatable(env)
-    local __index = _let_459_["__index"]
+    local _let_556_ = getmetatable(env)
+    local __index = _let_556_["__index"]
     if ("table" == type(__index)) then
       for k, v in pairs(__index) do
         combined[k] = v
@@ -1582,58 +1899,58 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   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
+      local _558_ = (_3fopts or utils.root.options)
+      if ((_G.type(_558_) == "table") and ((_558_)["compiler-env"] == "strict")) then
         provided = safe_compiler_env()
-      elseif ((_G.type(_461_) == "table") and (nil ~= (_461_).compilerEnv)) then
-        local compilerEnv = (_461_).compilerEnv
+      elseif ((_G.type(_558_) == "table") and (nil ~= (_558_).compilerEnv)) then
+        local compilerEnv = (_558_).compilerEnv
         provided = compilerEnv
-      elseif ((_G.type(_461_) == "table") and (nil ~= (_461_)["compiler-env"])) then
-        local compiler_env = (_461_)["compiler-env"]
+      elseif ((_G.type(_558_) == "table") and (nil ~= (_558_)["compiler-env"])) then
+        local compiler_env = (_558_)["compiler-env"]
         provided = compiler_env
       elseif true then
-        local _ = _461_
+        local _ = _558_
         provided = safe_compiler_env(false)
       else
         provided = nil
       end
     end
     local env
-    local function _463_(base)
+    local function _560_(base)
       return utils.sym(compiler.gensym((compiler.scopes.macro or scope), base))
     end
-    local function _464_()
+    local function _561_()
       return compiler.scopes.macro
     end
-    local function _465_(symbol)
+    local function _562_(symbol)
       compiler.assert(compiler.scopes.macro, "must call from macro", ast)
       return compiler.scopes.macro.manglings[tostring(symbol)]
     end
-    local function _466_(form)
+    local function _563_(form)
       compiler.assert(compiler.scopes.macro, "must call from macro", ast)
       return compiler.macroexpand(form, compiler.scopes.macro)
     end
-    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 = {_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, ["ast-source"] = utils["ast-source"], 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 = _560_, ["get-scope"] = _561_, ["in-scope?"] = _562_, macroexpand = _563_}
     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
+  local function _565_(...)
+    local tbl_16_auto = {}
+    local i_17_auto = #tbl_16_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
+      local val_18_auto = c
+      if (nil ~= val_18_auto) then
+        i_17_auto = (i_17_auto + 1)
+        do end (tbl_16_auto)[i_17_auto] = val_18_auto
       else
       end
     end
-    return tbl_14_auto
+    return tbl_16_auto
   end
-  local _local_467_ = _468_(...)
-  local dirsep = _local_467_[1]
-  local pathsep = _local_467_[2]
-  local pathmark = _local_467_[3]
+  local _local_564_ = _565_(...)
+  local dirsep = _local_564_[1]
+  local pathsep = _local_564_[2]
+  local pathmark = _local_564_[3]
   local pkg_config = {dirsep = (dirsep or "/"), pathmark = (pathmark or ";"), pathsep = (pathsep or "?")}
   local function escapepat(str)
     return string.gsub(str, "[^%w]", "%%%1")
@@ -1646,20 +1963,48 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     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 _470_ = (io.open(filename) or io.open(filename2))
-      if (nil ~= _470_) then
-        local file = _470_
+      local _567_ = (io.open(filename) or io.open(filename2))
+      if (nil ~= _567_) then
+        local file = _567_
         file:close()
         return filename
+      elseif true then
+        local _ = _567_
+        return nil, ("no file '" .. filename .. "'")
       else
         return nil
       end
     end
-    local function find_in_path(start)
-      local _472_ = fullpath:match(pattern, start)
-      if (nil ~= _472_) then
-        local path = _472_
-        return (try_path(path) or find_in_path((start + #path + 1)))
+    local function find_in_path(start, _3ftried_paths)
+      local _569_ = fullpath:match(pattern, start)
+      if (nil ~= _569_) then
+        local path = _569_
+        local _570_, _571_ = try_path(path)
+        if (nil ~= _570_) then
+          local filename = _570_
+          return filename
+        elseif ((_570_ == nil) and (nil ~= _571_)) then
+          local error = _571_
+          local function _573_()
+            local _572_ = (_3ftried_paths or {})
+            table.insert(_572_, error)
+            return _572_
+          end
+          return find_in_path((start + #path + 1), _573_())
+        else
+          return nil
+        end
+      elseif true then
+        local _ = _569_
+        local function _575_()
+          local tried_paths = table.concat((_3ftried_paths or {}), "\n\9")
+          if (_VERSION < "Lua 5.4") then
+            return ("\n\9" .. tried_paths)
+          else
+            return tried_paths
+          end
+        end
+        return nil, _575_()
       else
         return nil
       end
@@ -1667,61 +2012,80 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     return find_in_path(1)
   end
   local function make_searcher(_3foptions)
-    local function _474_(module_name)
+    local function _578_(module_name)
       local opts = utils.copy(utils.root.options)
       for k, v in pairs((_3foptions or {})) do
         opts[k] = v
       end
       opts["module-name"] = module_name
-      local _475_ = search_module(module_name)
-      if (nil ~= _475_) then
-        local filename = _475_
-        local _478_
+      local _579_, _580_ = search_module(module_name)
+      if (nil ~= _579_) then
+        local filename = _579_
+        local _583_
         do
-          local _476_ = filename
-          local _477_ = opts
-          local function _479_(...)
-            return utils["fennel-module"].dofile(_476_, _477_, ...)
+          local _581_ = filename
+          local _582_ = opts
+          local function _584_(...)
+            return utils["fennel-module"].dofile(_581_, _582_, ...)
           end
-          _478_ = _479_
+          _583_ = _584_
         end
-        return _478_, filename
+        return _583_, filename
+      elseif ((_579_ == nil) and (nil ~= _580_)) then
+        local error = _580_
+        return error
       else
         return nil
       end
     end
-    return _474_
+    return _578_
+  end
+  local function dofile_with_searcher(fennel_macro_searcher, filename, opts, ...)
+    local searchers = (package.loaders or package.searchers or {})
+    local _ = table.insert(searchers, 1, fennel_macro_searcher)
+    local m = utils["fennel-module"].dofile(filename, opts, ...)
+    table.remove(searchers, 1)
+    return m
   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_
+      local _586_ = utils.copy(utils.root.options)
+      do end (_586_)["module-name"] = module_name
+      _586_["env"] = "_COMPILER"
+      _586_["requireAsInclude"] = false
+      _586_["allowedGlobals"] = nil
+      opts = _586_
     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_, ...)
+    local _587_ = search_module(module_name, utils["fennel-module"]["macro-path"])
+    if (nil ~= _587_) then
+      local filename = _587_
+      local _588_
+      if (opts["compiler-env"] == _G) then
+        local _589_ = fennel_macro_searcher
+        local _590_ = filename
+        local _591_ = opts
+        local function _593_(...)
+          return dofile_with_searcher(_589_, _590_, _591_, ...)
         end
-        _485_ = _486_
+        _588_ = _593_
+      else
+        local _594_ = filename
+        local _595_ = opts
+        local function _597_(...)
+          return utils["fennel-module"].dofile(_594_, _595_, ...)
+        end
+        _588_ = _597_
       end
-      return _485_, filename
+      return _588_, 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 _600_ = search_module(module_name, package.path)
+    if (nil ~= _600_) then
+      local filename = _600_
       local code
       do
         local f = io.open(filename)
@@ -1733,10 +2097,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
             return error(..., 0)
           end
         end
-        local function _490_()
+        local function _602_()
           return assert(f:read("*a"))
         end
-        code = close_handlers_8_auto(_G.xpcall(_490_, (package.loaded.fennel or debug).traceback))
+        code = close_handlers_8_auto(_G.xpcall(_602_, (package.loaded.fennel or debug).traceback))
       end
       local chunk = load_code(code, make_compiler_env(), filename)
       return chunk, filename
@@ -1746,16 +2110,16 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   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_
+    local _604_ = macro_searchers[n]
+    if (nil ~= _604_) then
+      local f = _604_
+      local _605_, _606_ = f(modname)
+      if ((nil ~= _605_) and true) then
+        local loader = _605_
+        local _3ffilename = _606_
         return loader, _3ffilename
       elseif true then
-        local _ = _493_
+        local _ = _605_
         return search_macro_module(modname, (n + 1))
       else
         return nil
@@ -1764,35 +2128,36 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
       return nil
     end
   end
-  local function metadata_only_fennel(modname)
+  local function sandbox_fennel_module(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}
+      return {metadata = compiler.metadata, view = view}
     else
       return nil
     end
   end
-  local function _498_(modname)
-    local function _499_()
+  local function _610_(modname)
+    local function _611_()
       local loader, filename = search_macro_module(modname, 1)
       compiler.assert(loader, (modname .. " module not found."))
       do end (macro_loaded)[modname] = loader(modname, filename)
       return macro_loaded[modname]
     end
-    return (macro_loaded[modname] or metadata_only_fennel(modname) or _499_())
+    return (macro_loaded[modname] or sandbox_fennel_module(modname) or _611_())
   end
-  safe_require = _498_
+  safe_require = _610_
   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)
+      compiler["check-binding-valid"](utils.sym(k), scope, ast, {["macro?"] = true})
       do end (scope.macros)[k] = v
     end
     return nil
   end
-  local function resolve_module_name(_500_, _scope, _parent, opts)
-    local _arg_501_ = _500_
-    local filename = _arg_501_["filename"]
-    local second = _arg_501_[2]
+  local function resolve_module_name(_612_, _scope, _parent, opts)
+    local _arg_613_ = _612_
+    local filename = _arg_613_["filename"]
+    local second = _arg_613_[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)
@@ -1802,11 +2167,11 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
   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))
+    compiler.assert(utils["string?"](modname), "module name must compile to string", (_3freal_ast or ast))
     if not macro_loaded[modname] then
       local loader, filename = search_macro_module(modname, 1)
       compiler.assert(loader, (modname .. " module not found."), ast)
-      do end (macro_loaded)[modname] = loader(modname, filename)
+      do end (macro_loaded)[modname] = compiler.assert(utils["table?"](loader(modname, filename)), "expected macros to be table", (_3freal_ast or ast))
     else
     end
     if ("import-macros" == tostring(ast[1])) then
@@ -1851,10 +2216,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
           return error(..., 0)
         end
       end
-      local function _507_()
-        return f:read("*all"):gsub("[\13\n]*$", "")
+      local function _619_()
+        return assert(f:read("*all")):gsub("[\13\n]*$", "")
       end
-      src = close_handlers_8_auto(_G.xpcall(_507_, (package.loaded.fennel or debug).traceback))
+      src = close_handlers_8_auto(_G.xpcall(_619_, (package.loaded.fennel or debug).traceback))
     end
     local ret = utils.expr(("require(\"" .. mod .. "\")"), "statement")
     local target = ("package.preload[%q]"):format(mod)
@@ -1863,8 +2228,8 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     compiler.emit(temp_chunk, preload_str, ast)
     compiler.emit(temp_chunk, sub_chunk)
     compiler.emit(temp_chunk, "end", ast)
-    for i, v in ipairs(temp_chunk) do
-      table.insert(utils.root.chunk, i, v)
+    for _, v in ipairs(temp_chunk) do
+      table.insert(utils.root.chunk, v)
     end
     if fennel_3f then
       emit_included_fennel(src, path, opts, sub_chunk)
@@ -1886,12 +2251,12 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     compiler.assert((#ast == 2), "expected one argument", ast)
     local modexpr
     do
-      local _510_, _511_ = pcall(resolve_module_name, ast, scope, parent, opts)
-      if ((_510_ == true) and (nil ~= _511_)) then
-        local modname = _511_
+      local _622_, _623_ = pcall(resolve_module_name, ast, scope, parent, opts)
+      if ((_622_ == true) and (nil ~= _623_)) then
+        local modname = _623_
         modexpr = utils.expr(string.format("%q", modname), "literal")
       elseif true then
-        local _ = _510_
+        local _ = _622_
         modexpr = (compiler.compile1(ast[2], scope, parent, {nval = 1}))[1]
       else
         modexpr = nil
@@ -1910,13 +2275,13 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
       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_
+      local function _627_()
+        local _626_ = search_module(mod)
+        if (nil ~= _626_) then
+          local fennel_path = _626_
           return include_path(ast, opts, fennel_path, mod, true)
         elseif true then
-          local _0 = _514_
+          local _0 = _626_
           local lua_path = search_module(mod, package.path)
           if lua_path then
             return include_path(ast, opts, lua_path, mod, false)
@@ -1929,7 +2294,7 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
           return nil
         end
       end
-      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_())
+      res = ((utils["member?"](mod, (utils.root.options.skipInclude or {})) and opts.fallback(modexpr, true)) or include_circular_fallback(mod, modexpr, opts.fallback, ast) or utils.root.scope.includes[mod] or _627_())
       utils.root.options["module-name"] = oldmod
       return res
     end
@@ -1940,10 +2305,10 @@ package.preload["fennel.specials"] = package.preload["fennel.specials"] or funct
     local opts = utils.copy(utils.root.options)
     opts.scope = compiler["make-scope"](compiler.scopes.compiler)
     opts.allowedGlobals = current_global_names(env)
-    return load_code(compiler.compile(ast, opts), wrap_env(env))(opts["module-name"], ast.filename)
+    return assert(load_code(compiler.compile(ast, opts), wrap_env(env)), opts["module-name"], ast.filename)()
   end
   SPECIALS.macros = function(ast, scope, parent)
-    compiler.assert((#ast == 2), "Expected one table argument", ast)
+    compiler.assert(((#ast == 2) and utils["table?"](ast[2])), "Expected one table argument", ast)
     return add_macros(eval_compiler_2a(ast[2], scope, parent), ast, scope, parent)
   end
   doc_special("macros", {"{:macro-name-1 (fn [...] ...) ... :macro-name-N macro-body-N}"}, "Define all functions in the given table as macros local to the current scope.")
@@ -1965,13 +2330,13 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
   local scopes = {}
   local function make_scope(_3fparent)
     local parent = (_3fparent or scopes.global)
-    local _203_
+    local _268_
     if parent then
-      _203_ = ((parent.depth or 0) + 1)
+      _268_ = ((parent.depth or 0) + 1)
     else
-      _203_ = 0
+      _268_ = 0
     end
-    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}
+    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 = _268_, hashfn = (parent and parent.hashfn), refedglobals = {}, parent = parent}
   end
   local function assert_msg(ast, msg)
     local ast_tbl
@@ -1983,20 +2348,28 @@ 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 col = ((m and m.col) or ast_tbl.col or "?")
     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)
+    return string.format("%s:%s:%s Compile error in '%s': %s", filename, line, col, target, msg)
   end
-  local function assert_compile(condition, msg, ast)
+  local function assert_compile(condition, msg, ast, _3ffallback_ast)
     if not condition then
-      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
+      local _let_271_ = (utils.root.options or {})
+      local source = _let_271_["source"]
+      local unfriendly = _let_271_["unfriendly"]
+      local error_pinpoint = _let_271_["error-pinpoint"]
+      local ast0
+      if next(utils["ast-source"](ast)) then
+        ast0 = ast
+      else
+        ast0 = (_3ffallback_ast or {})
+      end
+      if (nil == utils.hook("assert-compile", condition, msg, ast0, 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)
+          error(assert_msg(ast0, msg), 0)
         else
-          friend["assert-compile"](condition, msg, ast, source)
+          friend["assert-compile"](condition, msg, ast0, source, {["error-pinpoint"] = error_pinpoint})
         end
       else
       end
@@ -2010,33 +2383,33 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
   scopes.macro = scopes.global
   local serialize_subst = {["\7"] = "\\a", ["\8"] = "\\b", ["\9"] = "\\t", ["\n"] = "n", ["\11"] = "\\v", ["\12"] = "\\f"}
   local function serialize_string(str)
-    local function _210_(_241)
+    local function _276_(_241)
       return ("\\" .. _241:byte())
     end
-    return string.gsub(string.gsub(string.format("%q", str), ".", serialize_subst), "[\128-\255]", _210_)
+    return string.gsub(string.gsub(string.format("%q", str), ".", serialize_subst), "[\128-\255]", _276_)
   end
   local function global_mangling(str)
     if utils["valid-lua-identifier?"](str) then
       return str
     else
-      local function _211_(_241)
+      local function _277_(_241)
         return string.format("_%02x", _241:byte())
       end
-      return ("__fnl_global__" .. str:gsub("[^%w]", _211_))
+      return ("__fnl_global__" .. str:gsub("[^%w]", _277_))
     end
   end
   local function global_unmangling(identifier)
-    local _213_ = string.match(identifier, "^__fnl_global__(.*)$")
-    if (nil ~= _213_) then
-      local rest = _213_
-      local _214_
-      local function _215_(_241)
+    local _279_ = string.match(identifier, "^__fnl_global__(.*)$")
+    if (nil ~= _279_) then
+      local rest = _279_
+      local _280_
+      local function _281_(_241)
         return string.char(tonumber(_241:sub(2), 16))
       end
-      _214_ = string.gsub(rest, "_[%da-f][%da-f]", _215_)
-      return _214_
+      _280_ = string.gsub(rest, "_[%da-f][%da-f]", _281_)
+      return _280_
     elseif true then
-      local _ = _213_
+      local _ = _279_
       return identifier
     else
       return nil
@@ -2062,10 +2435,10 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       raw = str
     end
     local mangling
-    local function _219_(_241)
+    local function _285_(_241)
       return string.format("_%02x", _241:byte())
     end
-    mangling = string.gsub(string.gsub(raw, "-", "_"), "[^%w_]", _219_)
+    mangling = string.gsub(string.gsub(raw, "-", "_"), "[^%w_]", _285_)
     local unique = unique_mangling(mangling, mangling, scope, 0)
     do end (scope.unmanglings)[unique] = str
     do
@@ -2109,28 +2482,45 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     do end (scope.gensyms)[mangling] = true
     return mangling
   end
+  local function combine_auto_gensym(parts, first)
+    parts[1] = first
+    local last = table.remove(parts)
+    local last2 = table.remove(parts)
+    local last_joiner = ((parts["multi-sym-method-call"] and ":") or ".")
+    table.insert(parts, (last2 .. last_joiner .. last))
+    return table.concat(parts, ".")
+  end
   local function autogensym(base, scope)
-    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 "."))
+    local _288_ = utils["multi-sym?"](base)
+    if (nil ~= _288_) then
+      local parts = _288_
+      return combine_auto_gensym(parts, autogensym(parts[1], scope))
     elseif true then
-      local _ = _222_
-      local function _223_()
+      local _ = _288_
+      local function _289_()
         local mangling = gensym(scope, base:sub(1, ( - 2)), "auto")
         do end (scope.autogensyms)[base] = mangling
         return mangling
       end
-      return (scope.autogensyms[base] or _223_())
+      return (scope.autogensyms[base] or _289_())
     else
       return nil
     end
   end
-  local function check_binding_valid(symbol, scope, ast)
+  local function check_binding_valid(symbol, scope, ast, _3fopts)
     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)
+    local macro_3f
+    do
+      local t_291_ = _3fopts
+      if (nil ~= t_291_) then
+        t_291_ = (t_291_)["macro?"]
+      else
+      end
+      macro_3f = t_291_
+    end
+    assert_compile(not name:find("&"), "invalid character: &", symbol)
+    assert_compile(not name:find("^%."), "invalid character: .", symbol)
+    assert_compile(not (scope.specials[name] or (not macro_3f and 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, _3ftemp_manglings)
@@ -2161,14 +2551,15 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     local multi_sym_parts = utils["multi-sym?"](name)
     local name0 = (hashfn_arg_name(name, multi_sym_parts, scope) or name)
     local parts = (multi_sym_parts or {name0})
-    local etype = (((#parts > 1) and "expression") or "sym")
+    local etype = (((1 < #parts) and "expression") or "sym")
     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 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)
+    assert_compile(not scope.macros[parts[1]], "tried to reference a macro without calling it", symbol)
+    assert_compile((not scope.specials[parts[1]] or ("require" == parts[1])), "tried to reference a special form without calling it", symbol)
+    assert_compile((not _3freference_3f or local_3f or ("_ENV" == parts[1]) or global_allowed_3f(parts[1])), ("unknown identifier: " .. tostring(parts[1])), symbol)
     if (allowed_globals and not local_3f and scope.parent) then
       scope.parent.refedglobals[parts[1]] = true
     else
@@ -2185,7 +2576,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
   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 ((3 <= #chunk) 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
@@ -2206,7 +2597,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
         out[last_line0] = ((out[last_line0] or "") .. " " .. chunk.leaf)
       else
         for _, subchunk in ipairs(chunk) do
-          if (subchunk.leaf or (#subchunk > 0)) then
+          if (subchunk.leaf or (0 < #subchunk)) then
             local source = utils["ast-source"](subchunk.ast)
             if (file == source.filename) then
               last_line0 = math.max(last_line0, (source.line or 0))
@@ -2229,35 +2620,33 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     end
     return table.concat(out, "\n")
   end
-  local function flatten_chunk(sm, chunk, tab, depth)
+  local function flatten_chunk(file_sourcemap, chunk, tab, depth)
     if chunk.leaf then
-      local code = chunk.leaf
-      local info = chunk.ast
-      if sm then
-        table.insert(sm, {(info and info.filename), (info and info.line)})
-      else
-      end
-      return code
+      local _let_303_ = utils["ast-source"](chunk.ast)
+      local filename = _let_303_["filename"]
+      local line = _let_303_["line"]
+      table.insert(file_sourcemap, {filename, line})
+      return chunk.leaf
     else
       local tab0
       do
-        local _236_ = tab
-        if (_236_ == true) then
+        local _304_ = tab
+        if (_304_ == true) then
           tab0 = "  "
-        elseif (_236_ == false) then
+        elseif (_304_ == false) then
           tab0 = ""
-        elseif (_236_ == tab) then
+        elseif (_304_ == tab) then
           tab0 = tab
-        elseif (_236_ == nil) then
+        elseif (_304_ == nil) then
           tab0 = ""
         else
           tab0 = nil
         end
       end
       local function parter(c)
-        if (c.leaf or (#c > 0)) then
-          local sub = flatten_chunk(sm, c, tab0, (depth + 1))
-          if (depth > 0) then
+        if (c.leaf or (0 < #c)) then
+          local sub = flatten_chunk(file_sourcemap, c, tab0, (depth + 1))
+          if (0 < depth) then
             return (tab0 .. sub:gsub("\n", ("\n" .. tab0)))
           else
             return sub
@@ -2283,35 +2672,32 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     if options.correlate then
       return flatten_chunk_correlated(chunk0, options), {}
     else
-      local sm = {}
-      local ret = flatten_chunk(sm, chunk0, options.indent, 0)
-      if sm then
-        sm.short_src = (options.filename or make_short_src((options.source or ret)))
-        if options.filename then
-          sm.key = ("@" .. options.filename)
-        else
-          sm.key = ret
-        end
-        sourcemap[sm.key] = sm
+      local file_sourcemap = {}
+      local src = flatten_chunk(file_sourcemap, chunk0, options.indent, 0)
+      file_sourcemap.short_src = (options.filename or make_short_src((options.source or src)))
+      if options.filename then
+        file_sourcemap.key = ("@" .. options.filename)
       else
+        file_sourcemap.key = src
       end
-      return ret, sm
+      sourcemap[file_sourcemap.key] = file_sourcemap
+      return src, file_sourcemap
     end
   end
   local function make_metadata()
-    local function _245_(self, tgt, key)
+    local function _312_(self, tgt, key)
       if self[tgt] then
         return self[tgt][key]
       else
         return nil
       end
     end
-    local function _247_(self, tgt, key, value)
+    local function _314_(self, tgt, key, value)
       self[tgt] = (self[tgt] or {})
       do end (self[tgt])[key] = value
       return tgt
     end
-    local function _248_(self, tgt, ...)
+    local function _315_(self, tgt, ...)
       local kv_len = select("#", ...)
       local kvs = {...}
       if ((kv_len % 2) ~= 0) then
@@ -2324,7 +2710,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       end
       return tgt
     end
-    return setmetatable({}, {__index = {get = _245_, set = _247_, setall = _248_}, __mode = "k"})
+    return setmetatable({}, {__index = {get = _312_, set = _314_, setall = _315_}, __mode = "k"})
   end
   local function exprs1(exprs)
     return table.concat(utils.map(exprs, tostring), ", ")
@@ -2354,7 +2740,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       local n = opts.nval
       local len = #exprs
       if (n ~= len) then
-        if (len > n) then
+        if (n < len) then
           keep_side_effects(exprs, parent, (n + 1), ast)
           for i = (n + 1), len do
             exprs[i] = nil
@@ -2374,83 +2760,127 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     end
     if opts.target then
       local result = exprs1(exprs)
-      local function _256_()
+      local function _323_()
         if (result == "") then
           return "nil"
         else
           return result
         end
       end
-      emit(parent, string.format("%s = %s", opts.target, _256_()), ast)
+      emit(parent, string.format("%s = %s", opts.target, _323_()), ast)
     else
     end
     if (opts.tail or opts.target) then
       return {returned = true}
     else
-      local _258_ = exprs
-      _258_["returned"] = true
-      return _258_
+      local _325_ = exprs
+      _325_["returned"] = true
+      return _325_
     end
   end
-  local function find_macro(ast, scope, multi_sym_parts)
-    local function find_in_table(t, i)
-      if (i <= #multi_sym_parts) then
-        return find_in_table((utils["table?"](t) and t[multi_sym_parts[i]]), (i + 1))
+  local function find_macro(ast, scope)
+    local macro_2a
+    do
+      local _327_ = utils["sym?"](ast[1])
+      if (_327_ ~= nil) then
+        local _328_ = tostring(_327_)
+        if (_328_ ~= nil) then
+          macro_2a = scope.macros[_328_]
+        else
+          macro_2a = _328_
+        end
       else
-        return t
+        macro_2a = _327_
       end
     end
-    local macro_2a = (utils["sym?"](ast[1]) and scope.macros[tostring(ast[1])])
+    local multi_sym_parts = utils["multi-sym?"](ast[1])
     if (not macro_2a and multi_sym_parts) then
-      local nested_macro = find_in_table(scope.macros, 1)
+      local nested_macro = utils["get-in"](scope.macros, multi_sym_parts)
       assert_compile((not scope.macros[multi_sym_parts[1]] or (type(nested_macro) == "function")), "macro not found in imported macro module", ast)
       return nested_macro
     else
       return macro_2a
     end
   end
-  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 function propagate_trace_info(_332_, _index, node)
+    local _arg_333_ = _332_
+    local filename = _arg_333_["filename"]
+    local line = _arg_333_["line"]
+    local bytestart = _arg_333_["bytestart"]
+    local byteend = _arg_333_["byteend"]
+    do
       local src = utils["ast-source"](node)
-      src.filename, src.line = filename, line
-      src.bytestart, src.byteend = bytestart, byteend
-    else
+      if (("table" == type(node)) and (filename ~= src.filename)) then
+        src.filename, src.line, src["from-macro?"] = filename, line, true
+        src.bytestart, src.byteend = bytestart, byteend
+      else
+      end
     end
     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]))
+  local function quote_literal_nils(index, node, parent)
+    if (parent and utils["list?"](parent)) then
+      for i = 1, utils.maxn(parent) do
+        local _335_ = parent[i]
+        if (_335_ == nil) then
+          parent[i] = utils.sym("nil")
+        else
+        end
+      end
     else
-      _265_ = nil
     end
-    if (_265_ == false) then
+    return index, node, parent
+  end
+  local function comp(f, g)
+    local function _338_(...)
+      return f(g(...))
+    end
+    return _338_
+  end
+  local function built_in_3f(m)
+    local found_3f = false
+    for _, f in pairs(scopes.global.macros) do
+      if found_3f then break end
+      found_3f = (f == m)
+    end
+    return found_3f
+  end
+  local function macroexpand_2a(ast, scope, _3fonce)
+    local _339_
+    if utils["list?"](ast) then
+      _339_ = find_macro(ast, scope)
+    else
+      _339_ = nil
+    end
+    if (_339_ == false) then
       return ast
-    elseif (nil ~= _265_) then
-      local macro_2a = _265_
+    elseif (nil ~= _339_) then
+      local macro_2a = _339_
       local old_scope = scopes.macro
       local _
       scopes.macro = scope
       _ = nil
       local ok, transformed = nil, nil
-      local function _267_()
+      local function _341_()
         return macro_2a(unpack(ast, 2))
       end
-      ok, transformed = xpcall(_267_, debug.traceback)
-      local function _269_()
-        local _268_ = ast
-        local function _270_(...)
-          return propagate_trace_info(_268_, ...)
+      local function _342_()
+        if built_in_3f(macro_2a) then
+          return tostring
+        else
+          return debug.traceback
         end
-        return _270_
       end
-      utils["walk-tree"](transformed, _269_())
+      ok, transformed = xpcall(_341_, _342_())
+      local _344_
+      do
+        local _343_ = ast
+        local function _345_(...)
+          return propagate_trace_info(_343_, ...)
+        end
+        _344_ = _345_
+      end
+      utils["walk-tree"](transformed, comp(_344_, quote_literal_nils))
       scopes.macro = old_scope
       assert_compile(ok, transformed, ast)
       if (_3fonce or not transformed) then
@@ -2459,7 +2889,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
         return macroexpand_2a(transformed, scope)
       end
     elseif true then
-      local _ = _265_
+      local _ = _339_
       return ast
     else
       return nil
@@ -2490,17 +2920,17 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
   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((("string" == type(ast[1])) or (fcallee.type ~= "literal")), ("cannot call literal value " .. tostring(ast[1])), ast)
+    assert_compile((utils["sym?"](ast[1]) or utils["list?"](ast[1]) or ("string" == type(ast[1]))), ("cannot call literal value " .. tostring(ast[1])), ast)
     for i = 2, len do
       local subexprs
-      local _276_
+      local _351_
       if (i ~= len) then
-        _276_ = 1
+        _351_ = 1
       else
-        _276_ = nil
+        _351_ = nil
       end
-      subexprs = compile1(ast[i], scope, parent, {nval = _276_})
-      table.insert(fargs, (subexprs[1] or utils.expr("nil", "literal")))
+      subexprs = compile1(ast[i], scope, parent, {nval = _351_})
+      table.insert(fargs, subexprs[1])
       if (i == len) then
         for j = 2, #subexprs do
           table.insert(fargs, subexprs[j])
@@ -2524,20 +2954,26 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     local first = ast[1]
     local multi_sym_parts = utils["multi-sym?"](first)
     local special = (utils["sym?"](first) and scope.specials[tostring(first)])
-    assert_compile((len > 0), "expected a function, macro, or special to call", ast)
+    assert_compile((0 < len), "expected a function, macro, or special to call", ast)
     if special then
       return compile_special(ast, scope, parent, opts, special)
     elseif (multi_sym_parts and multi_sym_parts["multi-sym-method-call"]) then
       local table_with_method = table.concat({unpack(multi_sym_parts, 1, (#multi_sym_parts - 1))}, ".")
       local method_to_call = multi_sym_parts[#multi_sym_parts]
-      local new_ast = utils.list(utils.sym(":", nil, scope), utils.sym(table_with_method, nil, scope), method_to_call, select(2, unpack(ast)))
+      local new_ast = utils.list(utils.sym(":", ast), utils.sym(table_with_method, ast), method_to_call, select(2, unpack(ast)))
       return compile1(new_ast, scope, parent, opts)
     else
       return compile_function_call(ast, scope, parent, opts, compile1, len)
     end
   end
   local function compile_varg(ast, scope, parent, opts)
-    assert_compile(scope.vararg, "unexpected vararg", ast)
+    local _356_
+    if scope.hashfn then
+      _356_ = "use $... in hashfn"
+    else
+      _356_ = "unexpected vararg"
+    end
+    assert_compile(scope.vararg, _356_, ast)
     return handle_compile_opts({utils.expr("...", "varg")}, parent, opts, ast)
   end
   local function compile_sym(ast, scope, parent, opts)
@@ -2552,20 +2988,20 @@ 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 _282_ = string.gsub(tostring(n), ",", ".")
-    return _282_
+    local _359_ = string.gsub(tostring(n), ",", ".")
+    return _359_
   end
   local function compile_scalar(ast, _scope, parent, opts)
     local serialize
     do
-      local _283_ = type(ast)
-      if (_283_ == "nil") then
+      local _360_ = type(ast)
+      if (_360_ == "nil") then
         serialize = tostring
-      elseif (_283_ == "boolean") then
+      elseif (_360_ == "boolean") then
         serialize = tostring
-      elseif (_283_ == "string") then
+      elseif (_360_ == "string") then
         serialize = serialize_string
-      elseif (_283_ == "number") then
+      elseif (_360_ == "number") then
         serialize = serialize_number
       else
         serialize = nil
@@ -2574,49 +3010,53 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     return handle_compile_opts({utils.expr(serialize(ast), "literal")}, parent, opts)
   end
   local function compile_table(ast, scope, parent, opts, compile1)
-    local buffer = {}
-    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 _let_285_ = compile1(k, scope, parent, {nval = 1})
-          local compiled = _let_285_[1]
-          local kstr = ("[" .. tostring(compiled) .. "]")
-          return {kstr, k}
-        end
+    local function escape_key(k)
+      if ((type(k) == "string") and utils["valid-lua-identifier?"](k)) then
+        return k
       else
-        return nil
+        local _let_362_ = compile1(k, scope, parent, {nval = 1})
+        local compiled = _let_362_[1]
+        return ("[" .. tostring(compiled) .. "]")
       end
     end
+    local keys = {}
+    local buffer
+    do
+      local tbl_16_auto = {}
+      local i_17_auto = #tbl_16_auto
+      for i, elem in ipairs(ast) do
+        local val_18_auto
+        do
+          local nval = ((nil ~= ast[(i + 1)]) and 1)
+          do end (keys)[i] = true
+          val_18_auto = exprs1(compile1(elem, scope, parent, {nval = nval}))
+        end
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
+        end
+      end
+      buffer = tbl_16_auto
+    end
     do
-      local keys
-      do
-        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
+      local tbl_16_auto = buffer
+      local i_17_auto = #tbl_16_auto
+      for k, v in utils.stablepairs(ast) do
+        local val_18_auto
+        if not keys[k] then
+          local _let_365_ = compile1(ast[k], scope, parent, {nval = 1})
+          local v0 = _let_365_[1]
+          val_18_auto = string.format("%s = %s", escape_key(k), tostring(v0))
+        else
+          val_18_auto = nil
+        end
+        if (nil ~= val_18_auto) then
+          i_17_auto = (i_17_auto + 1)
+          do end (tbl_16_auto)[i_17_auto] = val_18_auto
+        else
         end
-        keys = tbl_14_auto
       end
-      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, _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
@@ -2639,12 +3079,12 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
   end
   local function destructure(to, from, ast, scope, parent, opts)
     local opts0 = (opts or {})
-    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 _let_369_ = opts0
+    local isvar = _let_369_["isvar"]
+    local declaration = _let_369_["declaration"]
+    local forceglobal = _let_369_["forceglobal"]
+    local forceset = _let_369_["forceset"]
+    local symtype = _let_369_["symtype"]
     local symtype0 = ("_" .. (symtype or "dst"))
     local setter
     if declaration then
@@ -2665,9 +3105,9 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
         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
+        assert_compile((meta or not opts0.noundef or global_allowed_3f(parts[1])), ("expected local " .. parts[1]), symbol)
         if forceglobal then
           assert_compile(not scope.symmeta[scope.unmanglings[raw]], ("global " .. raw .. " conflicts with local"), symbol)
           do end (scope.manglings)[raw] = global_mangling(raw)
@@ -2683,17 +3123,18 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     end
     local function compile_top_target(lvalues)
       local inits
-      local function _300_(_241)
+      local function _375_(_241)
         if scope.manglings[_241] then
           return _241
         else
           return "nil"
         end
       end
-      inits = utils.map(lvalues, _300_)
+      inits = utils.map(lvalues, _375_)
       local init = table.concat(inits, ", ")
       local lvalue = table.concat(lvalues, ", ")
-      local plen, plast = #parent, parent[#parent]
+      local plast = parent[#parent]
+      local plen = #parent
       local ret = compile1(from, scope, parent, {target = lvalue})
       if declaration then
         for pi = plen, #parent do
@@ -2728,34 +3169,61 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
         return nil
       end
     end
+    local unpack_fn = "function (t, k, e)\n                        local mt = getmetatable(t)\n                        if 'table' == type(mt) and mt.__fennelrest then\n                          return mt.__fennelrest(t, k)\n                        elseif e then\n                          local rest = {}\n                          for k, v in pairs(t) do\n                            if not e[k] then rest[k] = v end\n                          end\n                          return rest\n                        else\n                          return {(table.unpack or unpack)(t, k)}\n                        end\n                      end"
+    local function destructure_kv_rest(s, v, left, excluded_keys, destructure1)
+      local exclude_str
+      local _382_
+      do
+        local tbl_16_auto = {}
+        local i_17_auto = #tbl_16_auto
+        for _, k in ipairs(excluded_keys) do
+          local val_18_auto = string.format("[%s] = true", serialize_string(k))
+          if (nil ~= val_18_auto) then
+            i_17_auto = (i_17_auto + 1)
+            do end (tbl_16_auto)[i_17_auto] = val_18_auto
+          else
+          end
+        end
+        _382_ = tbl_16_auto
+      end
+      exclude_str = table.concat(_382_, ", ")
+      local subexpr = utils.expr(string.format(string.gsub(("(" .. unpack_fn .. ")(%s, %s, {%s})"), "\n%s*", " "), s, tostring(v), exclude_str), "expression")
+      return destructure1(v, {subexpr}, left)
+    end
+    local function destructure_rest(s, k, left, destructure1)
+      local unpack_str = ("(" .. unpack_fn .. ")(%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)
+      return destructure1(left[(k + 1)], {subexpr}, left)
+    end
     local function destructure_table(left, rightexprs, top_3f, destructure1)
       local s = gensym(scope, symtype0)
       local right
       do
-        local _307_
+        local _384_
         if top_3f then
-          _307_ = exprs1(compile1(from, scope, parent))
+          _384_ = exprs1(compile1(from, scope, parent))
         else
-          _307_ = exprs1(rightexprs)
+          _384_ = exprs1(rightexprs)
         end
-        if (_307_ == "") then
+        if (_384_ == "") then
           right = "nil"
-        elseif (nil ~= _307_) then
-          local right0 = _307_
+        elseif (nil ~= _384_) then
+          local right0 = _384_
           right = right0
         else
           right = nil
         end
       end
+      local excluded_keys = {}
       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 (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)
+          if (utils["sym?"](k) and (tostring(k) == "&")) then
+            destructure_kv_rest(s, v, left, excluded_keys, destructure1)
+          elseif (utils["sym?"](v) and (tostring(v) == "&")) then
+            destructure_rest(s, k, left, destructure1)
           elseif (utils["sym?"](k) and (tostring(k) == "&as")) then
             destructure_sym(v, {utils.expr(tostring(s))}, left)
           elseif (utils["sequence?"](left) and (tostring(v) == "&as")) then
@@ -2770,6 +3238,10 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
               key = k
             end
             local subexpr = utils.expr(string.format("%s[%s]", s, key), "expression")
+            if (type(k) == "string") then
+              table.insert(excluded_keys, k)
+            else
+            end
             destructure1(v, {subexpr}, left)
           end
         else
@@ -2788,6 +3260,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
           do end (tables)[i] = {name, utils.expr(symname, "sym")}
         end
       end
+      assert_compile(left[1], "must provide at least one value", left)
       assert_compile(top_3f, "can't nest multi-value destructuring", left)
       compile_top_target(left_names)
       if declaration then
@@ -2821,13 +3294,16 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       end
     end
     local ret = destructure1(to, nil, ast, true)
-    utils.hook("destructure", from, to, scope)
+    utils.hook("destructure", from, to, scope, opts0)
     apply_manglings(scope, new_manglings, ast)
     return ret
   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)))
+    opts.fallback = function(e, no_warn)
+      if (not no_warn and ("literal" == e.type)) then
+        utils.warn(("include module not found, falling back to require: %s"):format(tostring(e)))
+      else
+      end
       return utils.expr(string.format("require(%s)", tostring(e)), "statement")
     end
     return scopes.global.specials.include(ast, scope, parent, opts)
@@ -2864,8 +3340,9 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     utils.root.reset()
     return flatten(chunk, opts)
   end
-  local function compile_string(str, opts)
-    return compile_stream(parser["string-stream"](str), (opts or {}))
+  local function compile_string(str, _3fopts)
+    local opts = (_3fopts or {})
+    return compile_stream(parser["string-stream"](str, opts), opts)
   end
   local function compile(ast, opts)
     local opts0 = utils.copy(opts)
@@ -2898,7 +3375,7 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     else
       local remap = sourcemap[info.source]
       if (remap and remap[info.currentline]) then
-        if remap[info.currentline][1] then
+        if ((remap[info.currentline][1] or "unknown") ~= "unknown") then
           info.short_src = sourcemap[("@" .. remap[info.currentline][1])].short_src
         else
           info.short_src = remap.short_src
@@ -2907,14 +3384,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       else
       end
       if (info.what == "Lua") then
-        local function _325_()
+        local function _404_()
           if info.name then
             return ("'" .. info.name .. "'")
           else
             return "?"
           end
         end
-        return string.format("  %s:%d: in function %s", info.short_src, info.currentline, _325_())
+        return string.format("  %s:%d: in function %s", info.short_src, info.currentline, _404_())
       elseif (info.short_src == "(tail call)") then
         return "  (tail call)"
       else
@@ -2922,27 +3399,27 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       end
     end
   end
-  local function traceback(msg, start)
-    local msg0 = tostring((msg or ""))
-    if ((msg0:find("^Compile error") or msg0:find("^Parse error")) and not utils["debug-on?"]("trace")) then
-      return msg0
+  local function traceback(_3fmsg, _3fstart)
+    local msg = tostring((_3fmsg or ""))
+    if ((msg:find("^%g+:%d+:%d+ Compile error:.*") or msg:find("^%g+:%d+:%d+ Parse error:.*")) and not utils["debug-on?"]("trace")) then
+      return msg
     else
       local lines = {}
-      if (msg0:find(":%d+: Compile error") or msg0:find(":%d+: Parse error")) then
-        table.insert(lines, msg0)
+      if (msg:find("^%g+:%d+:%d+ Compile error:") or msg:find("^%g+:%d+:%d+ Parse error:")) then
+        table.insert(lines, msg)
       else
-        local newmsg = msg0:gsub("^[^:]*:%d+:%s+", "runtime error: ")
+        local newmsg = msg:gsub("^[^:]*:%d+:%s+", "runtime error: ")
         table.insert(lines, newmsg)
       end
       table.insert(lines, "stack traceback:")
-      local done_3f, level = false, (start or 2)
+      local done_3f, level = false, (_3fstart or 2)
       while not done_3f do
         do
-          local _329_ = debug.getinfo(level, "Sln")
-          if (_329_ == nil) then
+          local _408_ = debug.getinfo(level, "Sln")
+          if (_408_ == nil) then
             done_3f = true
-          elseif (nil ~= _329_) then
-            local info = _329_
+          elseif (nil ~= _408_) then
+            local info = _408_
             table.insert(lines, traceback_frame(info))
           else
           end
@@ -2953,14 +3430,14 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
     end
   end
   local function entry_transform(fk, fv)
-    local function _332_(k, v)
+    local function _411_(k, v)
       if (type(k) == "number") then
         return k, fv(v)
       else
         return fk(k), fv(v)
       end
     end
-    return _332_
+    return _411_
   end
   local function mixed_concat(t, joiner)
     local seen = {}
@@ -3006,10 +3483,10 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       return res[1]
     elseif utils["list?"](form) then
       local mapped
-      local function _337_()
+      local function _416_()
         return nil
       end
-      mapped = utils.kvmap(form, entry_transform(_337_, q))
+      mapped = utils.kvmap(form, entry_transform(_416_, q))
       local filename
       if form.filename then
         filename = string.format("%q", form.filename)
@@ -3027,13 +3504,13 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       else
         filename = "nil"
       end
-      local _340_
+      local _419_
       if source then
-        _340_ = source.line
+        _419_ = source.line
       else
-        _340_ = "nil"
+        _419_ = "nil"
       end
-      return string.format("setmetatable({%s}, {filename=%s, line=%s, sequence=%s})", mixed_concat(mapped, ", "), filename, _340_, "(getmetatable(sequence()))['sequence']")
+      return string.format("setmetatable({%s}, {filename=%s, line=%s, sequence=%s})", mixed_concat(mapped, ", "), filename, _419_, "(getmetatable(sequence()))['sequence']")
     elseif (type(form) == "table") then
       local mapped = utils.kvmap(form, entry_transform(q, q))
       local source = getmetatable(form)
@@ -3043,118 +3520,138 @@ package.preload["fennel.compiler"] = package.preload["fennel.compiler"] or funct
       else
         filename = "nil"
       end
-      local function _343_()
+      local function _422_()
         if source then
           return source.line
         else
           return "nil"
         end
       end
-      return string.format("setmetatable({%s}, {filename=%s, line=%s})", mixed_concat(mapped, ", "), filename, _343_())
+      return string.format("setmetatable({%s}, {filename=%s, line=%s})", mixed_concat(mapped, ", "), filename, _422_())
     elseif (type(form) == "string") then
       return serialize_string(form)
     else
       return tostring(form)
     end
   end
-  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}
+  return {compile = compile, compile1 = compile1, ["compile-stream"] = compile_stream, ["compile-string"] = compile_string, ["check-binding-valid"] = check_binding_valid, 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 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 utf8_ok_3f, utf8 = pcall(require, "utf8")
+  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: (.*)"] = {"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", "making sure to use prefix operators, not infix"}, ["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"}, ["invalid 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 without calling it"] = {"renaming the macro so as not to conflict with locals"}, ["tried to reference a special form without calling it"] = {"making sure to use prefix operators, not infix", "wrapping the special in a function if you need it to be first class"}, ["missing subject"] = {"adding an item to operate on"}, ["expected even number of pattern/body pairs"] = {"checking that every pattern has a body to go with it", "adding _ before the final body"}, ["expected at least one pattern/body pair"] = {"adding a pattern and a body to execute when the pattern matches"}, ["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
+    local s = nil
     for pat, sug in pairs(suggestions) do
+      if s then break end
       local matches = {msg:match(pat)}
       if (0 < #matches) then
-        if ("table" == type(sug)) then
-          local out = {}
-          for _, s in ipairs(sug) do
-            table.insert(out, s:format(unpack(matches)))
+        local tbl_16_auto = {}
+        local i_17_auto = #tbl_16_auto
+        for _, s0 in ipairs(sug) do
+          local val_18_auto = s0:format(unpack(matches))
+          if (nil ~= val_18_auto) then
+            i_17_auto = (i_17_auto + 1)
+            do end (tbl_16_auto)[i_17_auto] = val_18_auto
+          else
           end
-          suggestion = out
-        else
-          suggestion = sug(matches)
         end
+        s = tbl_16_auto
       else
+        s = nil
       end
     end
-    return suggestion
+    return s
   end
-  local function read_line_from_file(filename, line)
-    local bytes = 0
-    local f = assert(io.open(filename))
-    local _
-    for _0 = 1, (line - 1) do
-      bytes = (bytes + 1 + #f:read())
-    end
-    _ = nil
-    local codeline = f:read()
-    f:close()
-    return codeline, bytes
-  end
-  local function read_line_from_string(matcher, target_line, _3fcurrent_line, _3fbytes)
-    local this_line, newline = matcher()
-    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 - #this_line - 1)
-    elseif this_line then
-      return read_line_from_string(matcher, target_line, (current_line + 1), bytes)
+  local function read_line(filename, line, _3fsource)
+    if _3fsource then
+      local matcher = string.gmatch((_3fsource .. "\n"), "(.-)(\13?\n)")
+      for _ = 2, line do
+        matcher()
+      end
+      return matcher()
     else
-      return nil
+      local f = assert(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 _185_()
+        for _ = 2, line do
+          f:read()
+        end
+        return f:read()
+      end
+      return close_handlers_8_auto(_G.xpcall(_185_, (package.loaded.fennel or debug).traceback))
     end
   end
-  local function read_line(filename, line, source)
-    if source then
-      return read_line_from_string(string.gmatch((source .. "\n"), "(.-)(\13?\n)"), line)
+  local function sub(str, start, _end)
+    if ((_end < start) or (#str < start) or (#str < _end)) then
+      return ""
+    elseif utf8_ok_3f then
+      return string.sub(str, utf8.offset(str, start), ((utf8.offset(str, (_end + 1)) or (utf8.len(str) + 1)) - 1))
     else
-      return read_line_from_file(filename, line)
+      return string.sub(str, start, math.min(_end, str:len()))
     end
   end
-  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 function highlight_line(codeline, col, _3fendcol, opts)
+    if ((opts and (false == opts["error-pinpoint"])) or (os and os.getenv and os.getenv("NO_COLOR"))) then
+      return codeline
+    else
+      local _let_188_ = (opts or {})
+      local error_pinpoint = _let_188_["error-pinpoint"]
+      local endcol = (_3fendcol or col)
+      local eol
+      if utf8_ok_3f then
+        eol = utf8.len(codeline)
+      else
+        eol = string.len(codeline)
+      end
+      local _let_190_ = (error_pinpoint or {"\27[7m", "\27[0m"})
+      local open = _let_190_[1]
+      local close = _let_190_[2]
+      return (sub(codeline, 1, col) .. open .. sub(codeline, (col + 1), (endcol + 1)) .. close .. sub(codeline, (endcol + 2), eol))
+    end
+  end
+  local function friendly_msg(msg, _192_, source, opts)
+    local _arg_193_ = _192_
+    local filename = _arg_193_["filename"]
+    local line = _arg_193_["line"]
+    local col = _arg_193_["col"]
+    local endcol = _arg_193_["endcol"]
+    local ok, codeline = pcall(read_line, filename, line, source)
     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))
+      if col then
+        table.insert(out, highlight_line(codeline, col, endcol, opts))
+      else
+        table.insert(out, codeline)
       end
     else
     end
+    for _, suggestion in ipairs((suggest(msg) or {})) do
+      table.insert(out, ("* Try %s."):format(suggestion))
+    end
     return table.concat(out, "\n")
   end
-  local function assert_compile(condition, msg, ast, source)
+  local function assert_compile(condition, msg, ast, source, opts)
     if not condition then
-      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)
+      local _let_196_ = utils["ast-source"](ast)
+      local filename = _let_196_["filename"]
+      local line = _let_196_["line"]
+      local col = _let_196_["col"]
+      error(friendly_msg(("%s:%s:%s Compile error: %s"):format((filename or "unknown"), (line or "?"), (col or "?"), msg), utils["ast-source"](ast), source, opts), 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), {filename = filename, line = line, bytestart = bytestart}, source), 0)
+  local function parse_error(msg, filename, line, col, source, opts)
+    return error(friendly_msg(("%s:%s:%s Parse error: %s"):format(filename, line, col, msg), {filename = filename, line = line, col = col}, source, opts), 0)
   end
   return {["assert-compile"] = assert_compile, ["parse-error"] = parse_error}
 end
@@ -3164,25 +3661,25 @@ 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 _150_(parser_state)
+    local function _198_(parser_state)
       if not done_3f then
         if (index <= #c) then
           local b = c:byte(index)
           index = (index + 1)
           return b
         else
-          local _151_ = getchunk(parser_state)
-          local function _152_()
-            local char = _151_
+          local _199_ = getchunk(parser_state)
+          local function _200_()
+            local char = _199_
             return (char ~= "")
           end
-          if ((nil ~= _151_) and _152_()) then
-            local char = _151_
+          if ((nil ~= _199_) and _200_()) then
+            local char = _199_
             c = char
             index = 2
             return c:byte()
           elseif true then
-            local _ = _151_
+            local _ = _199_
             done_3f = true
             return nil
           else
@@ -3193,26 +3690,27 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
         return nil
       end
     end
-    local function _156_()
+    local function _204_()
       c = ""
       return nil
     end
-    return _150_, _156_
+    return _198_, _204_
   end
-  local function string_stream(str)
+  local function string_stream(str, _3foptions)
     local str0 = str:gsub("^#!", ";;")
+    if _3foptions then
+      _3foptions.source = str0
+    else
+    end
     local index = 1
-    local function _157_()
+    local function _206_()
       local r = str0:byte(index)
       index = (index + 1)
       return r
     end
-    return _157_
+    return _206_
   end
   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
     if ("number" == type(b)) then
@@ -3220,17 +3718,27 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
     else
       b0 = string.byte(b)
     end
-    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))
+    return ((32 < b0) 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, _3ffilename, _3foptions)
+  local function char_starter_3f(b)
+    return ((function(_208_,_209_,_210_) return (_208_ < _209_) and (_209_ < _210_) end)(1,b,127) or (function(_211_,_212_,_213_) return (_211_ < _212_) and (_212_ < _213_) end)(192,b,247))
+  end
+  local function parser_fn(getbyte, filename, _214_)
+    local _arg_215_ = _214_
+    local source = _arg_215_["source"]
+    local unfriendly = _arg_215_["unfriendly"]
+    local comments = _arg_215_["comments"]
+    local options = _arg_215_
     local stack = {}
-    local line = 1
-    local byteindex = 0
-    local lastb = nil
+    local line, byteindex, col, prev_col, lastb = 1, 0, 0, 0, nil
     local function ungetb(ub)
+      if char_starter_3f(ub) then
+        col = (col - 1)
+      else
+      end
       if (ub == 10) then
-        line = (line - 1)
+        line, col = (line - 1), prev_col
       else
       end
       byteindex = (byteindex - 1)
@@ -3245,23 +3753,35 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
         r = getbyte({["stack-size"] = #stack})
       end
       byteindex = (byteindex + 1)
+      if (r and char_starter_3f(r)) then
+        col = (col + 1)
+      else
+      end
       if (r == 10) then
-        line = (line + 1)
+        line, col, prev_col = (line + 1), 0, col
       else
       end
       return r
     end
-    assert(((nil == _3ffilename) or ("string" == type(_3ffilename))), "expected filename as second argument to parser")
-    local function parse_error(msg, byteindex_override)
-      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)
+    local function whitespace_3f(b)
+      local function _225_()
+        local t_224_ = options.whitespace
+        if (nil ~= t_224_) then
+          t_224_ = (t_224_)[b]
         else
-          return friend["parse-error"](msg, (_3ffilename or "unknown"), (line or "?"), (byteindex_override or byteindex), source)
+        end
+        return t_224_
+      end
+      return ((b == 32) or (function(_221_,_222_,_223_) return (_221_ <= _222_) and (_222_ <= _223_) end)(9,b,13) or _225_())
+    end
+    local function parse_error(msg, _3fcol_adjust)
+      local col0 = (col + (_3fcol_adjust or -1))
+      if (nil == utils["hook-opts"]("parse-error", options, msg, filename, (line or "?"), col0, source, utils.root.reset)) then
+        utils.root.reset()
+        if (unfriendly or not _G.io or not _G.io.read) then
+          return error(string.format("%s:%s:%s Parse error: %s", filename, (line or "?"), col0, msg), 0)
+        else
+          return friend["parse-error"](msg, filename, (line or "?"), col0, source, options)
         end
       else
         return nil
@@ -3269,26 +3789,30 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
     end
     local function parse_stream()
       local whitespace_since_dispatch, done_3f, retval = true
+      local function set_source_fields(source0)
+        source0.byteend, source0.endcol = byteindex, (col - 1)
+        return nil
+      end
       local function dispatch(v)
-        local _165_ = stack[#stack]
-        if (_165_ == nil) then
+        local _229_ = stack[#stack]
+        if (_229_ == nil) then
           retval, done_3f, whitespace_since_dispatch = v, true, false
           return nil
-        elseif ((_G.type(_165_) == "table") and (nil ~= (_165_).prefix)) then
-          local prefix = (_165_).prefix
-          local source
+        elseif ((_G.type(_229_) == "table") and (nil ~= (_229_).prefix)) then
+          local prefix = (_229_).prefix
+          local source0
           do
-            local _166_ = table.remove(stack)
-            do end (_166_)["byteend"] = byteindex
-            source = _166_
+            local _230_ = table.remove(stack)
+            set_source_fields(_230_)
+            source0 = _230_
           end
-          local list = utils.list(utils.sym(prefix, source), v)
-          for k, v0 in pairs(source) do
+          local list = utils.list(utils.sym(prefix, source0), v)
+          for k, v0 in pairs(source0) do
             list[k] = v0
           end
           return dispatch(list)
-        elseif (nil ~= _165_) then
-          local top = _165_
+        elseif (nil ~= _229_) then
+          local top = _229_
           whitespace_since_dispatch = false
           return table.insert(top, v)
         else
@@ -3297,19 +3821,19 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
       end
       local function badend()
         local accum = utils.map(stack, "closer")
-        local _168_
+        local _232_
         if (#stack == 1) then
-          _168_ = ""
+          _232_ = ""
         else
-          _168_ = "s"
+          _232_ = "s"
         end
-        return parse_error(string.format("expected closing delimiter%s %s", _168_, string.char(unpack(accum))))
+        return parse_error(string.format("expected closing delimiter%s %s", _232_, string.char(unpack(accum))))
       end
       local function skip_whitespace(b)
         if (b and whitespace_3f(b)) then
           whitespace_since_dispatch = true
           return skip_whitespace(getb())
-        elseif (not b and (#stack > 0)) then
+        elseif (not b and (0 < #stack)) then
           return badend()
         else
           return b
@@ -3317,16 +3841,17 @@ 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 _172_()
-            local _171_ = contents
-            table.insert(_171_, string.char(b))
-            return _171_
+          local function _236_()
+            local _235_ = contents
+            table.insert(_235_, string.char(b))
+            return _235_
           end
-          return parse_comment(getb(), _172_())
-        elseif (_3foptions and _3foptions.comments) then
-          return dispatch(utils.comment(table.concat(contents), {line = (line - 1), filename = _3ffilename}))
+          return parse_comment(getb(), _236_())
+        elseif comments then
+          ungetb(10)
+          return dispatch(utils.comment(table.concat(contents), {line = line, filename = filename}))
         else
-          return b
+          return nil
         end
       end
       local function open_table(b)
@@ -3334,7 +3859,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
           parse_error(("expected whitespace before opening delimiter " .. string.char(b)))
         else
         end
-        return table.insert(stack, {bytestart = byteindex, closer = delims[b], filename = _3ffilename, line = line})
+        return table.insert(stack, {bytestart = byteindex, closer = delims[b], filename = filename, line = line, col = (col - 1)})
       end
       local function close_list(list)
         return dispatch(setmetatable(list, getmetatable(utils.list())))
@@ -3346,14 +3871,14 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
         end
         return dispatch(val)
       end
-      local function add_comment_at(comments, index, node)
-        local _175_ = comments[index]
-        if (nil ~= _175_) then
-          local existing = _175_
+      local function add_comment_at(comments0, index, node)
+        local _239_ = (comments0)[index]
+        if (nil ~= _239_) then
+          local existing = _239_
           return table.insert(existing, node)
         elseif true then
-          local _ = _175_
-          comments[index] = {node}
+          local _ = _239_
+          comments0[index] = {node}
           return nil
         else
           return nil
@@ -3362,23 +3887,25 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
       local function next_noncomment(tbl, i)
         if utils["comment?"](tbl[i]) then
           return next_noncomment(tbl, (i + 1))
+        elseif (utils.sym(":") == tbl[i]) then
+          return tostring(tbl[(i + 1)])
         else
           return tbl[i]
         end
       end
       local function extract_comments(tbl)
-        local comments = {keys = {}, values = {}, last = {}}
+        local comments0 = {keys = {}, values = {}, last = {}}
         while utils["comment?"](tbl[#tbl]) do
-          table.insert(comments.last, 1, table.remove(tbl))
+          table.insert(comments0.last, 1, table.remove(tbl))
         end
         local last_key_3f = false
         for i, node in ipairs(tbl) do
           if not utils["comment?"](node) then
             last_key_3f = not last_key_3f
           elseif last_key_3f then
-            add_comment_at(comments.values, next_noncomment(tbl, i), node)
+            add_comment_at(comments0.values, next_noncomment(tbl, i), node)
           else
-            add_comment_at(comments.keys, next_noncomment(tbl, i), node)
+            add_comment_at(comments0.keys, next_noncomment(tbl, i), node)
           end
         end
         for i = #tbl, 1, -1 do
@@ -3387,10 +3914,10 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
           else
           end
         end
-        return comments
+        return comments0
       end
       local function close_curly_table(tbl)
-        local comments = extract_comments(tbl)
+        local comments0 = extract_comments(tbl)
         local keys = {}
         local val = {}
         if ((#tbl % 2) ~= 0) then
@@ -3407,7 +3934,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
           val[tbl[i]] = tbl[(i + 1)]
           table.insert(keys, tbl[i])
         end
-        tbl.comments = comments
+        tbl.comments = comments0
         tbl.keys = keys
         return dispatch(val)
       end
@@ -3421,7 +3948,7 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
           parse_error(("mismatched closing delimiter " .. string.char(b) .. ", expected " .. string.char(top.closer)))
         else
         end
-        top.byteend = byteindex
+        set_source_fields(top)
         if (b == 41) then
           return close_list(top)
         elseif (b == 93) then
@@ -3434,16 +3961,16 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
         table.insert(chars, b)
         local state0
         do
-          local _185_ = {state, b}
-          if ((_G.type(_185_) == "table") and ((_185_)[1] == "base") and ((_185_)[2] == 92)) then
+          local _249_ = {state, b}
+          if ((_G.type(_249_) == "table") and ((_249_)[1] == "base") and ((_249_)[2] == 92)) then
             state0 = "backslash"
-          elseif ((_G.type(_185_) == "table") and ((_185_)[1] == "base") and ((_185_)[2] == 34)) then
+          elseif ((_G.type(_249_) == "table") and ((_249_)[1] == "base") and ((_249_)[2] == 34)) then
             state0 = "done"
-          elseif ((_G.type(_185_) == "table") and ((_185_)[1] == "backslash") and ((_185_)[2] == 10)) then
+          elseif ((_G.type(_249_) == "table") and ((_249_)[1] == "backslash") and ((_249_)[2] == 10)) then
             table.remove(chars, (#chars - 1))
             state0 = "base"
           elseif true then
-            local _ = _185_
+            local _ = _249_
             state0 = "base"
           else
             state0 = nil
@@ -3468,18 +3995,18 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
         table.remove(stack)
         local raw = string.char(unpack(chars))
         local formatted = raw:gsub("[\7-\13]", escape_char)
-        local _189_ = (rawget(_G, "loadstring") or load)(("return " .. formatted))
-        if (nil ~= _189_) then
-          local load_fn = _189_
+        local _253_ = (rawget(_G, "loadstring") or load)(("return " .. formatted))
+        if (nil ~= _253_) then
+          local load_fn = _253_
           return dispatch(load_fn())
-        elseif (_189_ == nil) then
+        elseif (_253_ == nil) then
           return parse_error(("Invalid string: " .. raw))
         else
           return nil
         end
       end
       local function parse_prefix(b)
-        table.insert(stack, {prefix = prefixes[b], filename = _3ffilename, line = line, bytestart = byteindex})
+        table.insert(stack, {prefix = prefixes[b], filename = filename, line = line, bytestart = byteindex, col = (col - 1)})
         local nextb = getb()
         if (whitespace_3f(nextb) or (true == delims[nextb])) then
           if (b ~= 35) then
@@ -3510,13 +4037,13 @@ 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 _195_ = tonumber(number_with_stripped_underscores)
-          if (nil ~= _195_) then
-            local x = _195_
+          local _259_ = tonumber(number_with_stripped_underscores)
+          if (nil ~= _259_) then
+            local x = _259_
             dispatch(x)
             return true
           elseif true then
-            local _ = _195_
+            local _ = _259_
             return false
           else
             return nil
@@ -3524,33 +4051,37 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
         end
       end
       local function check_malformed_sym(rawstr)
+        local function col_adjust(pat)
+          return (rawstr:find(pat) - utils.len(rawstr) - 1)
+        end
         if (rawstr:match("^~") and (rawstr ~= "~=")) then
-          return parse_error("illegal character: ~")
+          return parse_error("invalid character: ~")
         elseif rawstr:match("%.[0-9]") then
-          return parse_error(("can't start multisym segment with a digit: " .. rawstr), (((byteindex - #rawstr) + rawstr:find("%.[0-9]")) + 1))
+          return parse_error(("can't start multisym segment with a digit: " .. rawstr), col_adjust("%.[0-9]"))
         elseif (rawstr:match("[%.:][%.:]") and (rawstr ~= "..") and (rawstr ~= "$...")) then
-          return parse_error(("malformed multisym: " .. rawstr), ((byteindex - #rawstr) + 1 + rawstr:find("[%.:][%.:]")))
+          return parse_error(("malformed multisym: " .. rawstr), col_adjust("[%.:][%.:]"))
         elseif ((rawstr ~= ":") and rawstr:match(":$")) then
-          return parse_error(("malformed multisym: " .. rawstr), ((byteindex - #rawstr) + 1 + rawstr:find(":$")))
+          return parse_error(("malformed multisym: " .. rawstr), col_adjust(":$"))
         elseif rawstr:match(":.+[%.:]") then
-          return parse_error(("method must be last component of multisym: " .. rawstr), ((byteindex - #rawstr) + rawstr:find(":.+[%.:]")))
+          return parse_error(("method must be last component of multisym: " .. rawstr), col_adjust(":.+[%.:]"))
         else
           return rawstr
         end
       end
       local function parse_sym(b)
-        local bytestart = byteindex
+        local source0 = {bytestart = byteindex, filename = filename, line = line, col = (col - 1)}
         local rawstr = string.char(unpack(parse_sym_loop({b}, getb())))
+        set_source_fields(source0)
         if (rawstr == "true") then
           return dispatch(true)
         elseif (rawstr == "false") then
           return dispatch(false)
         elseif (rawstr == "...") then
-          return dispatch(utils.varg())
+          return dispatch(utils.varg(source0))
         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 = _3ffilename, line = line}))
+          return dispatch(utils.sym(check_malformed_sym(rawstr), source0))
         else
           return nil
         end
@@ -3569,8 +4100,8 @@ 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)
-        elseif not utils.hook("illegal-char", b, getb, ungetb, dispatch) then
-          parse_error(("illegal character: " .. string.char(b)))
+        elseif not utils["hook-opts"]("illegal-char", options, b, getb, ungetb, dispatch) then
+          parse_error(("invalid character: " .. string.char(b)))
         else
         end
         if not b then
@@ -3583,17 +4114,28 @@ package.preload["fennel.parser"] = package.preload["fennel.parser"] or function(
       end
       return parse_loop(skip_whitespace(getb()))
     end
-    local function _202_()
-      stack, line, byteindex, lastb = {}, 1, 0, nil
+    local function _266_()
+      stack, line, byteindex, col, lastb = {}, 1, 0, 0, nil
       return nil
     end
-    return parse_stream, _202_
+    return parse_stream, _266_
+  end
+  local function parser(stream_or_string, _3ffilename, _3foptions)
+    local filename = (_3ffilename or "unknown")
+    local options = (_3foptions or utils.root.options or {})
+    assert(("string" == type(filename)), "expected filename as second argument to parser")
+    if ("string" == type(stream_or_string)) then
+      return parser_fn(string_stream(stream_or_string, options), filename, options)
+    else
+      return parser_fn(stream_or_string, filename, options)
+    end
   end
   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 default_opts = {["one-line?"] = false, ["detect-cycles?"] = true, ["empty-as-sequence?"] = false, ["metamethod?"] = true, ["prefer-colon?"] = false, ["escape-newlines?"] = false, ["utf8?"] = true, ["line-length"] = 80, depth = 128, ["max-sparse-gap"] = 10}
   local lua_pairs = pairs
   local lua_ipairs = ipairs
   local function pairs(t)
@@ -3632,11 +4174,66 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
       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 function get_default(key)
+    local _7_ = default_opts[key]
+    if (_7_ == nil) then
+      return error(("option '%s' doesn't have a default value, use the :after key to set it"):format(tostring(key)))
+    elseif (nil ~= _7_) then
+      local v = _7_
+      return v
+    else
+      return nil
+    end
+  end
+  local function getopt(options, key)
+    local val = options[key]
+    local _9_ = val
+    if ((_G.type(_9_) == "table") and (nil ~= (_9_).once)) then
+      local val_2a = (_9_).once
+      return val_2a
+    elseif true then
+      local _ = _9_
+      return val
+    else
+      return nil
+    end
+  end
+  local function normalize_opts(options)
+    local tbl_13_auto = {}
+    for k, v in pairs(options) do
+      local k_14_auto, v_15_auto = nil, nil
+      local function _12_()
+        local _11_ = v
+        if ((_G.type(_11_) == "table") and (nil ~= (_11_).after)) then
+          local val = (_11_).after
+          return val
+        else
+          local function _13_()
+            return v.once
+          end
+          if ((_G.type(_11_) == "table") and _13_()) then
+            return get_default(k)
+          elseif true then
+            local _ = _11_
+            return v
+          else
+            return nil
+          end
+        end
+      end
+      k_14_auto, v_15_auto = k, _12_()
+      if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+        tbl_13_auto[k_14_auto] = v_15_auto
+      else
+      end
+    end
+    return tbl_13_auto
+  end
+  local function sort_keys(_16_, _18_)
+    local _arg_17_ = _16_
+    local a = _arg_17_[1]
+    local _arg_19_ = _18_
+    local b = _arg_19_[1]
     local ta = type(a)
     local tb = type(b)
     if ((ta == tb) and ((ta == "string") or (ta == "number"))) then
@@ -3657,12 +4254,12 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
   end
   local function max_index_gap(kv)
     local gap = 0
-    if (length_2a(kv) > 0) then
+    if (0 < length_2a(kv)) then
       local i = 0
-      for _, _13_ in ipairs(kv) do
-        local _each_14_ = _13_
-        local k = _each_14_[1]
-        if ((k - i) > gap) then
+      for _, _22_ in ipairs(kv) do
+        local _each_23_ = _22_
+        local k = _each_23_[1]
+        if (gap < (k - i)) then
           gap = (k - i)
         else
         end
@@ -3675,9 +4272,9 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
   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]
+    for _, _26_ in ipairs(kv) do
+      local _each_27_ = _26_
+      local j = _each_27_[1]
       i = (i + 1)
       while (i < j) do
         table.insert(missing_indexes, i)
@@ -3702,7 +4299,7 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     end
     table.sort(kv, sort_keys)
     if not assoc_3f then
-      if (max_index_gap(kv) > options["max-sparse-gap"]) then
+      if (options["max-sparse-gap"] < max_index_gap(kv)) then
         assoc_3f = true
       else
         fill_gaps(kv)
@@ -3712,14 +4309,14 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     if (length_2a(kv) == 0) then
       return kv, "empty"
     else
-      local function _22_()
+      local function _31_()
         if assoc_3f then
           return "table"
         else
           return "seq"
         end
       end
-      return kv, _22_()
+      return kv, _31_()
     end
   end
   local function count_table_appearances(t, appearances)
@@ -3750,10 +4347,10 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
   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_
+      local _36_, _37_ = next(t, _3fk)
+      if ((nil ~= _36_) and (nil ~= _37_)) then
+        local k = _36_
+        local v = _37_
         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
@@ -3763,7 +4360,7 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     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)))
+    return (getopt(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
@@ -3775,17 +4372,17 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     return (indent + opener_length)
   end
   local pp = nil
-  local function concat_table_lines(elements, options, multiline_3f, indent, table_type, prefix)
+  local function concat_table_lines(elements, options, multiline_3f, indent, table_type, prefix, last_comment_3f)
     local indent_str = ("\n" .. string.rep(" ", indent))
     local open
-    local function _32_()
+    local function _41_()
       if ("seq" == table_type) then
         return "["
       else
         return "{"
       end
     end
-    open = ((prefix or "") .. _32_())
+    open = ((prefix or "") .. _41_())
     local close
     if ("seq" == table_type) then
       close = "]"
@@ -3793,8 +4390,15 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
       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)
+    if (not getopt(options, "one-line?") and (multiline_3f or (options["line-length"] < (indent + length_2a(oneline))) or last_comment_3f)) then
+      local function _43_()
+        if last_comment_3f then
+          return indent_str
+        else
+          return ""
+        end
+      end
+      return (open .. table.concat(elements, indent_str) .. _43_() .. close)
     else
       return oneline
     end
@@ -3806,25 +4410,33 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     end
     return n
   end
+  local function comment_3f(x)
+    if ("table" == type(x)) then
+      local fst = x[1]
+      return (("string" == type(fst)) and (nil ~= fst:find("^;")))
+    else
+      return false
+    end
+  end
   local function pp_associative(t, kv, options, indent)
     local multiline_3f = false
     local id = options.seen[t]
-    if (options.level >= options.depth) then
+    if (options.depth <= options.level) then
       return "{...}"
-    elseif (id and options["detect-cycles?"]) then
+    elseif (id and getopt(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
+      if getopt(options, "utf8?") then
         slength = utf8_len
       else
-        local function _35_(_241)
+        local function _46_(_241)
           return #_241
         end
-        slength = _35_
+        slength = _46_
       end
       local prefix
       if visible_cycle_3f0 then
@@ -3834,36 +4446,37 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
       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
+        local options0 = normalize_opts(options)
+        local tbl_16_auto = {}
+        local i_17_auto = #tbl_16_auto
+        for _, _49_ in ipairs(kv) do
+          local _each_50_ = _49_
+          local k = _each_50_[1]
+          local v = _each_50_[2]
+          local val_18_auto
           do
-            local k0 = pp(k, options, (indent0 + 1), true)
-            local v0 = pp(v, options, (indent0 + slength(k0) + 1))
+            local k0 = pp(k, options0, (indent0 + 1), true)
+            local v0 = pp(v, options0, (indent0 + slength(k0) + 1))
             multiline_3f = (multiline_3f or k0:find("\n") or v0:find("\n"))
-            val_16_auto = (k0 .. " " .. v0)
+            val_18_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
+          if (nil ~= val_18_auto) then
+            i_17_auto = (i_17_auto + 1)
+            do end (tbl_16_auto)[i_17_auto] = val_18_auto
           else
           end
         end
-        items = tbl_14_auto
+        items = tbl_16_auto
       end
-      return concat_table_lines(items, options, multiline_3f, indent0, "table", prefix)
+      return concat_table_lines(items, options, multiline_3f, indent0, "table", prefix, false)
     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
+    if (options.depth <= options.level) then
       return "[...]"
-    elseif (id and options["detect-cycles?"]) then
+    elseif (id and getopt(options, "detect-cycles?")) then
       return ("@" .. id .. "[...]")
     else
       local visible_cycle_3f0 = visible_cycle_3f(t, options)
@@ -3875,56 +4488,58 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
       else
         prefix = ""
       end
+      local last_comment_3f = comment_3f(t[#t])
       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
+        local options0 = normalize_opts(options)
+        local tbl_16_auto = {}
+        local i_17_auto = #tbl_16_auto
+        for _, _54_ in ipairs(kv) do
+          local _each_55_ = _54_
+          local _0 = _each_55_[1]
+          local v = _each_55_[2]
+          local val_18_auto
           do
-            local v0 = pp(v, options, indent0)
-            multiline_3f = (multiline_3f or v0:find("\n"))
-            val_16_auto = v0
+            local v0 = pp(v, options0, indent0)
+            multiline_3f = (multiline_3f or v0:find("\n") or v0:find("^;"))
+            val_18_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
+          if (nil ~= val_18_auto) then
+            i_17_auto = (i_17_auto + 1)
+            do end (tbl_16_auto)[i_17_auto] = val_18_auto
           else
           end
         end
-        items = tbl_14_auto
+        items = tbl_16_auto
       end
-      return concat_table_lines(items, options, multiline_3f, indent0, "seq", prefix)
+      return concat_table_lines(items, options, multiline_3f, indent0, "seq", prefix, last_comment_3f)
     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
+      if getopt(options, "empty-as-sequence?") then
         return "[]"
       else
         return "{}"
       end
     else
       local oneline
-      local _48_
+      local _59_
       do
-        local tbl_14_auto = {}
-        local i_15_auto = #tbl_14_auto
+        local tbl_16_auto = {}
+        local i_17_auto = #tbl_16_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
+          local val_18_auto = line:gsub("^%s+", "")
+          if (nil ~= val_18_auto) then
+            i_17_auto = (i_17_auto + 1)
+            do end (tbl_16_auto)[i_17_auto] = val_18_auto
           else
           end
         end
-        _48_ = tbl_14_auto
+        _59_ = tbl_16_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
+      oneline = table.concat(_59_, " ")
+      if (not getopt(options, "one-line?") and (force_multi_line_3f or oneline:find("\n") or (options["line-length"] < (indent + length_2a(oneline))))) then
         return table.concat(lines, ("\n" .. string.rep(" ", indent)))
       else
         return oneline
@@ -3932,28 +4547,32 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     end
   end
   local function pp_metamethod(t, metamethod, options, indent)
-    if (options.level >= options.depth) then
-      if options["empty-as-sequence?"] then
+    if (options.depth <= options.level) then
+      if getopt(options, "empty-as-sequence?") then
         return "[...]"
       else
         return "{...}"
       end
     else
       local _
-      local function _53_(_241)
+      local function _64_(_241)
         return visible_cycle_3f(_241, options)
       end
-      options["visible-cycle?"] = _53_
+      options["visible-cycle?"] = _64_
       _ = nil
-      local lines, force_multi_line_3f = metamethod(t, pp, options, indent)
+      local lines, force_multi_line_3f = nil, nil
+      do
+        local options0 = normalize_opts(options)
+        lines, force_multi_line_3f = metamethod(t, pp, options0, indent)
+      end
       options["visible-cycle?"] = nil
-      local _54_ = type(lines)
-      if (_54_ == "string") then
+      local _65_ = type(lines)
+      if (_65_ == "string") then
         return lines
-      elseif (_54_ == "table") then
+      elseif (_65_ == "table") then
         return concat_lines(lines, options, indent, force_multi_line_3f)
       elseif true then
-        local _0 = _54_
+        local _0 = _65_
         return error("__fennelview metamethod must return a table of lines")
       else
         return nil
@@ -3964,40 +4583,40 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     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
+      local _68_
+      if getopt(options, "metamethod?") then
+        local _69_ = x
+        if (nil ~= _69_) then
+          local _70_ = getmetatable(_69_)
+          if (nil ~= _70_) then
+            _68_ = (_70_).__fennelview
           else
-            _57_ = _59_
+            _68_ = _70_
           end
         else
-          _57_ = _58_
+          _68_ = _69_
         end
       else
-        _57_ = nil
+        _68_ = nil
       end
-      if (nil ~= _57_) then
-        local metamethod = _57_
+      if (nil ~= _68_) then
+        local metamethod = _68_
         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
+        local _ = _68_
+        local _74_, _75_ = table_kv_pairs(x, options)
+        if (true and (_75_ == "empty")) then
+          local _0 = _74_
+          if getopt(options, "empty-as-sequence?") then
             x0 = "[]"
           else
             x0 = "{}"
           end
-        elseif ((nil ~= _63_) and (_64_ == "table")) then
-          local kv = _63_
+        elseif ((nil ~= _74_) and (_75_ == "table")) then
+          local kv = _74_
           x0 = pp_associative(x, kv, options, indent)
-        elseif ((nil ~= _63_) and (_64_ == "seq")) then
-          local kv = _63_
+        elseif ((nil ~= _74_) and (_75_ == "seq")) then
+          local kv = _74_
           x0 = pp_sequence(x, kv, options, indent)
         else
           x0 = nil
@@ -4010,8 +4629,8 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     return x0
   end
   local function number__3estring(n)
-    local _68_ = string.gsub(tostring(n), ",", ".")
-    return _68_
+    local _79_ = string.gsub(tostring(n), ",", ".")
+    return _79_
   end
   local function colon_string_3f(s)
     return s:find("^[-%w?^_!$%&*+./@|<=>]+$")
@@ -4026,12 +4645,12 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
         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)
+          ret = (byte and (function(_80_,_81_,_82_) return (_80_ <= _81_) and (_81_ <= _82_) end)(init0["min-byte"],byte,init0["max-byte"]) and init0)
         end
         init = ret
       end
       local code
-      local function _72_()
+      local function _83_()
         local code0
         if init then
           code0 = (byte - init["min-byte"])
@@ -4040,12 +4659,12 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
         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)))
+          code0 = (byte0 and code0 and (function(_85_,_86_,_87_) return (_85_ <= _86_) and (_86_ <= _87_) end)(128,byte0,191) 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
+      code = (init and _83_())
+      if (code and (function(_88_,_89_,_90_) return (_88_ <= _89_) and (_89_ <= _90_) end)(init["min-code"],code,init["max-code"]) and not (function(_91_,_92_,_93_) return (_91_ <= _92_) and (_92_ <= _93_) end)(55296,code,57343)) then
         return init.len
       else
         return nil
@@ -4070,26 +4689,39 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     return table.concat(output)
   end
   local function pp_string(str, options, indent)
+    local len = length_2a(str)
+    local esc_newline_3f = ((len < 2) or (getopt(options, "escape-newlines?") and (len < (options["line-length"] - indent))))
     local escs
-    local _86_
-    if (options["escape-newlines?"] and (length_2a(str) < (options["line-length"] - indent))) then
-      _86_ = "\\n"
+    local _97_
+    if esc_newline_3f then
+      _97_ = "\\n"
     else
-      _86_ = "\n"
+      _97_ = "\n"
     end
-    local function _88_(_241, _242)
+    local function _99_(_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_})
+    escs = setmetatable({["\7"] = "\\a", ["\8"] = "\\b", ["\12"] = "\\f", ["\11"] = "\\v", ["\13"] = "\\r", ["\9"] = "\\t", ["\\"] = "\\\\", ["\""] = "\\\"", ["\n"] = _97_}, {__index = _99_})
     local str0 = ("\"" .. str:gsub("[%c\\\"]", escs) .. "\"")
-    if options["utf8?"] then
+    if getopt(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 defaults
+    do
+      local tbl_13_auto = {}
+      for k, v in pairs(default_opts) do
+        local k_14_auto, v_15_auto = k, v
+        if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+          tbl_13_auto[k_14_auto] = v_15_auto
+        else
+        end
+      end
+      defaults = tbl_13_auto
+    end
     local overrides = {level = 0, appearances = count_table_appearances(t, {}), seen = {len = 0}}
     for k, v in pairs((options or {})) do
       defaults[k] = v
@@ -4099,7 +4731,7 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
     end
     return defaults
   end
-  local function _90_(x, options, indent, colon_3f)
+  local function _102_(x, options, indent, colon_3f)
     local indent0 = (indent or 0)
     local options0 = (options or make_options(x))
     local x0
@@ -4109,29 +4741,29 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
       x0 = x
     end
     local tv = type(x0)
-    local function _93_()
-      local _92_ = getmetatable(x0)
-      if (nil ~= _92_) then
-        return (_92_).__fennelview
+    local function _105_()
+      local _104_ = getmetatable(x0)
+      if (nil ~= _104_) then
+        return (_104_).__fennelview
       else
-        return _92_
+        return _104_
       end
     end
-    if ((tv == "table") or ((tv == "userdata") and _93_())) then
+    if ((tv == "table") or ((tv == "userdata") and _105_())) then
       return pp_table(x0, options0, indent0)
     elseif (tv == "number") then
       return number__3estring(x0)
     else
-      local function _95_()
+      local function _107_()
         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?"]
+          return getopt(options0, "prefer-colon?")
         end
       end
-      if ((tv == "string") and colon_string_3f(x0) and _95_()) then
+      if ((tv == "string") and colon_string_3f(x0) and _107_()) then
         return (":" .. x0)
       elseif (tv == "string") then
         return pp_string(x0, options0, indent0)
@@ -4142,7 +4774,7 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
       end
     end
   end
-  pp = _90_
+  pp = _102_
   local function view(x, _3foptions)
     return pp(x, make_options(x, _3foptions), 0)
   end
@@ -4150,7 +4782,37 @@ package.preload["fennel.view"] = package.preload["fennel.view"] or function(...)
 end
 package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(...)
   local view = require("fennel.view")
-  local version = "1.0.0"
+  local version = "1.3.0"
+  local function luajit_vm_3f()
+    return ((nil ~= _G.jit) and (type(_G.jit) == "table") and (nil ~= _G.jit.on) and (nil ~= _G.jit.off) and (type(_G.jit.version_num) == "number"))
+  end
+  local function luajit_vm_version()
+    local jit_os
+    if (_G.jit.os == "OSX") then
+      jit_os = "macOS"
+    else
+      jit_os = _G.jit.os
+    end
+    return (_G.jit.version .. " " .. jit_os .. "/" .. _G.jit.arch)
+  end
+  local function fengari_vm_3f()
+    return ((nil ~= _G.fengari) and (type(_G.fengari) == "table") and (nil ~= _G.fengari.VERSION) and (type(_G.fengari.VERSION_NUM) == "number"))
+  end
+  local function fengari_vm_version()
+    return (_G.fengari.RELEASE .. " (" .. _VERSION .. ")")
+  end
+  local function lua_vm_version()
+    if luajit_vm_3f() then
+      return luajit_vm_version()
+    elseif fengari_vm_3f() then
+      return fengari_vm_version()
+    else
+      return ("PUC " .. _VERSION)
+    end
+  end
+  local function runtime_version()
+    return ("Fennel " .. version .. " on " .. lua_vm_version())
+  end
   local function warn(message)
     if (_G.io and _G.io.stderr) then
       return (_G.io.stderr):write(("--WARNING: %s\n"):format(tostring(message)))
@@ -4158,68 +4820,137 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
       return nil
     end
   end
-  local function stablepairs(t)
-    local keys = {}
-    local used_keys = {}
-    local succ = {}
-    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
+  local len
+  do
+    local _112_, _113_ = pcall(require, "utf8")
+    if ((_112_ == true) and (nil ~= _113_)) then
+      local utf8 = _113_
+      len = utf8.len
+    elseif true then
+      local _ = _112_
+      len = string.len
     else
-      for k in pairs(t) do
-        table.insert(keys, k)
+      len = nil
+    end
+  end
+  local function mt_keys_in_order(t, out, used_keys)
+    for _, k in ipairs(getmetatable(t).keys) do
+      if (t[k] and not used_keys[k]) then
+        used_keys[k] = true
+        table.insert(out, k)
+      else
       end
-      local function _100_(_241, _242)
+    end
+    for k in pairs(t) do
+      if not used_keys[k] then
+        table.insert(out, k)
+      else
+      end
+    end
+    return out
+  end
+  local function stablepairs(t)
+    local keys
+    local _118_
+    do
+      local t_117_ = getmetatable(t)
+      if (nil ~= t_117_) then
+        t_117_ = (t_117_).keys
+      else
+      end
+      _118_ = t_117_
+    end
+    if _118_ then
+      keys = mt_keys_in_order(t, {}, {})
+    else
+      local _120_
+      do
+        local tbl_16_auto = {}
+        local i_17_auto = #tbl_16_auto
+        for k in pairs(t) do
+          local val_18_auto = k
+          if (nil ~= val_18_auto) then
+            i_17_auto = (i_17_auto + 1)
+            do end (tbl_16_auto)[i_17_auto] = val_18_auto
+          else
+          end
+        end
+        _120_ = tbl_16_auto
+      end
+      local function _122_(_241, _242)
         return (tostring(_241) < tostring(_242))
       end
-      table.sort(keys, _100_)
+      table.sort(_120_, _122_)
+      keys = _120_
     end
-    for i, k in ipairs(keys) do
-      succ[k] = keys[(i + 1)]
-    end
-    local function stablenext(tbl, idx)
-      local key
-      if (idx == nil) then
-        key = keys[1]
-      else
-        key = succ[idx]
+    local succ
+    do
+      local tbl_13_auto = {}
+      for i, k in ipairs(keys) do
+        local k_14_auto, v_15_auto = k, keys[(i + 1)]
+        if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+          tbl_13_auto[k_14_auto] = v_15_auto
+        else
+        end
       end
-      local value
+      succ = tbl_13_auto
+    end
+    local function stablenext(tbl, key)
+      local next_key
       if (key == nil) then
-        value = nil
+        next_key = keys[1]
       else
-        value = tbl[key]
+        next_key = succ[key]
       end
-      return key, value
+      return next_key, tbl[next_key]
     end
     return stablenext, t, nil
   end
+  local function get_in(tbl, path, _3ffallback)
+    assert(("table" == type(tbl)), "get-in expects path to be a table")
+    if (0 == #path) then
+      return _3ffallback
+    else
+      local _126_
+      do
+        local t = tbl
+        for _, k in ipairs(path) do
+          if (nil == t) then break end
+          local _127_ = type(t)
+          if (_127_ == "table") then
+            t = t[k]
+          else
+            t = nil
+          end
+        end
+        _126_ = t
+      end
+      if (nil ~= _126_) then
+        local res = _126_
+        return res
+      elseif true then
+        local _ = _126_
+        return _3ffallback
+      else
+        return nil
+      end
+    end
+  end
   local function map(t, f, _3fout)
     local out = (_3fout or {})
     local f0
     if (type(f) == "function") then
       f0 = f
     else
-      local function _104_(_241)
+      local function _131_(_241)
         return (_241)[f]
       end
-      f0 = _104_
+      f0 = _131_
     end
     for _, x in ipairs(t) do
-      local _106_ = f0(x)
-      if (nil ~= _106_) then
-        local v = _106_
+      local _133_ = f0(x)
+      if (nil ~= _133_) then
+        local v = _133_
         table.insert(out, v)
       else
       end
@@ -4232,19 +4963,19 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     if (type(f) == "function") then
       f0 = f
     else
-      local function _108_(_241)
+      local function _135_(_241)
         return (_241)[f]
       end
-      f0 = _108_
+      f0 = _135_
     end
     for k, x in stablepairs(t) do
-      local _110_, _111_ = f0(k, x)
-      if ((nil ~= _110_) and (nil ~= _111_)) then
-        local key = _110_
-        local value = _111_
+      local _137_, _138_ = f0(k, x)
+      if ((nil ~= _137_) and (nil ~= _138_)) then
+        local key = _137_
+        local value = _138_
         out[key] = value
-      elseif (nil ~= _110_) then
-        local value = _110_
+      elseif (nil ~= _137_) then
+        local value = _137_
         table.insert(out, value)
       else
       end
@@ -4252,25 +4983,48 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     return out
   end
   local function copy(from, _3fto)
-    local to = (_3fto or {})
+    local tbl_13_auto = (_3fto or {})
     for k, v in pairs((from or {})) do
-      to[k] = v
+      local k_14_auto, v_15_auto = k, v
+      if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+        tbl_13_auto[k_14_auto] = v_15_auto
+      else
+      end
     end
-    return to
+    return tbl_13_auto
   end
   local function member_3f(x, tbl, _3fn)
-    local _113_ = tbl[(_3fn or 1)]
-    if (_113_ == x) then
+    local _141_ = tbl[(_3fn or 1)]
+    if (_141_ == x) then
       return true
-    elseif (_113_ == nil) then
+    elseif (_141_ == nil) then
       return nil
     elseif true then
-      local _ = _113_
+      local _ = _141_
       return member_3f(x, tbl, ((_3fn or 1) + 1))
     else
       return nil
     end
   end
+  local function maxn(tbl)
+    local max = 0
+    for k in pairs(tbl) do
+      if ("number" == type(k)) then
+        max = math.max(max, k)
+      else
+        max = max
+      end
+    end
+    return max
+  end
+  local function every_3f(predicate, seq)
+    local result = true
+    for _, item in ipairs(seq) do
+      if not result then break end
+      result = predicate(item)
+    end
+    return result
+  end
   local function allpairs(tbl)
     assert((type(tbl) == "table"), "allpairs expects a table")
     local t = tbl
@@ -4283,9 +5037,9 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
         seen[next_state] = true
         return next_state, value
       else
-        local _115_ = getmetatable(t)
-        if ((_G.type(_115_) == "table") and true) then
-          local __index = (_115_).__index
+        local _144_ = getmetatable(t)
+        if ((_G.type(_144_) == "table") and true) then
+          local __index = (_144_).__index
           if ("table" == type(__index)) then
             t = __index
             return allpairs_next(t)
@@ -4303,18 +5057,22 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     return self[1]
   end
   local nil_sym = nil
-  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
+  local function list__3estring(self, _3fview, _3foptions, _3findent)
+    local safe = {}
+    local view0
+    if _3fview then
+      local function _148_(_241)
+        return _3fview(_241, _3foptions, _3findent)
       end
+      view0 = _148_
+    else
+      view0 = view
     end
+    local max = maxn(self)
     for i = 1, max do
       safe[i] = (((self[i] == nil) and nil_sym) or self[i])
     end
-    return ("(" .. table.concat(map(safe, (_3ftostring2 or view)), " ", 1, max) .. ")")
+    return ("(" .. table.concat(map(safe, view0), " ", 1, max) .. ")")
   end
   local function comment_view(c)
     return c, true
@@ -4327,19 +5085,19 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
   end
   local symbol_mt = {__fennelview = deref, __tostring = deref, __eq = sym_3d, __lt = sym_3c, "SYMBOL"}
   local expr_mt
-  local function _120_(x)
+  local function _150_(x)
     return tostring(deref(x))
   end
-  expr_mt = {__tostring = _120_, "EXPR"}
+  expr_mt = {__tostring = _150_, "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({"..."}, {__fennelview = deref, __tostring = deref, "VARARG"})
+  local varg_mt = {__fennelview = deref, __tostring = deref, "VARARG"}
   local getenv
-  local function _121_()
+  local function _151_()
     return nil
   end
-  getenv = ((os and os.getenv) or _121_)
+  getenv = ((os and os.getenv) or _151_)
   local function debug_on_3f(flag)
     local level = (getenv("FENNEL_DEBUG") or "")
     return ((level == "all") or level:find(flag))
@@ -4347,37 +5105,74 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
   local function list(...)
     return setmetatable({...}, list_mt)
   end
-  local function sym(str, _3fsource, _3fscope)
-    local s = {["?scope"] = _3fscope, str}
-    for k, v in pairs((_3fsource or {})) do
-      if (type(k) == "string") then
-        s[k] = v
-      else
+  local function sym(str, _3fsource)
+    local _152_
+    do
+      local tbl_13_auto = {str}
+      for k, v in pairs((_3fsource or {})) do
+        local k_14_auto, v_15_auto = nil, nil
+        if (type(k) == "string") then
+          k_14_auto, v_15_auto = k, v
+        else
+          k_14_auto, v_15_auto = nil
+        end
+        if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+          tbl_13_auto[k_14_auto] = v_15_auto
+        else
+        end
       end
+      _152_ = tbl_13_auto
     end
-    return setmetatable(s, symbol_mt)
+    return setmetatable(_152_, symbol_mt)
   end
   nil_sym = sym("nil")
   local function sequence(...)
-    return setmetatable({...}, {sequence = sequence_marker})
+    local function _155_(seq, view0, inspector, indent)
+      local opts
+      do
+        local _156_ = inspector
+        _156_["empty-as-sequence?"] = {once = true, after = inspector["empty-as-sequence?"]}
+        _156_["metamethod?"] = {once = false, after = inspector["metamethod?"]}
+        opts = _156_
+      end
+      return view0(seq, opts, indent)
+    end
+    return setmetatable({...}, {sequence = sequence_marker, __fennelview = _155_})
   end
   local function expr(strcode, etype)
     return setmetatable({type = etype, strcode}, expr_mt)
   end
   local function comment_2a(contents, _3fsource)
-    local _let_123_ = (_3fsource or {})
-    local filename = _let_123_["filename"]
-    local line = _let_123_["line"]
+    local _let_157_ = (_3fsource or {})
+    local filename = _let_157_["filename"]
+    local line = _let_157_["line"]
     return setmetatable({filename = filename, line = line, contents}, comment_mt)
   end
-  local function varg()
-    return vararg
+  local function varg(_3fsource)
+    local _158_
+    do
+      local tbl_13_auto = {"..."}
+      for k, v in pairs((_3fsource or {})) do
+        local k_14_auto, v_15_auto = nil, nil
+        if (type(k) == "string") then
+          k_14_auto, v_15_auto = k, v
+        else
+          k_14_auto, v_15_auto = nil
+        end
+        if ((k_14_auto ~= nil) and (v_15_auto ~= nil)) then
+          tbl_13_auto[k_14_auto] = v_15_auto
+        else
+        end
+      end
+      _158_ = tbl_13_auto
+    end
+    return setmetatable(_158_, varg_mt)
   end
   local function expr_3f(x)
     return ((type(x) == "table") and (getmetatable(x) == expr_mt) and x)
   end
   local function varg_3f(x)
-    return ((x == vararg) and x)
+    return ((type(x) == "table") and (getmetatable(x) == varg_mt) and x)
   end
   local function list_3f(x)
     return ((type(x) == "table") and (getmetatable(x) == list_mt) and x)
@@ -4393,7 +5188,10 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     return ((type(x) == "table") and (getmetatable(x) == comment_mt) and x)
   end
   local function table_3f(x)
-    return ((type(x) == "table") and (x ~= vararg) and (getmetatable(x) ~= list_mt) and (getmetatable(x) ~= symbol_mt) and not comment_3f(x) and x)
+    return ((type(x) == "table") and not varg_3f(x) and (getmetatable(x) ~= list_mt) and (getmetatable(x) ~= symbol_mt) and not comment_3f(x) and x)
+  end
+  local function string_3f(x)
+    return (type(x) == "string")
   end
   local function multi_sym_3f(str)
     if sym_3f(str) then
@@ -4401,27 +5199,33 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     elseif (type(str) ~= "string") then
       return false
     else
-      local parts = {}
-      for part in str:gmatch("[^%.%:]+[%.%:]?") do
-        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))
-        else
-          parts[(#parts + 1)] = part
+      local function _161_()
+        local parts = {}
+        for part in str:gmatch("[^%.%:]+[%.%:]?") do
+          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))
+          else
+            parts[(#parts + 1)] = part
+          end
         end
+        return ((0 < #parts) and parts)
       end
-      return ((#parts > 0) and (str:match("%.") or str:match(":")) and not str:match("%.%.") and (str:byte() ~= string.byte(".")) and (str:byte(( - 1)) ~= string.byte(".")) and parts)
+      return ((str:match("%.") or str:match(":")) and not str:match("%.%.") and (str:byte() ~= string.byte(".")) and (str:byte(( - 1)) ~= string.byte(".")) and _161_())
     end
   end
   local function quoted_3f(symbol)
     return symbol.quoted
   end
+  local function idempotent_expr_3f(x)
+    return ((type(x) == "string") or (type(x) == "integer") or (type(x) == "number") or (sym_3f(x) and not multi_sym_3f(x)))
+  end
   local function ast_source(ast)
-    if table_3f(ast) then
+    if (table_3f(ast) or sequence_3f(ast)) then
       return (getmetatable(ast) or {})
     elseif ("table" == type(ast)) then
       return ast
@@ -4458,15 +5262,15 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     return subopts
   end
   local root
-  local function _129_()
+  local function _167_()
   end
-  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 = {chunk = nil, scope = nil, options = nil, reset = _167_}
+  root["set-reset"] = function(_168_)
+    local _arg_169_ = _168_
+    local chunk = _arg_169_["chunk"]
+    local scope = _arg_169_["scope"]
+    local options = _arg_169_["options"]
+    local reset = _arg_169_["reset"]
     root.reset = function()
       root.chunk, root.scope, root.options, root.reset = chunk, scope, options, reset
       return nil
@@ -4474,11 +5278,11 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
     return root.reset
   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_
+  local function check_plugin_version(_170_)
+    local _arg_171_ = _170_
+    local name = _arg_171_["name"]
+    local versions = _arg_171_["versions"]
+    local plugin = _arg_171_
     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))
@@ -4486,24 +5290,47 @@ package.preload["fennel.utils"] = package.preload["fennel.utils"] or function(..
       return nil
     end
   end
-  local function hook(event, ...)
-    local result = nil
-    if (root.options and root.options.plugins) then
-      for _, plugin in ipairs(root.options.plugins) do
+  local function hook_opts(event, _3foptions, ...)
+    local plugins
+    local function _174_(...)
+      local t_173_ = _3foptions
+      if (nil ~= t_173_) then
+        t_173_ = (t_173_).plugins
+      else
+      end
+      return t_173_
+    end
+    local function _177_(...)
+      local t_176_ = root.options
+      if (nil ~= t_176_) then
+        t_176_ = (t_176_).plugins
+      else
+      end
+      return t_176_
+    end
+    plugins = (_174_(...) or _177_(...))
+    if plugins then
+      local result = nil
+      for _, plugin in ipairs(plugins) do
         if result then break end
         check_plugin_version(plugin)
-        local _135_ = plugin[event]
-        if (nil ~= _135_) then
-          local f = _135_
+        local _179_ = plugin[event]
+        if (nil ~= _179_) then
+          local f = _179_
           result = f(...)
         else
+          result = nil
         end
       end
+      return result
     else
+      return nil
     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")}, ";")}
+  local function hook(event, ...)
+    return hook_opts(event, root.options, ...)
+  end
+  return {warn = warn, allpairs = allpairs, stablepairs = stablepairs, copy = copy, ["get-in"] = get_in, kvmap = kvmap, map = map, ["walk-tree"] = walk_tree, ["member?"] = member_3f, maxn = maxn, ["every?"] = every_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, ["string?"] = string_3f, ["idempotent-expr?"] = idempotent_expr_3f, ["valid-lua-identifier?"] = valid_lua_identifier_3f, ["lua-keywords"] = lua_keywords, hook = hook, ["hook-opts"] = hook_opts, ["propagate-options"] = propagate_options, root = root, ["debug-on?"] = debug_on_3f, ["ast-source"] = ast_source, version = version, ["runtime-version"] = runtime_version, len = len, 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")
@@ -4544,14 +5371,14 @@ local function eval(str, options, ...)
   local env = eval_env(opts.env, opts)
   local lua_source = compiler["compile-string"](str, opts)
   local loader
-  local function _616_(...)
+  local function _753_(...)
     if opts.filename then
       return ("@" .. opts.filename)
     else
       return str
     end
   end
-  loader = specials["load-code"](lua_source, env, _616_(...))
+  loader = specials["load-code"](lua_source, env, _753_(...))
   opts.filename = nil
   return loader(...)
 end
@@ -4564,8 +5391,8 @@ local function dofile_2a(filename, options, ...)
   return eval(source, opts, ...)
 end
 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 body_3f = {"when", "with-open", "collect", "icollect", "fcollect", "lambda", "\206\187", "macro", "match", "match-try", "case", "case-try", "accumulate", "faccumulate", "doto"}
+  local binding_3f = {"collect", "icollect", "fcollect", "each", "for", "let", "with-open", "accumulate", "faccumulate"}
   local define_3f = {"fn", "lambda", "\206\187", "var", "local", "macro", "macros", "global"}
   local out = {}
   for k, v in pairs(compiler.scopes.global.specials) do
@@ -4576,10 +5403,10 @@ local function syntax()
     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
+    local _754_ = type(v)
+    if (_754_ == "function") then
       out[k] = {["global?"] = true, ["function?"] = true}
-    elseif (_617_ == "table") then
+    elseif (_754_ == "table") then
       for k2, v2 in pairs(v) do
         if (("function" == type(v2)) and (k ~= "_G")) then
           out[(k .. "." .. k2)] = {["function?"] = true, ["global?"] = true}
@@ -4592,18 +5419,34 @@ local function syntax()
   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"]}
+local mod = {list = utils.list, ["list?"] = utils["list?"], sym = utils.sym, ["sym?"] = utils["sym?"], ["multi-sym?"] = utils["multi-sym?"], sequence = utils.sequence, ["sequence?"] = utils["sequence?"], ["table?"] = utils["table?"], comment = utils.comment, ["comment?"] = utils["comment?"], varg = utils.varg, ["varg?"] = utils["varg?"], ["sym-char?"] = parser["sym-char?"], parser = parser.parser, compile = compiler.compile, ["compile-string"] = compiler["compile-string"], ["compile-stream"] = compiler["compile-stream"], eval = eval, repl = repl, view = view, dofile = dofile_2a, ["load-code"] = specials["load-code"], doc = specials.doc, metadata = compiler.metadata, traceback = compiler.traceback, version = utils.version, ["runtime-version"] = utils["runtime-version"], ["ast-source"] = utils["ast-source"], path = utils.path, ["macro-path"] = utils["macro-path"], ["macro-loaded"] = specials["macro-loaded"], ["macro-searchers"] = specials["macro-searchers"], ["search-module"] = specials["search-module"], ["make-searcher"] = specials["make-searcher"], searcher = specials["make-searcher"](), syntax = syntax, gensym = compiler.gensym, scope = compiler["make-scope"], mangle = compiler["global-mangling"], unmangle = compiler["global-unmangling"], compile1 = compiler.compile1, ["string-stream"] = parser["string-stream"], granulate = parser.granulate, loadCode = specials["load-code"], make_searcher = specials["make-searcher"], makeSearcher = specials["make-searcher"], searchModule = specials["search-module"], macroPath = utils["macro-path"], macroSearchers = specials["macro-searchers"], macroLoaded = specials["macro-loaded"], compileStream = compiler["compile-stream"], compileString = compiler["compile-string"], stringStream = parser["string-stream"], runtimeVersion = utils["runtime-version"]}
+mod.install = function(_3fopts)
+  table.insert((package.searchers or package.loaders), specials["make-searcher"](_3fopts))
+  return mod
+end
 utils["fennel-module"] = mod
 do
-  local builtin_macros = [===[;; This module contains all the built-in Fennel macros. Unlike all the other
-  ;; modules that are loaded by the old bootstrap compiler, this runs in the
-  ;; compiler scope of the version of the compiler being defined.
+  local module_name = "fennel.macros"
+  local _
+  local function _757_()
+    return mod
+  end
+  package.preload[module_name] = _757_
+  _ = nil
+  local env
+  do
+    local _758_ = specials["make-compiler-env"](nil, compiler.scopes.compiler, {})
+    do end (_758_)["utils"] = utils
+    _758_["fennel"] = mod
+    env = _758_
+  end
+  local built_ins = eval([===[;; These macros are awkward because their definition cannot rely on the any
+  ;; built-in macros, only special forms. (no when, no icollect, etc)
   
-  ;; The code for these macros is somewhat idiosyncratic because it cannot use any
-  ;; macros which have not yet been defined.
-  
-  ;; TODO: some of these macros modify their arguments; we should stop doing that,
-  ;; but in a way that preserves file/line metadata.
+  (fn copy [t]
+    (let [out []]
+      (each [_ v (ipairs t)] (table.insert out v))
+      (setmetatable out (getmetatable t))))
   
   (fn ->* [val ...]
     "Thread-first macro.
@@ -4611,7 +5454,7 @@ do
   The value of the second form is spliced into the first arg of the third, etc."
     (var x val)
     (each [_ e (ipairs [...])]
-      (let [elt (if (list? e) e (list e))]
+      (let [elt (if (list? e) (copy e) (list e))]
         (table.insert elt 2 x)
         (set x elt)))
     x)
@@ -4622,39 +5465,35 @@ do
   rather than the first."
     (var x val)
     (each [_ e (ipairs [...])]
-      (let [elt (if (list? e) e (list e))]
+      (let [elt (if (list? e) (copy e) (list e))]
         (table.insert elt x)
         (set x elt)))
     x)
   
-  (fn -?>* [val ...]
+  (fn -?>* [val ?e ...]
     "Nil-safe thread-first macro.
   Same as -> except will short-circuit with nil when it encounters a nil value."
-    (if (= 0 (select "#" ...))
+    (if (= nil ?e)
         val
-        (let [els [...]
-              e (table.remove els 1)
-              el (if (list? e) e (list e))
+        (let [el (if (list? ?e) (copy ?e) (list ?e))
               tmp (gensym)]
           (table.insert el 2 tmp)
           `(let [,tmp ,val]
              (if (not= nil ,tmp)
-                 (-?> ,el ,(unpack els))
+                 (-?> ,el ,...)
                  ,tmp)))))
   
-  (fn -?>>* [val ...]
+  (fn -?>>* [val ?e ...]
     "Nil-safe thread-last macro.
   Same as ->> except will short-circuit with nil when it encounters a nil value."
-    (if (= 0 (select "#" ...))
+    (if (= nil ?e)
         val
-        (let [els [...]
-              e (table.remove els 1)
-              el (if (list? e) e (list e))
+        (let [el (if (list? ?e) (copy ?e) (list ?e))
               tmp (gensym)]
           (table.insert el tmp)
           `(let [,tmp ,val]
              (if (not= ,tmp nil)
-                 (-?>> ,el ,(unpack els))
+                 (-?>> ,el ,...)
                  ,tmp)))))
   
   (fn ?dot [tbl ...]
@@ -4662,20 +5501,25 @@ do
   Same as . (dot), except will short-circuit with nil when it encounters
   a nil value in any of subsequent keys."
     (let [head (gensym :t)
-          lookups `(do (var ,head ,tbl) ,head)]
+          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.
+        ;; With this impl, it emits a flat, concise, and readable set of ifs
         (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])]
+    "Evaluate val and splice it into the first argument of subsequent forms."
+    (assert (not= val nil) "missing subject")
+    (let [rebind? (or (not (sym? val))
+                      (multi-sym? val))
+          name (if rebind? (gensym)            val)
+          form (if rebind? `(let [,name ,val]) `(do))]
       (each [_ elt (ipairs [...])]
-        (let [elt (if (list? elt) elt (list elt))]
+        (let [elt (if (list? elt) (copy elt) (list elt))]
           (table.insert elt 2 name)
           (table.insert form elt)))
       (table.insert form name)
@@ -4706,114 +5550,159 @@ do
          ,closer
          (close-handlers# (_G.xpcall ,bodyfn ,traceback)))))
   
-  (fn into-val [iter-tbl]
-    (var into nil)
+  (fn extract-into [iter-tbl]
+    (var (into iter-out found?) (values [] (copy iter-tbl)))
     (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 []))
+      (let [item (. iter-tbl i)]
+        (if (or (= `&into item)
+                (= :into  item))
+            (do
+              (assert (not found?) "expected only one &into clause")
+              (set found? true)
+              (set into (. iter-tbl (+ i 1)))
+              (table.remove iter-out i)
+              (table.remove iter-out i)))))
+    (assert (or (not found?) (sym? into) (table? into) (list? into))
+            "expected table, function call, or symbol in &into clause")
+    (values into iter-out))
   
   (fn collect* [iter-tbl key-expr value-expr ...]
-    "Returns a table made by running an iterator and evaluating an expression that
+    "Return 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.
+  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.
   
   For example,
     (collect [k v (pairs {:apple \"red\" :orange \"orange\"})]
-      v k)
+      (values v k))
   returns
     {: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))
+  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) (<= 2 (length iter-tbl)))
             "expected iterator binding table")
     (assert (not= nil key-expr) "expected key and value expression")
     (assert (= nil ...)
             "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#)))
+    (let [kv-expr (if (= nil value-expr) key-expr `(values ,key-expr ,value-expr))
+          (into iter) (extract-into iter-tbl)]
+      `(let [tbl# ,into]
+         (each ,iter
+           (let [(k# v#) ,kv-expr]
+             (if (and (not= k# nil) (not= v# nil))
+               (tset tbl# k# v#))))
+         tbl#)))
+  
+  (fn seq-collect [how iter-tbl value-expr ...]
+    "Common part between icollect and fcollect for producing sequential tables.
+  
+  Iteration code only differs in using the for or each keyword, the rest
+  of the generated code is identical."
+    (assert (not= nil value-expr) "expected table value expression")
+    (assert (= nil ...)
+            "expected exactly one body expression. Wrap multiple expressions in do")
+    (let [(into iter) (extract-into iter-tbl)]
+      `(let [tbl# ,into]
+         ;; 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#))
+         (,how ,iter
+               (let [val# ,value-expr]
+                 (when (not= nil val#)
+                   (set i# (+ i# 1))
+                   (tset tbl# i# val#))))
          tbl#)))
   
   (fn icollect* [iter-tbl value-expr ...]
-    "Returns a sequential table made by running an iterator and evaluating an
+    "Return 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\". If the body returns nil
-  that element is omitted from the resulting table.
+  This can be thought of as a table comprehension. If the body evaluates to nil
+  that element is omitted.
   
   For example,
-    (icollect [_ v (ipairs [1 2 3 4 5])] (when (not= v 3) (* v v)))
+    (icollect [_ v (ipairs [1 2 3 4 5])]
+      (when (not= v 3)
+        (* v v)))
   returns
     [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))
+  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) (<= 2 (length iter-tbl)))
             "expected iterator binding table")
-    (assert (not= nil value-expr) "expected table value expression")
+    (seq-collect 'each iter-tbl value-expr ...))
+  
+  (fn fcollect* [iter-tbl value-expr ...]
+    "Return a sequential table made by advancing a range as specified by
+  for, and evaluating an expression that returns values to be inserted
+  sequentially into the table.  This can be thought of as a range
+  comprehension. If the body evaluates to nil that element is omitted.
+  
+  For example,
+    (fcollect [i 1 10 2]
+      (when (not= i 3)
+        (* i i)))
+  returns
+    [1 25 49 81]
+  
+  Supports an &into clause after the range to put results in an existing table.
+  Supports early termination with an &until clause."
+    (assert (and (sequence? iter-tbl) (< 2 (length iter-tbl)))
+            "expected range binding table")
+    (seq-collect 'for iter-tbl value-expr ...))
+  
+  (fn accumulate-impl [for? iter-tbl body ...]
+    (assert (and (sequence? iter-tbl) (<= 4 (length iter-tbl)))
+            "expected initial value and iterator binding table")
+    (assert (not= nil body) "expected body expression")
     (assert (= nil ...)
             "expected exactly one body expression. Wrap multiple expressions with do")
-    `(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
-         (let [val# ,value-expr]
-           (when (not= nil val#)
-             (set i# (+ i# 1))
-             (tset tbl# i# val#))))
-       tbl#))
+    (let [[accum-var accum-init] iter-tbl
+          iter (sym (if for? "for" "each"))] ; accumulate or faccumulate?
+      `(do
+         (var ,accum-var ,accum-init)
+         (,iter ,[(unpack iter-tbl 3)]
+                (set ,accum-var ,body))
+         ,(if (list? accum-var)
+            (list (sym :values) (unpack accum-var))
+            accum-var))))
   
-  (fn accumulate* [iter-tbl accum-expr ...]
+  (fn accumulate* [iter-tbl body ...]
     "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 takes a binding table and an expression as its arguments.  In the binding
+  table, the first form starts out bound to the second value, which is an initial
+  accumulator. 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.
+  evaluated, and the accumulator is set to the value of the expression. It
+  eventually returns the final value of the accumulator.
   
   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)))
+  returns 5"
+    (accumulate-impl false iter-tbl body ...))
+  
+  (fn faccumulate* [iter-tbl body ...]
+    "Identical to accumulate, but after the accumulator the binding table is the
+  same as `for` instead of `each`. Like collect to fcollect, will iterate over a
+  numerical range like `for` rather than an iterator."
+    (accumulate-impl true iter-tbl body ...))
+  
+  (fn double-eval-safe? [x type]
+    (or (= :number type) (= :string type) (= :boolean type)
+        (and (sym? x) (not (multi-sym? x)))))
   
   (fn partial* [f ...]
-    "Returns a function with all arguments partially applied to f."
+    "Return a function with all arguments partially applied to f."
     (assert f "expected a function to partially apply")
     (let [bindings []
           args []]
       (each [_ arg (ipairs [...])]
-        (if (or (= :number (type arg))
-                (= :string (type arg))
-                (= :boolean (type arg))
-                (= `nil arg))
+        (if (double-eval-safe? arg (type arg))
           (table.insert args arg)
           (let [name (gensym)]
             (table.insert bindings name)
@@ -4821,12 +5710,14 @@ do
             (table.insert args name))))
       (let [body (list f (unpack args))]
         (table.insert body _VARARG)
-        `(let ,bindings
-           (fn [,_VARARG]
-             ,body)))))
+        ;; only use the extra let if we need double-eval protection
+        (if (= 0 (length bindings))
+            `(fn [,_VARARG] ,body)
+            `(let ,bindings
+               (fn [,_VARARG] ,body))))))
   
   (fn pick-args* [n f]
-    "Creates a function of arity n that applies its arguments to f.
+    "Create a function of arity n that applies its arguments to f.
   
   For example,
     (pick-args 2 func)
@@ -4835,7 +5726,7 @@ do
     (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))
+    (assert (and (= (type n) :number) (= n (math.floor n)) (<= 0 n))
             (.. "Expected n to be an integer literal >= 0, got " (tostring n)))
     (let [bindings []]
       (for [i 1 n]
@@ -4844,14 +5735,14 @@ do
          (,f ,(unpack bindings)))))
   
   (fn pick-values* [n ...]
-    "Like the `values` special, but emits exactly n values.
+    "Evaluate to exactly n values.
   
   For example,
     (pick-values 2 ...)
   expands to
     (let [(_0_ _1_) ...]
       (values _0_ _1_))"
-    (assert (and (= :number (type n)) (>= n 0) (= n (math.floor n)))
+    (assert (and (= :number (type n)) (<= 0 n) (= n (math.floor n)))
             (.. "Expected n to be an integer >= 0, got " (tostring n)))
     (let [let-syms (list)
           let-values (if (= 1 (select "#" ...)) ... `(values ,...))]
@@ -4869,7 +5760,7 @@ do
           has-internal-name? (sym? (. args 1))
           arglist (if has-internal-name? (. args 2) (. args 1))
           docstring-position (if has-internal-name? 3 2)
-          has-docstring? (and (> (length args) docstring-position)
+          has-docstring? (and (< docstring-position (length args))
                               (= :string (type (. args docstring-position))))
           arity-check-position (- 4 (if has-internal-name? 0 1)
                                   (if has-docstring? 0 1))
@@ -4908,7 +5799,7 @@ do
       `(,handle ,(view (macroexpand form _SCOPE)))))
   
   (fn import-macros* [binding1 module-name1 ...]
-    "Binds a table of macros from each macro module according to a binding form.
+    "Bind a table of macros from each macro module according to a binding form.
   Each binding form can be either a symbol or a k/v destructuring table.
   Example:
     (import-macros mymacros                 :my-macros    ; bind to symbol
@@ -4921,8 +5812,13 @@ do
       ;; this is weird because require-macros is deprecated but it works.
       (let [(binding modname) (select i binding1 module-name1 ...)
             scope (get-scope)
-            macros* (_SPECIALS.require-macros `(import-macros ,modname)
-                                              scope {} binding1)]
+            ;; if the module-name is an expression (and not just a string) we
+            ;; patch our expression to have the correct source filename so
+            ;; require-macros can pass it down when resolving the module-name.
+            expr `(import-macros ,modname)
+            filename (if (list? modname) (. modname 1 :filename) :unknown)
+            _ (tset expr :filename filename)
+            macros* (_SPECIALS.require-macros expr scope {} binding)]
         (if (sym? binding)
             ;; bind whole table of macros to table bound to symbol
             (tset scope.macros (. binding 1) macros*)
@@ -4935,28 +5831,65 @@ do
               (tset scope.macros import-key (. macros* macro-name))))))
     nil)
   
-  ;;; Pattern matching
+  {:-> ->*
+   :->> ->>*
+   :-?> -?>*
+   :-?>> -?>>*
+   :?. ?dot
+   :doto doto*
+   :when when*
+   :with-open with-open*
+   :collect collect*
+   :icollect icollect*
+   :fcollect fcollect*
+   :accumulate accumulate*
+   :faccumulate faccumulate*
+   :partial partial*
+   :lambda lambda*
+   :λ lambda*
+   :pick-args pick-args*
+   :pick-values pick-values*
+   :macro macro*
+   :macrodebug macrodebug*
+   :import-macros import-macros*}
+  ]===], {env = env, scope = compiler.scopes.compiler, useMetadata = true, filename = "src/fennel/macros.fnl", moduleName = module_name})
+  local _0
+  for k, v in pairs(built_ins) do
+    compiler.scopes.global.macros[k] = v
+  end
+  _0 = nil
+  local match_macros = eval([===[;;; Pattern matching
+  ;; This is separated out so we can use the "core" macros during the
+  ;; implementation of pattern matching.
   
-  (fn match-values [vals pattern unifications match-pattern]
+  (fn copy [t] (collect [k v (pairs t)] k v))
+  
+  (fn with [opts k]
+    (doto (copy opts) (tset k true)))
+  
+  (fn without [opts k]
+    (doto (copy opts) (tset k nil)))
+  
+  (fn case-values [vals pattern unifications case-pattern opts]
     (let [condition `(and)
           bindings []]
       (each [i pat (ipairs pattern)]
-        (let [(subcondition subbindings) (match-pattern [(. vals i)] pat
-                                                        unifications)]
+        (let [(subcondition subbindings) (case-pattern [(. vals i)] pat
+                                                        unifications (without opts :multival?))]
           (table.insert condition subcondition)
-          (each [_ b (ipairs subbindings)]
-            (table.insert bindings b))))
+          (icollect [_ b (ipairs subbindings) &into bindings] b)))
       (values condition bindings)))
   
-  (fn match-table [val pattern unifications match-pattern]
+  (fn case-table [val pattern unifications case-pattern opts]
     (let [condition `(and (= (_G.type ,val) :table))
           bindings []]
       (each [k pat (pairs pattern)]
         (if (= pat `&)
             (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)]
+                  subcondition (case-table `(pick-values 1 ,rest-val)
+                                            rest-pat unifications case-pattern
+                                            (without opts :multival?))]
               (if (not (sym? rest-pat))
                   (table.insert condition subcondition))
               (assert (= nil (. pattern (+ k 2)))
@@ -4977,25 +5910,124 @@ do
             (or (not= :number (type k)) (and (not= `&as (. pattern (- k 1)))
                                              (not= `& (. pattern (- k 1)))))
             (let [subval `(. ,val ,k)
-                  (subcondition subbindings) (match-pattern [subval] pat
-                                                            unifications)]
+                  (subcondition subbindings) (case-pattern [subval] pat
+                                                            unifications
+                                                            (without opts :multival?))]
               (table.insert condition subcondition)
-              (each [_ b (ipairs subbindings)]
-                (table.insert bindings b)))))
+              (icollect [_ b (ipairs subbindings) &into bindings] b))))
       (values condition bindings)))
   
-  (fn match-pattern [vals pattern unifications]
-    "Takes the AST of values and a single pattern and returns a condition
+  (fn case-guard [vals condition guards unifications case-pattern opts]
+    (if (= 0 (length guards))
+      (case-pattern vals condition unifications opts)
+      (let [(pcondition bindings) (case-pattern vals condition unifications opts)
+            condition `(and ,(unpack guards))]
+         (values `(and ,pcondition
+                       (let ,bindings
+                         ,condition)) bindings))))
+  
+  (fn symbols-in-pattern [pattern]
+    "gives the set of symbols inside a pattern"
+    (if (list? pattern)
+        (let [result {}]
+          (each [_ child-pattern (ipairs pattern)]
+            (collect [name symbol (pairs (symbols-in-pattern child-pattern)) &into result]
+              name symbol))
+          result)
+        (sym? pattern)
+        (if (and (not= pattern `or)
+                 (not= pattern `where)
+                 (not= pattern `?)
+                 (not= pattern `nil))
+            {(tostring pattern) pattern}
+            {})
+        (= (type pattern) :table)
+        (let [result {}]
+          (each [key-pattern value-pattern (pairs pattern)]
+            (collect [name symbol (pairs (symbols-in-pattern key-pattern)) &into result]
+              name symbol)
+            (collect [name symbol (pairs (symbols-in-pattern value-pattern)) &into result]
+              name symbol))
+          result)
+        {}))
+  
+  (fn symbols-in-every-pattern [pattern-list infer-unification?]
+    "gives a list of symbols that are present in every pattern in the list"
+    (let [?symbols (accumulate [?symbols nil
+                                _ pattern (ipairs pattern-list)]
+                     (let [in-pattern (symbols-in-pattern pattern)]
+                       (if ?symbols
+                         (do
+                           (each [name symbol (pairs ?symbols)]
+                             (when (not (. in-pattern name))
+                               (tset ?symbols name nil)))
+                           ?symbols)
+                         in-pattern)))]
+      (icollect [_ symbol (pairs (or ?symbols {}))]
+        (if (not (and infer-unification?
+                      (in-scope? symbol)))
+          symbol))))
+  
+  (fn case-or [vals pattern guards unifications case-pattern opts]
+    (let [pattern [(unpack pattern 2)]
+          bindings (symbols-in-every-pattern pattern opts.infer-unification?)] ;; TODO opts.infer-unification instead of opts.unification?
+      (if (= 0 (length bindings))
+        ;; no bindings special case generates simple code
+        (let [condition
+              (icollect [i subpattern (ipairs pattern) &into `(or)]
+                (let [(subcondition subbindings) (case-pattern vals subpattern unifications opts)]
+                  subcondition))]
+          (values
+            (if (= 0 (length guards))
+              condition
+              `(and ,condition ,(unpack guards)))
+            []))
+        ;; case with bindings is handled specially, and returns three values instead of two
+        (let [matched? (gensym :matched?)
+              bindings-mangled (icollect [_ binding (ipairs bindings)]
+                                 (gensym (tostring binding)))
+              pre-bindings `(if)]
+          (each [i subpattern (ipairs pattern)]
+            (let [(subcondition subbindings) (case-guard vals subpattern guards {} case-pattern opts)]
+              (table.insert pre-bindings subcondition)
+              (table.insert pre-bindings `(let ,subbindings
+                                            (values true ,(unpack bindings))))))
+          (values matched?
+                  [`(,(unpack bindings)) `(values ,(unpack bindings-mangled))]
+                  [`(,matched? ,(unpack bindings-mangled)) pre-bindings])))))
+  
+  (fn case-pattern [vals pattern unifications opts top-level?]
+    "Take the AST of values and a single pattern and returns a condition
   to determine if it matches as well as a list of bindings to
   introduce for the duration of the body if it does match."
+  
+    ;; This function returns the following values (multival):
+    ;; a "condition", which is an expression that determines whether the
+    ;;   pattern should match,
+    ;; a "bindings", which bind all of the symbols used in a pattern
+    ;; an optional "pre-bindings", which is a list of bindings that happen
+    ;;   before the condition and bindings are evaluated. These should only
+    ;;   come from a (case-or). In this case there should be no recursion:
+    ;;   the call stack should be case-condition > case-pattern > case-or
+    ;;
+    ;; Here are the expected flags in the opts table:
+    ;;   :infer-unification? boolean - if the pattern should guess when to unify  (ie, match -> true, case -> false)
+    ;;   :multival? boolean - if the pattern can contain multivals  (in order to disallow patterns like [(1 2)])
+    ;;   :in-where? boolean - if the pattern is surrounded by (where)  (where opts into more pattern features)
+    ;;   :legacy-guard-allowed? boolean - if the pattern should allow `(a ? b) patterns
+  
     ;; we have to assume we're matching against multiple values here until we
     ;; know we're either in a multi-valued clause (in which case we know the #
     ;; of vals) or we're not, in which case we only care about the first one.
     (let [[val] vals]
-      (if (or (and (sym? pattern) ; unification with outer locals (or nil)
-                   (not= "_" (tostring pattern)) ; never unify _
-                   (or (in-scope? pattern) (= :nil (tostring pattern))))
-              (and (multi-sym? pattern) (in-scope? (. (multi-sym? pattern) 1))))
+      (if (and (sym? pattern)
+               (or (= pattern `nil)
+                   (and opts.infer-unification?
+                        (in-scope? pattern)
+                        (not= pattern `_))
+                   (and opts.infer-unification?
+                        (multi-sym? pattern)
+                        (in-scope? (. (multi-sym? pattern) 1)))))
           (values `(= ,val ,pattern) [])
           ;; unify a local we've seen already
           (and (sym? pattern) (. unifications (tostring pattern)))
@@ -5006,168 +6038,210 @@ do
             (if (not wildcard?) (tset unifications (tostring pattern) val))
             (values (if (or wildcard? (string.find (tostring pattern) "^?")) true
                         `(not= ,(sym :nil) ,val)) [pattern val]))
+          ;; opt-in unify with (=)
+          (and (list? pattern)
+               (= (. pattern 1) `=)
+               (sym? (. pattern 2)))
+          (let [bind (. pattern 2)]
+            (assert-compile (= 2 (length pattern)) "(=) should take only one argument" pattern)
+            (assert-compile (not opts.infer-unification?) "(=) cannot be used inside of match" pattern)
+            (assert-compile opts.in-where? "(=) must be used in (where) patterns" pattern)
+            (assert-compile (and (sym? bind) (not= bind `nil) "= has to bind to a symbol" bind))
+            (values `(= ,val ,bind) []))
+          ;; where-or clause
+          (and (list? pattern) (= (. pattern 1) `where) (list? (. pattern 2)) (= (. pattern 2 1) `or))
+          (do
+            (assert-compile top-level? "can't nest (where) pattern" pattern)
+            (case-or vals (. pattern 2) [(unpack pattern 3)] unifications case-pattern (with opts :in-where?)))
+          ;; where clause
+          (and (list? pattern) (= (. pattern 1) `where))
+          (do
+            (assert-compile top-level? "can't nest (where) pattern" pattern)
+            (case-guard vals (. pattern 2) [(unpack pattern 3)] unifications case-pattern (with opts :in-where?)))
+          ;; or clause (not allowed on its own)
+          (and (list? pattern) (= (. pattern 1) `or))
+          (do
+            (assert-compile top-level? "can't nest (or) pattern" pattern)
+            ;; This assertion can be removed to make patterns more permissive
+            (assert-compile false "(or) must be used in (where) patterns" pattern)
+            (case-or vals pattern [] unifications case-pattern opts))
           ;; guard clause
           (and (list? pattern) (= (. pattern 2) `?))
-          (let [(pcondition bindings) (match-pattern vals (. pattern 1)
-                                                     unifications)
-                condition `(and ,(unpack pattern 3))]
-            (values `(and ,pcondition
-                          (let ,bindings
-                            ,condition)) bindings))
+          (do
+            (assert-compile opts.legacy-guard-allowed? "legacy guard clause not supported in case" pattern)
+            (case-guard vals (. pattern 1) [(unpack pattern 3)] unifications case-pattern opts))
           ;; multi-valued patterns (represented as lists)
           (list? pattern)
-          (match-values vals pattern unifications match-pattern)
+          (do
+            (assert-compile opts.multival? "can't nest multi-value destructuring" pattern)
+            (case-values vals pattern unifications case-pattern opts))
           ;; table patterns
           (= (type pattern) :table)
-          (match-table val pattern unifications match-pattern)
+          (case-table val pattern unifications case-pattern opts)
           ;; literal value
           (values `(= ,val ,pattern) []))))
   
-  (fn match-condition [vals clauses]
+  (fn add-pre-bindings [out pre-bindings]
+    "Decide when to switch from the current `if` AST to a new one"
+    (if pre-bindings
+        ;; `out` no longer needs to grow.
+        ;; Instead, a new tail `if` AST is introduced, which is where the rest of
+        ;; the clauses will get appended. This way, all future clauses have the
+        ;; pre-bindings in scope.
+        (let [tail `(if)]
+          (table.insert out true)
+          (table.insert out `(let ,pre-bindings ,tail))
+          tail)
+        ;; otherwise, keep growing the current `if` AST.
+        out))
+  
+  (fn case-condition [vals clauses match?]
     "Construct the actual `if` AST for the given match values and clauses."
-    (if (not= 0 (% (length clauses) 2)) ; treat odd final clause as default
-        (table.insert clauses (length clauses) (sym "_")))
-    (let [out `(if)]
-      (for [i 1 (length clauses) 2]
+    ;; root is the original `if` AST.
+    ;; out is the `if` AST that is currently being grown.
+    (let [root `(if)]
+      (faccumulate [out root
+                    i 1 (length clauses) 2]
         (let [pattern (. clauses i)
               body (. clauses (+ i 1))
-              (condition bindings) (match-pattern vals pattern {})]
+              (condition bindings pre-bindings) (case-pattern vals pattern {}
+                                                              {:multival? true
+                                                               :infer-unification? match?
+                                                               :legacy-guard-allowed? match?}
+                                                              true)
+              out (add-pre-bindings out pre-bindings)]
+          ;; grow the `if` AST by one extra condition
           (table.insert out condition)
           (table.insert out `(let ,bindings
-                               ,body))))
-      out))
+                              ,body))
+          out))
+      root))
   
-  (fn match-val-syms [clauses]
-    "How many multi-valued clauses are there? return a list of that many gensyms."
-    (let [syms (list (gensym))]
-      (for [i 1 (length clauses) 2]
-        (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 count-case-multival [pattern]
+    "Identify the amount of multival values that a pattern requires."
+    (if (and (list? pattern) (= (. pattern 2) `?))
+        (count-case-multival (. pattern 1))
+        (and (list? pattern) (= (. pattern 1) `where))
+        (count-case-multival (. pattern 2))
+        (and (list? pattern) (= (. pattern 1) `or))
+        (accumulate [longest 0
+                     _ child-pattern (ipairs pattern)]
+          (math.max longest (count-case-multival child-pattern)))
+        (list? pattern)
+        (length pattern)
+        1))
   
-  (fn match* [val ...]
-    ;; Old implementation of match macro, which doesn't directly support
-    ;; `where' and `or'. New syntax is implemented in `match-where',
-    ;; which simply generates old syntax and feeds it to `match*'.
+  (fn case-val-syms [clauses]
+    "What is the length of the largest multi-valued clause? return a list of that
+  many gensyms."
+    (let [patterns (fcollect [i 1 (length clauses) 2]
+                     (. clauses i))
+          sym-count (accumulate [longest 0
+                                 _ pattern (ipairs patterns)]
+                      (math.max longest (count-case-multival pattern)))]
+      (fcollect [i 1 sym-count &into (list)]
+        (gensym))))
+  
+  (fn case-impl [match? val ...]
+    "The shared implementation of case and match."
+    (assert (not= val nil) "missing subject")
+    (assert (= 0 (math.fmod (select :# ...) 2))
+            "expected even number of pattern/body pairs")
+    (assert (not= 0 (select :# ...))
+            "expected at least one pattern/body pair")
     (let [clauses [...]
-          vals (match-val-syms clauses)]
-      (assert (= 0 (math.fmod (length clauses) 2))
-              "expected even number of pattern/body pairs")
+          vals (case-val-syms clauses)]
       ;; 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))))
+      (list `let [vals val] (case-condition vals clauses match?))))
   
-  ;; Construction of old match syntax from new syntax
-  
-  (fn partition-2 [seq]
-    ;; Partition `seq` by 2.
-    ;; If `seq` has odd amount of elements, the last one is dropped.
-    ;;
-    ;; Input: [1 2 3 4 5]
-    ;; Output: [[1 2] [3 4]]
-    (let [firsts []
-          seconds []
-          res []]
-      (for [i 1 (length seq) 2]
-        (let [first (. seq i)
-              second (. seq (+ i 1))]
-          (table.insert firsts (if (not= nil first) first `nil))
-          (table.insert seconds (if (not= nil second) second `nil))))
-      (each [i v1 (ipairs firsts)]
-        (let [v2 (. seconds i)]
-          (if (not= nil v2)
-              (table.insert res [v1 v2]))))
-      res))
-  
-  (fn transform-or [[_ & pats] guards]
-    ;; Transforms `(or pat pats*)` lists into match `guard` patterns.
-    ;;
-    ;; (or pat1 pat2), guard => [(pat1 ? guard) (pat2 ? guard)]
-    (let [res []]
-      (each [_ pat (ipairs pats)]
-        (table.insert res (list pat `? (unpack guards))))
-      res))
-  
-  (fn transform-cond [cond]
-    ;; Transforms `where` cond into sequence of `match` guards.
-    ;;
-    ;; pat => [pat]
-    ;; (where pat guard) => [(pat ? guard)]
-    ;; (where (or pat1 pat2) guard) => [(pat1 ? guard) (pat2 ? guard)]
-    (if (and (list? cond) (= (. cond 1) `where))
-        (let [second (. cond 2)]
-          (if (and (list? second) (= (. second 1) `or))
-              (transform-or second [(unpack cond 3)])
-              :else
-              [(list second `? (unpack cond 3))]))
-        :else
-        [cond]))
-  
-  (fn match-where [val ...]
+  (fn case* [val ...]
     "Perform pattern matching on val. See reference for details.
   
   Syntax:
   
+  (case data-expression
+    pattern body
+    (where pattern guards*) body
+    (or pattern patterns*) body
+    (where (or pattern patterns*) guards*) body
+    ;; legacy:
+    (pattern ? guards*) body)"
+    (case-impl false val ...))
+  
+  (fn match* [val ...]
+    "Perform pattern matching on val, automatically unifying on variables in
+  local scope. See reference for details.
+  
+  Syntax:
+  
   (match data-expression
     pattern body
-    (where pattern guard guards*) body
-    (where (or pattern patterns*) guard guards*) body)"
-    (let [conds-bodies (partition-2 [...])
-          else-branch (if (not= 0 (% (select "#" ...) 2))
-                          (select (select "#" ...) ...))
-          match-body []]
-      (each [_ [cond body] (ipairs conds-bodies)]
-        (each [_ cond (ipairs (transform-cond cond))]
-          (table.insert match-body cond)
-          (table.insert match-body body)))
-      (if else-branch
-          (table.insert match-body else-branch))
-      (match* val (unpack match-body))))
+    (where pattern guards*) body
+    (or pattern patterns*) body
+    (where (or pattern patterns*) guards*) body
+    ;; legacy:
+    (pattern ? guards*) body)"
+    (case-impl true val ...))
   
-  {:-> ->*
-   :->> ->>*
-   :-?> -?>*
-   :-?>> -?>>*
-   :?. ?dot
-   :doto doto*
-   :when when*
-   :with-open with-open*
-   :collect collect*
-   :icollect icollect*
-   :accumulate accumulate*
-   :partial partial*
-   :lambda lambda*
-   :pick-args pick-args*
-   :pick-values pick-values*
-   :macro macro*
-   :macrodebug macrodebug*
-   :import-macros import-macros*
-   :match match-where}
-  ]===]
-  local module_name = "fennel.macros"
-  local _
-  local function _620_()
-    return mod
-  end
-  package.preload[module_name] = _620_
-  _ = nil
-  local env
-  do
-    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, {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
+  (fn case-try-step [how expr else pattern body ...]
+    (if (= nil pattern body)
+        expr
+        ;; unlike regular match, we can't know how many values the value
+        ;; might evaluate to, so we have to capture them all in ... via IIFE
+        ;; to avoid double-evaluation.
+        `((fn [...]
+            (,how ...
+              ,pattern ,(case-try-step how body else ...)
+              ,(unpack else)))
+          ,expr)))
+  
+  (fn case-try-impl [how expr pattern body ...]
+    (let [clauses [pattern body ...]
+          last (. clauses (length clauses))
+          catch (if (= `catch (and (= :table (type last)) (. last 1)))
+                   (let [[_ & e] (table.remove clauses)] e) ; remove `catch sym
+                   [`_# `...])]
+      (assert (= 0 (math.fmod (length clauses) 2))
+              "expected every pattern to have a body")
+      (assert (= 0 (math.fmod (length catch) 2))
+              "expected every catch pattern to have a body")
+      (case-try-step how expr catch (unpack clauses))))
+  
+  (fn case-try* [expr pattern body ...]
+    "Perform chained pattern matching for a sequence of steps which might fail.
+  
+  The values from the initial expression are matched against the first pattern.
+  If they match, the first body is evaluated and its values are matched against
+  the second pattern, etc.
+  
+  If there is a (catch pat1 body1 pat2 body2 ...) form at the end, any mismatch
+  from the steps will be tried against these patterns in sequence as a fallback
+  just like a normal match. If there is no catch, the mismatched values will be
+  returned as the value of the entire expression."
+    (case-try-impl `case expr pattern body ...))
+  
+  (fn match-try* [expr pattern body ...]
+    "Perform chained pattern matching for a sequence of steps which might fail.
+  
+  The values from the initial expression are matched against the first pattern.
+  If they match, the first body is evaluated and its values are matched against
+  the second pattern, etc.
+  
+  If there is a (catch pat1 body1 pat2 body2 ...) form at the end, any mismatch
+  from the steps will be tried against these patterns in sequence as a fallback
+  just like a normal match. If there is no catch, the mismatched values will be
+  returned as the value of the entire expression."
+    (case-try-impl `match expr pattern body ...))
+  
+  {:case case*
+   :case-try case-try*
+   :match match*
+   :match-try match-try*}
+  ]===], {env = env, scope = compiler.scopes.compiler, allowedGlobals = false, useMetadata = true, filename = "src/fennel/match.fnl", moduleName = module_name})
+  for k, v in pairs(match_macros) do
     compiler.scopes.global.macros[k] = v
   end
-  compiler.scopes.global.macros["\206\187"] = compiler.scopes.global.macros.lambda
   package.preload[module_name] = nil
 end
 return mod
diff --git a/lib/stdio.fnl b/lib/stdio.fnl
index 52d6ef6..7b4dfc0 100644
--- a/lib/stdio.fnl
+++ b/lib/stdio.fnl
@@ -1,5 +1,6 @@
 (require "love.event")
-(local view (require "lib.fennelview"))
+(local fennel (require "lib.fennel"))
+(local view fennel.view)
 
 ;; This module exists in order to expose stdio over a channel so that it
 ;; can be used in a non-blocking way from another thread.
diff --git a/vendor/lite/data/core/strict.lua b/vendor/lite/data/core/strict.lua
index 7d4b9da..aaade90 100644
--- a/vendor/lite/data/core/strict.lua
+++ b/vendor/lite/data/core/strict.lua
@@ -17,7 +17,7 @@ end
 
 
 function strict.__index(t, k)
-  if not strict.defined[k] then
+  if not strict.defined[k] and k ~= nil then
     error("cannot get undefined variable: " .. k, 2)
   end
 end