properly implement tco and add step7:quote

diff --git a/Makefile b/Makefile
index 2091235..a6a1c1e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,11 +94,7 @@ IMPLS = ada ada.2 awk bash basic bbc-basic c chuck clojure coffee common-lisp cp
        guile haskell haxe hy io java js julia kotlin livescript logo lua make mal \
        matlab miniMAL nasm nim objc objpascal ocaml perl perl6 php picolisp pike plpgsql \
        plsql powershell ps python python.2 r racket rexx rpython ruby rust scala scheme skew \
-<<<<<<< HEAD
-       swift swift3 swift4 swift5 tcl ts vala vb vhdl vimscript wasm wren yorick zig
-=======
        swift swift3 swift4 swift5 tcl ts vala vb vhdl vimscript wasm wren yorick zig jq
->>>>>>> basic...? impl
 
 EXTENSION = .mal
 

diff --git a/jq/core.jq b/jq/core.jq
index 18e9119..94364c2 100644 (file)
--- a/jq/core.jq
+++ b/jq/core.jq
@@ -220,4 +220,4 @@ def core_interp(arguments; env):
         select(.function == "first") | arguments[0].value | first // {kind:"nil"}
     ) // (
         select(.function == "rest") | arguments[0]?.value?[1:]? // [] | wrap("list")
-    ) // jqmal_error("Unknown native function \(.function)");
\ No newline at end of file
+    ) // jqmal_error("Unknown native function \(.function)");