Some syntax tweaks for AIX

Now that #1313 is fixed, |= no longer outputs null when the RHS update
expression outputs empty.

When a user wants to keep the current value of the LHS they would have
the RHS update expression output `.`, so having `empty` achieve the same
thing would be redundant.  The obvious thing to do is to delete the LHS
when the RHS update outputs `empty` (i.e., doesn't output any values).

It's reasonable to think that existing programs won't be broken by this
change, because reduce and |= not handling empty well is clearly a bug.
(Though it's possible that some programs were using empty to quickly
terminate reduce or |=, it's not likely.  They should use label/break
instead.)

Prior to this change |= would use the _last_ value output by the RHS
update expression.  With this change |= will use the _first_ value
instead.  This change _is_ a minor backwards-incompatible change.  It
may or may not be acceptable; we'll see.  It is a useful change in that
it makes |= faster when the update expression produces multiple values.

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore

.gitignore

@@ -1,13 +1,51 @@
 *.o
+*.a
+*.lo
+*.la
+*.lai
+*.so
+*.so.*
+*.gcda
+*.gcno
+*.gcov
 *~
+.*.sw[a-p]
+tags
 
-# Autogenerated
-*.gen.*
+jq
+!tests/modules/lib/jq/
+jq.1
 
-# Test binaries
-jv_test
-jv_parse
-parsertest*~
+# Generated source
+src/builtin.inc
 
-# Something delightfully recursive happens otherwise
-docs/content/2.download/source/*
+# Autotools junk
+.libs
+.deps
+.dirstamp
+libtool
+*.log
+stamp-h1
+config.log
+config.status
+autom4te.cache
+INSTALL
+Makefile
+jq-*.tar.gz
+configure
+aclocal.m4
+Makefile.in
+version.h
+.remake-version-h
+config.cache
+*.rpm
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+tests/*.trs
+
+cscope.in.out
+cscope.out
+cscope.po.out

.travis.yml

@@ -0,0 +1,75 @@
+os:
+    - linux
+    - osx
+
+sudo: false
+
+language: c
+
+compiler:
+    - gcc
+    - clang
+
+matrix:
+    include:
+        - compiler: gcc
+          env: COVERAGE="--disable-valgrind --enable-gcov"
+          os: linux
+
+addons:
+    apt:
+        packages:
+            - libonig-dev
+            - valgrind
+            - bison
+
+before_install:
+    - echo "$TRAVIS_OS_NAME"
+    - uname -s
+    - brew update               || true;
+      brew install flex         || true;
+      brew install bison        || true;
+      brew install oniguruma    || true;
+    - rm src/{lexer,parser}.{c,h}
+
+install:
+    - bundle install --gemfile=docs/Gemfile
+    - wget http://ftp.debian.org/debian/pool/main/b/bison/bison_3.0.2.dfsg-2_amd64.deb
+    - ar p bison_3.0.2.dfsg-2_amd64.deb data.tar.xz | tar xJ
+    - if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
+
+before_script:
+    # If this is OS X we'll get bison from brew, else we'll get bison
+    # from the .deb unpacked above in the install section.
+    - PATH=/usr/local/opt/bison/bin:$PWD/usr/bin:$PATH
+    - echo SHELL=$SHELL
+    - echo PATH=$PATH
+    - which bison
+    - bison --version
+    - autoreconf -i
+    - ./configure YACC="$(which bison) -y" $COVERAGE
+
+script:
+    # When using the bison from Debian we need to tell that bison where
+    # to find its data.  Yay non-relocatable code.  Not.
+    - echo PATH=$PATH
+    - which bison
+    - make BISON_PKGDATADIR=$PWD/usr/share/bison src/parser.c || make src/parser.c
+    - make -j4
+    - make check -j4
+
+after_script:
+    - |
+        if [ -n "$COVERAGE" ]; then
+            rm -rf src/.libs # don't care about coverage for libjq
+            coveralls --gcov-options '\-lp' \
+                -e src/lexer.c -e src/parser.c -e src/jv_dtoa.c
+        fi
+
+after_failure:
+    - cat test-suite.log
+    - cat tests/*.log
+
+notifications:
+    email: false
+

AUTHORS

@@ -0,0 +1,71 @@
+Created By:
+Stephen Dolan        <mu@netsoc.tcd.ie>
+
+Maintained by:
+Nicolas Williams     <nico@cryptonector.com>
+William Langford     <wlangfor@gmail.com>
+
+Contributions by:
+Aaron Peschel        <apeschel@zendesk.com>
+Adam Lindberg        <hello@alind.io>
+Alex Chamberlain     <alex@alexchamberlain.co.uk>
+Andrew O'Brien       <obrien.andrew@gmail.com>        - docs build
+Andrew Rodland       <andrew@cleverdomain.org>        - bug fixes
+Ankur                <ankz.kothari@gmail.com>         - bug fixes
+Anthony Shortland    <anthony.shortland@me.com>       - rpmbuild target
+Assaf Gordon         <assafgordon@gmail.com>          - error handling
+Brendan Macmillan    <melbourne.research@gmail.com>   - bug fixes, load library from ~/.jq
+cdnbacon             <mike@busbud.com>
+Charles Merriam      <charles.merriam@gmail.com>
+Colin von Heuring    <colin@janrain.com>
+Damian Gryski        <damian@gryski.com>
+David Haguenauer     <ml@kurokatta.org>
+David R. MacIver     <david@drmaciver.com>            - bug fixes
+David Tolnay         <dtolnay@gmail.com>              - destructuring, build improvements
+Doug Luce            <doug@github.con.com>            - build
+Eiichi Sato          <sato.eiichi@gmail.com>
+Filippo Giunchedi    <fgiunchedi@gmail.com>           - bug fixes
+Filippo Valsorda     <filippo.valsorda@gmail.com>     - recursive object merge (`*`)
+Hanfei Shen          <qqshfox@gmail.com>
+i                    <isomorphisms@sdf.org>
+Ian Miell            <ian.miell@gmail.com>
+Jack Pearkes         <jackpearkes@gmail.com>          - update tutorial
+James Andariese      <james.andariese@locationlabs.com> - Dockerfile
+Jingwen Owen Ou      <jingweno@gmail.com>             - jqplay.org and link to it
+jkleint              <jkleint@gmail.com>
+Joe Littlejohn       <joe.littlejohn@nokia.com>       - bug fixes
+Joel Purra           <code+github@joelpurra.com>
+Juan Guerrero        <juan.guerrero.lozano@gmail.com> - bug fixes
+Kenny Shen           <kenny.shen@zalora.com>          - doc fixes
+Kim De Mey           <kim.demey@gmail.com>            - build
+Kim Toms             <kim.toms@bplglobal.net>
+LCD 47               <lcd047@gmail.com>
+Lee Thompson         <stagr.lee@gmail.com>            - autoconf stuff, rpm
+Marc Abramowitz      <marc@marc-abramowitz.com>
+Marc Bruggmann       <marcbr@spotify.com>
+Markus Lanthaler     <mark_lanthaler@gmx.net>         - doc fixes
+Maxime Biais         <maxime.biais@gmail.com>         - build
+Michael Daines       <michael@mdaines.com>            - add sqrt; doc fixes
+Mike Fletcher        <john.m.fletcher@bankofamerica.com>
+Mike McCabe          <mccabe@archive.org>             - math (libm) functions
+Nicolas Pouillard    <nicolas.pouillard@gmail.com>    - add tests
+Nicolas Williams     <nico@cryptonector.com>          - library-fication, autoconf stuff, exception handling, various
+Peter van Dijk       <peter@7bits.nl>                 - doc fixes
+Philipp Hagemeister  <phihag@phihag.de>               - doc fixes
+pkoppstein           <pkoppstein@gmail.com>           - various builtins, improvements
+polyester            <paul@cleanclothes.org>          - automake version update
+Ryoichi KATO         <ryo1kato@gmail.com>             - doc fixes
+Rémy Léone           <remy.leone@gmail.com>           - add .travis.yml
+Santiago Lapresta    <santiago.lapresta@gmail.com>    - join, arrays, all, any, other filters
+Sebastian Freundt    <freundt@ga-group.nl>            - build
+Shay Elkin           <shay@everything.me>
+Simon Elsbrock       <simon@iodev.org>                - Debian
+Stefan Seemayer      <stefan@seemayer.de>
+Stephen Roantree     <stroantree@gmail.com>
+Stephen Shaw         <stesh@netsoc.tcd.ie>
+Steven Maude         <StevenMaude@users.noreply.github.com>
+Steven Penny         <svnpenn@gmail.com>              - Windows bug fixes
+tal@whatexit.org     <tal@whatexit.org>
+Travis Gockel        <travis@gockelhut.com>
+Zhiming Wang         <zmwangx@gmail.com>
+13ren                <melbourne.research@gmail.com>

COPYING

@@ -25,14 +25,14 @@ jq's documentation (everything found under the docs/ subdirectory in
 the source tree) is licensed under the Creative Commons CC BY 3.0
 license, which can be found at:
 
-         http://creativecommons.org/licenses/by/3.0/
+         https://creativecommons.org/licenses/by/3.0/
 
 The documentation website includes a copy of Twitter's Boostrap and
 relies on Bonsai, Liquid templates and various other projects, look
 them up for detailed licensing conditions.
-         
 
-         
+
+
 jq incorporates David M. Gay's dtoa.c and g_fmt.c, which bear the
 following notices:
 

Dockerfile

@@ -0,0 +1,53 @@
+FROM debian:8
+
+COPY . /app
+
+# get dependencies, build, and remove anything we don't need for running jq.
+# valgrind seems to have trouble with pthreads TLS so it's off.
+
+RUN apt-get update && \
+    apt-get install -y \
+        build-essential \
+        autoconf \
+        libtool \
+        git \
+        bison \
+        flex \
+        ruby \
+        wget \
+        ruby-dev && \
+    wget https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz -O onig-5.9.6.tar.gz && \
+    sha512sum onig-5.9.6.tar.gz | grep 6b048d345e148c9da38af7a8df76d4a358eb3d4db91fa7834076e511f526a63544284f212b0d56badbbd33112c8b458a5fff02bfbbda012ecfe478bc436ea679 && \
+    tar zxvf onig-5.9.6.tar.gz && \
+    (cd oniguruma-5.9.6 && \
+        touch NEWS ChangeLog && \
+        autoreconf -i && \
+        ./configure --prefix=/usr/local && \
+        make && \
+        make install ) && \
+    gem install bundler && \
+    (cd /app/docs && bundle install) && \
+    (cd /app && \
+        autoreconf -i && \
+        ./configure --disable-valgrind --enable-all-static --prefix=/usr/local && \
+        make -j8 && \
+        make check && \
+        make install && \
+        make distclean ) && \
+    (cd oniguruma-5.9.6 && \
+        make uninstall ) && \
+    apt-get purge -y \
+        build-essential \
+        autoconf \
+        libtool \
+        bison \
+        git \
+        flex \
+        ruby \
+        ruby-dev && \
+    apt-get autoremove -y && \
+    rm -rf oniguruma-5.9.6 && \
+    rm -rf /var/lib/apt/lists/* /var/lib/gems
+
+ENTRYPOINT ["/usr/local/bin/jq"]
+CMD []

KEYS

@@ -0,0 +1,8 @@
+pub   4096R/71523402 2015-10-11
+      Key fingerprint = 4FD7 01D6 FA9B 3D2D F5AC  935D AF19 040C 7152 3402
+uid                  jq Release Signing Key <jq@stedolan.github.io>
+
+pub   2048R/D15684DB 2015-10-12 [expires: 2017-10-11]
+      Key fingerprint = 7F6C 7BD3 0412 AFD5 8C1A  5007 EB26 A4F8 D156 84DB
+uid                  Nicolas Williams <nico@cryptonector.com>
+sub   2048R/9C9CCD6A 2015-10-12 [expires: 2017-10-11]

Makefile

@@ -1,61 +0,0 @@
-CC=gcc -Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function
-prefix=/usr/local
-
-.PHONY: all clean releasedep tarball install uninstall test releasetag
-all: jq
-
-clean:
-	make -Bnd | grep 'Must remake target' | \
-	sed 's/.*`\(.*\)'\''.*/\1/' | grep -v '^all$$' | \
-	xargs rm
-
-
-lexer.gen.c: lexer.l
-	flex -o lexer.gen.c --header-file=lexer.gen.h lexer.l
-lexer.gen.h: lexer.gen.c
-
-parser.gen.c: parser.y lexer.gen.h
-	bison -W -d parser.y -v --report-file=parser.gen.info -o $@
-parser.gen.h: parser.gen.c
-
-jv_utf8_tables.gen.h: gen_utf8_tables.py
-	python $^ > $@
-jv_unicode.c: jv_utf8_tables.gen.h
-
-version.gen.h: VERSION
-	sed 's/.*/#define JQ_VERSION "&"/' $^ > $@
-main.c: version.gen.h
-
-JQ_SRC=parser.gen.c lexer.gen.c opcode.c bytecode.c compile.c execute.c builtin.c jv.c jv_parse.c jv_print.c jv_dtoa.c jv_unicode.c
-
-
-jq_test: $(JQ_SRC) jq_test.c
-	$(CC) -DJQ_DEBUG=1 -o $@ $^
-
-jq: $(JQ_SRC) main.c
-	$(CC) -O -DJQ_DEBUG=0 -o $@ $^
-
-test: jq_test
-	valgrind --error-exitcode=1 -q --leak-check=full ./jq_test >/dev/null
-
-
-releasedep: lexer.gen.c parser.gen.c jv_utf8_tables.gen.h
-
-releasetag:
-	git tag -s "jq-$$(cat VERSION)" -m "jq release $$(cat VERSION)"
-
-docs/content/2.download/source/jq.tgz: jq
-	mkdir -p `dirname $@`
-	tar -czvf $@ `git ls-files; ls *.gen.*`
-
-tarball: docs/content/2.download/source/jq.tgz
-
-install: jq
-	install -d -m 0755 $(prefix)/bin
-	install -m 0755 jq $(prefix)/bin
-
-uninstall:
-	test -d $(prefix)/bin && \
-	cd $(prefix)/bin && \
-	rm -f jq
-

Makefile.am

@@ -0,0 +1,195 @@
+
+### C source files to be built and distributed.
+
+LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h                 \
+        src/exec_stack.h src/jq_parser.h src/jv_alloc.h src/jv_dtoa.h   \
+        src/jv_unicode.h src/jv_utf8_tables.h src/lexer.l src/libm.h    \
+        src/linker.h src/locfile.h src/opcode_list.h src/parser.y       \
+        src/util.h
+
+LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c    \
+        src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c              \
+        src/jv_dtoa.c src/jv_file.c src/jv_parse.c src/jv_print.c       \
+        src/jv_unicode.c src/linker.c src/locfile.c src/util.c          \
+        ${LIBJQ_INCS}
+
+### C build options
+
+AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers               \
+        -Wno-unused-parameter -Wno-unused-function
+
+ACLOCAL_AMFLAGS = -I config/m4
+
+### Generating the lexer and parser
+
+# While there is some autoconf macro support for lex/flex, it doesn't support
+# header file creation so we'll use good old make
+if MAINTAINER_MODE
+BUILT_SOURCES = src/lexer.h src/lexer.c src/parser.h src/parser.c 	\
+		src/builtin.inc src/version.h
+src/lexer.c: src/lexer.l
+	$(AM_V_LEX) flex -o src/lexer.c --header-file=src/lexer.h $<
+src/lexer.h: src/lexer.c
+else
+BUILT_SOURCES = src/builtin.inc src/version.h
+.y.c:
+	$(AM_V_YACC) echo "NOT building parser.c!"
+.l.c:
+	$(AM_V_LEX) echo "NOT building lexer.c!"
+endif
+
+# Tell YACC (bison) autoconf macros that you want a header file created.
+# If the --warnings=all fails, you probably have an old version of bison
+# OSX ships an old bison, so update with homebrew or macports
+AM_YFLAGS = --warnings=all -d
+
+### libjq
+
+lib_LTLIBRARIES = libjq.la
+libjq_la_SOURCES = ${LIBJQ_SRC}
+libjq_la_LIBADD = -lm
+libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+
+if WIN32
+libjq_la_LIBADD += -lshlwapi
+endif
+
+include_HEADERS = src/jv.h src/jq.h
+
+if ENABLE_UBSAN
+AM_CFLAGS += -fsanitize=undefined
+endif
+
+### Running tests under Valgrind
+
+if ENABLE_ASAN
+AM_CFLAGS += -fsanitize=address
+NO_VALGRIND = 1
+else
+if ENABLE_VALGRIND
+NO_VALGRIND =
+else
+NO_VALGRIND = 1
+endif
+endif
+
+### Code coverage with gcov
+
+if ENABLE_GCOV
+AM_CFLAGS += --coverage --no-inline
+endif
+
+### Error injection for testing
+
+if ENABLE_ERROR_INJECTION
+lib_LTLIBRARIES += libinject_errors.la
+libinject_errors_la_SOURCES = src/inject_errors.c
+libinject_errors_la_LIBADD = -ldl
+libinject_errors_la_LDFLAGS = -module
+endif
+
+### Building the jq binary
+
+# Remake the version.h header file if, and only if, the git ID has changed
+.PHONY: .FORCE
+.FORCE:
+generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
+.remake-version-h: .FORCE
+	@ $(generate_ver); test "x`cat src/version.h 2>/dev/null`" = "x$$ver" || touch .remake-version-h
+src/version.h: .remake-version-h
+	$(AM_V_GEN) $(generate_ver); echo "$$ver" > $@
+src/main.c: src/version.h
+
+src/builtin.inc: src/builtin.jq
+	$(AM_V_GEN) sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $^ > $@
+src/builtin.o: src/builtin.inc
+
+bin_PROGRAMS = jq
+jq_SOURCES = src/main.c src/version.h
+jq_LDFLAGS = -static-libtool-libs
+jq_LDADD = libjq.la -lm
+
+if ENABLE_ALL_STATIC
+jq_LDFLAGS += -all-static
+endif
+
+### Tests (make check)
+
+TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test
+TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND)
+
+
+### Building the manpage
+
+man_MANS = jq.1
+if ENABLE_DOCS
+jq.1: $(srcdir)/docs/content/3.manual/manual.yml
+	$(AM_V_GEN) ( cd ${abs_srcdir}/docs; '$(BUNDLER)' exec rake manpage ) > $@ || { rm -f $@; false; }
+jq.1.prebuilt: jq.1
+	$(AM_V_GEN) cp $^ $@ || { rm -f $@; false; }
+else
+jq.1: $(srcdir)/jq.1.prebuilt
+	$(AM_V_GEN) cp $^ $@
+endif
+
+
+### Packaging
+
+docs/site.yml: configure.ac
+	sed 's/^jq_version: .*/jq_version: "$(VERSION)"/' $@ > $@.new
+	mv $@.new $@
+
+install-binaries: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec
+
+DOC_FILES = docs/content docs/public docs/templates docs/site.yml       \
+        docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md     \
+        docs/default_manpage.md jq.1.default
+
+EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER)     \
+        jq.1.prebuilt jq.spec src/lexer.c src/lexer.h src/parser.c      \
+        src/parser.h src/version.h src/builtin.inc                      \
+        scripts/version tests/jq.test tests/modules/.jq                 \
+        tests/modules/a.jq tests/modules/b/b.jq tests/modules/c/c.jq    \
+        tests/modules/c/d.jq tests/modules/data.json                    \
+        tests/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq           \
+        tests/modules/syntaxerror/syntaxerror.jq                        \
+        tests/modules/test_bind_order.jq                                \
+        tests/modules/test_bind_order0.jq                               \
+        tests/modules/test_bind_order1.jq                               \
+        tests/modules/test_bind_order2.jq tests/onig.supp               \
+        tests/onig.test tests/setup tests/torture/input0.json
+
+
+# README.md is expected in Github projects, good stuff in it, so we'll
+# distribute it and install it with the package in the doc directory.
+docdir = ${datadir}/doc/${PACKAGE}
+dist_doc_DATA = README.md COPYING AUTHORS README
+
+RELEASE ?= 1
+rpm: dist jq.spec
+	@echo "Packaging jq as an RPM ..."
+	mkdir -p rpm/SOURCES rpm/BUILD rpm/BUILDROOT rpm/RPMS rpm/SPECS
+	cp jq-$(VERSION).tar.gz rpm/SOURCES/
+	rpmbuild -tb --define "_topdir ${PWD}/rpm" --define "_prefix /usr" --define "myver $(VERSION)" --define "myrel ${RELEASE}" rpm/SOURCES/jq-$(VERSION).tar.gz
+	find rpm/RPMS/ -name "*.rpm" -exec mv {} ./ \;
+	rm -rf rpm
+
+dist-clean-local:
+	rm -f ${BUILT_SOURCES}
+
+# Not sure why this doesn't get cleaned up automatically, guess
+# automake used to man pages which are hand coded?
+# 'make clean' doesn't delete the manpage if it can't be rebuilt
+clean-local-docs:
+if ENABLE_DOCS
+	rm -f jq.1
+endif
+
+clean-local-gcov:
+	rm -f src/*.gcno src/*.gcda src/*.gcov
+
+clean-local: clean-local-docs clean-local-gcov
+	rm -f src/version.h .remake-version-h
+
+.PHONY: clean-local-docs clean-local-gcov

NEWS

@@ -0,0 +1,89 @@
+
+Release history
+
+ * jq version 1.5 was released on Sat Aug 15 2015
+ * jq version 1.4 was released on Mon Jun 9 2014
+ * jq version 1.3 was released on Sun May 19 2013
+ * jq version 1.2 was released on Thu Dec 20 2012
+ * jq version 1.1 was released on Sun Oct 21 2012
+ * jq version 1.0 was released on Sun Oct 21 2012
+
+New features in 1.5 since 1.4:
+
+ - regular expressions (with Oniguruma)
+
+ - a library/module system
+
+ - many new builtins
+
+    - datetime builtins
+    - math builtins
+    - regexp-related builtins
+    - stream-related builtins (e.g., all/1, any/1)
+    - minimal I/O builtins (`inputs`, `debug`)
+
+ - new syntactic features, including:
+
+    - destructuring (`. as [$first, $second] | ...`)
+    - try/catch, generalized `?` operator, and label/break
+    - `foreach`
+    - multiple definitions of a function with different numbers of
+      arguments
+
+ - command-line arguments
+
+    - --join-lines / -j for raw output
+    - --argjson and --slurpfile
+    - --tab and --indent
+    - --stream (streaming JSON parser)
+    - --seq (RFC7464 JSON text sequence)
+    - --run-tests improvements
+
+ - optimizations:
+
+    - tail-call optimization
+    - reduce and foreach no longer leak a reference to .
+
+New features in 1.4 since 1.3:
+
+ - command-line arguments
+
+    - jq --arg-file variable file
+    - jq --unbuffered
+    - jq -e / --exit-status (set exit status based on outputs)
+    - jq -S / --sort-keys (now jq no longer sorts object keys by
+      default
+
+ - syntax
+
+    - .. -> like // in XPath (recursive traversal)
+    - question mark (e.g., .a?) to suppress errors
+    - ."foo" syntax (equivalent to .["foo"])
+    - better error handling for .foo
+    - added % operator (modulo)
+    - allow negation without requiring extra parenthesis
+    - more function arguments (up to six)
+
+ - filters:
+
+    - any, all
+    - iterables, arrays, objects, scalars, nulls, booleans, numbers,
+      strings, values
+
+ - string built-ins:
+
+    - split
+    - join (join an array of strings with a given separator string)
+    - ltrimstr, rtrimstr
+    - startswith, endswith
+    - explode, implode
+    - fromjson, tojson
+    - index, rindex, indices
+
+ - math functions
+
+    - floor, sqrt, cbrt, etetera (depends on what's available from libm)
+
+ - libjq -- a C API interface to jq's JSON representation and for
+   running jq programs from C applications
+

README

@@ -0,0 +1 @@
+README.md

README.md

@@ -1,14 +1,71 @@
 jq
 ==
 
-jq is a command-line JSON processor.
+jq is a lightweight and flexible command-line JSON processor.
+
+[![Coverage Status](https://coveralls.io/repos/stedolan/jq/badge.svg?branch=master&service=github)](https://coveralls.io/github/stedolan/jq?branch=master),
+Unix: [![Build Status](https://travis-ci.org/stedolan/jq.svg?branch=master)](https://travis-ci.org/stedolan/jq),
+Windows: [![Windows build status](https://ci.appveyor.com/api/projects/status/mi816811c9e9mx29?svg=true)](https://ci.appveyor.com/project/stedolan/jq)
+
 
 If you want to learn to use jq, read the documentation at
-[http://stedolan.github.com/jq](http://stedolan.github.com/jq). This
+[https://stedolan.github.io/jq](https://stedolan.github.io/jq).  This
 documentation is generated from the docs/ folder of this repository.
+You can also try it online at [jqplay.org](https://jqplay.org).
 
 If you want to hack on jq, feel free, but be warned that its internals
-are not well-documented at the moment. Bring a hard hat and a shovel.
+are not well-documented at the moment. Bring a hard hat and a
+shovel.  Also, read the wiki: https://github.com/stedolan/jq/wiki, where
+you will find cookbooks, discussion of advanced topics, internals,
+release engineering, and more.
 
-You can find some basic build instructions at
-[http://stedolan.github.com/jq/download](http://stedolan.github.com/jq/download)
+Source tarball and built executable releases can be found on the
+homepage and on the github release page, https://github.com/stedolan/jq/releases
+
+If you're building directly from the latest git, you'll need flex,
+bison (3.0 or newer), libtool, make, and autoconf installed.  To get
+regexp support you'll also need to install Oniguruma (note that jq's
+tests require regexp support to pass).  To build, run:
+
+    autoreconf -i   # if building from git
+    ./configure
+    make -j8
+    make check
+
+To build without bison or flex, add `--disable-maintainer-mode` to the
+./configure invocation:
+
+    ./configure --disable-maintainer-mode
+
+(Developers must not use `--disable-maintainer-mode`, not when making
+changes to the jq parser and/or lexer.)
+
+To build a statically linked version of jq, run:
+
+    make LDFLAGS=-all-static
+
+After make finishes, you'll be able to use `./jq`.  You can also
+install it using:
+
+    sudo make install
+
+If you're not using the latest git version but instead building a
+released tarball (available on the website), then you won't need to
+run `autoreconf` (and shouldn't), and you won't need flex or bison.
+
+To cross-compile for OS X and Windows, see docs/Rakefile's build task
+and scripts/crosscompile.  You'll need a cross-compilation environment,
+such as Mingw for cross-compiling for Windows.
+
+Cross-compilation requires a clean workspace, then:
+
+    # git clean ...
+    autoreconf -i
+    ./configure
+    make distclean
+    scripts/crosscompile <name-of-build> <configure-options>
+
+Use the --host= and --target= ./configure options to select a
+cross-compilation environment.  See also the wiki.
+
+Send questions to https://stackoverflow.com/questions/tagged/jq or to the #jq channel (http://irc.lc/freenode/%23jq/) on Freenode (https://webchat.freenode.net/).

VERSION

@@ -1 +0,0 @@
-1.1

appveyor.yml

@@ -0,0 +1,49 @@
+environment:
+  matrix:
+  - MSYSTEM: MINGW64
+    PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%
+  - MSYSTEM: MINGW32
+    PATH: C:\msys64\usr\bin;C:\msys64\mingw32\bin;C:\Windows\System32;C:\Windows;%PATH%
+
+
+install:
+  # update mysy2
+  - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors"
+  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy"
+  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex"
+  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-oniguruma mingw-w64-x86_64-oniguruma"
+
+
+build_script:
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && autoreconf -i"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --disable-shared --enable-static --enable-all-static"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make -j8"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && cat jq.1  | groff -mandoc -Thtml > jq.html"
+  - 7z a jq-package.zip jq.1 jq.html jq.exe
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && pwd && ls -la"
+  - file jq.exe
+  
+test_script:
+  # tests/optionaltest and tests/shtest fail on Windows; run them
+  # anyways but ignore their failures.  Also, trace shtest.
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make -j3 'TESTS=tests/mantest tests/jqtest tests/onigtest' check"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make TESTS=tests/optionaltest check || cat test-suite.log"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make TRACE_TESTS=1 TESTS=tests/shtest check || cat test-suite.log"
+      
+artifacts:
+  - path: jq-package.zip
+    name: jq-package
+    
+  - path: jq.exe
+    name: jq-exe
+    
+  - path: test-suite.log
+    name: logs
+    
+
+on_failure:
+  - cat test-suite.log
+  - appveyor PushArtifact test-suite.log
+  # also push the jq.exe so that someone can download it anyways...
+  - appveyor PushArtifact jq-package.zip
+    

build/.gitignore

@@ -0,0 +1 @@
+*

builtin.c

@@ -1,323 +0,0 @@
-#include <string.h>
-#include "builtin.h"
-#include "compile.h"
-#include "parser.h"
-#include "locfile.h"
-
-enum {
-  CMP_OP_LESS,
-  CMP_OP_GREATER,
-  CMP_OP_LESSEQ,
-  CMP_OP_GREATEREQ
-} _cmp_op;
-
-static void f_plus(jv input[], jv output[]) {
-  jv_free(input[0]);
-  jv a = input[2];
-  jv b = input[1];
-  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    output[0] = jv_number(jv_number_value(a) + 
-                          jv_number_value(b));
-  } else if (jv_get_kind(a) == JV_KIND_STRING && jv_get_kind(b) == JV_KIND_STRING) {
-    output[0] = jv_string_concat(a, b);
-  } else if (jv_get_kind(a) == JV_KIND_ARRAY && jv_get_kind(b) == JV_KIND_ARRAY) {
-    output[0] = jv_array_concat(a, b);
-  } else if (jv_get_kind(a) == JV_KIND_OBJECT && jv_get_kind(b) == JV_KIND_OBJECT) {
-    output[0] = jv_object_merge(a, b);
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Attempted to add %s and %s",
-                                                  jv_kind_name(jv_get_kind(a)),
-                                                  jv_kind_name(jv_get_kind(b))));
-    jv_free(a);
-    jv_free(b);
-  }
-}
-
-static void f_minus(jv input[], jv output[]) {
-  jv_free(input[0]);
-  jv a = input[2];
-  jv b = input[1];
-  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    output[0] = jv_number(jv_number_value(a) - jv_number_value(b));
-  } else if (jv_get_kind(a) == JV_KIND_ARRAY && jv_get_kind(b) == JV_KIND_ARRAY) {
-    jv out = jv_array();
-    for (int i=0; i<jv_array_length(jv_copy(a)); i++) {
-      jv x = jv_array_get(jv_copy(a), i);
-      int include = 1;
-      for (int j=0; j<jv_array_length(jv_copy(b)); j++) {
-        if (jv_equal(jv_copy(x), jv_array_get(jv_copy(b), j))) {
-          include = 0;
-          break;
-        }
-      }
-      if (include)
-        out = jv_array_append(out, jv_copy(x));
-      jv_free(x);
-    }
-    jv_free(a);
-    jv_free(b);
-    output[0] = out;
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Attempted to subtract %s and %s",
-                                                  jv_kind_name(jv_get_kind(a)),
-                                                  jv_kind_name(jv_get_kind(b))));
-    jv_free(a);
-    jv_free(b);
-  }
-}
-
-static void f_multiply(jv input[], jv output[]) {
-  jv_free(input[0]);
-  jv a = input[2];
-  jv b = input[1];
-  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    output[0] = jv_number(jv_number_value(a) * jv_number_value(b));
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Attempted to multiply %s and %s",
-                                                  jv_kind_name(jv_get_kind(a)),
-                                                  jv_kind_name(jv_get_kind(b))));
-    jv_free(a);
-    jv_free(b);
-  }  
-}
-
-static void f_divide(jv input[], jv output[]) {
-  jv_free(input[0]);
-  jv a = input[2];
-  jv b = input[1];
-  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    output[0] = jv_number(jv_number_value(a) / jv_number_value(b));
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Attempted to divide %s by %s",
-                                                  jv_kind_name(jv_get_kind(a)),
-                                                  jv_kind_name(jv_get_kind(b))));
-    jv_free(a);
-    jv_free(b);
-  }  
-}
-
-static void f_add(jv input[], jv output[]) {
-  jv array = input[0];
-  if (jv_get_kind(array) != JV_KIND_ARRAY) {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Cannot add elements of an %s",
-                                                  jv_kind_name(jv_get_kind(array))));
-  } else if (jv_array_length(jv_copy(array)) == 0) {
-    output[0] = jv_null();
-  } else {
-    jv sum = jv_array_get(jv_copy(array), 0);
-    for (int i = 1; i < jv_array_length(jv_copy(array)); i++) {
-      jv x = jv_array_get(jv_copy(array), i);
-      jv add_args[] = {jv_null(), x, sum};
-      f_plus(add_args, &sum);
-    }
-    output[0] = sum;
-  }
-  jv_free(array);
-}
-
-static void f_equal(jv input[], jv output[]) {
-  jv_free(input[0]);
-  output[0] = jv_bool(jv_equal(input[2], input[1]));
-}
-
-static void order_cmp(jv input[], jv output[], int op) {
-  jv_free(input[0]);
-  jv a = input[2];
-  jv b = input[1];
-  if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
-    double da = jv_number_value(a);
-    double db = jv_number_value(b);
-    output[0] = jv_bool((op == CMP_OP_LESS && da < db) ||
-                        (op == CMP_OP_LESSEQ && da <= db) ||
-                        (op == CMP_OP_GREATEREQ && da >= db) ||
-                        (op == CMP_OP_GREATER && da > db));
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Attempted to compare order of %s wrt %s",
-                                                  jv_kind_name(jv_get_kind(a)),
-                                                  jv_kind_name(jv_get_kind(b))));
-    jv_free(a);
-    jv_free(b);
-  }
-}
-
-static void f_less(jv input[], jv output[]) {
-  order_cmp(input, output, CMP_OP_LESS);
-}
-
-static void f_greater(jv input[], jv output[]) {
-  order_cmp(input, output, CMP_OP_GREATER);
-}
-
-static void f_lesseq(jv input[], jv output[]) {
-  order_cmp(input, output, CMP_OP_LESSEQ);
-}
-
-static void f_greatereq(jv input[], jv output[]) {
-  order_cmp(input, output, CMP_OP_GREATEREQ);
-}
-
-static void f_tonumber(jv input[], jv output[]) {
-  if (jv_get_kind(input[0]) == JV_KIND_NUMBER) {
-    output[0] = input[0];
-  } else if (jv_get_kind(input[0]) == JV_KIND_STRING) {
-    jv parsed = jv_parse(jv_string_value(input[0]));
-    if (!jv_is_valid(parsed)) {
-      jv_free(input[0]);
-      output[0] = parsed;
-    } else if (jv_get_kind(parsed) != JV_KIND_NUMBER) {
-      output[0] = jv_invalid_with_msg(jv_string_fmt("'%s' is not a number",
-                                                    jv_string_value(input[0])));
-      jv_free(input[0]);
-    } else {
-      jv_free(input[0]);
-      output[0] = parsed;
-    }
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Cannot parse %s as a number",
-                                                  jv_kind_name(jv_get_kind(input[0]))));
-    jv_free(input[0]);
-    return;
-  }
-}
-
-static void f_length(jv input[], jv output[]) {
-  if (jv_get_kind(input[0]) == JV_KIND_ARRAY) {
-    output[0] = jv_number(jv_array_length(input[0]));
-  } else if (jv_get_kind(input[0]) == JV_KIND_OBJECT) {
-    output[0] = jv_number(jv_object_length(input[0]));
-  } else if (jv_get_kind(input[0]) == JV_KIND_STRING) {
-    output[0] = jv_number(jv_string_length(input[0]));
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("Cannot get the length of %s",
-                                                  jv_kind_name(jv_get_kind(input[0]))));
-    jv_free(input[0]);
-  }
-}
-
-static void f_tostring(jv input[], jv output[]) {
-  if (jv_get_kind(input[0]) == JV_KIND_STRING) {
-    output[0] = input[0];
-  } else {
-    output[0] = jv_dump_string(input[0], 0);
-  }
-}
-
-static int string_cmp(const void* pa, const void* pb){
-  const jv* a = pa;
-  const jv* b = pb;
-  int lena = jv_string_length(jv_copy(*a));
-  int lenb = jv_string_length(jv_copy(*b));
-  int minlen = lena < lenb ? lena : lenb;
-  int r = memcmp(jv_string_value(*a), jv_string_value(*b), minlen);
-  if (r == 0) r = lena - lenb;
-  return r;
-}
-
-static void f_keys(jv input[], jv output[]) {
-  if (jv_get_kind(input[0]) == JV_KIND_OBJECT) {
-    int nkeys = jv_object_length(jv_copy(input[0]));
-    jv* keys = malloc(sizeof(jv) * nkeys);
-    int kidx = 0;
-    jv_object_foreach(i, input[0]) {
-      keys[kidx++] = jv_object_iter_key(input[0], i);
-    }
-    qsort(keys, nkeys, sizeof(jv), string_cmp);
-    output[0] = jv_array_sized(nkeys);
-    for (int i = 0; i<nkeys; i++) {
-      output[0] = jv_array_append(output[0], keys[i]);
-    }
-    free(keys);
-    jv_free(input[0]);
-  } else {
-    output[0] = jv_invalid_with_msg(jv_string_fmt("'keys' only supports object, not %s",
-                                                  jv_kind_name(jv_get_kind(input[0]))));
-    jv_free(input[0]);
-  }
-}
-
-static void f_type(jv input[], jv output[]) {
-  output[0] = jv_string(jv_kind_name(jv_get_kind(input[0])));
-  jv_free(input[0]);
-}
-
-static block j_empty() {
-  return gen_op_block_defn(CLOSURE_CREATE, "empty", gen_op_simple(BACKTRACK));
-}
-
-static block j_false() {
-  return gen_op_block_defn(CLOSURE_CREATE, "false",
-                           block_join(gen_op_const(LOADK, jv_false()),
-                                      gen_op_simple(RET)));
-}
-
-static block j_true() {
-  return gen_op_block_defn(CLOSURE_CREATE, "true",
-                           block_join(gen_op_const(LOADK, jv_true()),
-                                      gen_op_simple(RET)));
-}
-
-static block j_null() {
-  return gen_op_block_defn(CLOSURE_CREATE, "null",
-                           block_join(gen_op_const(LOADK, jv_null()),
-                                      gen_op_simple(RET)));
-}
-
-static block j_not() {
-  return gen_op_block_defn(CLOSURE_CREATE, "not",
-                           block_join(gen_condbranch(gen_op_const(LOADK, jv_false()),
-                                                     gen_op_const(LOADK, jv_true())),
-                                      gen_op_simple(RET)));
-}
-
-static struct cfunction function_list[] = {
-  {f_plus, "_plus", CALL_BUILTIN_3_1},
-  {f_minus, "_minus", CALL_BUILTIN_3_1},
-  {f_multiply, "_multiply", CALL_BUILTIN_3_1},
-  {f_divide, "_divide", CALL_BUILTIN_3_1},
-  {f_tonumber, "tonumber", CALL_BUILTIN_1_1},
-  {f_tostring, "tostring", CALL_BUILTIN_1_1},
-  {f_keys, "keys", CALL_BUILTIN_1_1},
-  {f_equal, "_equal", CALL_BUILTIN_3_1},
-  {f_less, "_less", CALL_BUILTIN_3_1},
-  {f_greater, "_greater", CALL_BUILTIN_3_1},
-  {f_lesseq, "_lesseq", CALL_BUILTIN_3_1},
-  {f_greatereq, "_greatereq", CALL_BUILTIN_3_1},
-  {f_length, "length", CALL_BUILTIN_1_1},
-  {f_type, "type", CALL_BUILTIN_1_1},
-  {f_add, "add", CALL_BUILTIN_1_1},
-};
-
-static struct symbol_table cbuiltins = {function_list, sizeof(function_list)/sizeof(function_list[0])};
-
-typedef block (*bytecoded_builtin)();
-static bytecoded_builtin bytecoded_builtins[] = {
-  j_empty,
-  j_false,
-  j_true,
-  j_null,
-  j_not,
-};
-
-static const char* jq_builtins[] = {
-  "def map(f): [.[] | f];",
-  "def select(f): if f then . else empty end;",
-};
-
-
-block builtins_bind(block b) {
-  for (int i=(int)(sizeof(jq_builtins)/sizeof(jq_builtins[0]))-1; i>=0; i--) {
-    struct locfile src;
-    locfile_init(&src, jq_builtins[i], strlen(jq_builtins[i]));
-    block funcs;
-    int nerrors = jq_parse_library(&src, &funcs);
-    assert(!nerrors);
-    b = block_bind(funcs, b, OP_IS_CALL_PSEUDO);
-    locfile_free(&src);
-  }
-  block builtins = gen_noop();
-  for (unsigned i=0; i<sizeof(bytecoded_builtins)/sizeof(bytecoded_builtins[0]); i++) {
-    block_append(&builtins, bytecoded_builtins[i]());
-  }
-  b = block_bind(builtins, b, OP_IS_CALL_PSEUDO);
-  return gen_cbinding(&cbuiltins, b);
-}

bytecode.c

@@ -1,88 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "bytecode.h"
-#include "opcode.h"
-
-static int bytecode_operation_length(uint16_t* codeptr) {
-  if (opcode_describe(*codeptr)->flags & OP_HAS_VARIABLE_LENGTH_ARGLIST) {
-    return 2 + codeptr[1] * 2;
-  } else {
-    return opcode_length(*codeptr);
-  }
-}
-
-void dump_disassembly(int indent, struct bytecode* bc) {
-  if (bc->nclosures > 0) {
-    printf("%*s[params: %d]\n", indent, "", bc->nclosures);
-  }
-  dump_code(indent, bc);
-  for (int i=0; i<bc->nsubfunctions; i++) {
-    printf("%*ssubfn[%d]:\n", indent, "", i);
-    dump_disassembly(indent+2, bc->subfunctions[i]);
-  }
-}
-
-void dump_code(int indent, struct bytecode* bc) {
-  int pc = 0;
-  while (pc < bc->codelen) {
-    printf("%*s", indent, "");
-    dump_operation(bc, bc->code + pc);
-    printf("\n");
-    pc += bytecode_operation_length(bc->code + pc);
-  }
-}
-
-void dump_operation(struct bytecode* bc, uint16_t* codeptr) {
-  int pc = codeptr - bc->code;
-  printf("%04d ", pc);
-  const struct opcode_description* op = opcode_describe(bc->code[pc++]);
-  printf("%s", op->name);
-  if (op->length > 1) {
-    uint16_t imm = bc->code[pc++];
-    if (op->flags & OP_HAS_VARIABLE_LENGTH_ARGLIST) {
-      for (int i=0; i<imm; i++) {
-        uint16_t level = bc->code[pc++];
-        uint16_t idx = bc->code[pc++];
-        if (idx & ARG_NEWCLOSURE) {
-          printf(" subfn[%d]", idx & ~ARG_NEWCLOSURE);
-        } else {
-          printf(" param[%d]", idx);
-        }
-        if (level) {
-          printf("^%d", level);
-        }
-      }
-    } else if (op->flags & OP_HAS_BRANCH) {
-      printf(" %04d", pc + imm);
-    } else if (op->flags & OP_HAS_CONSTANT) {
-      printf(" ");
-      jv_dump(jv_array_get(jv_copy(bc->constants), imm), 0);
-    } else if (op->flags & OP_HAS_VARIABLE) {
-      uint16_t v = bc->code[pc++];
-      printf(" v%d", v);
-      if (imm) {
-        printf("^%d", imm);
-      }
-    } else {
-      printf(" %d", imm);
-    }
-  }  
-}
-
-void symbol_table_free(struct symbol_table* syms) {
-  free(syms->cfunctions);
-  free(syms);
-}
-
-void bytecode_free(struct bytecode* bc) {
-  free(bc->code);
-  jv_free(bc->constants);
-  for (int i=0; i<bc->nsubfunctions; i++)
-    bytecode_free(bc->subfunctions[i]);
-  if (!bc->parent)
-    symbol_table_free(bc->globals);
-  free(bc->subfunctions);
-  free(bc);
-}

bytecode.h

@@ -1,52 +0,0 @@
-#ifndef BYTECODE_H
-#define BYTECODE_H
-#include <stdint.h>
-
-#include "jv.h"
-#include "opcode.h"
-
-typedef void (*cfunction_ptr)(jv input[], jv output[]);
-
-struct cfunction {
-  cfunction_ptr fptr;
-  const char* name;
-  opcode callop;
-};
-
-#define MAX_CFUNCTION_ARGS 10
-struct symbol_table {
-  struct cfunction* cfunctions;
-  int ncfunctions;
-};
-
-// The bytecode format matters in:
-//   execute.c  - interpreter
-//   compile.c  - compiler
-//   bytecode.c - disassembler
-
-#define ARG_NEWCLOSURE 0x1000
-
-struct bytecode {
-  uint16_t* code;
-  int codelen;
-
-  int nlocals;
-  int nclosures;
-
-  jv constants; // JSON array of constants
-  struct symbol_table* globals;
-
-  struct bytecode** subfunctions;
-  int nsubfunctions;
-
-  struct bytecode* parent;
-};
-
-void dump_disassembly(int, struct bytecode* code);
-void dump_code(int, struct bytecode* code);
-void dump_operation(struct bytecode* bc, uint16_t* op);
-
-void symbol_table_free(struct symbol_table* syms);
-void bytecode_free(struct bytecode* bc);
-
-#endif

compile-ios.sh

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# old values
+OLD_CFLAGS=$CFLAGS
+OLD_LDFLAGS=$LDFLAGS
+ORIG_PWD=`pwd`
+
+# For parallelism in make
+NJOBS="-j`sysctl -n hw.ncpu || echo 1`"
+
+
+# Get oniguruma
+rm -rf $PWD/build/ios onig-5.9.5
+echo "Downloading oniguruma 5.9.5"
+curl -L https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz | tar xz
+cd oniguruma-5.9.5
+
+# So, we need to remake the configure scripts so that the arm64 architecture
+# exists in config.sub.  In order to keep autoreconf from failing, create
+# NEWS and ChangeLog.
+touch NEWS ChangeLog
+autoreconf -fi >/dev/null 2>&1
+
+
+
+
+CC=`xcrun -f clang`
+cd $ORIG_PWD
+
+autoreconf -fi
+for arch in i386 x86_64 armv7 armv7s arm64; do
+
+	# Some of the architectures are a bit different...
+	if [[ "$arch" = "i386" || "$arch" = "x86_64" ]]
+	then
+		SYSROOT=`xcrun -f --sdk iphonesimulator --show-sdk-path`
+	else
+		SYSROOT=`xcrun -f --sdk iphoneos --show-sdk-path`
+	fi
+	if [[ "$arch" = "arm64" ]]
+	then
+		HOST="aarch64-apple-darwin"
+	else
+		HOST="$arch-apple-darwin"
+	fi
+
+	CFLAGS="-arch $arch -miphoneos-version-min=6.0 -isysroot $SYSROOT $OLD_CFLAGS"
+	LDFLAGS="-arch $arch -miphoneos-version-min=6.0 -isysroot $SYSROOT $OLD_LDFLAGS"
+
+
+
+	# Build oniguruma for this architecture
+	cd onig-5.9.5
+	CC=$CC CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS ./configure --disable-shared --enable-static --host=$HOST --prefix=$ORIG_PWD/build/ios/$arch
+	STATUS=$?
+	if [ $STATUS -ne 0 ]
+	then
+		echo "Failed to configure oniguruma for architecture $arch.  Check `pwd`/config.log for details."
+		cd $PWD
+		exit $STATUS
+	fi
+	make clean
+	make $NJBOS install
+	STATUS=$?
+	if [ $STATUS -ne 0 ]
+	then
+		echo "Failed to make oniguruma for architecture $arch."
+		cd $PWD
+		exit $STATUS
+	fi
+
+
+
+	# Build jq for this architecture
+	cd $ORIG_PWD
+	CC=$CC CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS ./configure --disable-shared --enable-static -host=$HOST --prefix=$ORIG_PWD/build/ios/$arch --with-oniguruma=$ORIG_PWD/build/ios/$arch
+	STATUS=$?
+	if [ $STATUS -ne 0 ]
+	then
+		echo "Failed to configure jq for architecture $arch"
+		exit $STATUS
+	fi
+	make clean
+	make $NJOBS install
+	STATUS=$?
+	if [ $STATUS -ne 0 ]
+	then
+		echo "Failed to make jq for architecture $arch"
+		exit $STATUS
+	fi
+done
+
+
+# lipo together the different architectures into a universal 'fat' file
+lipo -create -output $ORIG_PWD/build/ios/libonig.a $ORIG_PWD/build/ios/{i386,x86_64,armv7,armv7s,arm64}/lib/libonig.a
+lipo -create -output $ORIG_PWD/build/ios/libjq.a $ORIG_PWD/build/ios/{i386,x86_64,armv7,armv7s,arm64}/lib/libjq.a
+
+# copy the products into the destination directory and clean up the single-architecture files.
+cp $ORIG_PWD/build/ios/i386/include/*.h $ORIG_PWD/build/ios/
+rm -rf $ORIG_PWD/build/ios/{i386,x86_64,armv7,armv7s,arm64}
+
+echo "Products are in $ORIG_PWD/build/ios"

compile.c

@@ -1,613 +0,0 @@
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include "opcode.h"
-#include "compile.h"
-#include "locfile.h"
-
-struct inst {
-  struct inst* next;
-  struct inst* prev;
-
-  opcode op;
-  
-  union {
-    uint16_t intval;
-    struct inst* target;
-    jv constant;
-    struct cfunction* cfunc;
-  } imm;
-
-  location source;
-
-  // Binding
-  // An instruction requiring binding (for parameters/variables)
-  // is in one of three states:
-  //   bound_by = NULL  - Unbound free variable
-  //   bound_by = self  - This instruction binds a variable
-  //   bound_by = other - Uses variable bound by other instruction
-  // The immediate field is generally not meaningful until instructions
-  // are bound, and even then only for instructions which bind.
-  struct inst* bound_by;
-  char* symbol;
-  block subfn;
-
-  // This instruction is compiled as part of which function?
-  // (only used during block_compile)
-  struct bytecode* compiled;
-
-  int bytecode_pos; // position just after this insn
-};
-
-static inst* inst_new(opcode op) {
-  inst* i = malloc(sizeof(inst));
-  i->next = i->prev = 0;
-  i->op = op;
-  i->bytecode_pos = -1;
-  i->bound_by = 0;
-  i->symbol = 0;
-  i->subfn = gen_noop();
-  i->source = UNKNOWN_LOCATION;
-  return i;
-}
-
-static void inst_free(struct inst* i) {
-  free(i->symbol);
-  if (opcode_describe(i->op)->flags & OP_HAS_BLOCK) {
-    block_free(i->subfn);
-  }
-  if (opcode_describe(i->op)->flags & OP_HAS_CONSTANT) {
-    jv_free(i->imm.constant);
-  }
-  free(i);
-}
-
-static block inst_block(inst* i) {
-  block b = {i,i};
-  return b;
-}
-
-static int block_is_single(block b) {
-  return b.first && b.first == b.last;
-}
-
-static inst* block_take(block* b) {
-  if (b->first == 0) return 0;
-  inst* i = b->first;
-  if (i->next) {
-    i->next->prev = 0;
-    b->first = i->next;
-    i->next = 0;
-  } else {
-    b->first = 0;
-    b->last = 0;
-  }
-  return i;
-}
-
-block gen_location(location loc, block b) {
-  for (inst* i = b.first; i; i = i->next) {
-    if (i->source.start == UNKNOWN_LOCATION.start &&
-        i->source.end == UNKNOWN_LOCATION.end) {
-      i->source = loc;
-    }
-  }
-  return b;
-}
-
-block gen_noop() {
-  block b = {0,0};
-  return b;
-}
-
-block gen_op_simple(opcode op) {
-  assert(opcode_describe(op)->length == 1);
-  return inst_block(inst_new(op));
-}
-
-
-block gen_op_const(opcode op, jv constant) {
-  assert(opcode_describe(op)->flags & OP_HAS_CONSTANT);
-  inst* i = inst_new(op);
-  i->imm.constant = constant;
-  return inst_block(i);
-}
-
-block gen_op_target(opcode op, block target) {
-  assert(opcode_describe(op)->flags & OP_HAS_BRANCH);
-  assert(target.last);
-  inst* i = inst_new(op);
-  i->imm.target = target.last;
-  return inst_block(i);
-}
-
-block gen_op_targetlater(opcode op) {
-  assert(opcode_describe(op)->flags & OP_HAS_BRANCH);
-  inst* i = inst_new(op);
-  i->imm.target = 0;
-  return inst_block(i);
-}
-void inst_set_target(block b, block target) {
-  assert(block_is_single(b));
-  assert(opcode_describe(b.first->op)->flags & OP_HAS_BRANCH);
-  assert(target.last);
-  b.first->imm.target = target.last;
-}
-
-block gen_op_var_unbound(opcode op, const char* name) {
-  assert(opcode_describe(op)->flags & OP_HAS_VARIABLE);
-  inst* i = inst_new(op);
-  i->symbol = strdup(name);
-  return inst_block(i);
-}
-
-block gen_op_var_bound(opcode op, block binder) {
-  assert(block_is_single(binder));
-  block b = gen_op_var_unbound(op, binder.first->symbol);
-  b.first->bound_by = binder.first;
-  return b;
-}
-
-block gen_op_symbol(opcode op, const char* sym) {
-  assert(opcode_describe(op)->flags & OP_HAS_SYMBOL);
-  inst* i = inst_new(op);
-  i->symbol = strdup(sym);
-  return inst_block(i);
-}
-
-block gen_op_block_defn(opcode op, const char* name, block block) {
-  assert(opcode_describe(op)->flags & OP_IS_CALL_PSEUDO);
-  assert(opcode_describe(op)->flags & OP_HAS_BLOCK);
-  inst* i = inst_new(op);
-  i->subfn = block;
-  i->symbol = strdup(name);
-  return inst_block(i);
-}
-
-static void block_bind_subblock(block binder, block body, int bindflags);
-block gen_op_block_defn_rec(opcode op, const char* name, block blk) {
-  block b = gen_op_block_defn(op, name, blk);
-  block_bind_subblock(b, b, OP_IS_CALL_PSEUDO | OP_HAS_BINDING);
-  return b;
-}
-
-block gen_op_block_unbound(opcode op, const char* name) {
-  assert(opcode_describe(op)->flags & OP_IS_CALL_PSEUDO);
-  inst* i = inst_new(op);
-  i->symbol = strdup(name);
-  return inst_block(i);
-}
-
-block gen_op_block_bound(opcode op, block binder) {
-  assert(block_is_single(binder));
-  block b = gen_op_block_unbound(op, binder.first->symbol);
-  b.first->bound_by = binder.first;
-  return b;
-}
-
-block gen_op_call(opcode op, block arglist) {
-  assert(opcode_describe(op)->flags & OP_HAS_VARIABLE_LENGTH_ARGLIST);
-  inst* i = inst_new(op);
-  block prelude = gen_noop();
-  block call = inst_block(i);
-  int nargs = 0;
-  inst* curr = 0;
-  while ((curr = block_take(&arglist))) {
-    assert(opcode_describe(curr->op)->flags & OP_IS_CALL_PSEUDO);
-    block bcurr = inst_block(curr);
-    switch (curr->op) {
-    default: assert(0 && "Unknown type of parameter"); break;
-    case CLOSURE_REF:
-      block_append(&call, bcurr);
-      break;
-    case CLOSURE_CREATE:
-      block_append(&prelude, bcurr);
-      block_append(&call, gen_op_block_bound(CLOSURE_REF, bcurr));
-      break;
-    }
-    nargs++;
-  }
-  assert(nargs < 100); //FIXME
-  i->imm.intval = nargs;
-  return block_join(prelude, call);
-}
-
-static void inst_join(inst* a, inst* b) {
-  assert(a && b);
-  assert(!a->next);
-  assert(!b->prev);
-  a->next = b;
-  b->prev = a;
-}
-
-void block_append(block* b, block b2) {
-  if (b2.first) {
-    if (b->last) {
-      inst_join(b->last, b2.first);
-    } else {
-      b->first = b2.first;
-    }
-    b->last = b2.last;
-  }
-}
-
-block block_join(block a, block b) {
-  block c = a;
-  block_append(&c, b);
-  return c;
-}
-
-int block_has_only_binders(block binders, int bindflags) {
-  bindflags |= OP_HAS_BINDING;
-  for (inst* curr = binders.first; curr; curr = curr->next) {
-    if ((opcode_describe(curr->op)->flags & bindflags) != bindflags) {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-static void block_bind_subblock(block binder, block body, int bindflags) {
-  assert(block_is_single(binder));
-  assert((opcode_describe(binder.first->op)->flags & bindflags) == bindflags);
-  assert(binder.first->symbol);
-  assert(binder.first->bound_by == 0 || binder.first->bound_by == binder.first);
-
-  binder.first->bound_by = binder.first;
-  for (inst* i = body.first; i; i = i->next) {
-    int flags = opcode_describe(i->op)->flags;
-    if ((flags & bindflags) == bindflags &&
-        i->bound_by == 0 &&
-        !strcmp(i->symbol, binder.first->symbol)) {
-      // bind this instruction
-      i->bound_by = binder.first;
-    }
-    if (flags & OP_HAS_BLOCK) {
-      // binding recurses into closures
-      block_bind_subblock(binder, i->subfn, bindflags);
-    }
-  }
-}
-
-block block_bind(block binder, block body, int bindflags) {
-  assert(block_has_only_binders(binder, bindflags));
-  bindflags |= OP_HAS_BINDING;
-  for (inst* curr = binder.first; curr; curr = curr->next) {
-    block_bind_subblock(inst_block(curr), body, bindflags);
-  }
-  return block_join(binder, body);
-}
-
-
-block gen_subexp(block a) {
-  block c = gen_noop();
-  block_append(&c, gen_op_simple(DUP));
-  block_append(&c, a);
-  block_append(&c, gen_op_simple(SWAP));
-  return c;
-}
-
-block gen_both(block a, block b) {
-  block c = gen_noop();
-  block jump = gen_op_targetlater(JUMP);
-  block fork = gen_op_targetlater(FORK);
-  block_append(&c, fork);
-  block_append(&c, a);
-  block_append(&c, jump);
-  inst_set_target(fork, c);
-  block_append(&c, b);
-  inst_set_target(jump, c);
-  return c;
-}
-
-
-block gen_collect(block expr) {
-  block c = gen_noop();
-  block_append(&c, gen_op_simple(DUP));
-  block_append(&c, gen_op_const(LOADK, jv_array()));
-  block array_var = block_bind(gen_op_var_unbound(STOREV, "collect"),
-                               gen_noop(), OP_HAS_VARIABLE);
-  block_append(&c, array_var);
-
-  block tail = {0};
-  block_append(&tail, gen_op_simple(DUP));
-  block_append(&tail, gen_op_var_bound(LOADV, array_var));
-  block_append(&tail, gen_op_simple(SWAP));
-  block_append(&tail, gen_op_simple(APPEND));
-  block_append(&tail, gen_op_var_bound(STOREV, array_var));
-  block_append(&tail, gen_op_simple(BACKTRACK));
-
-  block_append(&c, gen_op_target(FORK, tail));
-  block_append(&c, expr);
-  block_append(&c, tail);
-
-  block_append(&c, gen_op_var_bound(LOADV, array_var));
-
-  return c;
-}
-
-block gen_assign(block expr) {
-  block c = gen_noop();
-  block_append(&c, gen_op_simple(DUP));
-  block result_var = block_bind(gen_op_var_unbound(STOREV, "result"),
-                                gen_noop(), OP_HAS_VARIABLE);
-  block_append(&c, result_var);
-
-  block loop = gen_noop();
-  block_append(&loop, gen_op_simple(DUP));
-  block_append(&loop, expr);
-  block_append(&loop, gen_op_var_bound(ASSIGN, result_var));
-  block_append(&loop, gen_op_simple(BACKTRACK));
-
-  block_append(&c, gen_op_target(FORK, loop));
-  block_append(&c, loop);
-  block_append(&c, gen_op_var_bound(LOADV, result_var));
-  return c;
-}
-
-block gen_definedor(block a, block b) {
-  // var found := false
-  block c = gen_op_simple(DUP);
-  block_append(&c, gen_op_const(LOADK, jv_false()));
-  block found_var = block_bind(gen_op_var_unbound(STOREV, "found"),
-                               gen_noop(), OP_HAS_VARIABLE);
-  block_append(&c, found_var);
-
-  // if found, backtrack. Otherwise execute b
-  block tail = gen_op_simple(DUP);
-  block_append(&tail, gen_op_var_bound(LOADV, found_var));
-  block backtrack = gen_op_simple(BACKTRACK);
-  block_append(&tail, gen_op_target(JUMP_F, backtrack));
-  block_append(&tail, backtrack);
-  block_append(&tail, gen_op_simple(POP));
-  block_append(&tail, b);
-
-  // try again
-  block if_notfound = gen_op_simple(BACKTRACK);
-
-  // found := true, produce result
-  block if_found = gen_op_simple(DUP);
-  block_append(&if_found, gen_op_const(LOADK, jv_true()));
-  block_append(&if_found, gen_op_var_bound(STOREV, found_var));
-  block_append(&if_found, gen_op_target(JUMP, tail));
-
-  block_append(&c, gen_op_target(FORK, if_notfound));
-  block_append(&c, a);
-  block_append(&c, gen_op_target(JUMP_F, if_found));
-  block_append(&c, if_found);
-  block_append(&c, if_notfound);
-  block_append(&c, tail);
-
-  return c;
-}
-
-block gen_condbranch(block iftrue, block iffalse) {
-  block b = gen_noop();
-  block_append(&iftrue, gen_op_target(JUMP, iffalse));
-  block_append(&b, gen_op_target(JUMP_F, iftrue));
-  block_append(&b, iftrue);
-  block_append(&b, iffalse);
-  return b;
-}
-
-block gen_and(block a, block b) {
-  // a and b = if a then (if b then true else false) else false
-  block code = gen_op_simple(DUP);
-  block_append(&code, a);
-
-  block if_a_true = gen_op_simple(POP);
-  block_append(&if_a_true, b);
-  block_append(&if_a_true, gen_condbranch(gen_op_const(LOADK, jv_true()),
-                                          gen_op_const(LOADK, jv_false())));
-  block_append(&code, gen_condbranch(if_a_true,
-                                     block_join(gen_op_simple(POP), gen_op_const(LOADK, jv_false()))));
-  return code;
-}
-
-block gen_or(block a, block b) {
-  // a or b = if a then true else (if b then true else false)
-  block code = gen_op_simple(DUP);
-  block_append(&code, a);
-
-  block if_a_false = gen_op_simple(POP);
-  block_append(&if_a_false, b);
-  block_append(&if_a_false, gen_condbranch(gen_op_const(LOADK, jv_true()),
-                                           gen_op_const(LOADK, jv_false())));
-  block_append(&code, gen_condbranch(block_join(gen_op_simple(POP), gen_op_const(LOADK, jv_true())),
-                                     if_a_false));
-  return code;
-}
-
-block gen_cond(block cond, block iftrue, block iffalse) {
-  block b = gen_op_simple(DUP);
-  block_append(&b, cond);
-  block_append(&b, gen_condbranch(block_join(gen_op_simple(POP), iftrue),
-                                  block_join(gen_op_simple(POP), iffalse)));
-  return b;
-}
-
-block gen_cbinding(struct symbol_table* t, block code) {
-  for (int cfunc=0; cfunc<t->ncfunctions; cfunc++) {
-    inst* i = inst_new(CLOSURE_CREATE_C);
-    i->imm.cfunc = &t->cfunctions[cfunc];
-    i->symbol = strdup(i->imm.cfunc->name);
-    code = block_bind(inst_block(i), code, OP_IS_CALL_PSEUDO);
-  }
-  return code;
-}
-
-static uint16_t nesting_level(struct bytecode* bc, inst* target) {
-  uint16_t level = 0;
-  assert(bc && target->compiled);
-  while (bc && target->compiled != bc) {
-    level++;
-    bc = bc->parent;
-  }
-  assert(bc && bc == target->compiled);
-  return level;
-}
-
-static int count_cfunctions(block b) {
-  int n = 0;
-  for (inst* i = b.first; i; i = i->next) {
-    if (i->op == CLOSURE_CREATE_C) n++;
-    if (opcode_describe(i->op)->flags & OP_HAS_BLOCK)
-      n += count_cfunctions(i->subfn);
-  }
-  return n;
-}
-
-static int compile(struct locfile* locations, struct bytecode* bc, block b) {
-  int errors = 0;
-  int pos = 0;
-  int var_frame_idx = 0;
-  bc->nsubfunctions = 0;
-  bc->nclosures = 0;
-  for (inst* curr = b.first; curr; curr = curr->next) {
-    if (!curr->next) assert(curr == b.last);
-    pos += opcode_length(curr->op);
-    curr->bytecode_pos = pos;
-    curr->compiled = bc;
-
-    int opflags = opcode_describe(curr->op)->flags;
-    if (opflags & OP_HAS_BINDING) {
-      if (!curr->bound_by) {
-        locfile_locate(locations, curr->source, "error: %s is not defined", curr->symbol);
-        errors++;
-      }
-    }
-    if ((opflags & OP_HAS_VARIABLE) &&
-        curr->bound_by == curr) {
-      curr->imm.intval = var_frame_idx++;
-    }
-    if (opflags & OP_HAS_BLOCK) {
-      assert(curr->bound_by == curr);
-      curr->imm.intval = bc->nsubfunctions++;
-    }
-    if (curr->op == CLOSURE_PARAM) {
-      assert(curr->bound_by == curr);
-      curr->imm.intval = bc->nclosures++;
-    }
-    if (curr->op == CLOSURE_CREATE_C) {
-      assert(curr->bound_by == curr);
-      int idx = bc->globals->ncfunctions++;
-      bc->globals->cfunctions[idx] = *curr->imm.cfunc;
-      curr->imm.intval = idx;
-    }
-  }
-  if (bc->nsubfunctions) {
-    bc->subfunctions = malloc(sizeof(struct bytecode*) * bc->nsubfunctions);
-    for (inst* curr = b.first; curr; curr = curr->next) {
-      if (!(opcode_describe(curr->op)->flags & OP_HAS_BLOCK))
-        continue;
-      struct bytecode* subfn = malloc(sizeof(struct bytecode));
-      bc->subfunctions[curr->imm.intval] = subfn;
-      subfn->globals = bc->globals;
-      subfn->parent = bc;
-      errors += compile(locations, subfn, curr->subfn);
-    }
-  } else {
-    bc->subfunctions = 0;
-  }
-  bc->codelen = pos;
-  uint16_t* code = malloc(sizeof(uint16_t) * bc->codelen);
-  bc->code = code;
-  pos = 0;
-  jv constant_pool = jv_array();
-  int maxvar = -1;
-  if (!errors) for (inst* curr = b.first; curr; curr = curr->next) {
-    const struct opcode_description* op = opcode_describe(curr->op);
-    if (op->length == 0)
-      continue;
-    uint16_t* opcode_rewrite = &code[pos];
-    code[pos++] = curr->op;
-    int opflags = op->flags;
-    assert(!(op->flags & OP_IS_CALL_PSEUDO));
-    if (opflags & OP_HAS_VARIABLE_LENGTH_ARGLIST) {
-      int nargs = curr->imm.intval;
-      assert(nargs > 0);
-      code[pos++] = (uint16_t)nargs;
-      int desired_params = 0;
-      for (int i=0; i<nargs; i++) {
-        curr = curr->next;
-        assert(curr && opcode_describe(curr->op)->flags & OP_IS_CALL_PSEUDO);
-        code[pos++] = nesting_level(bc, curr->bound_by);
-        switch (curr->bound_by->op) {
-        default: assert(0 && "Unknown type of argument");
-        case CLOSURE_CREATE:
-          code[pos++] = curr->bound_by->imm.intval | ARG_NEWCLOSURE;
-          if (i == 0) {
-            inst* i = curr->bound_by;
-            desired_params = i->compiled->subfunctions[i->imm.intval]->nclosures;
-          }
-          break;
-        case CLOSURE_PARAM:
-          code[pos++] = curr->bound_by->imm.intval;
-          if (i == 0) desired_params = 0;
-          break;
-        case CLOSURE_CREATE_C:
-          code[pos++] = curr->bound_by->imm.intval;
-          *opcode_rewrite = bc->globals->cfunctions[curr->bound_by->imm.intval].callop;
-          if (i == 0) desired_params = 0;
-          break;
-        }
-      }
-      assert(nargs - 1 == desired_params);
-    } else if (opflags & OP_HAS_CONSTANT) {
-      code[pos++] = jv_array_length(jv_copy(constant_pool));
-      constant_pool = jv_array_append(constant_pool, jv_copy(curr->imm.constant));
-    } else if (opflags & OP_HAS_VARIABLE) {
-      code[pos++] = nesting_level(bc, curr->bound_by);
-      uint16_t var = (uint16_t)curr->bound_by->imm.intval;
-      code[pos++] = var;
-      if (var > maxvar) maxvar = var;
-    } else if (opflags & OP_HAS_BRANCH) {
-      assert(curr->imm.target->bytecode_pos != -1);
-      assert(curr->imm.target->bytecode_pos > pos); // only forward branches
-      code[pos] = curr->imm.target->bytecode_pos - (pos + 1);
-      pos++;
-    } else if (opflags & OP_HAS_CFUNC) {
-      assert(curr->symbol);
-      int found = 0;
-      for (int i=0; i<bc->globals->ncfunctions; i++) {
-        if (!strcmp(curr->symbol, bc->globals->cfunctions[i].name)) {
-          code[pos++] = i;
-          found = 1;
-          break;
-        }
-      }
-      assert(found);
-    } else if (op->length > 1) {
-      assert(0 && "codegen not implemented for this operation");
-    }
-  }
-  bc->constants = constant_pool;
-  bc->nlocals = maxvar + 2; // FIXME: frames of size zero?
-  return errors;
-}
-
-int block_compile(block b, struct locfile* locations, struct bytecode** out) {
-  struct bytecode* bc = malloc(sizeof(struct bytecode));
-  bc->parent = 0;
-  bc->globals = malloc(sizeof(struct symbol_table));
-  int ncfunc = count_cfunctions(b);
-  bc->globals->ncfunctions = 0;
-  bc->globals->cfunctions = malloc(sizeof(struct cfunction) * ncfunc);
-  int nerrors = compile(locations, bc, b);
-  assert(bc->globals->ncfunctions == ncfunc);
-  if (nerrors > 0) {
-    bytecode_free(bc);
-    *out = 0;
-  } else {
-    *out = bc;
-  }
-  return nerrors;
-}
-
-void block_free(block b) {
-  struct inst* next;
-  for (struct inst* curr = b.first; curr; curr = next) {
-    next = curr->next;
-    inst_free(curr);
-  }
-}

compile.h

@@ -1,55 +0,0 @@
-#ifndef COMPILE_H
-#define COMPILE_H
-#include <stdint.h>
-#include "bytecode.h"
-#include "opcode.h"
-#include "locfile.h"
-
-struct inst;
-typedef struct inst inst;
-
-
-typedef struct block {
-  inst* first;
-  inst* last;
-} block;
-
-block gen_location(location, block);
-
-block gen_noop();
-block gen_op_simple(opcode op);
-block gen_op_const(opcode op, jv constant);
-block gen_op_target(opcode op, block target);
-block gen_op_var_unbound(opcode op, const char* name);
-block gen_op_var_bound(opcode op, block binder);
-block gen_op_block_defn(opcode op, const char* name, block block);
-block gen_op_block_defn_rec(opcode op, const char* name, block block);
-block gen_op_block_unbound(opcode op, const char* name);
-block gen_op_call(opcode op, block arglist);
-block gen_op_symbol(opcode op, const char* name);
-
-block gen_subexp(block a);
-block gen_both(block a, block b);
-block gen_collect(block expr);
-block gen_assign(block expr);
-block gen_definedor(block a, block b);
-block gen_condbranch(block iftrue, block iffalse);
-block gen_and(block a, block b);
-block gen_or(block a, block b);
-
-block gen_cond(block cond, block iftrue, block iffalse);
-
-block gen_cbinding(struct symbol_table* functions, block b);
-
-void block_append(block* b, block b2);
-block block_join(block a, block b);
-int block_has_only_binders(block, int bindflags);
-block block_bind(block binder, block body, int bindflags);
-
-int block_compile(block, struct locfile*, struct bytecode**);
-
-void block_free(block);
-
-
-
-#endif

config/.gitignore

@@ -0,0 +1,10 @@
+config.guess
+config.sub
+compile
+depcomp
+install-sh
+ltmain.sh
+missing
+ylwrap
+test-driver
+ar-lib

config/m4/.gitignore

@@ -0,0 +1,2 @@
+libtool.m4
+lt*.m4

config/m4/check-math-func.m4

@@ -0,0 +1,4 @@
+dnl AC_FIND_FUNC(func, arguments)
+AC_DEFUN([AC_CHECK_MATH_FUNC], [
+  AC_FIND_FUNC_NO_LIBS([$1], [m], [#include <math.h>], [$2])
+])

config/m4/find-func-no-libs.m4

@@ -0,0 +1,8 @@
+dnl Shamelessly stolen from Heimdal
+dnl
+dnl Look for function in any of the specified libraries
+dnl
+
+dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args)
+AC_DEFUN([AC_FIND_FUNC_NO_LIBS], [
+AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])])

config/m4/find-func-no-libs2.m4

@@ -0,0 +1,62 @@
+dnl Shamelessly stolen from Heimdal
+dnl
+dnl Look for function in any of the specified libraries
+dnl
+
+dnl AC_FIND_FUNC_NO_LIBS2(func, libraries, includes, arguments, extra libs, extra args)
+AC_DEFUN([AC_FIND_FUNC_NO_LIBS2], [
+
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(ac_cv_funclib_$1,
+[
+if eval "test \"\$ac_cv_func_$1\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in $2; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS="$6 $ac_lib $5 $ac_save_LIBS"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$1($4)]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break])
+	done
+	eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}"
+	LIBS="$ac_save_LIBS"
+fi
+])
+
+eval "ac_res=\$ac_cv_funclib_$1"
+
+if false; then
+	AC_CHECK_FUNCS($1)
+dnl	AC_CHECK_LIBS($2, foo)
+fi
+# $1
+eval "ac_tr_func=HAVE_[]upcase($1)"
+eval "ac_tr_lib=HAVE_LIB[]upcase($ac_res | sed -e 's/-l//')"
+eval "LIB_$1=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_$1=yes"
+	eval "LIB_$1="
+	AC_DEFINE_UNQUOTED($ac_tr_func)
+	AC_MSG_RESULT([yes])
+	;;
+	no)
+	eval "ac_cv_func_$1=no"
+	eval "LIB_$1="
+	AC_MSG_RESULT([no])
+	;;
+	*)
+	eval "ac_cv_func_$1=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	AC_DEFINE_UNQUOTED($ac_tr_func)
+	AC_DEFINE_UNQUOTED($ac_tr_lib)
+	AC_MSG_RESULT([yes, in $ac_res])
+	;;
+esac
+AC_SUBST(LIB_$1)
+])

config/m4/find-func.m4

@@ -0,0 +1,9 @@
+dnl Shamelessly stolen from Heimdal
+dnl
+dnl AC_FIND_FUNC(func, libraries, includes, arguments)
+AC_DEFUN([AC_FIND_FUNC], [
+AC_FIND_FUNC_NO_LIBS([$1], [$2], [$3], [$4])
+if test -n "$LIB_$1"; then
+	LIBS="$LIB_$1 $LIBS"
+fi
+])

config/m4/misc.m4

@@ -0,0 +1,3 @@
+
+dnl Shamelessly stolen from Heimdal
+AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl

configure.ac

@@ -0,0 +1,262 @@
+m4_define([jq_version], m4_esyscmd_s([git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//']))
+
+AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
+             [jq], [https://stedolan.github.io/jq])
+
+m4_include([m4/ax_compare_version.m4])
+m4_include([m4/ax_prog_bison_version.m4])
+
+dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
+AC_PREREQ([2.64])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([1.11.2 subdir-objects parallel-tests foreign -Wall])
+AM_SILENT_RULES([yes])
+AM_PROG_AR
+AM_MAINTAINER_MODE([enable])
+AC_PROG_CC
+AC_PROG_CC_STDC
+AC_PROG_CPP_WERROR
+AC_PROG_YACC
+AC_OBJEXT
+AC_EXEEXT
+LT_INIT([shared static win32-dll])
+AM_PROG_CC_C_O
+
+
+dnl couldn't use AM_PROG_LEX as it doesn't support header files like the
+dnl AC_PROG_YACC macros...
+
+dnl check bison version
+
+if test "$USE_MAINTAINER_MODE" = yes; then
+  if test "$YACC" != "bison -y"; then
+    AC_MSG_CHECKING([bison version])
+    AC_MSG_RESULT([not bison])
+  else
+    AX_PROG_BISON_VERSION([3],
+      [],
+      [AC_MSG_ERROR([You need bison version 3.0 or greater, or use --disable-maintainer-mode.])])
+  fi
+
+  AC_PROG_LEX
+  if test "x$LEX" != xflex; then
+    LEX="$SHELL $missing_dir/missing flex"
+  fi
+fi
+
+
+##########################################################################
+# check for ONIGURUMA library
+##########################################################################
+
+AC_ARG_WITH([oniguruma],
+    [AS_HELP_STRING([--with-oniguruma=prefix],
+        [try this for a non-standard install prefix of the oniguruma library])],
+    [],
+    [with_oniguruma=yes])
+
+AS_IF([test "x$with_oniguruma" != xno], [
+    AS_IF([test "x$with_oniguruma" != xyes], [
+        CFLAGS="$CFLAGS -I${with_oniguruma}/include"
+        LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
+    ])
+    # check for ONIGURUMA library
+    have_oniguruma=0
+    AC_CHECK_HEADER("oniguruma.h",
+        AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;]))
+    # handle check results
+    AS_IF([test $have_oniguruma = 1], [
+        AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed])
+    ], [
+        AC_MSG_NOTICE([Oniguruma was not found.])
+        AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX'])
+    ])
+])
+
+dnl Check for valgrind
+AC_CHECK_PROGS(valgrind_cmd, valgrind)
+if test "x$valgrind_cmd" = "x" ; then
+    AC_MSG_WARN([valgrind is required to test jq.])
+fi
+AC_CHECK_FUNCS(memmem)
+AC_CHECK_FUNCS(mkstemp)
+
+AC_CHECK_HEADER("shlwapi.h",[have_win32=1;])
+AM_CONDITIONAL([WIN32], [test "x$have_win32" = x1])
+
+dnl Running tests with Valgrind is slow. It is faster to iterate on
+dnl code without Valgrind until tests pass, then enable Valgrind and
+dnl fix leaks.
+AC_ARG_ENABLE([valgrind],
+   AC_HELP_STRING([--disable-valgrind], [do not run tests under Valgrind]))
+
+dnl Running tests with Valgrind is slow; address sanitizer (ASAN) is
+dnl faster.
+AC_ARG_ENABLE([asan],
+   AC_HELP_STRING([--enable-asan], [enable address sanitizer]))
+
+dnl Undefined Behavior Sanitizer
+AC_ARG_ENABLE([ubsan],
+   AC_HELP_STRING([--enable-ubsan], [enable undefined behavior sanitizer]))
+
+dnl Code coverage
+AC_ARG_ENABLE([gcov],
+   AC_HELP_STRING([--enable-gcov], [enable gcov code coverage tool]))
+
+dnl Don't attempt to build docs if there's no Ruby lying around
+AC_ARG_ENABLE([docs],
+   AC_HELP_STRING([--disable-docs], [don't build docs]))
+
+dnl Don't attempt to build the error injection object (if there is no LD_PRELOAD support)
+AC_ARG_ENABLE([error-injection],
+   AC_HELP_STRING([--enable-error-injection], [build and test with error injection]))
+
+dnl Enable building all static
+AC_ARG_ENABLE([all-static],
+   AC_HELP_STRING([--enable-all-static], [link jq with static libraries only]))
+
+AS_IF([test "x$enable_docs" != "xno"],[
+   AC_CHECK_PROGS(bundle_cmd, bundle)
+
+   AC_CACHE_CHECK([for Ruby dependencies], [jq_cv_ruby_deps],
+     [jq_cv_ruby_deps=yes;
+        AS_IF([test "x$bundle_cmd" = "x" || \
+        ! bmsg="`cd ${srcdir}/docs; "$bundle_cmd" check 2>/dev/null`"],[
+           AC_MSG_WARN([$bmsg])
+           cat <<EOF
+*****************************************************************
+*  Ruby dependencies for building jq documentation not found.   *
+*  You can still build, install and hack on jq, but the manpage *
+*  will not be rebuilt and some of the tests will not run.      *
+*  See docs/README.md for how to install the docs dependencies. *
+*****************************************************************
+EOF
+           jq_cv_ruby_deps=no
+     ])])
+
+   if test "x$jq_cv_ruby_deps" != "xyes"; then
+     enable_docs=no
+   fi
+])
+
+AM_CONDITIONAL([ENABLE_VALGRIND], [test "x$enable_valgrind" != xno])
+AM_CONDITIONAL([ENABLE_ASAN], [test "x$enable_asan" = xyes])
+AM_CONDITIONAL([ENABLE_UBSAN], [test "x$enable_ubsan" = xyes])
+AM_CONDITIONAL([ENABLE_GCOV], [test "x$enable_gcov" = xyes])
+AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" != xno])
+AM_CONDITIONAL([ENABLE_ERROR_INJECTION], [test "x$enable_error_injection" = xyes])
+AM_CONDITIONAL([ENABLE_ALL_STATIC], [test "x$enable_all_static" = xyes])
+
+AC_FUNC_ALLOCA
+
+AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
+AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])
+AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0])
+AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0])
+AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0])
+AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
+AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
+AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
+AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])],
+                [], [[#include <time.h>]])
+AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
+                [], [[#include <time.h>]])
+
+AC_ARG_ENABLE([pthread-tls],
+              [AC_HELP_STRING([--enable-pthread-tls],
+                              [Enable use of pthread thread local storage])],
+              [],
+              [enable_pthread_tls=no])
+
+if test $enable_pthread_tls = yes; then
+    AC_FIND_FUNC([pthread_key_create], [pthread], [#include <pthread.h>], [NULL, NULL])
+    AC_FIND_FUNC([pthread_once], [pthread], [#include <pthread.h>], [NULL, NULL])
+    AC_FIND_FUNC([atexit], [pthread], [#include <stdlib.h>], [NULL])
+fi
+
+dnl libm math.h functions
+AC_CHECK_MATH_FUNC(acos, [.5])
+AC_CHECK_MATH_FUNC(acosh, [.5])
+AC_CHECK_MATH_FUNC(asin, [.5])
+AC_CHECK_MATH_FUNC(asinh, [.5])
+AC_CHECK_MATH_FUNC(atan2, [.5,.5])
+AC_CHECK_MATH_FUNC(atan, [.5])
+AC_CHECK_MATH_FUNC(atanh, [.5])
+AC_CHECK_MATH_FUNC(cbrt, [.5])
+AC_CHECK_MATH_FUNC(ceil,[.5])
+AC_CHECK_MATH_FUNC(copysign,[.5,1.0])
+AC_CHECK_MATH_FUNC(cos, [.5])
+AC_CHECK_MATH_FUNC(cosh, [.5])
+AC_CHECK_MATH_FUNC(drem,[.5,1.0])
+AC_CHECK_MATH_FUNC(erf,[.5])
+AC_CHECK_MATH_FUNC(erfc,[.5])
+AC_CHECK_MATH_FUNC(exp10,[.5])
+AC_CHECK_MATH_FUNC(exp2, [.5])
+AC_CHECK_MATH_FUNC(exp, [.5])
+AC_CHECK_MATH_FUNC(expm1,[.5])
+AC_CHECK_MATH_FUNC(fabs,[.5])
+AC_CHECK_MATH_FUNC(fdim,[.5,1.0])
+AC_CHECK_MATH_FUNC(floor, [.5])
+AC_CHECK_MATH_FUNC(fma,[.5,1.0,1.5])
+AC_CHECK_MATH_FUNC(fmax,[.5,1.0])
+AC_CHECK_MATH_FUNC(fmin,[.5,1.0])
+AC_CHECK_MATH_FUNC(fmod,[.5,1.0])
+AC_CHECK_MATH_FUNC(frexp,[.5,1.0])
+AC_CHECK_MATH_FUNC(gamma,[.5])
+AC_CHECK_MATH_FUNC(hypot, [.5,.5])
+AC_CHECK_MATH_FUNC(j0, [.5])
+AC_CHECK_MATH_FUNC(j1, [.5])
+AC_CHECK_MATH_FUNC(ldexp,[.5,2])
+AC_CHECK_MATH_FUNC(lgamma,[.5])
+AC_CHECK_MATH_FUNC(log10, [.5])
+AC_CHECK_MATH_FUNC(log1p,[.5])
+AC_CHECK_MATH_FUNC(log2, [.5])
+AC_CHECK_MATH_FUNC(log, [.5])
+AC_CHECK_MATH_FUNC(logb,[.5])
+AC_CHECK_MATH_FUNC(modf,[.5,1.0])
+AC_CHECK_MATH_FUNC(nearbyint,[.5])
+AC_CHECK_MATH_FUNC(nextafter,[.5,1.0])
+AC_CHECK_MATH_FUNC(nexttoward,[.5,1.0])
+AC_CHECK_MATH_FUNC(pow10,[.5])
+AC_CHECK_MATH_FUNC(pow, [2,2])
+AC_CHECK_MATH_FUNC(remainder, [3,2])
+AC_CHECK_MATH_FUNC(rint,[.5])
+AC_CHECK_MATH_FUNC(round,[.5])
+AC_CHECK_MATH_FUNC(scalb,[.5,1.0])
+AC_CHECK_MATH_FUNC(scalbln,[.5,2])
+AC_CHECK_MATH_FUNC(significand,[.5])
+AC_CHECK_MATH_FUNC(sin, [.5])
+AC_CHECK_MATH_FUNC(sinh, [.5])
+AC_CHECK_MATH_FUNC(sqrt, [.5])
+AC_CHECK_MATH_FUNC(tan, [.5])
+AC_CHECK_MATH_FUNC(tanh, [.5])
+AC_CHECK_MATH_FUNC(tgamma, [.5])
+AC_CHECK_MATH_FUNC(trunc,[.5])
+AC_CHECK_MATH_FUNC(y0, [.5])
+AC_CHECK_MATH_FUNC(y1, [.5])
+
+dnl Thread local storage
+have___thread=no
+AC_MSG_CHECKING(for thread-local storage)
+AC_LINK_IFELSE([AC_LANG_SOURCE([
+static __thread int x ;
+int main () { x = 123; return x; }
+])], have___thread=yes)
+if test $have___thread = yes; then
+   AC_DEFINE([HAVE___THREAD],1,[Define to 1 if the system supports __thread])
+fi
+AC_MSG_RESULT($have___thread)
+
+AC_C_BIGENDIAN(
+   AC_DEFINE([IEEE_MC68k], 1, [machine is bigendian]),
+   AC_DEFINE([IEEE_8087], 1, [machine is littleendian]),
+   AC_MSG_ERROR(unknown endianess),
+   AC_MSG_ERROR(universial endianess not supported)
+)
+
+AC_SUBST([BUNDLER], ["$bundle_cmd"])
+
+AC_CONFIG_MACRO_DIR([config/m4])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+

docs/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rake"
+gem "bonsai"
+gem "maruku"
+gem "ronn"
+gem "mustache", "<1.0" # to support ruby <2.0

docs/Gemfile.lock

@@ -0,0 +1,63 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    bonsai (1.4.9)
+      activesupport (>= 3.0.3)
+      builder (>= 3.0.0)
+      i18n (>= 0.5.0)
+      launchy (>= 0.3.7)
+      liquid (>= 2.2.2)
+      maruku (>= 0.6.0)
+      rack
+      sass
+      sinatra (>= 1.0)
+      tilt (>= 1.3)
+      watch (>= 0.1.0)
+      yui-compressor
+    builder (3.2.2)
+    hpricot (0.8.6)
+    i18n (0.7.0)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    liquid (3.0.6)
+    maruku (0.7.2)
+    minitest (5.8.0)
+    mustache (0.99.8)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rake (10.4.2)
+    rdiscount (2.1.8)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    sass (3.4.16)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    watch (0.1.0)
+    yui-compressor (0.12.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bonsai
+  maruku
+  mustache (< 1.0)
+  rake
+  ronn

docs/README.md

@@ -0,0 +1,25 @@
+Documentation
+=============
+
+The jq website, manpages and some of the tests are generated from this
+directory. The directory holds a [Bonsai](http://tinytree.info)
+website, and the manual is a YAML file in `content/3.manual`.
+
+To build the documentation (including building the jq manpage), you'll
+need a working Ruby setup. The easiest way to get one is to install
+RVM and Ruby 1.9.3 like so:
+
+    \curl -L https://get.rvm.io | bash -s stable --ruby=1.9.3
+
+After that finishes installing, you'll need to make sure RVM is on
+your path by doing `source $HOME/.rvm/scripts/rvm`, or just opening a
+new shell. See <https://rvm.io> for more info on RVM.
+
+Once RVM is installed, you can install all the dependencies for jq's
+documentation build by running this from the `docs` directory:
+
+    bundle install
+
+When bundle manages to install the dependencies, rerun `./configure`
+in the jq root directory and then the Makefile will be able to
+generate the jq manpage.

docs/Rakefile

@@ -1,59 +1,24 @@
-require 'bonsai'
-require 'liquid'
-require 'maruku'
-require 'json'
+current_dir = File.dirname(__FILE__)
+rakefile_manual = File.expand_path(File.join(current_dir, "Rakefile.manual"))
+rakefile_website = File.expand_path(File.join(current_dir, "Rakefile.website"))
 
-module ExtraFilters
-  def markdownify(input)
-    Maruku.new(input).to_html
-  end
-
-  def sanitize(input)
-    input.gsub(/[^a-zA-Z0-9_]/,"")
-  end
-
-  def json(input)
-    input.to_json
-  end
-  
-  def unique(input)
-    @n = (@n || 0) + 1
-    input + @n.to_s
-  end
+desc "Build the manpage from the bonsai source of the manual"
+task :manpage do
+    system %(#{$0} -f #{rakefile_manual} manpage)
 end
 
-Liquid::Template.register_filter(ExtraFilters)
-
-
-task :serve do
-  begin
-    Bonsai.log "Press Control+C to quit"
-    
-    require 'rack'
-    require 'sinatra'
-    require 'watch'
-    require 'launchy'
-    
-    Bonsai.root_dir = Dir.pwd
-    
-    server = fork {        
-      app = Rack::Builder.app {
-        use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
-        run Bonsai::DevelopmentServer
-      }
-      Rack::Handler.default.run(app, :Port => 5000) do
-        Launchy.open("http://localhost:5000/")
-      end
-    }    
-    Watch.new("{content,templates,public}/**/*") { Bonsai::Exporter.process! }
-  rescue Interrupt
-    Process.kill("QUIT", server)
-    Process.wait(server)
-    exit
-  end
+desc "Collect jq unit test cases from the bonsai source of the manual"
+task :mantests do
+    system %(#{$0} -f #{rakefile_manual} mantests)
 end
 
+desc "Build the website from the bonsai sources"
 task :build do
-  Bonsai.root_dir = Dir.pwd
-  Bonsai::Exporter.publish!
+    system %(#{$0} -f #{rakefile_website} build)
 end
+
+desc "Serve a live view of the website on http://localhost:5000/jq/"
+task :serve do
+    system %(#{$0} -f #{rakefile_website} serve)
+end
+

docs/Rakefile.manual

@@ -0,0 +1,49 @@
+require 'ronn'
+require 'tempfile'
+require 'yaml'
+
+def load_manual
+  YAML::load(File.open("content/3.manual/manual.yml"))
+end
+
+task :manpage do
+  Tempfile.open "manpage" do |f|
+    manual = load_manual
+    f.puts manual['manpage_intro']
+    f.puts manual['body']
+    manual['sections'].each do |section|
+
+      f.puts "## #{section['title'].upcase}\n"
+      f.puts section['body']
+      f.puts ""
+      (section['entries'] || []).each do |entry|
+        f.puts "### #{entry['title']}\n"
+        f.puts entry['body']
+        f.puts ""
+        (entry['examples'] || []).each do |example|
+          f.puts "    jq '#{example['program']}'"
+          f.puts "       #{example['input']}"
+          f.puts "    => #{example['output'].join(", ")}"
+          f.puts
+        end
+      end
+      f.puts ""
+    end
+    f.puts manual['manpage_epilogue']
+    f.close
+    puts Ronn::Document.new(f.path).convert('roff').gsub(/<\/?code>/,"")
+  end
+end
+
+task :mantests do
+  load_manual['sections'].each do |section|
+    (section['entries'] || []).each do |entry|
+      (entry['examples'] || []).each do |example|
+        puts example['program'].gsub("\n", " ")
+        puts example['input']
+        example['output'].each do |s| puts s end
+        puts
+      end
+    end
+  end
+end

docs/Rakefile.website

@@ -0,0 +1,66 @@
+require 'bonsai'
+require 'json'
+require 'liquid'
+require 'maruku'
+
+module ExtraFilters
+  def markdownify(input)
+    Maruku.new(input).to_html
+  end
+  def search_id(input)
+    input.gsub(/`/, '')
+  end
+  def section_id(input)
+    input.gsub(/[^a-zA-Z0-9_]/, '')
+  end
+  def entry_id(input)
+    input.gsub(/[ `]/, '')
+  end
+  def no_paragraph(input)
+    input.gsub('<p>', '').gsub('</p>', '')
+  end
+  def json(input)
+    input.to_json
+  end
+  def unique(input)
+    @n = (@n || 0) + 1
+    input + @n.to_s
+  end
+end
+
+Liquid::Template.register_filter(ExtraFilters)
+
+task :build do
+  Bonsai.root_dir = Dir.pwd
+  Bonsai::Exporter.publish!
+end
+
+task :serve do
+  begin
+    Bonsai.log "Press Control+C to quit"
+
+    require 'rack'
+    require 'sinatra'
+    require 'watch'
+    require 'launchy'
+
+    Bonsai.root_dir = Dir.pwd
+
+    server = fork {
+      app = Rack::Builder.app {
+        map "/jq" do
+          use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
+        end
+        run Bonsai::DevelopmentServer
+      }
+      Rack::Handler.default.run(app, :Port => 5000) do
+        Launchy.open("http://localhost:5000/jq/")
+      end
+    }
+    Watch.new("{content,templates,public}/**/*") { Bonsai::Exporter.process! }
+  rescue Interrupt
+    Process.kill("QUIT", server)
+    Process.wait(server)
+    exit
+  end
+end

docs/content/1.tutorial/default.yml

@@ -2,124 +2,212 @@ headline: Tutorial
 body:
   - text: |
 
-      Twitter have a JSON API, so let's play with that. This URL gets
-      us the last 5 tweets about JSON:
-      
-  - command: "curl 'http://search.twitter.com/search.json?q=json&rpp=5&include_entities=true'"
+      GitHub has a JSON API, so let's play with that. This URL gets us the last
+      5 commits from the jq repo.
+
+  - command: "curl 'https://api.github.com/repos/stedolan/jq/commits?per_page=5'"
     result: |
-      {"completed_in":0.108,"max_id":247677287108067328,"max_id_str":"247677287108067328","next_page":"?page=2&max_id=247677287108067328&q=json&rpp=5&include_entities=1","page":1,"query":"json","refresh_url":"?since_id=247677287108067328&q=json&include_entities=1","results":[{"created_at":"Mon, 17 Sep 2012 12:44:01 +0000","entities":{"hashtags":[],"urls":[{"url":"http:\/\/t.co\/XRvh1ZVw","expanded_url":"http:\/\/jase.im\/Ri7I0M","display_url":"jase.im\/Ri7I0M","indices":[112,132]}],"user_mentions":[{"screen_name":"imagemechanics","name":"Jason Cotterell","id":57271393,"id_str":"57271393","indices":[3,18]}]},"from_user":"_AaronNg","from_user_id":79771704,"from_user_id_str":"79771704","from_user_name":"NgChenChong","geo":null,"id":247677287108067328,"id_str":"247677287108067328","iso_language_code":"en","metadata":{"result_type":"recent"},"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/2523558403\/ek8mo4j4beq84iw28gjl_normal.jpeg","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/2523558403\/ek8mo4j4beq84iw28gjl_normal.jpeg","source":"<a href="http:\/\/twitter.com\/">web<\/a>","text":"RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp:\/\/t.co\/XRvh1ZVw","to_user":null,"to_user_id":0,"to_user_id_str":"0","to_user_name":null}, ...
+      [
+        {
+          "sha": "d25341478381063d1c76e81b3a52e0592a7c997f",
+          "commit": {
+            "author": {
+              "name": "Stephen Dolan",
+              "email": "mu@netsoc.tcd.ie",
+              "date": "2013-06-22T16:30:59Z"
+            },
+            "committer": {
+              "name": "Stephen Dolan",
+              "email": "mu@netsoc.tcd.ie",
+              "date": "2013-06-22T16:30:59Z"
+            },
+            "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+            "tree": {
+              "sha": "6ab697a8dfb5a96e124666bf6d6213822599fb40",
+              "url": "https://api.github.com/repos/stedolan/jq/git/trees/6ab697a8dfb5a96e124666bf6d6213822599fb40"
+            },
+            "url": "https://api.github.com/repos/stedolan/jq/git/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
+            "comment_count": 0
+          },
+          "url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
+          "html_url": "https://github.com/stedolan/jq/commit/d25341478381063d1c76e81b3a52e0592a7c997f",
+          "comments_url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f/comments",
+          "author": {
+            "login": "stedolan",
+      ...
 
   - text: |
 
-      There's lots of info and no whitespace, so to make it a bit more
-      legible we pipe it through jq, telling jq to just spit the input
-      back at us using the expression `.`:
+      GitHub returns nicely formatted JSON. For servers that don't, it can be
+      helpful to pipe the response through jq to pretty-print it. The simplest
+      jq program is the expression `.`, which takes the input and produces it
+      unchanged as output.
 
-    
-  - command: "curl 'http://search.twitter.com/search.json?q=json&rpp=5&include_entities=true' | jq '.'"
+  - command: "curl 'https://api.github.com/repos/stedolan/jq/commits?per_page=5' | jq '.'"
     result: |
-
-      {
-        "since_id_str": "0",
-        "since_id": 0,
-        "results_per_page": 5,
-        "completed_in": 0.108,
-        "max_id": 247677287108067330,
-        "max_id_str": "247677287108067328",
-        "next_page": "?page=2&max_id=247677287108067328&q=json&rpp=5&include_entities=1",
-        "page": 1,
-        "query": "json",
-        "refresh_url": "?since_id=247677287108067328&q=json&include_entities=1",
-        "results": [
-          {
-            "from_user_name": "NgChenChong",
-            "from_user_id_str": "79771704",
-            "from_user_id": 79771704,
-            "from_user": "_AaronNg",
-            "iso_language_code": "en",
-            "text": "RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp://t.co/XRvh1ZVw",
-            "to_user": null
-            /* lots more fields... */
+      [
+        {
+          "sha": "d25341478381063d1c76e81b3a52e0592a7c997f",
+          "commit": {
+            "author": {
+              "name": "Stephen Dolan",
+              "email": "mu@netsoc.tcd.ie",
+              "date": "2013-06-22T16:30:59Z"
+            },
+            "committer": {
+              "name": "Stephen Dolan",
+              "email": "mu@netsoc.tcd.ie",
+              "date": "2013-06-22T16:30:59Z"
+            },
+            "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+            "tree": {
+              "sha": "6ab697a8dfb5a96e124666bf6d6213822599fb40",
+              "url": "https://api.github.com/repos/stedolan/jq/git/trees/6ab697a8dfb5a96e124666bf6d6213822599fb40"
+            },
+            "url": "https://api.github.com/repos/stedolan/jq/git/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
+            "comment_count": 0
           },
-          /* lots more results... */
+          "url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
+          "html_url": "https://github.com/stedolan/jq/commit/d25341478381063d1c76e81b3a52e0592a7c997f",
+          "comments_url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f/comments",
+          "author": {
+            "login": "stedolan",
+      ...
+
+  - text: |
+
+      We can use jq to extract just the first commit.
+
+  - command: "curl 'https://api.github.com/repos/stedolan/jq/commits?per_page=5' | jq '.[0]'"
+    result: |
+      {
+        "sha": "d25341478381063d1c76e81b3a52e0592a7c997f",
+        "commit": {
+          "author": {
+            "name": "Stephen Dolan",
+            "email": "mu@netsoc.tcd.ie",
+            "date": "2013-06-22T16:30:59Z"
+          },
+          "committer": {
+            "name": "Stephen Dolan",
+            "email": "mu@netsoc.tcd.ie",
+            "date": "2013-06-22T16:30:59Z"
+          },
+          "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+          "tree": {
+            "sha": "6ab697a8dfb5a96e124666bf6d6213822599fb40",
+            "url": "https://api.github.com/repos/stedolan/jq/git/trees/6ab697a8dfb5a96e124666bf6d6213822599fb40"
+          },
+          "url": "https://api.github.com/repos/stedolan/jq/git/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
+          "comment_count": 0
+        },
+        "url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f",
+        "html_url": "https://github.com/stedolan/jq/commit/d25341478381063d1c76e81b3a52e0592a7c997f",
+        "comments_url": "https://api.github.com/repos/stedolan/jq/commits/d25341478381063d1c76e81b3a52e0592a7c997f/comments",
+        "author": {
+          "login": "stedolan",
+          "id": 79765,
+          "avatar_url": "https://avatars.githubusercontent.com/u/79765?v=3",
+          "gravatar_id": "",
+          "url": "https://api.github.com/users/stedolan",
+          "html_url": "https://github.com/stedolan",
+          "followers_url": "https://api.github.com/users/stedolan/followers",
+          "following_url": "https://api.github.com/users/stedolan/following{/other_user}",
+          "gists_url": "https://api.github.com/users/stedolan/gists{/gist_id}",
+          "starred_url": "https://api.github.com/users/stedolan/starred{/owner}{/repo}",
+          "subscriptions_url": "https://api.github.com/users/stedolan/subscriptions",
+          "organizations_url": "https://api.github.com/users/stedolan/orgs",
+          "repos_url": "https://api.github.com/users/stedolan/repos",
+          "events_url": "https://api.github.com/users/stedolan/events{/privacy}",
+          "received_events_url": "https://api.github.com/users/stedolan/received_events",
+          "type": "User",
+          "site_admin": false
+        },
+        "committer": {
+          "login": "stedolan",
+          "id": 79765,
+          "avatar_url": "https://avatars.githubusercontent.com/u/79765?v=3",
+          "gravatar_id": "",
+          "url": "https://api.github.com/users/stedolan",
+          "html_url": "https://github.com/stedolan",
+          "followers_url": "https://api.github.com/users/stedolan/followers",
+          "following_url": "https://api.github.com/users/stedolan/following{/other_user}",
+          "gists_url": "https://api.github.com/users/stedolan/gists{/gist_id}",
+          "starred_url": "https://api.github.com/users/stedolan/starred{/owner}{/repo}",
+          "subscriptions_url": "https://api.github.com/users/stedolan/subscriptions",
+          "organizations_url": "https://api.github.com/users/stedolan/orgs",
+          "repos_url": "https://api.github.com/users/stedolan/repos",
+          "events_url": "https://api.github.com/users/stedolan/events{/privacy}",
+          "received_events_url": "https://api.github.com/users/stedolan/received_events",
+          "type": "User",
+          "site_admin": false
+        },
+        "parents": [
+          {
+            "sha": "54b9c9bdb225af5d886466d72f47eafc51acb4f7",
+            "url": "https://api.github.com/repos/stedolan/jq/commits/54b9c9bdb225af5d886466d72f47eafc51acb4f7",
+            "html_url": "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7"
+          },
+          {
+            "sha": "8b1b503609c161fea4b003a7179b3fbb2dd4345a",
+            "url": "https://api.github.com/repos/stedolan/jq/commits/8b1b503609c161fea4b003a7179b3fbb2dd4345a",
+            "html_url": "https://github.com/stedolan/jq/commit/8b1b503609c161fea4b003a7179b3fbb2dd4345a"
+          }
         ]
       }
 
-    
   - text: |
-          
-      Let's pull out the first tweet:
-          
-          
-  - command: "curl 'http://search.twitter.com/search.json?q=json&rpp=5&include_entities=true' | jq '.results[0]'"
+
+      For the rest of the examples, I'll leave out the `curl` command - it's not
+      going to change.
+
+      There's a lot of info we don't care about there, so we'll restrict it down
+      to the most interesting fields.
+
+  - command: "jq '.[0] | {message: .commit.message, name: .commit.committer.name}'"
     result: |
       {
-        "from_user_name": "NgChenChong",
-        "from_user_id_str": "79771704",
-        "from_user_id": 79771704,
-        "from_user": "_AaronNg",
-        "iso_language_code": "en",
-        "text": "RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp://t.co/XRvh1ZVw",
-        "to_user": null
-        /* lots more fields... */
-      },
-          
+        "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+        "name": "Stephen Dolan"
+      }
+
   - text: |
 
-      For the rest of the examples, I'll leave out the `curl` command - it's not going to change.
+      The `|` operator in jq feeds the output of one filter (`.[0]` which gets
+      the first element of the array in the response) into the input of another
+      (`{...}` which builds an object out of those fields). You can access
+      nested attributes, such as `.commit.message`.
 
-    
-      There's still a lot of info we don't care about there, so we'll
-      restrict it down to the most interesting fields.
-          
+      Now let's get the rest of the commits.
 
-  - command: "jq '.results[0] | {from_user, text}'"
+  - command:  "jq '.[] | {message: .commit.message, name: .commit.committer.name}'"
     result: |
       {
-        "text": "RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp://t.co/XRvh1ZVw",
-        "from_user": "_AaronNg"
+        "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+        "name": "Stephen Dolan"
+      }
+      {
+        "message": "Reject all overlong UTF8 sequences.",
+        "name": "Stephen Dolan"
+      }
+      {
+        "message": "Fix various UTF8 parsing bugs.\n\nIn particular, parse bad UTF8 by replacing the broken bits with U+FFFD\nand resychronise correctly after broken sequences.",
+        "name": "Stephen Dolan"
+      }
+      {
+        "message": "Fix example in manual for `floor`. See #155.",
+        "name": "Stephen Dolan"
+      }
+      {
+        "message": "Document floor",
+        "name": "Nicolas Williams"
       }
-      
-  - text: |
-    
-      The `|` operator in jq feeds the output of one filter
-      (`.results[0]` which gets the first element of the results
-      array) into the input of another (`{from_user, text}` which
-      builds an object of those two fields).
-    
-      Now let's get the rest of the tweets:
-    
-          
 
-  - command: "jq '.results[] | {from_user, text}'"
-    result: |
-      {
-        "text": "RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp://t.co/XRvh1ZVw",
-        "from_user": "_AaronNg"
-      }
-      {
-        "text": "RT @_kud: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas> -- http://t.co/Lhp92IqD",
-        "from_user": "blouerat"
-      }
-      {
-        "text": "Dynamic Forms Mobile App by pmadiset: Few Forms details are hosted on our server in the form of JSON. This JSON ... http://t.co/7KALdWaX",
-        "from_user": "cebu_iphone"
-      }
-      {
-        "text": "iPhone 5 website insanity - Video compressing using JPEG, JSON, and <canvas> http://t.co/28Jesbio (Oh #Apple, U So #Awesome...)",
-        "from_user": "dieswaytoofast"
-      }
-      {
-        "text": "RT @umutm: A very nice web-based JSON editor - http://t.co/M70snaIf",
-        "from_user": "Leolik"
-      }
-         
-          
   - text: |
-    
-      `.results[]` returns each element of the results array, one at a
-      time, which are all fed into `{from_user, text}`.
 
+      `.[]` returns each element of the array returned in the response, one at a
+      time, which are all fed into
+      `{message: .commit.message, name: .commit.committer.name}`.
 
       Data in jq is represented as streams of JSON values - every jq
       expression runs for each value in its input stream, and can
@@ -128,114 +216,112 @@ body:
       Streams are serialised by just separating JSON values with
       whitespace. This is a `cat`-friendly format - you can just join
       two JSON streams together and get a valid JSON stream.
-    
+
       If you want to get the output as a single array, you can tell jq to
       "collect" all of the answers by wrapping the filter in square
       brackets:
 
-  - command: "jq '[.results[] | {from_user, text}]'"
+  - command: "jq '[.[] | {message: .commit.message, name: .commit.committer.name}]'"
     result: |
       [
         {
-          "text": "RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp://t.co/XRvh1ZVw",
-          "from_user": "_AaronNg"
+          "message": "Merge pull request #163 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+          "name": "Stephen Dolan"
         },
         {
-          "text": "RT @_kud: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas> -- http://t.co/Lhp92IqD",
-          "from_user": "blouerat"
+          "message": "Reject all overlong UTF8 sequences.",
+          "name": "Stephen Dolan"
         },
         {
-          "text": "Dynamic Forms Mobile App by pmadiset: Few Forms details are hosted on our server in the form of JSON. This JSON ... http://t.co/7KALdWaX",
-          "from_user": "cebu_iphone"
+          "message": "Fix various UTF8 parsing bugs.\n\nIn particular, parse bad UTF8 by replacing the broken bits with U+FFFD\nand resychronise correctly after broken sequences.",
+          "name": "Stephen Dolan"
         },
         {
-          "text": "iPhone 5 website insanity - Video compressing using JPEG, JSON, and <canvas> http://t.co/28Jesbio (Oh #Apple, U So #Awesome...)",
-          "from_user": "dieswaytoofast"
+          "message": "Fix example in manual for `floor`. See #155.",
+          "name": "Stephen Dolan"
         },
         {
-          "text": "RT @umutm: A very nice web-based JSON editor - http://t.co/M70snaIf",
-          "from_user": "Leolik"
+          "message": "Document floor",
+          "name": "Nicolas Williams"
         }
       ]
-          
-          
+
   - text: |
 
       - - -
-    
-      Next, let's try getting the URLs out of those API results as
-      well. In each tweet, the Twitter API includes a field called
-      "entities" which looks like this:
 
-          {
-            "user_mentions": [],
-            "urls": [{
-                "indices": [83, 103],
-                "display_url": "bit.ly/StniqT",
-                "expanded_url": "http://bit.ly/StniqT",
-                "url": "http://t.co/28Jesbio"
-            }],
-            "hashtags": [
-              {"indices": [108, 114], "text": "Apple" },
-              {"indices": [121, 129], "text": "Awesome"}
-            ]
-          }
+      Next, let's try getting the URLs of the parent commits out of the
+      API results as well. In each commit, the GitHub API includes information
+      about "parent" commits. There can be one or many.
 
-      We want to pull out all of the "url" fields inside that array of url
-      objects, and make a simple list of strings to go along with the
-      "from_user" and "text" fields we already have.
-    
-          
+          "parents": [
+            {
+              "sha": "54b9c9bdb225af5d886466d72f47eafc51acb4f7",
+              "url": "https://api.github.com/repos/stedolan/jq/commits/54b9c9bdb225af5d886466d72f47eafc51acb4f7",
+              "html_url": "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7"
+            },
+            {
+              "sha": "8b1b503609c161fea4b003a7179b3fbb2dd4345a",
+              "url": "https://api.github.com/repos/stedolan/jq/commits/8b1b503609c161fea4b003a7179b3fbb2dd4345a",
+              "html_url": "https://github.com/stedolan/jq/commit/8b1b503609c161fea4b003a7179b3fbb2dd4345a"
+            }
+          ]
 
-  - command: "jq '.results[] | {from_user, text, urls: [.entities.urls[].url]}'"
+      We want to pull out all of the "html_url" fields inside that array of parent
+      commits and make a simple list of strings to go along with the
+      "message" and "author" fields we already have.
+
+  - command: "jq '[.[] | {message: .commit.message, name: .commit.committer.name, parents: [.parents[].html_url]}]'"
     result: |
-      {
-       "urls": [
-         "http://t.co/XRvh1ZVw"
-       ],
-       "text": "RT @imagemechanics: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas>.\nhttp://t.co/XRvh1ZVw",
-        "from_user": "_AaronNg"
-      }
-      {
-        "urls": [
-          "http://t.co/Lhp92IqD"
-        ],
-        "text": "RT @_kud: iPhone 5 website teardown: How Apple compresses video using JPEG, JSON, and <canvas> -- http://t.co/Lhp92IqD",
-        "from_user": "blouerat"
-      }
-      {
-        "urls": [
-          "http://t.co/7KALdWaX"
-        ],
-        "text": "Dynamic Forms Mobile App by pmadiset: Few Forms details are hosted on our server in the form of JSON. This JSON ... http://t.co/7KALdWaX",
-        "from_user": "cebu_iphone"
-      }
-      {
-        "urls": [
-          "http://t.co/28Jesbio"
-        ],
-        "text": "iPhone 5 website insanity - Video compressing using JPEG, JSON, and <canvas> http://t.co/28Jesbio (Oh #Apple, U So #Awesome...)",
-        "from_user": "dieswaytoofast"
-      }
-      {
-        "urls": [
-          "http://t.co/M70snaIf"
-        ],
-        "text": "RT @umutm: A very nice web-based JSON editor - http://t.co/M70snaIf",
-        "from_user": "Leolik"
-      }
-    
-          
+      [
+        {
+          "message": "Merge pull request #162 from stedolan/utf8-fixes\n\nUtf8 fixes. Closes #161",
+          "name": "Stephen Dolan",
+          "parents": [
+            "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7",
+            "https://github.com/stedolan/jq/commit/8b1b503609c161fea4b003a7179b3fbb2dd4345a"
+          ]
+        },
+        {
+          "message": "Reject all overlong UTF8 sequences.",
+          "name": "Stephen Dolan",
+          "parents": [
+            "https://github.com/stedolan/jq/commit/ff48bd6ec538b01d1057be8e93b94eef6914e9ef"
+          ]
+        },
+        {
+          "message": "Fix various UTF8 parsing bugs.\n\nIn particular, parse bad UTF8 by replacing the broken bits with U+FFFD\nand resychronise correctly after broken sequences.",
+          "name": "Stephen Dolan",
+          "parents": [
+            "https://github.com/stedolan/jq/commit/54b9c9bdb225af5d886466d72f47eafc51acb4f7"
+          ]
+        },
+        {
+          "message": "Fix example in manual for `floor`. See #155.",
+          "name": "Stephen Dolan",
+          "parents": [
+            "https://github.com/stedolan/jq/commit/3dcdc582ea993afea3f5503a78a77675967ecdfa"
+          ]
+        },
+        {
+          "message": "Document floor",
+          "name": "Nicolas Williams",
+          "parents": [
+            "https://github.com/stedolan/jq/commit/7c4171d414f647ab08bcd20c76a4d8ed68d9c602"
+          ]
+        }
+      ]
+
   - text: |
-    
-      Here we're making an object as before, but this time the urls
-      field is being set to `[.entities.urls[].url]`, which collects
-      all of the URLs defined in the entities object.
+
+      Here we're making an object as before, but this time the `parents`
+      field is being set to `[.parents[].html_url]`, which collects
+      all of the parent commit URLs defined in the parents object.
 
   - text: |
 
       - - -
 
-      Here endeth the tutorial! There's lots more to play with, go
-      read [the manual](../manual) if you're interested, and [download
-      jq](../download) if you haven't already.
+      Here endeth the tutorial! There's lots more to play with. Go
+      read [the manual](../manual/) if you're interested, and [download
+      jq](../download/) if you haven't already.

docs/content/2.download/default.yml

@@ -5,53 +5,166 @@ body:
 
       jq is written in C and has no runtime dependencies, so it should be
       possible to build it for nearly any platform. Prebuilt binaries are
-      available for Linux (64-bit x86) and OS X.
-    
-       * [Download binary for 64-bit Linux](linux_x86_64/jq)
-       * [Download binary for OS X](osx_64/jq)
-       * [Download source](source/jq.tgz)
+      available for Linux, OS X and Windows.
 
-      The binaries should just run, but you may need to make them
-      executable first using:
+      The binaries should just run, but on OS X and Linux you may need
+      to make them executable first using `chmod +x jq`.
 
-          chmod +x jq
-       
       jq is licensed under the MIT license. For all of the gory
       details, read the file `COPYING` in the source distribution.
 
-      Hacking on jq
-      =============
 
-      If you want to work on jq, grab the source from
-      [https://github.com/stedolan/jq](https://github.com/stedolan/jq).
-        
+      ### Linux
+
+       * jq 1.5 is in the official [Debian](https://packages.debian.org/jq) and
+         [Ubuntu](http://packages.ubuntu.com/jq) repositories. Install using
+         `sudo apt-get install jq`.
+
+       * jq 1.5 is in the official
+         [Fedora](http://pkgs.fedoraproject.org/cgit/jq.git/) repository.
+         Install using `sudo dnf install jq`.
+
+       * jq 1.4 is in the official [openSUSE](https://software.opensuse.org/package/jq)
+         repository. Install using `sudo zypper install jq`.
+
+       * jq 1.5 is in the official
+         [Arch](https://www.archlinux.org/packages/?sort=&q=jq&maintainer=&flagged=)
+         repository.  Install using `sudo pacman -Sy jq`.
+
+       * jq 1.5 binaries for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux32).
+
+       * jq 1.4 binaries for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-linux-x86_64)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-linux-x86).
+
+       * jq 1.3 binaries for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-linux-x86_64)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-linux-x86).
+
+      ### OS X
+
+       * Use [Homebrew](http://brew.sh/) to install jq 1.5 with
+         `brew install jq`.
+
+       * jq 1.5 binary for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-osx-amd64).
+
+       * jq 1.4 binaries for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-osx-x86_64)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-osx-x86).
+
+       * jq 1.3 binaries for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-osx-x86_64)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-osx-x86).
+
+      ### FreeBSD
+
+         * Use [FreshPorts](https://www.freshports.org/textproc/jq/) to install
+           jq 1.4 with `pkg install jq`.
+
+      ### Solaris
+
+       * `pkgutil -i jq` in [OpenCSW](https://www.opencsw.org/p/jq) for Solaris
+         10+, Sparc and x86.
+
+       * jq 1.4 binaries for Solaris 11
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-solaris11-64)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-solaris11-32).
+
+      ### Windows
+
+       * Use [Chocolatey NuGet](https://chocolatey.org/) to install jq 1.5 with
+         `chocolatey install jq`.
+
+       * jq 1.5 executables for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win64.exe)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win32.exe).
+
+       * jq 1.4 executables for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-win64.exe)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.4/jq-win32.exe).
+
+       * jq 1.3 executables for
+         [64-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-win64.exe)
+         or
+         [32-bit](https://github.com/stedolan/jq/releases/download/jq-1.3/jq-win32.exe).
+
+      ### Checksums and signatures
+
+      SHA-256 checksums are provided for all release and pre-release binaries.
+      They can be found under
+      [sig/v1.x/sha256sum.txt](https://github.com/stedolan/jq/tree/master/sig).
+      The checksums for jq 1.5 are in
+      [sig/v1.5/sha256sum.txt](https://raw.githubusercontent.com/stedolan/jq/master/sig/v1.5/sha256sum.txt).
+
+      Additionally, all binaries are signed by the
+      [jq Package Signing Key](https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key).
+      The signatures can be found under
+      [sig/v1.x/\*.asc](https://github.com/stedolan/jq/tree/master/sig).
+      The signatures for jq 1.5 are in
+      [sig/v1.5/\*.asc](https://github.com/stedolan/jq/tree/master/sig/v1.5).
+      You can use [GnuPG](https://gnupg.org/) to verify a signature by downloading
+      the signature and running `gpg --verify signature.asc`.
+
+      ### From source on Linux, OS X, Cygwin, and other POSIX-like operating systems
+
+       * [Source tarball for jq 1.5](https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz)
+
+      You can build it using the usual `./configure && make && sudo
+      make install` rigmarole.
+
+      If you're interested in using the lastest development version, try:
+
+          git clone https://github.com/stedolan/jq.git
+          cd jq
+          autoreconf -i
+          ./configure --disable-maintainer-mode
+          make
+          sudo make install
 
       To build it from a git clone, you'll need to install a few
       packages first:
 
-       * [Flex](http://www.gnu.org/software/flex/)
-       * [Bison](http://www.gnu.org/software/bison/)
-       * [Python](http://www.python.org)
-       * [GCC](http://gcc.gnu.org)
-       * [Make](http://www.gnu.org/software/make)
-
-      Most of these aren't necessary if you're just trying to compile
-      jq from the released tarball - that version has the
-      non-platform-specific build steps already done, so you'll only
-      need a C compiler and `make` to finish it off.
+       * [GCC](https://gcc.gnu.org)
+       * [Make](https://www.gnu.org/software/make/)
+       * [Autotools](https://www.gnu.org/software/automake/)
 
       For Linux systems, these will all be in your system's package
       manager, and if you do development on the machine they're most
-      likely already installed. I have no idea how to get these
-      installed on OS X, you're on your own there.
+      likely already installed.
 
-      `flex` and `bison` are used to generate the lexer and parser for
-      jq, and some python scripts generate the UTF8 encoding tables
-      needed for JSON parsing.
-   
-      Building the documentation
-      --
+      On OS X, these are all included in Apple's command line tools, which can
+      be installed from [Xcode](https://developer.apple.com/xcode/). However,
+      you may find that you need a newer version of Bison than the one provided
+      by Apple. This can be found in [Homebrew](http://brew.sh) or
+      [MacPorts](https://macports.org/).
+
+      The `--disable-maintainer-mode` flag says to use the pre-generated lexer
+      and parser that come with the code. To compile the lexer and parser also
+      from source, leave out this flag. You will need to install
+      [Flex](http://flex.sourceforge.net/) and
+      [Bison](https://www.gnu.org/software/bison/).
+
+      #### Building the documentation
 
       jq's documentation is compiled into static HTML using
-      [Bonsai](http://www.tinytree.info). To view the documentation
-      locally, run `rake serve` from the docs/ subdirectory.
+      [Bonsai](http://www.tinytree.info).  To view the documentation
+      locally, run `rake serve` (or `bundle exec rake serve`) from the
+      docs/ subdirectory.  To build the docs just `rake build` from the
+      docs subdirectory.  You'll need a few Ruby dependencies, which can
+      be installed by following the instructions in `docs/README.md`.
+
+      The man page is built by `make jq.1`, or just `make`, also from
+      the YAML docs, and you'll still need the Ruby dependencies to
+      build the manpage.
+

docs/content/index/index.yml

@@ -1,9 +1,9 @@
 headline: jq
 
 blurb: |
-  
+
   jq is a lightweight and flexible command-line JSON processor.
-  
+
 body1: |
 
   jq is like `sed` for JSON data - you can use it to slice and filter
@@ -14,14 +14,54 @@ body2: |
 
   jq is written in portable C, and it has zero runtime
   dependencies. You can download a single binary, `scp` it to a far away
-  machine, and expect it to work.
+  machine of the same type, and expect it to work.
 
 body3: |
 
   jq can mangle the data format that you have into the one that you
   want with very little effort, and the program to do so is often
   shorter and simpler than you'd expect.
-  
+
 tail: |
-  Go read the [tutorial](tutorial) for more, or the [manual](manual)
-  for *way* more.
+
+  Go read the [tutorial](/jq/tutorial/) for more, or the [manual](/jq/manual/)
+  for *way* more.
+
+  Ask questions on [stackoverflow](https://stackoverflow.com/) using the [jq
+  tag](https://stackoverflow.com/questions/tagged/jq), or on the
+  [#jq](http://irc.lc/freenode/%23jq/) channel on
+  [Freenode](https://webchat.freenode.net/).
+
+news:
+  - date: 15 August 2015
+    body: |
+
+        jq 1.5 released, including new datetime, math, and regexp functions,
+        try/catch syntax, array and object destructuring, a streaming parser,
+        and a module system. See installation options on the
+        [download](/jq/download/) page, and the
+        [release notes](https://github.com/stedolan/jq/releases/tag/jq-1.5)
+        for details.
+
+  - date: 26 July 2015
+    body: |
+
+      jq 1.5rc2 is available. Get it on the
+      [releases](https://github.com/stedolan/jq/releases) page.
+
+  - date: 01 January 2015
+    body: |
+
+      jq 1.5rc1 is available. Get it on the
+      [releases](https://github.com/stedolan/jq/releases) page.
+
+  - date: 09 June 2014
+    body: |
+
+      jq 1.4 (finally) released! Get it on the [download](/jq/download/) page.
+
+  - date: 19 May 2013
+    body: |
+
+      jq 1.3 released.
+

docs/public/.htaccess

@@ -12,7 +12,7 @@ FileETag All
 	</IfModule>
 </IfModule>
 
-# Cache, aggressively 
+# Cache, aggressively
 <IfModule mod_expires.c>
   ExpiresActive On
   ExpiresDefault "access plus 10 days"
@@ -25,4 +25,4 @@ FileETag All
 # Mime-types
 AddType application/vnd.ms-fontobject .eot
 AddType font/ttf .ttf
-AddType font/otf .otf
+AddType font/otf .otf

docs/public/bootstrap/css/bootstrap-responsive.min.css

@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*maLine truncated

docs/public/bootstrap/css/bootstrap.min.css

@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluiLine truncated

docs/public/bootstrap/js/bootstrap.min.js

@@ -1,6 +0,0 @@
-/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hLine truncated

docs/public/css/base.scss

@@ -1,85 +1,79 @@
 @charset "utf-8";
 body {
-    padding-top: 60px;
+    padding-top: 80px;
 }
 
-footer {
-    background-color: #F5F5F5;
-    padding: 40px 0;
-    height: 100px;
-    margin-top: 40px;
-    color: #999999;
+.container {
+    max-width: 970px;
 }
 
-section {
-    padding-top: 30px;
-}
-
-.manual-example {
-    border-top: 1px solid #E5E5E5;
-}
-
-.manual-example td {
-    white-space: pre-wrap;
-    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-}
-
-.manual-example td.jqprogram {
-    font-weight: bold;
-}
-
-.manual-example th {
-    text-align: right;
-    padding-right: 10px;
-}
-
-.tutorial-example {
-    position: relative;
-    margin-bottom: 10px;
-}
-
-.tutorial-example pre {
-    margin-bottom: 0px;
-}
-
-.tutorial-example a {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    padding: 15px 8px;
-    color: #777777;
-    font-weight: bold;
-    line-height: 10px;
-    font-size: 12px;
-    border-left: 1px solid #DDDDDD;
-    bottom: 0;
-    display: block;
-}
-
-
+/* index.liquid *******************************************/
 
 #blurb {
     padding-top: 40px;
-    padding-right: 50px;
-}
-
-#blurb p {
-    font-size: 20pt;
-}
-
-#blurb .btn-group {
-    margin-top: 20px;
+    p {
+        font-size: 1.9em;
+    }
+    .btn-group {
+        margin: 4px;
+    }
 }
 
 #multiblurb {
     line-height: 1.7;
     text-align: center;
     font-size: 12pt;
+    code {
+        border: 0;
+        font-size: 12pt;
+    }
 }
 
-#multiblurb code {
-    border: 0;
+#news {
     font-size: 12pt;
+    .date {
+          font-style: italic;
+    }
+}
+
+/* default.liquid *****************************************/
+
+.tutorial-example {
+    position: relative;
+    margin-bottom: 10px;
+    pre {
+        margin-bottom: 0px;
+    }
+    a {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        padding: 15px 8px;
+        color: #777777;
+        font-weight: bold;
+        line-height: 10px;
+        font-size: 12px;
+        border-left: 1px solid #DDDDDD;
+        display: block;
+    }
+    .accordion-body pre {
+        margin: 0 4px;
+        border-top: 0;
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+    }
+}
+
+@media print {
+    .tutorial-example a {
+        display: none;
+    }
+}
+
+/* manual.liquid ******************************************/
+
+section {
+    padding-top: 24px;
 }
 
 h3 code {
@@ -87,6 +81,101 @@ h3 code {
     font-size: 20px;
 }
 
+@media(max-width: 991px){
+    #navcolumn {
+        /* Put nav column above manual content */
+        position: relative !important;
+        margin-bottom: 60px;
+    }
+}
+
+@media(min-width: 992px) {
+    #manualcontent {
+        /* Put nav column left of manual content */
+        padding-left: 280px;
+    }
+}
+
+.nav-pills {
+    li a {
+        padding: 8px 12px;
+    }
+    margin-bottom: 20px;
+}
+
+.manual-example table {
+    border-top: 1px solid #E5E5E5;
+    td {
+        white-space: pre-wrap;
+        font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+    }
+    td.jqprogram {
+        font-weight: bold;
+    }
+    th {
+        text-align: right;
+        padding-right: 10px;
+    }
+}
+
+@media print {
+    #navcolumn {
+        display: none !important;
+    }
+    .manual-example {
+        display: block !important;
+        height: auto !important;
+    }
+    .jqplay-btn {
+        display: none !important;
+    }
+}
+
+/* shared/_footer.liquid **********************************/
+
 footer {
+    background-color: #F5F5F5;
+    padding: 20px 0;
+    margin-top: 40px;
+    color: #999999;
     text-align: center;
-}
+    p {
+        margin: 8px 0;
+    }
+}
+
+/* typeahead **********************************************/
+
+.twitter-typeahead {
+    width: 100%;
+}
+
+.tt-menu {
+    width: 100%;
+    background-color: #fff;
+    padding: 8px 0;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    -webkit-border-radius: 8px;
+       -moz-border-radius: 8px;
+            border-radius: 8px;
+    -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+       -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+            box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.tt-suggestion {
+    padding: 3px 20px;
+    &:hover {
+        cursor: pointer;
+        color: #fff;
+        background-color: #446e9b;
+    }
+    &.tt-cursor {
+        color: #fff;
+        background-color: #446e9b;
+    }
+    p {
+        margin: 0;
+    }
+}

docs/public/js/manual-search.js

@@ -0,0 +1,52 @@
+var section_names = function(q) {
+  if (!q) {
+    return [];
+  }
+  var matches = [];
+  q = q.toLowerCase();
+  $.each(section_map, function(k, v) {
+    if (k.toLowerCase().indexOf(q) != -1) {
+      matches.push(k);
+    }
+  });
+  matches.sort(function(a, b) {
+    // shortest to longest
+    return a.length - b.length;
+  });
+  return matches;
+}
+var section_names_cb = function(q, cb) {
+  cb(section_names(q));
+}
+var go_to_section = function() {
+  query = $('#searchbox').val();
+  results = section_names(query);
+  if (results.length == 0) {
+    return;
+  }
+  result = results[0];
+  location.hash = '#' + section_map[result];
+  if (result != query) {
+    $('#searchbox').val(result);
+  }
+}
+$(function(){
+  $('#searchbox').typeahead(
+    {hint: false, highlight: true, minLength: 1},
+    {name: "contents", source: section_names_cb, limit: 6}
+  ).on('typeahead:selected', function(e, data) {
+    go_to_section();
+  });
+  $('#searchbox').change(go_to_section);
+});
+// add "Run" button to execute examples on jqplay.org
+$(function() {
+  $.each($('.manual-example table'), function(index, value) {
+    $value = $(value)
+    var j = $value.find('tr:nth-child(2) td:first').text();
+    var q = $value.find('.jqprogram').text().replace(/^jq /, '').replace(/^'(.+)'$/, '$1');
+    var url = 'https://jqplay.org/jq?q=' + encodeURIComponent(q) +'&j=' + encodeURIComponent(j)
+    var $last_tr = $value.find('tr:last');
+    $last_tr.after('<tr class="jqplay-btn"><th><a href="' + url + '" class="btn btn-primary btn-sm">Run</a></th><th></th></tr><tr><th></th><th></th></tr>');
+  });
+});

docs/site.yml

@@ -1,16 +1,9 @@
 # The key value pairs found below are available within the templates.
 
+:url: https://stedolan.github.io/jq
+
+# This line is modified by the Makefile. To change the version number,
+# edit the Autoconf version number at the top of configure.ac
+jq_version: "1.4-2-g15c4a7f-dirty"
 
-jq_version: 1.1
-# Next line is needed for publishing to github pages
 root: '/jq'
-# root: ''
-footer: |
-  
-  This website is made with [Bonsai](http://www.tinytree.info) and
-  [Twitter Bootstrap](http://twitter.github.com/bootstrap/), themed
-  with [Bootswatch](http://bootswatch.com).
-
-  jq is licensed under the MIT license (code) and the
-  [CC-BY-3.0](http://creativecommons.org/licenses/by/3.0/) license
-  (docs).

docs/templates/default.liquid

@@ -1,34 +1,34 @@
 <!DOCTYPE html>
 <html lang="en">
-  {% include "shared/head" %}
+{% include "shared/head" %}
+
   <body id="{{slug}}">
-    {% include "shared/header" %}	
-    
+{% include "shared/navbar" %}
+
     <div class="container">
-        
       <div class="row">
         <h1>{{headline}}</h1>
         {% for item in body %}
           {% if item.text %}
-            {{ item.text | markdownify }}
+            {{ item.text | replace: '$JQ_VERSION', jq_version | markdownify }}
           {% endif %}
-        
-          {% if item.command %}
 
-        
+          {% if item.command %}
             {% capture resultID %}{{ "result" | unique}}{% endcapture %}
             <div class="tutorial-example">
               <div class="accordion-heading">
                 <pre>{{item.command}}</pre>
                 <a data-toggle="collapse" href="#{{resultID}}">Show result</a>
               </div>
-              <div id="{{resultID}}" class="accordion-body collapse"><pre>{{item.result}}</pre></div>
+              <div id="{{resultID}}" class="accordion-body collapse">
+                <pre>{{item.result}}</pre>
+              </div>
             </div>
           {% endif %}
         {% endfor %}
       </div>
     </div>
-    {% include "shared/footer" %}
-    
+
+{% include "shared/footer" %}
   </body>
 </html>

docs/templates/index.liquid

@@ -1,41 +1,73 @@
 <!DOCTYPE html>
 <html lang="en">
-  {% include "shared/head" %}
+{% include "shared/head" %}
+
   <body id="{{slug}}">
-    {% include "shared/header" %}	
-    
+{% include "shared/navbar" %}
+
     <div class="container">
       <div class="row">
-        <div class="hero-unit">
-          <img src="{{root}}/jq.png" style="width: 400px; height: 220px; float: left; margin-right: 60px">
-          <div id="blurb">
-            {{blurb | markdownify}}
-            <div class="btn-group" style="float:right">
-              <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">
-                Download jq-{{jq_version}}
-                <span class="caret"></span>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="{{root}}/download/linux_x86_64/jq">Linux (x86_64)</a></li>
-                <li><a href="{{root}}/download/osx_64/jq">OS X (64-bit)</a></li>
-                <li><a href="{{root}}/download">Other platforms and source</a></li>
-              </ul>
+        <div class="jumbotron">
+          <div class="row">
+            <div class="col-sm-6">
+              <img src="{{root}}/jq.png" class="img-responsive" alt="jq logo"
+                  width="400" height="220">
             </div>
+            <div class="col-sm-6">
+              <div id="blurb">
+                {{blurb | markdownify}}
 
+                <div class="btn-toolbar" role="toolbar">
+                  <div class="btn-group" role="group">
+                    <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">
+                      Download jq 1.5
+                      <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li><a href="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64">Linux (64-bit)</a></li>
+                      <li><a href="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-osx-amd64">OS X (64-bit)</a></li>
+                      <li><a href="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win64.exe">Windows (64-bit)</a></li>
+                      <li><a href="/jq/download/">Other platforms, older versions, and source</a></li>
+                    </ul>
+                  </div>
+
+                  <div class="btn-group">
+                    <a class="btn btn-primary" href="https://jqplay.org">
+                      Try online at jqplay.org!
+                    </a>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
-          <div style="clear:both;"></div>
         </div>
       </div>
-        
+
       <div class="row" id="multiblurb">
-	<div class="span4">{{body1 | markdownify}}</div>
-        <div class="span4">{{body2 | markdownify}}</div>
-	<div class="span4">{{body3 | markdownify}}</div>        
+        <div class="col-sm-4">{{body1 | markdownify}}</div>
+        <div class="col-sm-4">{{body2 | markdownify}}</div>
+        <div class="col-sm-4">{{body3 | markdownify}}</div>
       </div>
+
       <div class="row" style="text-align:center; margin-top: 30px">
         {{tail | markdownify}}
       </div>
+
+      <div class="row">
+        <h2>News</h2>
+        <div id="news">
+          <ul>
+            {% for item in news %}
+              <li>
+                <span class="date">{{item.date}}</span>
+                {{item.body | markdownify}}
+              </li>
+            {% endfor %}
+          </ul>
+        </div>
+      </div>
     </div>
-    {% include "shared/footer" %}    
+
+{% include "shared/footer" %}
   </body>
 </html>

docs/templates/manual.liquid

@@ -1,110 +1,99 @@
 <!DOCTYPE html>
 <html lang="en">
-  {% include "shared/head" %}
+{% include "shared/head" %}
+
   <body id="{{slug}}" data-spy="scroll" data-target="#navcolumn" data-offset="100">
-    {% include "shared/header" %}
+{% include "shared/navbar" %}
+
     <div class="container">
       <div class="row">
-        <div class="span3" id="navcolumn">
-          <div class="affix">
+        <div class="affix" id="navcolumn">
           <h4>Contents</h4>
           <ul class="nav nav-pills nav-stacked">
             {% for section in sections %}
-              <li {% if forloop.first %} class="active" {% endif %}>
-                <a href="#{{section.title | sanitize}}">{{section.title}}</a>
+              <li>
+                <a href="#{{section.title | section_id}}">{{section.title}}</a>
               </li>
             {% endfor %}
           </ul>
-          <form class="form-search">
-            <script type="text/javascript">
-              var section_map = {
-                {% for section in sections %}
-                  {% for entry in section.entries %}
-                    {{entry.title | json}} : {{entry.title | sanitize | json}},
-                  {% endfor %}
-                  {{section.title | json}} : {{section.title | sanitize | json}}
-                  {% unless forloop.last %},{% endunless %}
-                {% endfor %}
-              };
-              var section_names = $.map(section_map, function(v,k){return k});
-              $(function(){
-                $('#searchbox').typeahead({source: section_names})
-                $('#searchbox').change(function() {
-                  if ($(this).val() in section_map) {
-                    location.hash = '#' + section_map[$(this).val()];
-                  }
-                });
-              });
-            </script>
+          <form class="form-group" onsubmit="go_to_section(); return false;">
             <input type="text"
-                   class="input-medium search-query"
-                   placeholder="Search"
-                   autocomplete="off"
-                   id="searchbox">
+                  class="form-control"
+                  placeholder="Search"
+                  autocomplete="off"
+                  id="searchbox">
           </form>
-          </div>
         </div>
-        <div class="span9">
+
+        <div id="manualcontent">
           <h1>{{headline}}</h1>
+          {{ history | markdownify }}
           {{ body | markdownify }}
           {% for section in sections %}
-            <section id="{{section.title | sanitize}}">
+            <section id="{{section.title | section_id}}">
               <h2>{{section.title}}</h2>
               {{section.body | markdownify}}
               {% for entry in section.entries %}
-                <section id="{{entry.title | sanitize}}">
-                <h3>
-                  {{entry.title | markdownify}}
-                  {% if entry.subtitle %}<small>{{entry.subtitle}}</small>{% endif %}
-                </h3>
-                {{entry.body | markdownify}}
+                <section id="{{entry.title | entry_id}}">
+                  <h3>
+                    {{entry.title | markdownify | no_paragraph}}
+                    {% if entry.subtitle %}<small>{{entry.subtitle}}</small>{% endif %}
+                  </h3>
+                  {{entry.body | markdownify}}
 
-                {% if entry.examples %}
-                  <div>
-                    {% capture exampleID %}{{ "" | unique }}{% endcapture %}
-                    <a data-toggle="collapse" href="#example{{exampleID}}">
-                      <i class="icon-chevron-right"></i>
-                      {% if entry.examples[1] %}Examples{%else%}Example{%endif%}
-                    </a>
-                    <div id="example{{exampleID}}" class="collapse">
-                      
-                    {% for example in entry.examples %}
-                      <table class="manual-example">
-                        <tr><th></th><td class="jqprogram">jq '{{example.program}}'</td></tr>
-                        <tr><th>Input</th><td>{{example.input}}</td></tr>
-                        {% unless example.output[0] %}
-                          <tr>
-                            <th>Output</th>
-                            <td><i>none</i></td>
-                          </tr>
-                        {% endunless %}
-                        {% for output in example.output %}
-                          <tr>
-                            {% if forloop.index == 1 %}
-                              <th>Output</th>
-                            {% else %}
-                              <th></th>
-                            {% endif %}
-                            <td>{{output}}</td>
-                          </tr>
+                  {% if entry.examples %}
+                    <div>
+                      {% capture exampleID %}{{ "" | unique }}{% endcapture %}
+                      <a data-toggle="collapse" href="#example{{exampleID}}">
+                        <i class="glyphicon glyphicon-chevron-right"></i>
+                        {% if entry.examples[1] %}Examples{%else%}Example{%endif%}
+                      </a>
+                      <div id="example{{exampleID}}" class="manual-example collapse">
+                        {% for example in entry.examples %}
+                          <table>
+                            <tr><th></th><td class="jqprogram">jq '{{example.program | escape}}'</td></tr>
+                            <tr><th>Input</th><td>{{example.input | escape}}</td></tr>
+                            {% unless example.output[0] %}
+                              <tr>
+                                <th>Output</th>
+                                <td><i>none</i></td>
+                              </tr>
+                            {% endunless %}
+                            {% for output in example.output %}
+                              <tr>
+                                {% if forloop.index == 1 %}
+                                  <th>Output</th>
+                                {% else %}
+                                  <th></th>
+                                {% endif %}
+                                <td>{{output | escape}}</td>
+                              </tr>
+                            {% endfor %}
+                          </table>
                         {% endfor %}
-                        
-                      </table>
-                    {% endfor %}
+                      </div>
                     </div>
-                  </div>
-                 {% endif %}
-                 </section>
+                  {% endif %}
+                </section>
               {% endfor %}
             </section>
           {% endfor %}
         </div>
       </div>
-      
-
     </div>
-      {% include "shared/footer" %}    
+
+{% include "shared/footer" %}
+    <script>
+      var section_map = {
+        {% for section in sections %}
+          {% for entry in section.entries %}
+            {{entry.title | search_id | json}} : {{entry.title | entry_id | json}},
+          {% endfor %}
+          {{section.title | search_id | json}} : {{section.title | section_id | json}}
+          {% unless forloop.last %},{% endunless %}
+        {% endfor %}
+      };
+    </script>
+    <script src="{{root}}/js/manual-search.js"></script>
   </body>
-
-
 </html>

docs/templates/shared/_footer.liquid

@@ -1,5 +1,10 @@
-<footer>
-  <div class="container">
-    {{ footer | markdownify }}
-  </div>
-</footer>
+    <footer>
+      <div class="container">
+        <p>This website is made with <a href="http://www.tinytree.info">Bonsai</a> and <a href="http://getbootstrap.com">Bootstrap</a>, themed with <a href="https://bootswatch.com">Bootswatch</a>.</p>
+        <p>jq is licensed under the MIT license (code) and the <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a> license (docs).</p>
+      </div>
+    </footer>
+
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha256-Sk3nkD6mLTMOF0EOpNtsIry+s1CsaqQC1rVLTAy+0yc= sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>
+    <script src="https://twitter.github.io/typeahead.js/releases/0.11.1/typeahead.bundle.js"></script>

docs/templates/shared/_head.liquid

@@ -1,12 +1,17 @@
-<head>
-  <meta charset=UTF-8>
-  <title>{{headline}}</title>
-  <link rel="stylesheet" href="{{root}}/bootstrap/css/bootstrap.css" type="text/css">
-  <link rel="stylesheet" href="{{root}}/css/base.css" type="text/css">
-  <!--[if IE]>
-    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
-  <script src="{{root}}/bootstrap/js/bootstrap.js"></script>
-
-</head>
+  <head>
+    <script>
+      if ((window.location.host == "stedolan.github.io") && (window.location.protocol != "https:"))
+        window.location.protocol = "https";
+    </script>
+    <meta charset="utf-8">
+    <title>{{headline}}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <link rel="canonical" href="{{url}}{{permalink | remove:'/index'}}" />
+    <link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
+    <link rel="stylesheet" href="{{root}}/css/base.css" type="text/css">
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>

docs/templates/shared/_header.liquid

@@ -1,24 +0,0 @@
-
-<div class="navbar navbar-inverse navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-      <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="brand" href="{{root}}/">jq</a>
-      <div class="nav-collapse collapse">
-        <ul class="nav">
-          {% for item in navigation %}
-            <li {% if item.permalink == permalink %} class="active" {% endif %}>
-              <a href="{{root}}{{item.permalink}}">{{item.name}}</a>
-            </li>
-          {% endfor %}
-          <li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>
-          <li><a href="https://github.com/stedolan/jq">Source</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>

docs/templates/shared/_navbar.liquid

@@ -0,0 +1,27 @@
+    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="{{root}}/">jq</a>
+        </div>
+
+        <div class="navbar-collapse collapse" id="nav-collapse">
+          <ul class="nav navbar-nav">
+            {% for item in navigation %}
+              <li {% if item.permalink == permalink %} class="active" {% endif %}>
+                <a href="{{root}}{{item.permalink}}">{{item.name}}</a>
+              </li>
+            {% endfor %}
+            <li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>
+            <li><a href="https://github.com/stedolan/jq">Source</a></li>
+            <li><a href="https://jqplay.org">Try online!</a></li>
+            <li><a href="https://raw.githubusercontent.com/stedolan/jq/master/NEWS">News</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>

execute.c

@@ -1,525 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "execute.h"
-
-#include "opcode.h"
-#include "bytecode.h"
-#include "compile.h"
-
-#include "forkable_stack.h"
-#include "frame_layout.h"
-
-#include "locfile.h"
-#include "jv.h"
-#include "parser.h"
-#include "builtin.h"
-
-typedef struct {
-  jv value;
-  int pathidx;
-} stackval;
-
-
-jv* pathbuf;
-int pathsize; // number of allocated elements
-
-int path_push(stackval sv, jv val) {
-  int pos = sv.pathidx;
-  assert(pos <= pathsize);
-  assert(pos >= 0);
-  if (pos == pathsize) {
-    int oldpathsize = pathsize;
-    pathsize = oldpathsize ? oldpathsize * 2 : 100;
-    pathbuf = realloc(pathbuf, sizeof(pathbuf[0]) * pathsize);
-    for (int i=oldpathsize; i<pathsize; i++) {
-      pathbuf[i] = jv_invalid();
-    }
-  }
-  jv_free(pathbuf[pos]);
-  pathbuf[pos] = val;
-  return pos + 1;
-}
-
-stackval stackval_replace(stackval value, jv newjs) {
-  jv_free(value.value);
-  stackval s = {newjs, value.pathidx};
-  return s;
-}
-
-
-// Probably all uses of this function are bugs
-stackval stackval_root(jv v) {
-  stackval s = {v, 0};
-  return s;
-}
-
-struct forkable_stack data_stk;
-typedef struct {
-  FORKABLE_STACK_HEADER;
-  stackval sv;
-} data_stk_elem;
-
-void stack_push(stackval val) {
-  assert(jv_is_valid(val.value));
-  data_stk_elem* s = forkable_stack_push(&data_stk, sizeof(data_stk_elem));
-  s->sv = val;
-}
-
-stackval stack_pop() {
-  data_stk_elem* s = forkable_stack_peek(&data_stk);
-  stackval sv = s->sv;
-  if (!forkable_stack_pop_will_free(&data_stk)) {
-    sv.value = jv_copy(sv.value);
-  }
-  forkable_stack_pop(&data_stk);
-  assert(jv_is_valid(sv.value));
-  return sv;
-}
-
-struct forkable_stack frame_stk;
-
-
-struct forkpoint {
-  FORKABLE_STACK_HEADER;
-  struct forkable_stack_state saved_data_stack;
-  struct forkable_stack_state saved_call_stack;
-};
-
-struct forkable_stack fork_stk;
-
-void stack_save(){
-  struct forkpoint* fork = forkable_stack_push(&fork_stk, sizeof(struct forkpoint));
-  forkable_stack_save(&data_stk, &fork->saved_data_stack);
-  forkable_stack_save(&frame_stk, &fork->saved_call_stack);
-}
-
-void stack_switch() {
-  struct forkpoint* fork = forkable_stack_peek(&fork_stk);
-  forkable_stack_switch(&data_stk, &fork->saved_data_stack);
-  forkable_stack_switch(&frame_stk, &fork->saved_call_stack);
-}
-
-int stack_restore(){
-  while (!forkable_stack_empty(&data_stk) && 
-         forkable_stack_pop_will_free(&data_stk)) {
-    jv_free(stack_pop().value);
-  }
-  while (!forkable_stack_empty(&frame_stk) && 
-         forkable_stack_pop_will_free(&frame_stk)) {
-    frame_pop(&frame_stk);
-  }
-  if (forkable_stack_empty(&fork_stk)) {
-    return 0;
-  } else {
-    struct forkpoint* fork = forkable_stack_peek(&fork_stk);
-    forkable_stack_restore(&data_stk, &fork->saved_data_stack);
-    forkable_stack_restore(&frame_stk, &fork->saved_call_stack);
-    forkable_stack_pop(&fork_stk);
-    return 1;
-  }
-}
-
-static struct closure make_closure(struct forkable_stack* stk, frame_ptr fr, uint16_t* pc) {
-  uint16_t level = *pc++;
-  uint16_t idx = *pc++;
-  fr = frame_get_level(stk, fr, level);
-  if (idx & ARG_NEWCLOSURE) {
-    int subfn_idx = idx & ~ARG_NEWCLOSURE;
-    assert(subfn_idx < frame_self(fr)->bc->nsubfunctions);
-    struct closure cl = {frame_self(fr)->bc->subfunctions[subfn_idx],
-                         forkable_stack_to_idx(stk, fr)};
-    return cl;
-  } else {
-    return *frame_closure_arg(fr, idx);
-  }
-}
-
-void print_error(jv value) {
-  assert(!jv_is_valid(value));
-  jv msg = jv_invalid_get_msg(value);
-  if (jv_get_kind(msg) == JV_KIND_STRING) {
-    fprintf(stderr, "jq: error: %s\n", jv_string_value(msg));
-  }
-  jv_free(msg);
-}
-#define ON_BACKTRACK(op) ((op)+NUM_OPCODES)
-
-jv jq_next() {
-  jv cfunc_input[MAX_CFUNCTION_ARGS];
-  jv cfunc_output[MAX_CFUNCTION_ARGS];
-
-  assert(!forkable_stack_empty(&frame_stk));
-  uint16_t* pc = *frame_current_retaddr(&frame_stk);
-  frame_pop(&frame_stk);
-  
-  assert(!forkable_stack_empty(&frame_stk));
-
-  int backtracking = 0;
-  while (1) {
-    uint16_t opcode = *pc;
-
-#if JQ_DEBUG
-    dump_operation(frame_current_bytecode(&frame_stk), pc);
-    printf("\t");
-    const struct opcode_description* opdesc = opcode_describe(opcode);
-    data_stk_elem* param;
-    for (int i=0; i<opdesc->stack_in; i++) {
-      if (i == 0) {
-        param = forkable_stack_peek(&data_stk);
-      } else {
-        printf(" | ");
-        param = forkable_stack_peek_next(&data_stk, param);
-      }
-      if (!param) break;
-      jv_dump(jv_copy(param->sv.value), 0);
-      printf("<%d>", jv_get_refcnt(param->sv.value));
-    }
-
-    if (backtracking) printf("\t<backtracking>");
-
-    printf("\n");
-#endif
-    if (backtracking) {
-      opcode = ON_BACKTRACK(opcode);
-      backtracking = 0;
-    }
-    pc++;
-
-    switch (opcode) {
-    default: assert(0 && "invalid instruction");
-
-    case LOADK: {
-      jv v = jv_array_get(jv_copy(frame_current_bytecode(&frame_stk)->constants), *pc++);
-      assert(jv_is_valid(v));
-      stack_push(stackval_replace(stack_pop(), v));
-      break;
-    }
-
-    case DUP: {
-      stackval v = stack_pop();
-      stackval v2 = v;
-      v2.value = jv_copy(v.value);
-      stack_push(v);
-      stack_push(v2);
-      break;
-    }
-
-    case SWAP: {
-      stackval a = stack_pop();
-      stackval b = stack_pop();
-      stack_push(a);
-      stack_push(b);
-      break;
-    }
-      
-    case POP: {
-      jv_free(stack_pop().value);
-      break;
-    }
-
-    case APPEND: {
-      // FIXME paths
-      jv v = stack_pop().value;
-      jv array = stack_pop().value;
-      array = jv_array_append(array, v);
-      stack_push(stackval_root(array));
-      break;
-    }
-
-    case INSERT: {
-      stackval stktop = stack_pop();
-      jv v = stack_pop().value;
-      jv k = stack_pop().value;
-      stackval objv = stack_pop();
-      assert(jv_get_kind(k) == JV_KIND_STRING);
-      assert(jv_get_kind(objv.value) == JV_KIND_OBJECT);
-      objv.value = jv_object_set(objv.value, k, v);
-      stack_push(objv);
-      stack_push(stktop);
-      break;
-    }
-
-      // FIXME: loadv/storev may do too much copying/freeing
-    case LOADV: {
-      uint16_t level = *pc++;
-      uint16_t v = *pc++;
-      frame_ptr fp = frame_get_level(&frame_stk, frame_current(&frame_stk), level);
-      jv* var = frame_local_var(fp, v);
-      #if JQ_DEBUG
-      printf("V%d = ", v);
-      jv_dump(jv_copy(*var), 0);
-      printf("\n");
-      #endif
-      stack_push(stackval_replace(stack_pop(), jv_copy(*var)));
-      break;
-    }
-
-    case STOREV: {
-      uint16_t level = *pc++;
-      uint16_t v = *pc++;
-      frame_ptr fp = frame_get_level(&frame_stk, frame_current(&frame_stk), level);
-      jv* var = frame_local_var(fp, v);
-      stackval val = stack_pop();
-      #if JQ_DEBUG
-      printf("V%d = ", v);
-      jv_dump(jv_copy(val.value), 0);
-      printf("\n");
-      #endif
-      jv_free(*var);
-      *var = val.value;
-      break;
-    }
-
-    case ASSIGN: {
-      stackval replacement = stack_pop();
-      stackval path_end = stack_pop();
-      stackval path_start = stack_pop();
-      jv_free(path_end.value);
-      jv_free(path_start.value);
-
-      uint16_t level = *pc++;
-      uint16_t v = *pc++;
-      frame_ptr fp = frame_get_level(&frame_stk, frame_current(&frame_stk), level);
-      jv* var = frame_local_var(fp, v);
-      jv result = jv_insert(*var, replacement.value, pathbuf + path_start.pathidx, path_end.pathidx - path_start.pathidx);
-      if (jv_is_valid(result)) {
-        *var = result;
-      } else {
-        print_error(result);
-        *var = jv_null();
-      }
-      break;
-    }
-
-    case INDEX: {
-      stackval t = stack_pop();
-      jv k = stack_pop().value;
-      int pathidx = path_push(t, jv_copy(k));
-      jv v = jv_lookup(t.value, k);
-      if (jv_is_valid(v)) {
-        stackval sv;
-        sv.value = v;
-        sv.pathidx = pathidx;
-        stack_push(sv);
-      } else {
-        print_error(v);
-        goto do_backtrack;
-      }
-      break;
-    }
-
-
-    case JUMP: {
-      uint16_t offset = *pc++;
-      pc += offset;
-      break;
-    }
-
-    case JUMP_F: {
-      uint16_t offset = *pc++;
-      stackval t = stack_pop();
-      jv_kind kind = jv_get_kind(t.value);
-      if (kind == JV_KIND_FALSE || kind == JV_KIND_NULL) {
-        pc += offset;
-      }
-      stack_push(t); // FIXME do this better
-      break;
-    }
-
-    case EACH: 
-      stack_push(stackval_root(jv_number(-1)));
-      // fallthrough
-    case ON_BACKTRACK(EACH): {
-      int idx = jv_number_value(stack_pop().value);
-      stackval container = stack_pop();
-
-      int keep_going;
-      jv key, value;
-      if (jv_get_kind(container.value) == JV_KIND_ARRAY) {
-        if (opcode == EACH) idx = 0;
-        else idx = idx + 1;
-        keep_going = idx < jv_array_length(jv_copy(container.value));
-        if (keep_going) {
-          key = jv_number(idx);
-          value = jv_array_get(jv_copy(container.value), idx);
-        }
-      } else if (jv_get_kind(container.value) == JV_KIND_OBJECT) {
-        if (opcode == EACH) idx = jv_object_iter(container.value);
-        else idx = jv_object_iter_next(container.value, idx);
-        keep_going = jv_object_iter_valid(container.value, idx);
-        if (keep_going) {
-          key = jv_object_iter_key(container.value, idx);
-          value = jv_object_iter_value(container.value, idx);
-        }
-      } else {
-        assert(opcode == EACH);
-        print_error(jv_invalid_with_msg(jv_string_fmt("Cannot iterate over %s",
-                                                      jv_kind_name(jv_get_kind(container.value)))));
-        keep_going = 0;
-      }
-
-      if (!keep_going) {
-        jv_free(container.value);
-        goto do_backtrack;
-      } else {
-        stack_save();
-        stack_push(container);
-        stack_push(stackval_root(jv_number(idx)));
-        frame_push_backtrack(&frame_stk, pc - 1);
-        stack_switch();
-        
-        stackval sv = {value,
-                       path_push(container, key)};
-        stack_push(sv);
-      }
-      break;
-    }
-
-    do_backtrack:
-    case BACKTRACK: {
-      if (!stack_restore()) {
-        return jv_invalid();
-      }
-      pc = *frame_current_retaddr(&frame_stk);
-      frame_pop(&frame_stk);
-      backtracking = 1;
-      break;
-    }
-
-    case FORK: {
-      stack_save();
-      frame_push_backtrack(&frame_stk, pc - 1);
-      stack_switch();
-      pc++; // skip offset this time
-      break;
-    }
-
-    case ON_BACKTRACK(FORK): {
-      uint16_t offset = *pc++;
-      pc += offset;
-      break;
-    }
-
-    case YIELD: {
-      jv value = stack_pop().value;
-      frame_push_backtrack(&frame_stk, pc);
-      return value;
-    }
-      
-    case CALL_BUILTIN_1_1: {
-      assert(*pc == 1); // no closure args allowed
-      pc++; // skip nclosures
-      pc++; // skip level
-      stackval top = stack_pop();
-      cfunc_input[0] = top.value;
-      struct cfunction* func = &frame_current_bytecode(&frame_stk)->globals->cfunctions[*pc++];
-      func->fptr(cfunc_input, cfunc_output);
-      top.value = cfunc_output[0];
-      if (jv_is_valid(top.value)) {
-        stack_push(top);
-      } else {
-        print_error(top.value);
-        goto do_backtrack;
-      }
-      break;
-    }
-
-    case CALL_BUILTIN_3_1: {
-      assert(*pc == 1); // no closure args allowed
-      pc++; // skip nclosures
-      pc++; // skip level
-      stackval top = stack_pop();
-      jv a = stack_pop().value;
-      jv b = stack_pop().value;
-      cfunc_input[0] = top.value;
-      cfunc_input[1] = a;
-      cfunc_input[2] = b;
-      struct cfunction* func = &frame_current_bytecode(&frame_stk)->globals->cfunctions[*pc++];
-      func->fptr(cfunc_input, cfunc_output);
-      top.value = cfunc_output[0];
-      if (jv_is_valid(top.value)) {
-        stack_push(top);
-      } else {
-        print_error(top.value);
-        goto do_backtrack;
-      }
-      break;
-    }
-
-    case CALL_1_1: {
-      uint16_t nclosures = *pc++;
-      frame_ptr new_frame = frame_push(&frame_stk, 
-                                       make_closure(&frame_stk, frame_current(&frame_stk), pc),
-                                       pc + nclosures * 2);
-      pc += 2;
-      frame_ptr old_frame = forkable_stack_peek_next(&frame_stk, new_frame);
-      assert(nclosures - 1 == frame_self(new_frame)->bc->nclosures);
-      for (int i=0; i<nclosures-1; i++) {
-        *frame_closure_arg(new_frame, i) = make_closure(&frame_stk, old_frame, pc);
-        pc += 2;
-      }
-
-      pc = frame_current_bytecode(&frame_stk)->code;
-      break;
-    }
-
-    case RET: {
-      pc = *frame_current_retaddr(&frame_stk);
-      frame_pop(&frame_stk);
-      break;
-    }
-    }
-  }
-}
-
-
-void jq_init(struct bytecode* bc, jv input) {
-  forkable_stack_init(&data_stk, sizeof(stackval) * 1000); // FIXME: lower this number, see if it breaks
-  forkable_stack_init(&frame_stk, 10240); // FIXME: lower this number, see if it breaks
-  forkable_stack_init(&fork_stk, 10240); // FIXME: lower this number, see if it breaks
-  
-  stack_push(stackval_root(input));
-  struct closure top = {bc, -1};
-  frame_push(&frame_stk, top, 0);
-  frame_push_backtrack(&frame_stk, bc->code);
-}
-
-void jq_teardown() {
-  while (stack_restore()) {}
-
-  assert(forkable_stack_empty(&fork_stk));
-  assert(forkable_stack_empty(&data_stk));
-  assert(forkable_stack_empty(&frame_stk));
-  forkable_stack_free(&fork_stk);
-  forkable_stack_free(&data_stk);
-  forkable_stack_free(&frame_stk);
-
-  for (int i=0; i<pathsize; i++) {
-    jv_free(pathbuf[i]);
-  }
-  free(pathbuf);
-  pathbuf = 0;
-  pathsize = 0;
-}
-
-struct bytecode* jq_compile(const char* str) {
-  struct locfile locations;
-  locfile_init(&locations, str, strlen(str));
-  block program;
-  struct bytecode* bc = 0;
-  int nerrors = jq_parse(&locations, &program);
-  if (nerrors == 0) {
-    block_append(&program, block_join(gen_op_simple(YIELD), gen_op_simple(BACKTRACK)));
-    program = builtins_bind(program);
-    nerrors = block_compile(program, &locations, &bc);
-    block_free(program);
-  }
-  if (nerrors) {
-    fprintf(stderr, "%d compile %s\n", nerrors, nerrors > 1 ? "errors" : "error");
-  }
-  locfile_free(&locations);
-  return bc;
-}

execute.h

@@ -1,13 +0,0 @@
-#ifndef EXECUTE_H
-#define EXECUTE_H
-#include "bytecode.h"
-
-
-struct bytecode* jq_compile(const char* str);
-
-void jq_init(struct bytecode* bc, jv value);
-jv jq_next();
-void jq_teardown();
-
-
-#endif

forkable_stack.h

@@ -1,162 +0,0 @@
-#ifndef FORKABLE_STACK_H
-#define FORKABLE_STACK_H
-#include <stdlib.h>
-#include <stddef.h>
-#include <assert.h>
-#include <string.h>
-
-struct forkable_stack_header {
-  /* distance in bytes between this header and the header
-     of the next object on the stack */
-  int next_delta;
-};
-
-#define FORKABLE_STACK_HEADER struct forkable_stack_header fk_header_
-
-struct forkable_stack {
-  // Stack grows down from stk+length
-
-  char* stk;
-
-  // stk+length is just past end of allocated area
-  // stk = malloc(length)
-  int length;
-
-  // stk+pos is header of top object, or stk+length if empty
-  int pos;
-
-  // everything after-or-including stk+savedlimit must be preserved
-  int savedlimit;
-};
-
-static void forkable_stack_check(struct forkable_stack* s) {
-  assert(s->stk);
-  assert(s->length > 0);
-  assert(s->pos >= 0 && s->pos <= s->length);
-  assert(s->savedlimit >= 0 && s->savedlimit <= s->length);
-}
-
-static int forkable_stack_empty(struct forkable_stack* s) {
-  return s->pos == s->length;
-}
-
-static void forkable_stack_init(struct forkable_stack* s, size_t sz) {
-  s->stk = malloc(sz);
-  s->length = sz;
-  s->pos = s->length;
-  s->savedlimit = s->length;
-  forkable_stack_check(s);
-}
-
-static void forkable_stack_free(struct forkable_stack* s) {
-  assert(forkable_stack_empty(s));
-  assert(s->savedlimit == s->length);
-  free(s->stk);
-  s->stk = 0;
-}
-
-static void* forkable_stack_push(struct forkable_stack* s, size_t sz_size) {
-  assert(sz_size > 0 && sz_size % sizeof(struct forkable_stack_header) == 0);
-  int size = (int)sz_size;
-  forkable_stack_check(s);
-  int curr = s->pos < s->savedlimit ? s->pos : s->savedlimit;
-  if (curr - size < 0) {
-    //assert(0);
-    int oldlen = s->length;
-    s->length = (size + oldlen + 1024) * 2;
-    s->stk = realloc(s->stk, s->length);
-    int shift = s->length - oldlen;
-    memmove(s->stk + shift, s->stk, oldlen);
-    s->pos += shift;
-    s->savedlimit += shift;
-    curr += shift;
-  }
-  int newpos = curr - size;
-  assert(newpos < s->pos);
-  void* ret = (void*)(s->stk + newpos);
-  ((struct forkable_stack_header*)ret)->next_delta = s->pos - newpos;
-  s->pos = newpos;
-  forkable_stack_check(s);
-  return ret;
-}
-
-static void* forkable_stack_peek(struct forkable_stack* s) {
-  assert(!forkable_stack_empty(s));
-  forkable_stack_check(s);
-  return (void*)(s->stk + s->pos);
-}
-
-static void* forkable_stack_peek_next(struct forkable_stack* s, void* top) {
-  forkable_stack_check(s);
-  struct forkable_stack_header* elem = top;
-  int elempos = (char*)top - s->stk;
-  assert(elempos >= 0 && elempos < s->length);
-  assert(elempos + elem->next_delta <= s->length);
-  if (elempos + elem->next_delta < s->length) {
-    return (void*)(s->stk + elempos + elem->next_delta);
-  } else {
-    return 0;
-  }
-}
-
-// Returns 1 if the next forkable_stack_pop will permanently remove an
-// object from the stack (i.e. the top object was not saved with a fork)
-static int forkable_stack_pop_will_free(struct forkable_stack* s) {
-  return s->pos < s->savedlimit ? 1 : 0;
-}
-
-static void forkable_stack_pop(struct forkable_stack* s) {
-  forkable_stack_check(s);
-  struct forkable_stack_header* elem = forkable_stack_peek(s);
-  s->pos += elem->next_delta;
-}
-
-
-
-struct forkable_stack_state {
-  int prevpos, prevlimit;
-};
-
-static void forkable_stack_save(struct forkable_stack* s, struct forkable_stack_state* state) {
-  forkable_stack_check(s);
-  state->prevpos = s->pos;
-  state->prevlimit = s->savedlimit;
-  if (s->pos < s->savedlimit) s->savedlimit = s->pos;
-}
-
-static void forkable_stack_switch(struct forkable_stack* s, struct forkable_stack_state* state) {
-  forkable_stack_check(s);
-  int curr_pos = s->pos;
-  s->pos = state->prevpos;
-  state->prevpos = curr_pos;
-
-  int curr_limit = s->savedlimit;
-  if (curr_pos < curr_limit) s->savedlimit = curr_pos;
-  //state->prevlimit = curr_limit; FIXME clean up
-  forkable_stack_check(s);
-}
-
-static void forkable_stack_restore(struct forkable_stack* s, struct forkable_stack_state* state) {
-  forkable_stack_check(s);
-  assert(s->savedlimit <= state->prevpos);
-  assert(s->savedlimit <= state->prevlimit);
-  s->pos = state->prevpos;
-  s->savedlimit = state->prevlimit;
-  forkable_stack_check(s);
-}
-
-typedef int stack_idx;
-
-static stack_idx forkable_stack_to_idx(struct forkable_stack* s, void* ptr) {
-  char* item = ptr;
-  int pos = item - s->stk;
-  assert(pos >= 0 && pos < s->length);
-  return s->length - pos;
-}
-
-static void* forkable_stack_from_idx(struct forkable_stack* s, stack_idx idx) {
-  assert(idx >= 1 && idx <= s->length);
-  return &s->stk[s->length - idx];
-}
-
-#endif

frame_layout.h

@@ -1,118 +0,0 @@
-#ifndef FRAME_LAYOUT_H
-#include "forkable_stack.h"
-#include "bytecode.h"
-
-struct closure {
-  struct bytecode* bc;
-  stack_idx env;
-};
-
-struct continuation {
-  struct bytecode* bc;
-  stack_idx env;
-  uint16_t* retaddr;
-  // FIXME: probably not necessary as a separate field
-  int is_backtrack_frame;
-};
-
-typedef union frame_elem {
-  FORKABLE_STACK_HEADER;
-  struct continuation cont;
-  struct closure closure;
-  jv jsonval;
-} *frame_ptr;
-
-/*
- * Frame layout
- * fr[0] - FORKABLE_STACK_HEADER (next pointer)
- * fr[1] - self (used to store return addresses, etc)
- * fr[2...nclosures+2] - closure params
- * fr[nclosures+2..nclosures+nlocals+2] - local variables
- */
-
-static int frame_size(struct bytecode* bc) {
-  return sizeof(union frame_elem) * (bc->nclosures + bc->nlocals + 2);
-}
-
-static struct continuation* frame_self(frame_ptr fr) {
-  return &fr[1].cont;
-}
-
-static struct closure* frame_closure_arg(frame_ptr fr, int closure) {
-  assert(closure >= 0);
-  assert(closure < frame_self(fr)->bc->nclosures);
-  return &fr[2+closure].closure;
-}
-
-static jv* frame_local_var(frame_ptr fr, int var) {
-  assert(var >= 0);
-  assert(var < frame_self(fr)->bc->nlocals);
-  return &fr[2 + frame_self(fr)->bc->nclosures + var].jsonval;
-}
-
-
-static frame_ptr frame_current(struct forkable_stack* stk) {
-  frame_ptr fp = forkable_stack_peek(stk);
-  if (forkable_stack_peek_next(stk, fp)) {
-    struct bytecode* bc = frame_self(forkable_stack_peek_next(stk, fp))->bc;
-    assert(frame_self(fp)->retaddr >= bc->code && frame_self(fp)->retaddr < bc->code + bc->codelen);
-  } else {
-    assert(frame_self(fp)->retaddr == 0);
-  }
-  return fp;
-}
-
-static struct bytecode* frame_current_bytecode(struct forkable_stack* stk) {
-  return frame_self(frame_current(stk))->bc;
-}
-static uint16_t** frame_current_retaddr(struct forkable_stack* stk) {
-  return &frame_self(frame_current(stk))->retaddr;
-}
-
-static frame_ptr frame_get_parent(struct forkable_stack* stk, frame_ptr fr) {
-  return forkable_stack_from_idx(stk, frame_self(fr)->env);
-}
-
-static frame_ptr frame_get_level(struct forkable_stack* stk, frame_ptr fr, int level) {
-  for (int i=0; i<level; i++) {
-    fr = frame_get_parent(stk, fr);
-  }
-  return fr;
-}
-
-static frame_ptr frame_push(struct forkable_stack* stk, struct closure cl, uint16_t* retaddr) {
-  frame_ptr fp = forkable_stack_push(stk, frame_size(cl.bc));
-  struct continuation* cc = frame_self(fp);
-  cc->bc = cl.bc;
-  cc->env = cl.env;
-  cc->retaddr = retaddr;
-  cc->is_backtrack_frame = 0;
-  for (int i=0; i<cl.bc->nlocals; i++) {
-    *frame_local_var(fp, i) = jv_invalid();
-  }
-  return fp;
-}
-
-static frame_ptr frame_push_backtrack(struct forkable_stack* stk, uint16_t* retaddr) {
-  struct continuation cc = *frame_self(frame_current(stk));
-  frame_ptr fp = forkable_stack_push(stk, sizeof(union frame_elem) * 2);
-  assert(!cc.is_backtrack_frame);
-  cc.is_backtrack_frame = 1;
-  cc.retaddr = retaddr;
-  *frame_self(fp) = cc;
-  return fp;
-}
-
-static void frame_pop(struct forkable_stack* stk) {
-  frame_ptr fp = frame_current(stk);
-  if (forkable_stack_pop_will_free(stk) && 
-      !frame_self(fp)->is_backtrack_frame) {
-    int nlocals = frame_self(fp)->bc->nlocals;
-    for (int i=0; i<nlocals; i++) {
-      jv_free(*frame_local_var(fp, i));
-    }
-  }
-  forkable_stack_pop(stk);
-}
-
-#endif

jq.spec

@@ -0,0 +1,70 @@
+# This is spec file maintained by developers of JQ, not by a OS distro.
+# Your OS of choice will likely ignore this RPM spec file.
+Summary: Command-line JSON processor
+Name: jq
+Version: %{myver}
+Release: %{myrel}%{?dist}
+Source0: jq-%{myver}.tar.gz
+URL: https://stedolan.github.io/jq
+License: BSD
+AutoReqProv: no
+#BuildPrereq: autoconf, libtool, automake, flex, bison, python
+
+Group: Applications/System
+# Requires:
+
+# Disables debug packages and stripping of binaries:
+%global _enable_debug_package 0
+%global debug_package %{nil}
+%global __os_install_post %{nil}
+
+# Crank up the compression
+%define _binary_payload w7.lzdio
+
+%description
+jq is a command-line JSON processor
+
+%prep
+%setup
+
+%build
+echo "Building in: \"$(pwd)\""
+%if "%{devbuild}" == "yes"
+./configure --prefix=%{_prefix} --enable-devel
+%else
+./configure --prefix=%{_prefix}
+%endif
+make
+
+%install
+echo "Installing to: \"%{buildroot}\""
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_bindir}/jq
+%if "%{devbuild}" == "yes"
+%{_libexecdir}/%{name}/jq_test
+%{_libexecdir}/%{name}/testdata
+%endif
+%{_datadir}/doc/%{name}/AUTHORS
+%{_datadir}/doc/%{name}/COPYING
+%{_datadir}/doc/%{name}/README
+%{_datadir}/doc/%{name}/README.md
+%{_datadir}/man/man1/jq.1
+%{_includedir}/jq.h
+%{_includedir}/jv.h
+%{_prefix}/lib/libjq.a
+%{_prefix}/lib/libjq.la
+%{_prefix}/lib/libjq.so
+%{_prefix}/lib/libjq.so.1
+%{_prefix}/lib/libjq.so.1.0.4
+
+%changelog
+
+%pre
+
+%post

jv.c

@@ -1,979 +0,0 @@
-#include <stdint.h>
-#include <stddef.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "jv.h"
-
-/*
- * Internal refcounting helpers
- */
-
-static void jvp_refcnt_init(jv_complex* c) {
-  c->ptr->count = 1;
-}
-
-static void jvp_refcnt_inc(jv_complex* c) {
-  c->ptr->count++;
-}
-
-static int jvp_refcnt_dec(jv_complex* c) {
-  c->ptr->count--;
-  return c->ptr->count == 0;
-}
-
-static int jvp_refcnt_unshared(jv_complex* c) {
-  assert(c->ptr->count > 0);
-  return c->ptr->count == 1;
-}
-
-/*
- * Simple values (true, false, null)
- */
-
-jv_kind jv_get_kind(jv x) {
-  return x.kind;
-}
-
-const char* jv_kind_name(jv_kind k) {
-  switch (k) {
-  case JV_KIND_INVALID: return "<invalid>";
-  case JV_KIND_NULL:    return "null";
-  case JV_KIND_FALSE:   return "boolean";
-  case JV_KIND_TRUE:    return "boolean";
-  case JV_KIND_NUMBER:  return "number";
-  case JV_KIND_STRING:  return "string";
-  case JV_KIND_ARRAY:   return "array";
-  case JV_KIND_OBJECT:  return "object";
-  }
-  assert(0 && "invalid kind");
-  return "<unknown>";
-}
-
-static const jv JV_NULL = {JV_KIND_NULL, {0}};
-static const jv JV_FALSE = {JV_KIND_FALSE, {0}};
-static const jv JV_TRUE = {JV_KIND_TRUE, {0}};
-
-jv jv_true() {
-  return JV_TRUE;
-}
-
-jv jv_false() {
-  return JV_FALSE;
-}
-
-jv jv_null() {
-  return JV_NULL;
-}
-
-jv jv_bool(int x) {
-  return x ? JV_TRUE : JV_FALSE;
-}
-
-/*
- * Invalid objects, with optional error messages
- */ 
-
-typedef struct {
-  jv_refcnt refcnt;
-  jv errmsg;
-} jvp_invalid;
-
-jv jv_invalid_with_msg(jv err) {
-  jv x;
-  x.kind = JV_KIND_INVALID;
-  x.val.complex.i[0] = x.val.complex.i[1] = 0;
-  jvp_invalid* i = malloc(sizeof(jvp_invalid));
-  x.val.complex.ptr = &i->refcnt;
-  i->refcnt.count = 1;
-  i->errmsg = err;
-  return x;
-}
-
-jv jv_invalid() {
-  return jv_invalid_with_msg(jv_null());
-}
-
-jv jv_invalid_get_msg(jv inv) {
-  jv x = jv_copy(((jvp_invalid*)inv.val.complex.ptr)->errmsg);
-  jv_free(inv);
-  return x;
-}
-
-int jv_invalid_has_msg(jv inv) {
-  jv msg = jv_invalid_get_msg(inv);
-  int r = jv_get_kind(msg) != JV_KIND_NULL;
-  jv_free(msg);
-  return r;
-}
-
-static void jvp_invalid_free(jv_complex* x) {
-  if (jvp_refcnt_dec(x)) {
-    jv_free(((jvp_invalid*)x->ptr)->errmsg);
-    free(x->ptr);
-  }
-}
-
-/*
- * Numbers
- */
-
-jv jv_number(double x) {
-  jv j;
-  j.kind = JV_KIND_NUMBER;
-  j.val.number = x;
-  return j;
-}
-
-double jv_number_value(jv j) {
-  assert(jv_get_kind(j) == JV_KIND_NUMBER);
-  return j.val.number;
-}
-
-
-/*
- * Arrays (internal helpers)
- */
-
-#define ARRAY_SIZE_ROUND_UP(n) (((n)*3)/2)
-
-static int imax(int a, int b) {
-  if (a>b) return a;
-  else return b;
-}
-
-//FIXME signed vs unsigned
-typedef struct {
-  jv_refcnt refcnt;
-  int length, alloc_length;
-  jv elements[];
-} jvp_array;
-
-static jvp_array* jvp_array_ptr(jv_complex* a) {
-  return (jvp_array*)a->ptr;
-}
-
-static jvp_array* jvp_array_alloc(unsigned size) {
-  jvp_array* a = malloc(sizeof(jvp_array) + sizeof(jv) * size);
-  a->refcnt.count = 1;
-  a->length = 0;
-  a->alloc_length = size;
-  return a;
-}
-
-static jv_complex jvp_array_new(unsigned size) {
-  jv_complex r = {&jvp_array_alloc(size)->refcnt, {0, 0}};
-  return r;
-}
-
-static void jvp_array_free(jv_complex* a) {
-  if (jvp_refcnt_dec(a)) {
-    jvp_array* array = jvp_array_ptr(a);
-    for (int i=0; i<array->length; i++) {
-      jv_free(array->elements[i]);
-    }
-    free(array);
-  }
-}
-
-static int jvp_array_length(jv_complex* a) {
-  return a->i[1] - a->i[0];
-}
-
-static jv* jvp_array_read(jv_complex* a, int i) {
-  if (i >= 0 && i < jvp_array_length(a)) {
-    jvp_array* array = jvp_array_ptr(a);
-    assert(i + a->i[0] < array->length);
-    return &array->elements[i + a->i[0]];
-  } else {
-    return 0;
-  }
-}
-
-static jv* jvp_array_write(jv_complex* a, int i) {
-  assert(i >= 0);
-  jvp_array* array = jvp_array_ptr(a);
-
-  int pos = i + a->i[0];
-  if (pos < array->alloc_length) {
-    // maybe we can update it in-place
-    // FIXME: this "optimisation" can cause circular references
-    #if 0
-    int can_write_past_end = 
-      array->length <= pos && /* the end of this array has never been used */
-      a->i[1] == array->length; /* the current slice sees the end of the array */
-    #endif
-    int can_write_past_end = 0;
-    if (can_write_past_end || jvp_refcnt_unshared(a)) {
-      // extend the array
-      for (int j = array->length; j <= pos; j++) {
-        array->elements[j] = JV_NULL;
-      }
-      array->length = imax(pos + 1, array->length);
-      a->i[1] = imax(pos + 1, array->length);
-      return &array->elements[pos];
-    }
-  }
-  
-  
-  int new_length = imax(i + 1, jvp_array_length(a));
-  jvp_array* new_array = jvp_array_alloc(ARRAY_SIZE_ROUND_UP(new_length));
-  int j;
-  for (j = 0; j < jvp_array_length(a); j++) {
-    new_array->elements[j] = jv_copy(array->elements[j + a->i[0]]);
-  }
-  for (; j < new_length; j++) {
-    new_array->elements[j] = JV_NULL;
-  }
-  new_array->length = new_length;
-  jvp_array_free(a);
-  a->ptr = &new_array->refcnt;
-  a->i[0] = 0;
-  a->i[1] = new_length;
-  return &new_array->elements[i];
-}
-
-static int jvp_array_equal(jv_complex* a, jv_complex* b) {
-  if (jvp_array_length(a) != jvp_array_length(b)) 
-    return 0;
-  if (jvp_array_ptr(a) == jvp_array_ptr(b) &&
-      a->i[0] == b->i[0]) 
-    return 1;
-  for (int i=0; i<jvp_array_length(a); i++) {
-    if (!jv_equal(jv_copy(*jvp_array_read(a, i)), 
-                  jv_copy(*jvp_array_read(b,i))))
-      return 0;
-  }
-  return 1;
-}
-
-static jv_complex jvp_array_slice(jv_complex* a, int start, int end) {
-  // FIXME: maybe slice should reallocate if the slice is small enough
-  assert(start <= end);
-  jvp_array* array = jvp_array_ptr(a);
-  assert(a->i[1] + end < array->length);
-  jv_complex slice = *a;
-  slice.i[0] += start;
-  slice.i[1] = slice.i[0] + (end - start);
-  return slice;
-}
-
-/*
- * Arrays (public interface)
- */
-
-jv jv_array_sized(int n) {
-  jv j;
-  j.kind = JV_KIND_ARRAY;
-  j.val.complex = jvp_array_new(n);
-  return j;
-}
-
-jv jv_array() {
-  return jv_array_sized(16);
-}
-
-int jv_array_length(jv j) {
-  assert(jv_get_kind(j) == JV_KIND_ARRAY);
-  int len = jvp_array_length(&j.val.complex);
-  jv_free(j);
-  return len;
-}
-
-jv jv_array_get(jv j, int idx) {
-  assert(jv_get_kind(j) == JV_KIND_ARRAY);
-  jv* slot = jvp_array_read(&j.val.complex, idx);
-  jv val;
-  if (slot) {
-    val = jv_copy(*slot);
-  } else {
-    val = jv_invalid();
-  }
-  jv_free(j);
-  return val;
-}
-
-jv jv_array_set(jv j, int idx, jv val) {
-  assert(jv_get_kind(j) == JV_KIND_ARRAY);
-  // copy/free of val,j coalesced
-  jv* slot = jvp_array_write(&j.val.complex, idx);
-  jv_free(*slot);
-  *slot = val;
-  return j;
-}
-
-jv jv_array_append(jv j, jv val) {
-  // copy/free of val,j coalesced
-  return jv_array_set(j, jv_array_length(jv_copy(j)), val);
-}
-
-jv jv_array_concat(jv a, jv b) {
-  assert(jv_get_kind(a) == JV_KIND_ARRAY);
-  assert(jv_get_kind(b) == JV_KIND_ARRAY);
-
-  // FIXME: could be much faster
-  for (int i=0; i<jv_array_length(jv_copy(b)); i++) {
-    a = jv_array_append(a, jv_array_get(jv_copy(b), i));
-  }
-  jv_free(b);
-  return a;
-}
-
-jv jv_array_slice(jv a, int start, int end) {
-  assert(jv_get_kind(a) == JV_KIND_ARRAY);
-  // copy/free of a coalesced
-  a.val.complex = jvp_array_slice(&a.val.complex, start, end);
-  return a;
-}
-
-
-/*
- * Strings (internal helpers)
- */
-
-typedef struct {
-  jv_refcnt refcnt;
-  uint32_t hash;
-  // high 31 bits are length, low bit is a flag 
-  // indicating whether hash has been computed.
-  uint32_t length_hashed;
-  uint32_t alloc_length;
-  char data[];
-} jvp_string;
-
-static jvp_string* jvp_string_ptr(jv_complex* a) {
-  return (jvp_string*)a->ptr;
-}
-
-static jvp_string* jvp_string_alloc(uint32_t size) {
-  jvp_string* s = malloc(sizeof(jvp_string) + size + 1);
-  s->refcnt.count = 1;
-  s->alloc_length = size;
-  return s;
-}
-
-static jv_complex jvp_string_new(const char* data, uint32_t length) {
-  jvp_string* s = jvp_string_alloc(length);
-  s->length_hashed = length << 1;
-  memcpy(s->data, data, length);
-  s->data[length] = 0;
-  jv_complex r = {&s->refcnt, {0,0}};
-  return r;
-}
-
-static void jvp_string_free(jv_complex* s) {
-  if (jvp_refcnt_dec(s)) {
-    jvp_string* str = jvp_string_ptr(s);
-    free(str);
-  }
-}
-
-static void jvp_string_free_p(jvp_string* s) {
-  jv_complex p = {&s->refcnt,{0,0}};
-  jvp_string_free(&p);
-}
-
-static jvp_string* jvp_string_copy_p(jvp_string* s) {
-  jv_complex p = {&s->refcnt,{0,0}};
-  jvp_refcnt_inc(&p);
-  return s;
-}
-
-static uint32_t jvp_string_length(jvp_string* s) {
-  return s->length_hashed >> 1;
-}
-
-static uint32_t jvp_string_remaining_space(jvp_string* s) {
-  assert(s->alloc_length >= jvp_string_length(s));
-  uint32_t r = s->alloc_length - jvp_string_length(s);
-  return r;
-}
-
-static void jvp_string_append(jv_complex* string, const char* data, uint32_t len) {
-  jvp_string* s = jvp_string_ptr(string);
-  uint32_t currlen = jvp_string_length(s);
-    
-  if (jvp_refcnt_unshared(string) &&
-      jvp_string_remaining_space(s) >= len) {
-    // the next string fits at the end of a
-    memcpy(s->data + currlen, data, len);
-    s->data[currlen + len] = 0;
-    s->length_hashed = (currlen + len) << 1;
-  } else {
-    // allocate a bigger buffer and copy
-    uint32_t allocsz = (currlen + len) * 2;
-    if (allocsz < 32) allocsz = 32;
-    jvp_string* news = jvp_string_alloc(allocsz);
-    news->length_hashed = (currlen + len) << 1;
-    memcpy(news->data, s->data, currlen);
-    memcpy(news->data + currlen, data, len);
-    news->data[currlen + len] = 0;
-    jvp_string_free(string);
-    jv_complex r = {&news->refcnt, {0,0}};
-    *string = r;
-  }
-}
-
-static const uint32_t HASH_SEED = 0x432A9843;
-
-static uint32_t rotl32 (uint32_t x, int8_t r){
-  return (x << r) | (x >> (32 - r));
-}
-
-static uint32_t jvp_string_hash(jvp_string* str) {
-  if (str->length_hashed & 1) 
-    return str->hash;
-
-  /* The following is based on MurmurHash3.
-     MurmurHash3 was written by Austin Appleby, and is placed
-     in the public domain. */
-
-  const uint8_t* data = (const uint8_t*)str->data;
-  int len = (int)jvp_string_length(str);
-  const int nblocks = len / 4;
-
-  uint32_t h1 = HASH_SEED;
-
-  const uint32_t c1 = 0xcc9e2d51;
-  const uint32_t c2 = 0x1b873593;
-  const uint32_t* blocks = (const uint32_t *)(data + nblocks*4);
-
-  for(int i = -nblocks; i; i++) {
-    uint32_t k1 = blocks[i]; //FIXME: endianness/alignment
-    
-    k1 *= c1;
-    k1 = rotl32(k1,15);
-    k1 *= c2;
-    
-    h1 ^= k1;
-    h1 = rotl32(h1,13); 
-    h1 = h1*5+0xe6546b64;
-  }
-
-  const uint8_t* tail = (const uint8_t*)(data + nblocks*4);
-
-  uint32_t k1 = 0;
-
-  switch(len & 3) {
-  case 3: k1 ^= tail[2] << 16;
-  case 2: k1 ^= tail[1] << 8;
-  case 1: k1 ^= tail[0];
-          k1 *= c1; k1 = rotl32(k1,15); k1 *= c2; h1 ^= k1;
-  }
-
-  h1 ^= len;
-
-  h1 ^= h1 >> 16;
-  h1 *= 0x85ebca6b;
-  h1 ^= h1 >> 13;
-  h1 *= 0xc2b2ae35;
-  h1 ^= h1 >> 16;
-
-  str->length_hashed |= 1;
-  str->hash = h1;
-
-  return h1;
-}
-
-static int jvp_string_equal_hashed(jvp_string* a, jvp_string* b) {
-  assert(a->length_hashed & 1);
-  assert(b->length_hashed & 1);
-  if (a == b) return 1;
-  if (a->hash != b->hash) return 0;
-  if (a->length_hashed != b->length_hashed) return 0;
-  return memcmp(a->data, b->data, jvp_string_length(a)) == 0;
-}
-
-static int jvp_string_equal(jv_complex* a, jv_complex* b) {
-  jvp_string* stra = jvp_string_ptr(a);
-  jvp_string* strb = jvp_string_ptr(b);
-  if (jvp_string_length(stra) != jvp_string_length(strb)) return 0;
-  return memcmp(stra->data, strb->data, jvp_string_length(stra)) == 0;
-}
-
-/*
- * Strings (public API)
- */
-
-jv jv_string_sized(const char* str, int len) {
-  jv j;
-  j.kind = JV_KIND_STRING;
-  j.val.complex = jvp_string_new(str, len);
-  return j;
-}
-
-jv jv_string(const char* str) {
-  return jv_string_sized(str, strlen(str));
-}
-
-int jv_string_length(jv j) {
-  assert(jv_get_kind(j) == JV_KIND_STRING);
-  int r = jvp_string_length(jvp_string_ptr(&j.val.complex));
-  jv_free(j);
-  return r;
-}
-
-uint32_t jv_string_hash(jv j) {
-  assert(jv_get_kind(j) == JV_KIND_STRING);
-  uint32_t hash = jvp_string_hash(jvp_string_ptr(&j.val.complex));
-  jv_free(j);
-  return hash;
-}
-
-const char* jv_string_value(jv j) {
-  assert(jv_get_kind(j) == JV_KIND_STRING);
-  return jvp_string_ptr(&j.val.complex)->data;
-}
-
-jv jv_string_concat(jv a, jv b) {
-  jvp_string* sb = jvp_string_ptr(&b.val.complex);
-  jvp_string_append(&a.val.complex, sb->data, jvp_string_length(sb));
-  jv_free(b);
-  return a;
-}
-
-jv jv_string_append_buf(jv a, const char* buf, int len) {
-  jvp_string_append(&a.val.complex, buf, len);
-  return a;
-}
-
-jv jv_string_append_str(jv a, const char* str) {
-  return jv_string_append_buf(a, str, strlen(str));
-}
-                        
-jv jv_string_fmt(const char* fmt, ...) {
-  int size = 1024;
-  while (1) {
-    char* buf = malloc(size);
-    va_list args;
-    va_start(args, fmt);
-    int n = vsnprintf(buf, size, fmt, args);
-    va_end(args);
-    if (n < size) {
-      jv ret = jv_string_sized(buf, n);
-      free(buf);
-      return ret;
-    } else {
-      free(buf);
-      size = n * 2;
-    }
-  }
-}
-
-/*
- * Objects (internal helpers)
- */
-
-struct object_slot {
-  int next;
-  jvp_string* string;
-  uint32_t hash;
-  jv value;
-};
-
-typedef struct {
-  jv_refcnt refcnt;
-  int first_free;
-  struct object_slot elements[];
-} jvp_object;
-
-
-/* warning: complex justification of alignment */
-static jv_complex jvp_object_new(int size) {
-  // Allocates an object of (size) slots and (size*2) hash buckets.
-
-  // size must be a power of two
-  assert(size > 0 && (size & (size - 1)) == 0);
-  jvp_object* obj = malloc(sizeof(jvp_object) + 
-                           sizeof(struct object_slot) * size +
-                           sizeof(int) * (size * 2));
-  obj->refcnt.count = 1;
-  for (int i=0; i<size; i++) {
-    obj->elements[i].next = i - 1;
-    obj->elements[i].string = 0;
-    obj->elements[i].hash = 0;
-    obj->elements[i].value = JV_NULL;
-  }
-  obj->first_free = size - 1;
-  int* hashbuckets = (int*)(&obj->elements[size]);
-  jv_complex r = {&obj->refcnt, 
-                  {size*2 - 1, (char*)hashbuckets - (char*)obj}};
-  for (int i=0; i<size*2; i++) {
-    hashbuckets[i] = -1;
-  }
-  return r;
-}
-
-static jvp_object* jvp_object_ptr(jv_complex* o) {
-  return (jvp_object*)o->ptr;
-}
-
-static uint32_t jvp_object_mask(jv_complex* o) {
-  return o->i[0];
-}
-
-static int jvp_object_size(jv_complex* o) {
-  return (o->i[0] + 1) >> 1;
-}
-
-static int* jvp_object_buckets(jv_complex* o) {
-  int* buckets = (int*)((char*)o->ptr + o->i[1]);
-  assert(buckets == (int*)&jvp_object_ptr(o)->elements[jvp_object_size(o)]);
-  return buckets;
-}
-
-static int* jvp_object_find_bucket(jv_complex* object, jvp_string* key) {
-  return jvp_object_buckets(object) + (jvp_object_mask(object) & jvp_string_hash(key));
-}
-
-static struct object_slot* jvp_object_get_slot(jv_complex* object, int slot) {
-  assert(slot == -1 || (slot >= 0 && slot < jvp_object_size(object)));
-  if (slot == -1) return 0;
-  else return &jvp_object_ptr(object)->elements[slot];
-}
-
-static struct object_slot* jvp_object_next_slot(jv_complex* object, struct object_slot* slot) {
-  return jvp_object_get_slot(object, slot->next);
-}
-
-static struct object_slot* jvp_object_find_slot(jv_complex* object, jvp_string* keystr, int* bucket) {
-  for (struct object_slot* curr = jvp_object_get_slot(object, *bucket); 
-       curr; 
-       curr = jvp_object_next_slot(object, curr)) {
-    if (jvp_string_equal_hashed(keystr, curr->string)) {
-      return curr;
-    }
-  }
-  return 0;
-}
-
-static struct object_slot* jvp_object_add_slot(jv_complex* object, jvp_string* key, int* bucket) {
-  jvp_object* o = jvp_object_ptr(object);
-  int newslot_idx = o->first_free;
-  struct object_slot* newslot = jvp_object_get_slot(object, newslot_idx);
-  if (newslot == 0) return 0;
-  o->first_free = newslot->next;
-  newslot->next = *bucket;
-  *bucket = newslot_idx;
-  newslot->hash = jvp_string_hash(key);
-  newslot->string = key;
-  return newslot;
-}
-
-static void jvp_object_free_slot(jv_complex* object, struct object_slot* slot) {
-  jvp_object* o = jvp_object_ptr(object);
-  slot->next = o->first_free;
-  assert(slot->string);
-  jvp_string_free_p(slot->string);
-  slot->string = 0;
-  jv_free(slot->value);
-  o->first_free = slot - jvp_object_get_slot(object, 0);
-}
-
-static jv* jvp_object_read(jv_complex* object, jvp_string* key) {
-  int* bucket = jvp_object_find_bucket(object, key);
-  struct object_slot* slot = jvp_object_find_slot(object, key, bucket);
-  if (slot == 0) return 0;
-  else return &slot->value;
-}
-
-static void jvp_object_free(jv_complex* o) {
-  if (jvp_refcnt_dec(o)) {
-    for (int i=0; i<jvp_object_size(o); i++) {
-      struct object_slot* slot = jvp_object_get_slot(o, i);
-      if (slot->string) {
-        jvp_string_free_p(slot->string);
-        jv_free(slot->value);
-      }
-    }
-    free(jvp_object_ptr(o));
-  }
-}
-
-static void jvp_object_rehash(jv_complex* object) {
-  assert(jvp_refcnt_unshared(object));
-  int size = jvp_object_size(object);
-  jv_complex new_object = jvp_object_new(size * 2);
-  for (int i=0; i<size; i++) {
-    struct object_slot* slot = jvp_object_get_slot(object, i);
-    if (!slot->string) continue;
-    
-    int* new_bucket = jvp_object_find_bucket(&new_object, slot->string);
-    assert(!jvp_object_find_slot(&new_object, slot->string, new_bucket));
-    struct object_slot* new_slot = jvp_object_add_slot(&new_object, slot->string, new_bucket);
-    assert(new_slot);
-    new_slot->value = slot->value;
-  }
-  // references are transported, just drop the old table
-  free(jvp_object_ptr(object));
-  *object = new_object;
-}
-
-static void jvp_object_unshare(jv_complex* object) {
-  if (jvp_refcnt_unshared(object))
-    return;
-
-  jv_complex new_object = jvp_object_new(jvp_object_size(object));
-  jvp_object_ptr(&new_object)->first_free = jvp_object_ptr(object)->first_free;
-  for (int i=0; i<jvp_object_size(&new_object); i++) {
-    struct object_slot* old_slot = jvp_object_get_slot(object, i);
-    struct object_slot* new_slot = jvp_object_get_slot(&new_object, i);
-    *new_slot = *old_slot;
-    if (old_slot->string) {
-      new_slot->string = jvp_string_copy_p(old_slot->string);
-      new_slot->value = jv_copy(old_slot->value);
-    }
-  }
-
-  int* old_buckets = jvp_object_buckets(object);
-  int* new_buckets = jvp_object_buckets(&new_object);
-  memcpy(new_buckets, old_buckets, sizeof(int) * jvp_object_size(&new_object)*2);
-
-  jvp_object_free(object);
-  *object = new_object;
-  assert(jvp_refcnt_unshared(object));
-}
-
-static jv* jvp_object_write(jv_complex* object, jvp_string* key) {
-  jvp_object_unshare(object);
-  int* bucket = jvp_object_find_bucket(object, key);
-  struct object_slot* slot = jvp_object_find_slot(object, key, bucket);
-  if (slot) {
-    // already has the key
-    jvp_string_free_p(key);
-    return &slot->value;
-  }
-  slot = jvp_object_add_slot(object, key, bucket);
-  if (slot) {
-    slot->value = jv_invalid();
-  } else {
-    jvp_object_rehash(object);
-    bucket = jvp_object_find_bucket(object, key);
-    assert(!jvp_object_find_slot(object, key, bucket));
-    slot = jvp_object_add_slot(object, key, bucket);
-    assert(slot);
-    slot->value = jv_invalid();
-  }
-  return &slot->value;
-}
-
-static int jvp_object_delete(jv_complex* object, jvp_string* key) {
-  jvp_object_unshare(object);
-  int* bucket = jvp_object_find_bucket(object, key);
-  int* prev_ptr = bucket;
-  for (struct object_slot* curr = jvp_object_get_slot(object, *bucket); 
-       curr; 
-       curr = jvp_object_next_slot(object, curr)) {
-    if (jvp_string_equal_hashed(key, curr->string)) {
-      *prev_ptr = curr->next;
-      jvp_object_free_slot(object, curr);
-      return 1;
-    }
-    prev_ptr = &curr->next;
-  }
-  return 0;
-}
-
-static int jvp_object_length(jv_complex* object) {
-  int n = 0;
-  for (int i=0; i<jvp_object_size(object); i++) {
-    struct object_slot* slot = jvp_object_get_slot(object, i);
-    if (slot->string) n++;
-  }
-  return n;
-}
-
-static int jvp_object_equal(jv_complex* o1, jv_complex* o2) {
-  int len2 = jvp_object_length(o2);
-  int len1 = 0;
-  for (int i=0; i<jvp_object_size(o1); i++) {
-    struct object_slot* slot = jvp_object_get_slot(o1, i);
-    if (!slot->string) continue;
-    jv* slot2 = jvp_object_read(o2, slot->string);
-    if (!slot2) return 0;
-    // FIXME: do less refcounting here
-    if (!jv_equal(jv_copy(slot->value), jv_copy(*slot2))) return 0;
-    len1++;
-  }
-  return len1 == len2;
-}
-
-/*
- * Objects (public interface)
- */
-#define DEFAULT_OBJECT_SIZE 8
-jv jv_object() {
-  jv j;
-  j.kind = JV_KIND_OBJECT;
-  j.val.complex = jvp_object_new(8);
-  return j;
-}
-
-jv jv_object_get(jv object, jv key) {
-  assert(jv_get_kind(object) == JV_KIND_OBJECT);
-  assert(jv_get_kind(key) == JV_KIND_STRING);
-  jv* slot = jvp_object_read(&object.val.complex, jvp_string_ptr(&key.val.complex));
-  jv val;
-  if (slot) {
-    val = jv_copy(*slot);
-  } else {
-    val = jv_invalid();
-  }
-  jv_free(object);
-  jv_free(key);
-  return val;
-}
-
-jv jv_object_set(jv object, jv key, jv value) {
-  assert(jv_get_kind(object) == JV_KIND_OBJECT);
-  assert(jv_get_kind(key) == JV_KIND_STRING);
-  // copy/free of object, key, value coalesced
-  jv* slot = jvp_object_write(&object.val.complex, jvp_string_ptr(&key.val.complex));
-  jv_free(*slot);
-  *slot = value;
-  return object;
-}
-
-jv jv_object_delete(jv object, jv key) {
-  assert(jv_get_kind(object) == JV_KIND_OBJECT);
-  assert(jv_get_kind(key) == JV_KIND_STRING);
-  jvp_object_delete(&object.val.complex, jvp_string_ptr(&key.val.complex));
-  jv_free(key);
-  return object;
-}
-
-int jv_object_length(jv object) {
-  assert(jv_get_kind(object) == JV_KIND_OBJECT);
-  int n = jvp_object_length(&object.val.complex);
-  jv_free(object);
-  return n;
-}
-
-jv jv_object_merge(jv a, jv b) {
-  assert(jv_get_kind(a) == JV_KIND_OBJECT);
-  jv_object_foreach(i, b) {
-    a = jv_object_set(a, 
-                      jv_object_iter_key(b, i),
-                      jv_object_iter_value(b, i));
-  }
-  jv_free(b);
-  return a;
-}
-
-/*
- * Object iteration (internal helpers)
- */
-
-enum { ITER_FINISHED = -2 };
-
-int jv_object_iter_valid(jv object, int i) {
-  return i != ITER_FINISHED;
-}
-
-int jv_object_iter(jv object) {
-  assert(jv_get_kind(object) == JV_KIND_OBJECT);
-  return jv_object_iter_next(object, -1);
-}
-
-int jv_object_iter_next(jv object, int iter) {
-  assert(jv_get_kind(object) == JV_KIND_OBJECT);
-  assert(iter != ITER_FINISHED);
-  jv_complex* o = &object.val.complex;
-  struct object_slot* slot;
-  do {
-    iter++;
-    if (iter >= jvp_object_size(o)) 
-      return ITER_FINISHED;
-    slot = jvp_object_get_slot(o, iter);
-  } while (!slot->string);
-  return iter;
-}
-
-jv jv_object_iter_key(jv object, int iter) {
-  jvp_string* s = jvp_object_get_slot(&object.val.complex, iter)->string;
-  assert(s);
-  jv j;
-  j.kind = JV_KIND_STRING;
-  j.val.complex.ptr = &s->refcnt;
-  j.val.complex.i[0] = 0;
-  j.val.complex.i[1] = 0;
-  return jv_copy(j);
-}
-
-jv jv_object_iter_value(jv object, int iter) {
-  return jv_copy(jvp_object_get_slot(&object.val.complex, iter)->value);
-}
-
-/*
- * Memory management
- */
-jv jv_copy(jv j) {
-  if (jv_get_kind(j) == JV_KIND_ARRAY || 
-      jv_get_kind(j) == JV_KIND_STRING || 
-      jv_get_kind(j) == JV_KIND_OBJECT ||
-      jv_get_kind(j) == JV_KIND_INVALID) {
-    jvp_refcnt_inc(&j.val.complex);
-  }
-  return j;
-}
-
-void jv_free(jv j) {
-  if (jv_get_kind(j) == JV_KIND_ARRAY) {
-    jvp_array_free(&j.val.complex);
-  } else if (jv_get_kind(j) == JV_KIND_STRING) {
-    jvp_string_free(&j.val.complex);
-  } else if (jv_get_kind(j) == JV_KIND_OBJECT) {
-    jvp_object_free(&j.val.complex);
-  } else if (jv_get_kind(j) == JV_KIND_INVALID) {
-    jvp_invalid_free(&j.val.complex);
-  }
-}
-
-int jv_get_refcnt(jv j) {
-  switch (jv_get_kind(j)) {
-  case JV_KIND_ARRAY:
-  case JV_KIND_STRING:
-  case JV_KIND_OBJECT:
-    return j.val.complex.ptr->count;
-  default:
-    return 1;
-  }
-}
-
-/*
- * Higher-level operations
- */
-
-int jv_equal(jv a, jv b) {
-  int r;
-  if (jv_get_kind(a) != jv_get_kind(b)) {
-    r = 0;
-  } else if (jv_get_kind(a) == JV_KIND_NUMBER) {
-    r = jv_number_value(a) == jv_number_value(b);
-  } else if (a.val.complex.ptr == b.val.complex.ptr &&
-             a.val.complex.i[0] == b.val.complex.i[0] &&
-             a.val.complex.i[1] == b.val.complex.i[1]) {
-    r = 1;
-  } else {
-    switch (jv_get_kind(a)) {
-    case JV_KIND_ARRAY:
-      r = jvp_array_equal(&a.val.complex, &b.val.complex);
-      break;
-    case JV_KIND_STRING:
-      r = jvp_string_equal(&a.val.complex, &b.val.complex);
-      break;
-    case JV_KIND_OBJECT:
-      r = jvp_object_equal(&a.val.complex, &b.val.complex);
-      break;
-    default:
-      r = 1;
-      break;
-    }
-  }
-  jv_free(a);
-  jv_free(b);
-  return r;
-}

jv.h

@@ -1,206 +0,0 @@
-#ifndef JV_H
-#define JV_H
-
-#include <stdint.h>
-#include <assert.h>
-#include <stddef.h>
-
-
-
-typedef enum {
-  JV_KIND_INVALID,
-  JV_KIND_NULL,
-  JV_KIND_FALSE,
-  JV_KIND_TRUE,
-  JV_KIND_NUMBER,
-  JV_KIND_STRING,
-  JV_KIND_ARRAY,
-  JV_KIND_OBJECT
-} jv_kind;
-
-typedef struct {
-  size_t count;
-} jv_refcnt;
-
-typedef struct{
-  jv_refcnt* ptr;
-  int i[2];
-} jv_complex;
-
-typedef struct {
-  jv_kind kind;
-  union {
-    double number;
-    jv_complex complex;
-  } val;
-} jv;
-
-/*
- * All jv_* functions consume (decref) input and produce (incref) output
- * Except jv_copy
- */
-
-jv_kind jv_get_kind(jv);
-const char* jv_kind_name(jv_kind);
-static int jv_is_valid(jv x) { return jv_get_kind(x) != JV_KIND_INVALID; }
-
-jv jv_copy(jv);
-void jv_free(jv);
-
-int jv_equal(jv, jv);
-
-jv jv_invalid();
-jv jv_invalid_with_msg(jv);
-jv jv_invalid_get_msg(jv);
-int jv_invalid_has_msg(jv);
-
-
-jv jv_null();
-jv jv_true();
-jv jv_false();
-jv jv_bool(int);
-
-jv jv_number(double);
-double jv_number_value(jv);
-
-jv jv_array();
-jv jv_array_sized(int);
-int jv_array_length(jv);
-jv jv_array_get(jv, int);
-jv jv_array_set(jv, int, jv);
-jv jv_array_append(jv, jv);
-jv jv_array_concat(jv, jv);
-jv jv_array_slice(jv, int, int);
-
-
-jv jv_string(const char*);
-jv jv_string_sized(const char*, int);
-int jv_string_length(jv);
-uint32_t jv_string_hash(jv);
-const char* jv_string_value(jv);
-jv jv_string_concat(jv, jv);
-jv jv_string_fmt(const char*, ...);
-jv jv_string_append_buf(jv a, const char* buf, int len);
-jv jv_string_append_str(jv a, const char* str);
-
-jv jv_object();
-jv jv_object_get(jv object, jv key);
-jv jv_object_set(jv object, jv key, jv value);
-jv jv_object_delete(jv object, jv key);
-int jv_object_length(jv object);
-jv jv_object_merge(jv, jv);
-
-int jv_object_iter(jv);
-int jv_object_iter_next(jv, int);
-int jv_object_iter_valid(jv, int);
-jv jv_object_iter_key(jv, int);
-jv jv_object_iter_value(jv, int);
-#define jv_object_foreach(i,t) \
-  for (int i = jv_object_iter(t);               \
-       jv_object_iter_valid(t, i);              \
-       i = jv_object_iter_next(t, i))           \
- 
-
-
-int jv_get_refcnt(jv);
-
-enum { JV_PRINT_PRETTY = 1, JV_PRINT_ASCII = 2 };
-void jv_dump(jv, int flags);
-jv jv_dump_string(jv, int flags);
-
-jv jv_parse(const char* string);
-jv jv_parse_sized(const char* string, int length);
-
-
-static jv jv_lookup(jv t, jv k) {
-  jv v;
-  if (jv_get_kind(t) == JV_KIND_OBJECT && jv_get_kind(k) == JV_KIND_STRING) {
-    v = jv_object_get(t, k);
-    if (!jv_is_valid(v)) {
-      jv_free(v);
-      v = jv_null();
-    }
-  } else if (jv_get_kind(t) == JV_KIND_ARRAY && jv_get_kind(k) == JV_KIND_NUMBER) {
-    // FIXME: don't do lookup for noninteger index
-    v = jv_array_get(t, (int)jv_number_value(k));
-    if (!jv_is_valid(v)) {
-      jv_free(v);
-      v = jv_null();
-    }
-  } else if (jv_get_kind(t) == JV_KIND_NULL && 
-             (jv_get_kind(k) == JV_KIND_STRING || jv_get_kind(k) == JV_KIND_NUMBER)) {
-    jv_free(t);
-    jv_free(k);
-    v = jv_null();
-  } else {
-    v = jv_invalid_with_msg(jv_string_fmt("Cannot index %s with %s",
-                                          jv_kind_name(jv_get_kind(t)),
-                                          jv_kind_name(jv_get_kind(k))));
-    jv_free(t);
-    jv_free(k);
-  }
-  return v;
-}
-
-static jv jv_modify(jv t, jv k, jv v) {
-  int isnull = jv_get_kind(t) == JV_KIND_NULL;
-  if (jv_get_kind(k) == JV_KIND_STRING && 
-      (jv_get_kind(t) == JV_KIND_OBJECT || isnull)) {
-    if (isnull) t = jv_object();
-    t = jv_object_set(t, k, v);
-  } else if (jv_get_kind(k) == JV_KIND_NUMBER &&
-             (jv_get_kind(t) == JV_KIND_ARRAY || isnull)) {
-    if (isnull) t = jv_array();
-    t = jv_array_set(t, (int)jv_number_value(k), v);
-  } else {
-    jv err = jv_invalid_with_msg(jv_string_fmt("Cannot update field at %s index of %s",
-                                               jv_kind_name(jv_get_kind(t)),
-                                               jv_kind_name(jv_get_kind(v))));
-    jv_free(t);
-    jv_free(k);
-    jv_free(v);
-    t = err;
-  }
-  return t;
-}
-
-static jv jv_insert(jv root, jv value, jv* path, int pathlen) {
-  if (pathlen == 0) {
-    jv_free(root);
-    return value;
-  }
-  return jv_modify(root, jv_copy(*path), 
-                   jv_insert(jv_lookup(jv_copy(root), jv_copy(*path)), value, path+1, pathlen-1));
-}
-
-
-
-
-
-
-
-
-
-#endif
-
-
-/*
-
-true/false/null:
-check kind
-
-number:
-introduce/eliminate jv
-to integer
-
-array:
-copy
-free
-slice
-index
-update
-
-updateslice?
-
-
- */

jv_parse.c

@@ -1,418 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jv.h"
-#include "jv_dtoa.h"
-#include "jv_parse.h"
-#include "jv_unicode.h"
-
-typedef const char* presult;
-
-#define TRY(x) do {presult msg__ = (x); if (msg__) return msg__; } while(0)
-#ifdef __GNUC__
-#define pfunc __attribute__((warn_unused_result)) presult
-#else
-#define pfunc presult
-#endif
-
-void jv_parser_init(struct jv_parser* p) {
-  p->stack = 0;
-  p->stacklen = p->stackpos = 0;
-  p->next = jv_invalid();
-  p->tokenbuf = 0;
-  p->tokenlen = p->tokenpos = 0;
-  p->st = JV_PARSER_NORMAL;
-  p->curr_buf = 0;
-  p->curr_buf_length = p->curr_buf_pos = p->curr_buf_is_partial = 0;
-  jvp_dtoa_context_init(&p->dtoa);
-}
-
-void jv_parser_free(struct jv_parser* p) {
-  jv_free(p->next);
-  for (int i=0; i<p->stackpos; i++) 
-    jv_free(p->stack[i]);
-  free(p->stack);
-  free(p->tokenbuf);
-  jvp_dtoa_context_free(&p->dtoa);
-}
-
-static pfunc value(struct jv_parser* p, jv val) {
-  if (jv_is_valid(p->next)) return "Expected separator between values";
-  jv_free(p->next);
-  p->next = val;
-  return 0;
-}
-
-static void push(struct jv_parser* p, jv v) {
-  assert(p->stackpos <= p->stacklen);
-  if (p->stackpos == p->stacklen) {
-    p->stacklen = p->stacklen * 2 + 10;
-    p->stack = realloc(p->stack, p->stacklen * sizeof(jv));
-  }
-  assert(p->stackpos < p->stacklen);
-  p->stack[p->stackpos++] = v;
-}
-
-static pfunc token(struct jv_parser* p, char ch) {
-  switch (ch) {
-  case '[':
-    if (jv_is_valid(p->next)) return "Expected separator between values";
-    push(p, jv_array());
-    break;
-
-  case '{':
-    if (jv_is_valid(p->next)) return "Expected separator between values";
-    push(p, jv_object());
-    break;
-
-  case ':':
-    if (!jv_is_valid(p->next)) 
-      return "Expected string key before ':'";
-    if (p->stackpos == 0 || jv_get_kind(p->stack[p->stackpos-1]) != JV_KIND_OBJECT)
-      return "':' not as part of an object";
-    if (jv_get_kind(p->next) != JV_KIND_STRING)
-      return "Object keys must be strings";
-    push(p, p->next);
-    p->next = jv_invalid();
-    break;
-
-  case ',':
-    if (!jv_is_valid(p->next))
-      return "Expected value before ','";
-    if (p->stackpos == 0)
-      return "',' not as part of an object or array";
-    if (jv_get_kind(p->stack[p->stackpos-1]) == JV_KIND_ARRAY) {
-      p->stack[p->stackpos-1] = jv_array_append(p->stack[p->stackpos-1], p->next);
-      p->next = jv_invalid();
-    } else if (jv_get_kind(p->stack[p->stackpos-1]) == JV_KIND_STRING) {
-      assert(p->stackpos > 1 && jv_get_kind(p->stack[p->stackpos-2]) == JV_KIND_OBJECT);
-      p->stack[p->stackpos-2] = jv_object_set(p->stack[p->stackpos-2], 
-                                              p->stack[p->stackpos-1], p->next);
-      p->stackpos--;
-      p->next = jv_invalid();
-    } else {
-      // this case hits on input like {"a", "b"}
-      return "Objects must consist of key:value pairs";
-    }
-    break;
-
-  case ']':
-    if (p->stackpos == 0 || jv_get_kind(p->stack[p->stackpos-1]) != JV_KIND_ARRAY)
-      return "Unmatched ']'";
-    if (jv_is_valid(p->next)) {
-      p->stack[p->stackpos-1] = jv_array_append(p->stack[p->stackpos-1], p->next);
-      p->next = jv_invalid();
-    } else {
-      if (jv_array_length(jv_copy(p->stack[p->stackpos-1])) != 0) {
-        // this case hits on input like [1,2,3,]
-        return "Expected another array element";
-      }
-    }
-    jv_free(p->next);
-    p->next = p->stack[--p->stackpos];
-    break;
-
-  case '}':
-    if (p->stackpos == 0)
-      return "Unmatched '}'";
-    if (jv_is_valid(p->next)) {
-      if (jv_get_kind(p->stack[p->stackpos-1]) != JV_KIND_STRING)
-        return "Objects must consist of key:value pairs";
-      assert(p->stackpos > 1 && jv_get_kind(p->stack[p->stackpos-2]) == JV_KIND_OBJECT);
-      p->stack[p->stackpos-2] = jv_object_set(p->stack[p->stackpos-2], 
-                                              p->stack[p->stackpos-1], p->next);
-      p->stackpos--;
-      p->next = jv_invalid();
-    } else {
-      if (jv_get_kind(p->stack[p->stackpos-1]) != JV_KIND_OBJECT)
-        return "Unmatched '}'";
-      if (jv_object_length(jv_copy(p->stack[p->stackpos-1])) != 0)
-        return "Expected another key-value pair";
-    }
-    jv_free(p->next);
-    p->next = p->stack[--p->stackpos];
-    break;
-  }
-  return 0;
-}
-
-
-static void tokenadd(struct jv_parser* p, char c) {
-  assert(p->tokenpos <= p->tokenlen);
-  if (p->tokenpos == p->tokenlen) {
-    p->tokenlen = p->tokenlen*2 + 256;
-    p->tokenbuf = realloc(p->tokenbuf, p->tokenlen);
-  }
-  assert(p->tokenpos < p->tokenlen);
-  p->tokenbuf[p->tokenpos++] = c;
-}
-
-static int unhex4(char* hex) {
-  int r = 0;
-  for (int i=0; i<4; i++) {
-    char c = *hex++;
-    int n;
-    if ('0' <= c && c <= '9') n = c - '0';
-    else if ('a' <= c && c <= 'f') n = c - 'a' + 10;
-    else if ('A' <= c && c <= 'F') n = c - 'A' + 10;
-    else return -1;
-    r <<= 4;
-    r |= n;
-  }
-  return r;
-}
-
-static pfunc found_string(struct jv_parser* p) {
-  char* in = p->tokenbuf;
-  char* out = p->tokenbuf;
-  char* end = p->tokenbuf + p->tokenpos;
-  
-  while (in < end) {
-    char c = *in++;
-    if (c == '\\') {
-      if (in >= end)
-        return "Expected escape character at end of string";
-      c = *in++;
-      switch (c) {
-      case '\\':
-      case '"':
-      case '/': *out++ = c;    break;
-      case 'b': *out++ = '\b'; break;
-      case 'f': *out++ = '\f'; break;
-      case 't': *out++ = '\t'; break;
-      case 'n': *out++ = '\n'; break;
-      case 'r': *out++ = '\r'; break;
-
-      case 'u':
-        /* ahh, the complicated case */
-        if (in + 4 > end)
-          return "Invalid \\uXXXX escape";
-        int hexvalue = unhex4(in);
-        if (hexvalue < 0)
-          return "Invalid characters in \\uXXXX escape";
-        unsigned long codepoint = (unsigned long)hexvalue;
-        in += 4;
-        if (0xD800 <= codepoint && codepoint <= 0xDBFF) {
-          /* who thought UTF-16 surrogate pairs were a good idea? */
-          if (in + 6 > end || in[0] != '\\' || in[1] != 'u')
-            return "Invalid \\uXXXX\\uXXXX surrogate pair escape";
-          unsigned long surrogate = unhex4(in+2);
-          if (!(0xDC00 <= surrogate && surrogate <= 0xDFFF))
-            return "Invalid \\uXXXX\\uXXXX surrogate pair escape";
-          in += 6;
-          codepoint = 0x10000 + (((codepoint - 0xD800) << 10)
-                                 |(surrogate - 0xDC00));
-        }
-        // FIXME assert valid codepoint
-        out += jvp_utf8_encode(codepoint, out);
-        break;
-
-      default:
-        return "Invalid escape";
-      }
-    } else {
-      *out++ = c;
-    }
-  }
-  TRY(value(p, jv_string_sized(p->tokenbuf, out - p->tokenbuf)));
-  p->tokenpos = 0;
-  return 0;
-}
-
-static pfunc check_literal(struct jv_parser* p) {
-  if (p->tokenpos == 0) return 0;
-
-  const char* pattern = 0;
-  int plen;
-  jv v;
-  switch (p->tokenbuf[0]) {
-  case 't': pattern = "true"; plen = 4; v = jv_true(); break;
-  case 'f': pattern = "false"; plen = 5; v = jv_false(); break;
-  case 'n': pattern = "null"; plen = 4; v = jv_null(); break;
-  }
-  if (pattern) {
-    if (p->tokenpos != plen) return "Invalid literal";
-    for (int i=0; i<plen; i++) 
-      if (p->tokenbuf[i] != pattern[i])
-        return "Invalid literal";
-    TRY(value(p, v));
-  } else {
-    // FIXME: better parser
-    p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
-    char* end = 0;
-    double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end);
-    if (end == 0 || *end != 0)
-      return "Invalid numeric literal";
-    TRY(value(p, jv_number(d)));
-  }
-  p->tokenpos = 0;
-  return 0;
-}
-
-typedef enum {
-  LITERAL,
-  WHITESPACE,
-  STRUCTURE,
-  QUOTE,
-  INVALID
-} chclass;
-
-static chclass classify(char c) {
-  switch (c) {
-  case ' ':
-  case '\t':
-  case '\r':
-  case '\n':
-    return WHITESPACE;
-  case '"':
-    return QUOTE;
-  case '[':
-  case ',':
-  case ']':
-  case '{':
-  case ':':
-  case '}':
-    return STRUCTURE;
-  default:
-    return LITERAL;
-  }
-}
-
-
-static presult OK = "output produced";
-
-static int check_done(struct jv_parser* p, jv* out) {
-  if (p->stackpos == 0 && jv_is_valid(p->next)) {
-    *out = p->next;
-    p->next = jv_invalid();
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-static pfunc scan(struct jv_parser* p, char ch, jv* out) {
-  presult answer = 0;
-  if (p->st == JV_PARSER_NORMAL) {
-    chclass cls = classify(ch);
-    if (cls != LITERAL) {
-      TRY(check_literal(p));
-      if (check_done(p, out)) answer = OK;
-    }
-    switch (cls) {
-    case LITERAL:
-      tokenadd(p, ch);
-      break;
-    case WHITESPACE:
-      break;
-    case QUOTE:
-      p->st = JV_PARSER_STRING;
-      break;
-    case STRUCTURE:
-      TRY(token(p, ch));
-      break;
-    case INVALID:
-      return "Invalid character";
-    }
-    if (check_done(p, out)) answer = OK;
-  } else {
-    if (ch == '"' && p->st == JV_PARSER_STRING) {
-      TRY(found_string(p));
-      p->st = JV_PARSER_NORMAL;
-      if (check_done(p, out)) answer = OK;
-    } else {
-      tokenadd(p, ch);
-      if (ch == '\\' && p->st == JV_PARSER_STRING) {
-        p->st = JV_PARSER_STRING_ESCAPE;
-      } else {
-        p->st = JV_PARSER_STRING;
-      }
-    }
-  }
-  return answer;
-}
-
-void jv_parser_set_buf(struct jv_parser* p, const char* buf, int length, int is_partial) {
-  assert((p->curr_buf == 0 || p->curr_buf_pos == p->curr_buf_length)
-         && "previous buffer not exhausted");
-  p->curr_buf = buf;
-  p->curr_buf_length = length;
-  p->curr_buf_pos = 0;
-  p->curr_buf_is_partial = is_partial;
-}
-
-jv jv_parser_next(struct jv_parser* p) {
-  assert(p->curr_buf && "a buffer must be provided");
-  jv value;
-  presult msg = 0;
-  while (!msg && p->curr_buf_pos < p->curr_buf_length) {
-    char ch = p->curr_buf[p->curr_buf_pos++];
-    msg = scan(p, ch, &value);
-  }
-  if (msg == OK) {
-    return value;
-  } else if (msg) {
-    return jv_invalid_with_msg(jv_string(msg));
-  } else if (p->curr_buf_is_partial) {
-    assert(p->curr_buf_pos == p->curr_buf_length);
-    // need another buffer
-    return jv_invalid();
-  } else {
-    assert(p->curr_buf_pos == p->curr_buf_length);
-    // at EOF
-    if (p->st != JV_PARSER_NORMAL) 
-      return jv_invalid_with_msg(jv_string("Unfinished string"));
-    if ((msg = check_literal(p)))
-      return jv_invalid_with_msg(jv_string(msg));
-    if (p->stackpos != 0)
-      return jv_invalid_with_msg(jv_string("Unfinished JSON term"));
-    // p->next is either invalid (nothing here but no syntax error)
-    // or valid (this is the value). either way it's the thing to return
-    value = p->next;
-    p->next = jv_invalid();
-    return value;
-  }
-}
-
-jv jv_parse_sized(const char* string, int length) {
-  struct jv_parser parser;
-  jv_parser_init(&parser);
-  jv_parser_set_buf(&parser, string, length, 0);
-  jv value = jv_parser_next(&parser);
-  if (jv_is_valid(value)) {
-    jv next = jv_parser_next(&parser);
-    if (jv_is_valid(next)) {
-      // multiple JSON values, we only wanted one
-      jv_free(value);
-      jv_free(next);
-      value = jv_invalid_with_msg(jv_string("Unexpected extra JSON values"));
-    } else if (jv_invalid_has_msg(jv_copy(next))) {
-      // parser error after the first JSON value
-      jv_free(value);
-      value = next;
-    } else {
-      // a single valid JSON value
-      jv_free(next);
-    }
-  } else if (jv_invalid_has_msg(jv_copy(value))) {
-    // parse error, we'll return it
-  } else {
-    // no value at all
-    jv_free(value);
-    value = jv_invalid_with_msg(jv_string("Expected JSON value"));
-  }
-  jv_parser_free(&parser);
-
-  if (!jv_is_valid(value) && jv_invalid_has_msg(jv_copy(value))) {
-    jv msg = jv_invalid_get_msg(value);
-    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%s')",
-                                              jv_string_value(msg),
-                                              string));
-    jv_free(msg);
-  }
-  return value;
-}
-
-jv jv_parse(const char* string) {
-  return jv_parse_sized(string, strlen(string));
-}

jv_parse.h

@@ -1,34 +0,0 @@
-#ifndef JV_PARSE_H
-#define JV_PARSE_H
-#include "jv_dtoa.h"
-struct jv_parser {
-  const char* curr_buf;
-  int curr_buf_length;
-  int curr_buf_pos;
-  int curr_buf_is_partial;
-
-  jv* stack;
-  int stackpos;
-  int stacklen;
-  jv next;
-  
-  char* tokenbuf;
-  int tokenpos;
-  int tokenlen;
-  
-  struct dtoa_context dtoa;
-
-  enum {
-    JV_PARSER_NORMAL,
-    JV_PARSER_STRING,
-    JV_PARSER_STRING_ESCAPE
-  } st;
-};
-
-void jv_parser_init(struct jv_parser* p);
-void jv_parser_free(struct jv_parser* p);
-
-void jv_parser_set_buf(struct jv_parser* p, const char* buf, int length, int is_partial);
-
-jv jv_parser_next(struct jv_parser* p);
-#endif

jv_print.c

@@ -1,208 +0,0 @@
-#include "jv.h"
-#include <stdio.h>
-#include <float.h>
-#include <string.h>
-
-#include "jv_dtoa.h"
-#include "jv_unicode.h"
-
-static void put_buf(const char* s, int len, FILE* fout, jv* strout) {
-  if (strout) {
-    *strout = jv_string_append_buf(*strout, s, len);
-  } else {
-    fwrite(s, 1, len, fout);
-  }
-}
-
-static void put_char(char c, FILE* fout, jv* strout) {
-  put_buf(&c, 1, fout, strout);
-}
-
-static void put_str(const char* s, FILE* fout, jv* strout) {
-  put_buf(s, strlen(s), fout, strout);
-}
-
-static void put_space(int n, FILE* fout, jv* strout) {
-  while (n--) {
-    put_char(' ', fout, strout);
-  }
-}
-
-static void jvp_dump_string(jv str, int ascii_only, FILE* F, jv* S) {
-  assert(jv_get_kind(str) == JV_KIND_STRING);
-  const char* i = jv_string_value(str);
-  const char* end = i + jv_string_length(jv_copy(str));
-  const char* cstart;
-  int c = 0;
-  char buf[32];
-  while ((i = jvp_utf8_next((cstart = i), end, &c))) {
-    assert(c != -1);
-    int unicode_escape = 0;
-    if (0x20 <= c && c <= 0x7E) {
-      // printable ASCII
-      if (c == '"' || c == '\\') {
-        put_char('\\', F, S);
-      }
-      put_char(c, F, S);
-    } else if (c < 0x20 || c == 0x7F) {
-      // ASCII control character
-      switch (c) {
-      case '\b':
-        put_char('\\', F, S);
-        put_char('b', F, S);
-        break;
-      case '\t':
-        put_char('\\', F, S);
-        put_char('t', F, S);
-        break;
-      case '\r':
-        put_char('\\', F, S);
-        put_char('r', F, S);
-        break;
-      case '\n':
-        put_char('\\', F, S);
-        put_char('n', F, S);
-        break;
-      case '\f':
-        put_char('\\', F, S);
-        put_char('f', F, S);
-        break;
-      default:
-        unicode_escape = 1;
-        break;
-      }
-    } else {
-      if (ascii_only) {
-        unicode_escape = 1;
-      } else {
-        put_buf(cstart, i - cstart, F, S);
-      }
-    }
-    if (unicode_escape) {
-      if (c <= 0xffff) {
-        sprintf(buf, "\\u%04x", c);
-      } else {
-        c -= 0x10000;
-        sprintf(buf, "\\u%04x\\u%04x", 
-                0xD800 | ((c & 0xffc00) >> 10),
-                0xDC00 | (c & 0x003ff));
-      }
-      put_str(buf, F, S);
-    }
-  }
-  assert(c != -1);
-}
-
-enum { INDENT = 2 };
-
-static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FILE* F, jv* S) {
-  char buf[JVP_DTOA_FMT_MAX_LEN];
-  switch (jv_get_kind(x)) {
-  case JV_KIND_INVALID:
-    assert(0 && "Invalid value");
-    break;
-  case JV_KIND_NULL:
-    put_str("null", F, S);
-    break;
-  case JV_KIND_FALSE:
-    put_str("false", F, S);
-    break;
-  case JV_KIND_TRUE:
-    put_str("true", F, S);
-    break;
-  case JV_KIND_NUMBER: {
-    double d = jv_number_value(x);
-    if (d != d) {
-      // JSON doesn't have NaN, so we'll render it as "null"
-      put_str("null", F, S);
-    } else {
-      // Normalise infinities to something we can print in valid JSON
-      if (d > DBL_MAX) d = DBL_MAX;
-      if (d < -DBL_MAX) d = -DBL_MAX;
-      put_str(jvp_dtoa_fmt(C, buf, d), F, S);
-    }
-    break;
-  }
-  case JV_KIND_STRING:
-    put_char('"', F, S);
-    jvp_dump_string(x, flags & JV_PRINT_ASCII, F, S);
-    put_char('"', F, S);
-    break;
-  case JV_KIND_ARRAY: {
-    if (jv_array_length(jv_copy(x)) == 0) {
-      put_str("[]", F, S);
-      break;
-    }
-    put_str("[", F, S);
-    if (flags & JV_PRINT_PRETTY) {
-      put_char('\n', F, S);
-      put_space(indent+INDENT, F, S);
-    }
-    for (int i=0; i<jv_array_length(jv_copy(x)); i++) {
-      if (i!=0) {
-        if (flags & JV_PRINT_PRETTY) {
-          put_str(",\n", F, S);
-          put_space(indent+INDENT, F, S);
-        } else {
-          put_str(", ", F, S);
-        }
-      }
-      jv_dump_term(C, jv_array_get(jv_copy(x), i), flags, indent + INDENT, F, S);
-    }
-    if (flags & JV_PRINT_PRETTY) {
-      put_char('\n', F, S);
-      put_space(indent, F, S);
-    }
-    put_char(']', F, S);
-    break;
-  }
-  case JV_KIND_OBJECT: {
-    if (jv_object_length(jv_copy(x)) == 0) {
-      put_str("{}", F, S);
-      break;
-    }
-    put_char('{', F, S);
-    if (flags & JV_PRINT_PRETTY) {
-      put_char('\n', F, S);
-      put_space(indent+INDENT, F, S);
-    }
-    int first = 1;
-    jv_object_foreach(i, x) {
-      if (!first) {
-        if (flags & JV_PRINT_PRETTY){
-          put_str(",\n", F, S);
-          put_space(indent+INDENT, F, S);
-        } else {
-          put_str(", ", F, S);
-        }
-      }
-      first = 0;
-      jv_dump_term(C, jv_object_iter_key(x, i), flags, indent + INDENT, F, S);
-      put_str(": ", F, S);
-      jv_dump_term(C, jv_object_iter_value(x, i), flags, indent + INDENT, F, S);
-    }
-    if (flags & JV_PRINT_PRETTY) {
-      put_char('\n', F, S);
-      put_space(indent, F, S);
-    }
-    put_char('}', F, S);
-  }
-  }
-  jv_free(x);
-}
-
-void jv_dump(jv x, int flags) {
-  struct dtoa_context C;
-  jvp_dtoa_context_init(&C);
-  jv_dump_term(&C, x, flags, 0, stdout, 0);
-  jvp_dtoa_context_free(&C);
-}
-
-jv jv_dump_string(jv x, int flags) {
-  struct dtoa_context C;
-  jvp_dtoa_context_init(&C);
-  jv s = jv_string("");
-  jv_dump_term(&C, x, flags, 0, 0, &s);
-  jvp_dtoa_context_free(&C);
-  return s;
-}

jv_unicode.c

@@ -1,64 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-#include "jv_unicode.h"
-#include "jv_utf8_tables.gen.h"
-
-const char* jvp_utf8_next(const char* in, const char* end, int* codepoint) {
-  if (in == end) {
-    codepoint = 0;
-    return 0;
-  }
-  unsigned char first = (unsigned char)in[0];
-  int length = utf8_coding_length[first];
-  if (length == 0 || length == UTF8_CONTINUATION_BYTE || in + length > end) {
-    *codepoint = -1;
-    return 0;
-  }
-  *codepoint = ((unsigned)in[0]) & utf8_coding_bits[first];
-  for (int i=1; i<length; i++) {
-    int ch = (unsigned char)in[i];
-    if (utf8_coding_length[(unsigned char)in[i]] != UTF8_CONTINUATION_BYTE){
-      *codepoint = -1;
-      return 0;
-    }
-    *codepoint = (*codepoint << 6) | (ch & 0x3f);
-  }
-  return in + length;
-}
-
-int jvp_utf8_verify(const char* in, const char* end) {
-  int codepoint = 0;
-  while ((in = jvp_utf8_next(in, end, &codepoint))) {
-    if (codepoint == -1) return 0;
-  }
-  return codepoint != -1;
-}
-
-int jvp_utf8_encode_length(int codepoint) {
-  if (codepoint <= 0x7F) return 1;
-  else if (codepoint <= 0x7FF) return 2;
-  else if (codepoint <= 0xFFFF) return 3;
-  else return 4;
-}
-
-int jvp_utf8_encode(int codepoint, char* out) {
-  assert(codepoint >= 0 && codepoint <= 0x10FFFF);
-  char* start = out;
-  if (codepoint <= 0x7F) {
-    *out++ = codepoint;
-  } else if (codepoint <= 0x7FF) {
-    *out++ = 0xC0 + ((codepoint & 0x7C0) >> 6);
-    *out++ = 0x80 + ((codepoint & 0x03F));
-  } else if(codepoint <= 0xFFFF) {
-    *out++ = 0xE0 + ((codepoint & 0xF000) >> 12);
-    *out++ = 0x80 + ((codepoint & 0x0FC0) >> 6);
-    *out++ = 0x80 + ((codepoint & 0x003F));
-  } else {
-    *out++ = 0xF0 + ((codepoint & 0x1C0000) >> 18);
-    *out++ = 0x80 + ((codepoint & 0x03F000) >> 12);
-    *out++ = 0x80 + ((codepoint & 0x000FC0) >> 6);
-    *out++ = 0x80 + ((codepoint & 0x00003F));
-  }
-  assert(out - start == jvp_utf8_encode_length(codepoint));
-  return out - start;
-}

locfile.h

@@ -1,78 +0,0 @@
-#ifndef _LOCFILE_H
-#define _LOCFILE_H
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <stdarg.h>
-typedef struct {
-  int start, end;
-} location;
-
-static const location UNKNOWN_LOCATION = {-1, -1};
-
-struct locfile {
-  const char* data;
-  int length;
-  int* linemap;
-  int nlines;
-};
-
-static void locfile_init(struct locfile* l, const char* data, int length) {
-  l->data = data;
-  l->length = length;
-  l->nlines = 1;
-  for (int i=0; i<length; i++) {
-    if (data[i] == '\n') l->nlines++;
-  }
-  l->linemap = malloc(sizeof(int) * (l->nlines + 1));
-  l->linemap[0] = 0;
-  int line = 1;
-  for (int i=0; i<length; i++) {
-    if (data[i] == '\n') {
-      l->linemap[line] = i;
-      line++;
-    }
-  }
-  l->linemap[l->nlines] = length;
-}
-
-static void locfile_free(struct locfile* l) {
-  free(l->linemap);
-}
-
-static int locfile_get_line(struct locfile* l, int pos) {
-  assert(pos < l->length);
-  int line = 0;
-  while (l->linemap[line+1] < pos) line++;
-  assert(line < l->nlines);
-  return line;
-}
-
-static int locfile_line_length(struct locfile* l, int line) {
-  assert(line < l->nlines);
-  return l->linemap[line+1] - l->linemap[line];
-}
-
-static void locfile_locate(struct locfile* l, location loc, const char* fmt, ...) {
-  va_list fmtargs;
-  va_start(fmtargs, fmt);
-  vfprintf(stderr, fmt, fmtargs);
-  va_end(fmtargs);
-  fprintf(stderr, "\n");
-  if (loc.start == -1) {
-    fprintf(stderr, "<unknown location>\n");
-    return;
-  }
-  int startline = locfile_get_line(l, loc.start);
-  int offset = l->linemap[startline];
-  fprintf(stderr, "%.*s\n", locfile_line_length(l, startline), l->data + offset);
-  fprintf(stderr, "%*s", loc.start - offset, "");
-  for (int i = loc.start; 
-       i < loc.end && i < offset + locfile_line_length(l, startline);
-       i++){
-    fprintf(stderr, "^");
-  }
-  fprintf(stderr, "\n");
-}
-
-#endif

m4/ax_compare_version.m4

@@ -0,0 +1,177 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+#   This macro compares two version strings. Due to the various number of
+#   minor-version numbers that can exist, and the fact that string
+#   comparisons are not compatible with numeric comparisons, this is not
+#   necessarily trivial to do in a autoconf script. This macro makes doing
+#   these comparisons easy.
+#
+#   The six basic comparisons are available, as well as checking equality
+#   limited to a certain number of minor-version levels.
+#
+#   The operator OP determines what type of comparison to do, and can be one
+#   of:
+#
+#    eq  - equal (test A == B)
+#    ne  - not equal (test A != B)
+#    le  - less than or equal (test A <= B)
+#    ge  - greater than or equal (test A >= B)
+#    lt  - less than (test A < B)
+#    gt  - greater than (test A > B)
+#
+#   Additionally, the eq and ne operator can have a number after it to limit
+#   the test to that number of minor versions.
+#
+#    eq0 - equal up to the length of the shorter version
+#    ne0 - not equal up to the length of the shorter version
+#    eqN - equal up to N sub-version levels
+#    neN - not equal up to N sub-version levels
+#
+#   When the condition is true, shell commands ACTION-IF-TRUE are run,
+#   otherwise shell commands ACTION-IF-FALSE are run. The environment
+#   variable 'ax_compare_version' is always set to either 'true' or 'false'
+#   as well.
+#
+#   Examples:
+#
+#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+#   would both be true.
+#
+#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+#   would both be false.
+#
+#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+#   would be true because it is only comparing two minor versions.
+#
+#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+#   would be true because it is only comparing the lesser number of minor
+#   versions of the two values.
+#
+#   Note: The characters that separate the version numbers do not matter. An
+#   empty string is the same as version 0. OP is evaluated by autoconf, not
+#   configure, so must be a string, not a variable.
+#
+#   The author would like to acknowledge Guido Draheim whose advice about
+#   the m4_case and m4_ifvaln functions make this macro only include the
+#   portions necessary to perform the specific comparison specified by the
+#   OP argument in the final configure script.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 11
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+  AC_REQUIRE([AC_PROG_AWK])
+
+  # Used to indicate true or false condition
+  ax_compare_version=false
+
+  # Convert the two version strings to be compared into a format that
+  # allows a simple string comparison.  The end result is that a version
+  # string of the form 1.12.5-r617 will be converted to the form
+  # 0001001200050617.  In other words, each number is zero padded to four
+  # digits, and non digits are removed.
+  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+                     -e 's/[[^0-9]]//g'`
+
+  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+                     -e 's/[[^0-9]]//g'`
+
+  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+  dnl # then the first line is used to determine if the condition is true.
+  dnl # The sed right after the echo is to remove any indented white space.
+  m4_case(m4_tolower($2),
+  [lt],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+  ],
+  [gt],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+  ],
+  [le],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+  ],
+  [ge],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+  ],[
+    dnl Split the operator from the subversion count if present.
+    m4_bmatch(m4_substr($2,2),
+    [0],[
+      # A count of zero means use the length of the shorter version.
+      # Determine the number of characters in A and B.
+      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+      # Set A to no more than B's length and B to no more than A's length.
+      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+    ],
+    [[0-9]+],[
+      # A count greater than zero means use only that many subversions
+      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+    ],
+    [.+],[
+      AC_WARNING(
+        [illegal OP numeric parameter: $2])
+    ],[])
+
+    # Pad zeros at end of numbers to make same length.
+    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+    B="$B`echo $A | sed 's/./0/g'`"
+    A="$ax_compare_version_tmp_A"
+
+    # Check for equality or inequality as necessary.
+    m4_case(m4_tolower(m4_substr($2,0,2)),
+    [eq],[
+      test "x$A" = "x$B" && ax_compare_version=true
+    ],
+    [ne],[
+      test "x$A" != "x$B" && ax_compare_version=true
+    ],[
+      AC_WARNING([illegal OP parameter: $2])
+    ])
+  ])
+
+  AS_VAR_POPDEF([A])dnl
+  AS_VAR_POPDEF([B])dnl
+
+  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+  if test "$ax_compare_version" = "true" ; then
+    m4_ifvaln([$4],[$4],[:])dnl
+    m4_ifvaln([$5],[else $5])dnl
+  fi
+]) dnl AX_COMPARE_VERSION

m4/ax_prog_bison_version.m4

@@ -0,0 +1,68 @@
+# ===========================================================================
+#   Modified from
+#   http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_BISON_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+#   Makes sure that bison supports the version indicated. If true the shell
+#   commands in ACTION-IF-TRUE are executed. If not the shell commands in
+#   ACTION-IF-FALSE are run. Note if $PERL is not set the macro will fail.
+#
+#   Example:
+#
+#     AC_PROG_YACC
+#     AX_PROG_BISON_VERSION([3.0.0],[ ... ],[ ... ])
+#
+#   This will check to make sure that the bison you have supports at least
+#   version 3.0.0.
+#
+#   NOTE: This macro uses the $YACC variable to perform the check.
+#   AX_WITH_YACC can be used to set that variable prior to running this
+#   macro. The $BISON_VERSION variable will be set with the detected
+#   version.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 12
+
+AC_DEFUN([AX_PROG_BISON_VERSION],[
+    AC_REQUIRE([AC_PROG_SED])
+    AC_REQUIRE([AC_PROG_GREP])
+
+    AS_IF([test -n "$YACC"],[
+        ax_bison_version="$1"
+
+        AC_MSG_CHECKING([for bison version])
+        changequote(<<,>>)
+        bison_version=`$YACC --version 2>&1 \
+          | $GREP bison \
+          | $SED -e 's/^[^0-9]*//' -e 's/[^0-9]*$//'`
+        changequote([,])
+        AC_MSG_RESULT($bison_version)
+
+	AC_SUBST([BISON_VERSION],[$bison_version])
+
+        AX_COMPARE_VERSION([$ax_bison_version],[le],[$bison_version],[
+	    :
+            $2
+        ],[
+	    :
+            $3
+        ])
+    ],[
+        AC_MSG_WARN([could not find bison])
+        $3
+    ])
+])

main.c

@@ -1,175 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include "compile.h"
-#include "builtin.h"
-#include "jv.h"
-#include "jv_parse.h"
-#include "locfile.h"
-#include "parser.h"
-#include "execute.h"
-#include "version.gen.h"
-
-static const char* progname;
-
-static void usage() {
-  fprintf(stderr, "\njq - commandline JSON processor [version %s]\n", JQ_VERSION);
-  fprintf(stderr, "Usage: %s [options] <jq filter>\n\n", progname);
-  fprintf(stderr, "For a description of the command line options and\n");
-  fprintf(stderr, "how to write jq filters (and why you might want to)\n");
-  fprintf(stderr, "see the jq documentation at http://stedolan.github.com/jq\n\n");
-  exit(1);
-}
-
-static void die() {
-  fprintf(stderr, "Use %s --help for help with command-line options,\n", progname);
-  fprintf(stderr, "or see the jq documentation at http://stedolan.github.com/jq\n");
-  exit(1);
-}
-
-
-
-
-static int isoptish(const char* text) {
-  return text[0] == '-' && (text[1] == '-' || isalpha(text[1]));
-}
-
-static int isoption(const char* text, char shortopt, const char* longopt) {
-  if (text[0] != '-') return 0;
-  if (strlen(text) == 2 && text[1] == shortopt) return 1;
-  if (text[1] == '-' && !strcmp(text+2, longopt)) return 1;
-  return 0;
-}
-
-enum {
-  SLURP = 1,
-  RAW_INPUT = 2,
-  PROVIDE_NULL = 4,
-
-  RAW_OUTPUT = 8,
-  COMPACT_OUTPUT = 16,
-  ASCII_OUTPUT = 32,
-};
-static int options = 0;
-static struct bytecode* bc;
-
-static void process(jv value) {
-  jq_init(bc, value);
-  jv result;
-  while (jv_is_valid(result = jq_next())) {
-    if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
-      fwrite(jv_string_value(result), 1, jv_string_length(jv_copy(result)), stdout);
-    } else {
-      int dumpopts = 0;
-      if (!(options & COMPACT_OUTPUT)) dumpopts |= JV_PRINT_PRETTY;
-      if (options & ASCII_OUTPUT) dumpopts |= JV_PRINT_ASCII;
-      jv_dump(result, dumpopts);
-    }
-    printf("\n");
-  }
-  jv_free(result);
-  jq_teardown();
-}
-
-int main(int argc, char* argv[]) {
-  if (argc) progname = argv[0];
-
-  const char* program = 0;
-  for (int i=1; i<argc; i++) {
-    if (!isoptish(argv[i])) {
-      if (program) usage();
-      program = argv[i];
-    } else if (isoption(argv[i], 's', "slurp")) {
-      options |= SLURP;
-    } else if (isoption(argv[i], 'r', "raw-output")) {
-      options |= RAW_OUTPUT;
-    } else if (isoption(argv[i], 'c', "compact-output")) {
-      options |= COMPACT_OUTPUT;
-    } else if (isoption(argv[i], 'a', "ascii-output")) {
-      options |= ASCII_OUTPUT;
-    } else if (isoption(argv[i], 'R', "raw-input")) {
-      options |= RAW_INPUT;
-    } else if (isoption(argv[i], 'n', "null-input")) {
-      options |= PROVIDE_NULL;
-    } else if (isoption(argv[i], 'h', "help")) {
-      usage();
-    } else if (isoption(argv[i], 'V', "version")) {
-      fprintf(stderr, "jq version %s\n", JQ_VERSION);
-      return 0;
-    } else {
-      fprintf(stderr, "%s: Unknown option %s\n", progname, argv[i]);
-      die();
-    }
-  }
-  if (!program) usage();
-
-  if ((options & PROVIDE_NULL) && (options & (RAW_INPUT | SLURP))) {
-    fprintf(stderr, "%s: --null-input cannot be used with --raw-input or --slurp\n", program);
-    die();
-  }
-
-  bc = jq_compile(program);
-  if (!bc) return 1;
-
-#if JQ_DEBUG
-  dump_disassembly(0, bc);
-  printf("\n");
-#endif
-
-  if (options & PROVIDE_NULL) {
-    process(jv_null());
-  } else {
-    jv slurped;
-    if (options & SLURP) slurped = jv_invalid();
-    int first = 1;
-    struct jv_parser parser;
-    jv_parser_init(&parser);
-    while (!feof(stdin)) {
-      char buf[4096];
-      if (!fgets(buf, sizeof(buf), stdin)) buf[0] = 0;
-      if (options & RAW_INPUT) {
-        int len = strlen(buf);
-        if (len > 0) {
-          if (options & SLURP) {
-            if (first) slurped = jv_string(buf);
-            else slurped = jv_string_concat(slurped, jv_string(buf));
-          } else {
-            if (buf[len-1] == '\n') buf[len-1] = 0;
-            process(jv_string(buf));
-          }
-        }
-      } else {
-        jv_parser_set_buf(&parser, buf, strlen(buf), !feof(stdin));
-        jv value;
-        while (jv_is_valid((value = jv_parser_next(&parser)))) {
-          if (options & SLURP) {
-            if (first) slurped = jv_array();
-            slurped = jv_array_append(slurped, value);
-          } else {
-            process(value);
-          }
-        }
-        if (jv_invalid_has_msg(jv_copy(value))) {
-          jv msg = jv_invalid_get_msg(value);
-          fprintf(stderr, "parse error: %s\n", jv_string_value(msg));
-          jv_free(msg);
-          break;
-        } else {
-          jv_free(value);
-        }
-      }
-      first = 0;
-    }
-    jv_parser_free(&parser);
-    if (options & SLURP) {
-      if (jv_is_valid(slurped)) {
-        process(slurped);
-      } else {
-        jv_free(slurped);
-      }
-    }
-  }
-
-  bytecode_free(bc);
-  return 0;
-}

opcode.c

@@ -1,33 +0,0 @@
-#include "opcode.h"
-
-// flags, length
-#define NONE 0, 1
-#define CONSTANT OP_HAS_CONSTANT, 2
-#define VARIABLE (OP_HAS_VARIABLE | OP_HAS_BINDING), 3
-#define BRANCH OP_HAS_BRANCH, 2
-#define CFUNC (OP_HAS_SYMBOL | OP_HAS_CFUNC | OP_HAS_VARIABLE_LENGTH_ARGLIST), 2
-#define UFUNC (OP_HAS_UFUNC | OP_HAS_VARIABLE_LENGTH_ARGLIST), 2
-#define CLOSURE_PARAM_IMM (OP_IS_CALL_PSEUDO | OP_HAS_BINDING), 0
-#define CLOSURE_CREATE_IMM (OP_HAS_BLOCK | OP_IS_CALL_PSEUDO | OP_HAS_BINDING), 0
-#define CLOSURE_CREATE_C_IMM (OP_IS_CALL_PSEUDO | OP_HAS_BINDING), 0
-#define CLOSURE_REF_IMM (OP_IS_CALL_PSEUDO | OP_HAS_BINDING), 2
-
-#define OP(name, imm, in, out) \
-  {name, #name, imm, in, out},
-
-static const struct opcode_description opcode_descriptions[] = {
-#include "opcode_list.h"
-};
-
-static const struct opcode_description invalid_opcode_description = {
-  -1, "#INVALID", 0, 0, 0, 0
-};
-
-
-const struct opcode_description* opcode_describe(opcode op) {
-  if ((int)op >= 0 && (int)op < NUM_OPCODES) {
-    return &opcode_descriptions[op];
-  } else {
-    return &invalid_opcode_description;
-  }
-}

opcode.h

@@ -1,48 +0,0 @@
-#ifndef OPCODE_H
-#define OPCODE_H
-#include <assert.h>
-
-typedef enum {
-#define OP(name, imm, in, out) name,
-#include "opcode_list.h"
-#undef OP
-} opcode;
-
-enum {
-  NUM_OPCODES = 
-#define OP(name, imm, in, out) +1
-#include "opcode_list.h"
-#undef OP
-};
-
-enum {
-  OP_HAS_CONSTANT = 2,
-  OP_HAS_VARIABLE = 4,
-  OP_HAS_BRANCH = 8,
-  OP_HAS_SYMBOL = 16,
-  OP_HAS_CFUNC = 32,
-  OP_HAS_UFUNC = 64,
-  OP_IS_CALL_PSEUDO = 128,
-  OP_HAS_VARIABLE_LENGTH_ARGLIST = 256,
-  OP_HAS_BLOCK = 512,
-  OP_HAS_BINDING = 1024,
-};
-struct opcode_description {
-  opcode op;
-  const char* name;
-
-  int flags;
-
-  // length in 16-bit units
-  int length;
-
-  int stack_in, stack_out;
-};
-
-const struct opcode_description* opcode_describe(opcode op);
-
-static inline int opcode_length(opcode op) {
-  return opcode_describe(op)->length;
-}
-
-#endif

opcode_list.h

@@ -1,30 +0,0 @@
-OP(LOADK, CONSTANT, 1, 1)
-OP(DUP,   NONE,     1, 2)
-OP(SWAP,  NONE,     2, 2)
-OP(POP,   NONE,     1, 0)
-OP(LOADV, VARIABLE, 1, 1)
-OP(STOREV, VARIABLE, 1, 0)
-OP(INDEX, NONE,     2, 1)
-//OP(DISPLAY, NONE,   1, 0)
-OP(YIELD, NONE, 1, 0)
-OP(EACH,  NONE,     1, 1)
-OP(FORK,  BRANCH,   0, 0)
-OP(JUMP,  BRANCH,   0, 0)
-OP(JUMP_F,BRANCH,   1, 0)
-OP(BACKTRACK, NONE, 0, 0)
-OP(APPEND, NONE,    2, 1)
-OP(INSERT, NONE,    4, 2)
-
-OP(ASSIGN, VARIABLE, 3, 0)
-
-OP(CALL_BUILTIN_1_1, CFUNC, 1, 1)
-OP(CALL_BUILTIN_2_1, CFUNC, 2, 1)
-OP(CALL_BUILTIN_3_1, CFUNC, 3, 1)
-
-OP(CALL_1_1, UFUNC, 1, 1)
-OP(RET, NONE, 1, 1)
-
-OP(CLOSURE_PARAM, CLOSURE_PARAM_IMM, 0, 0)
-OP(CLOSURE_REF, CLOSURE_REF_IMM, 0, 0)
-OP(CLOSURE_CREATE, CLOSURE_CREATE_IMM, 0, 0)
-OP(CLOSURE_CREATE_C, CLOSURE_CREATE_C_IMM, 0, 0)

parser.gen.h

@@ -1,130 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
-
-/* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* "%code requires" blocks.  */
-
-/* Line 2068 of yacc.c  */
-#line 6 "parser.y"
-
-#include "locfile.h"
-#define YYLTYPE location
-#define YYLLOC_DEFAULT(Loc, Rhs, N)             \
-  do {                                          \
-    if (N) {                                    \
-      (Loc).start = YYRHSLOC(Rhs, 1).start;     \
-      (Loc).end = YYRHSLOC(Rhs, N).end;         \
-    } else {                                    \
-      (Loc).start = YYRHSLOC(Rhs, 0).end;       \
-      (Loc).end = YYRHSLOC(Rhs, 0).end;         \
-    }                                           \
-  } while (0)
- 
-
-
-/* Line 2068 of yacc.c  */
-#line 55 "parser.gen.h"
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     INVALID_CHARACTER = 258,
-     IDENT = 259,
-     LITERAL = 260,
-     EQ = 261,
-     DEFINEDOR = 262,
-     AS = 263,
-     DEF = 264,
-     IF = 265,
-     THEN = 266,
-     ELSE = 267,
-     ELSE_IF = 268,
-     END = 269,
-     AND = 270,
-     OR = 271,
-     SETPIPE = 272,
-     SETPLUS = 273,
-     SETMINUS = 274,
-     SETMULT = 275,
-     SETDIV = 276,
-     SETDEFINEDOR = 277,
-     LESSEQ = 278,
-     GREATEREQ = 279,
-     QQSTRING_START = 280,
-     QQSTRING_TEXT = 281,
-     QQSTRING_INTERP_START = 282,
-     QQSTRING_INTERP_END = 283,
-     QQSTRING_END = 284
-   };
-#endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 2068 of yacc.c  */
-#line 24 "parser.y"
-
-  jv literal;
-  block blk;
-
-
-
-/* Line 2068 of yacc.c  */
-#line 108 "parser.gen.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-

parser.y

@@ -1,462 +0,0 @@
-%{
-#include <stdio.h>
-#include <string.h>
-#include "compile.h"
-%}
-%code requires {
-#include "locfile.h"
-#define YYLTYPE location
-#define YYLLOC_DEFAULT(Loc, Rhs, N)             \
-  do {                                          \
-    if (N) {                                    \
-      (Loc).start = YYRHSLOC(Rhs, 1).start;     \
-      (Loc).end = YYRHSLOC(Rhs, N).end;         \
-    } else {                                    \
-      (Loc).start = YYRHSLOC(Rhs, 0).end;       \
-      (Loc).end = YYRHSLOC(Rhs, 0).end;         \
-    }                                           \
-  } while (0)
- }
-
-%locations
-%error-verbose
-%define api.pure
-%union {
-  jv literal;
-  block blk;
-}
-
-%destructor { jv_free($$); } <literal>
-%destructor { block_free($$); } <blk>
-
-%parse-param {block* answer}
-%parse-param {int* errors}
-%parse-param {struct locfile* locations}
-%parse-param {yyscan_t lexer}
-%lex-param {block* answer}
-%lex-param {int* errors}
-%lex-param {struct locfile* locations}
-%lex-param {yyscan_t lexer}
-
-
-%token INVALID_CHARACTER
-%token <literal> IDENT
-%token <literal> LITERAL
-%token EQ "=="
-%token DEFINEDOR "//"
-%token AS "as"
-%token DEF "def"
-%token IF "if"
-%token THEN "then"
-%token ELSE "else"
-%token ELSE_IF "elif"
-%token END "end"
-%token AND "and"
-%token OR "or"
-%token SETPIPE "|="
-%token SETPLUS "+="
-%token SETMINUS "-="
-%token SETMULT "*="
-%token SETDIV "/="
-%token SETDEFINEDOR "//="
-%token LESSEQ "<="
-%token GREATEREQ ">="
-
-%token QQSTRING_START
-%token <literal> QQSTRING_TEXT
-%token QQSTRING_INTERP_START
-%token QQSTRING_INTERP_END
-%token QQSTRING_END
-
- /* revolting hack */
-%left ';'
-%left '|'
-%left ','
-%right "//"
-%nonassoc '=' SETPIPE SETPLUS SETMINUS SETMULT SETDIV SETDEFINEDOR
-%left OR
-%left AND
-%nonassoc EQ '<' '>' LESSEQ GREATEREQ
-%left '+' '-'
-%left '*' '/'
-
-
-%type <blk> Exp Term MkDict MkDictPair ExpD ElseBody QQString FuncDef FuncDefs String
-%{
-#include "lexer.gen.h"
-#define FAIL(loc, msg)                                   \
-  do {                                                   \
-    location l = loc;                                    \
-    yyerror(&l, answer, errors, locations, lexer, msg);  \
-    /*YYERROR*/;                                         \
-  } while (0)
-
-void yyerror(YYLTYPE* loc, block* answer, int* errors, 
-             struct locfile* locations, yyscan_t lexer, const char *s){
-  (*errors)++;
-  locfile_locate(locations, *loc, "error: %s", s);
-}
-
-int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors, 
-          struct locfile* locations, yyscan_t lexer) {
-  while (1) {
-    int tok = jq_yylex(yylval, yylloc, lexer);
-    if (tok == INVALID_CHARACTER) {
-      FAIL(*yylloc, "Invalid character");
-    } else {
-      if ((tok == LITERAL || tok == QQSTRING_TEXT) && !jv_is_valid(yylval->literal)) {
-        jv msg = jv_invalid_get_msg(jv_copy(yylval->literal));
-        if (jv_get_kind(msg) == JV_KIND_STRING) {
-          FAIL(*yylloc, jv_string_value(msg));
-        } else {
-          FAIL(*yylloc, "Invalid literal");
-        }
-        jv_free(msg);
-        jv_free(yylval->literal);
-        yylval->literal = jv_null();
-      }
-      return tok;
-    }
-  }
-}
-
-static block gen_dictpair(block k, block v) {
-  block b = gen_subexp(k);
-  block_append(&b, gen_subexp(v));
-  block_append(&b, gen_op_simple(INSERT));
-  return b;
-}
-
-static block gen_index(block obj, block key) {
-  return block_join(obj, block_join(gen_subexp(key), gen_op_simple(INDEX)));
-}
-
-static block gen_binop(block a, block b, int op) {
-  const char* funcname = 0;
-  switch (op) {
-  case '+': funcname = "_plus"; break;
-  case '-': funcname = "_minus"; break;
-  case '*': funcname = "_multiply"; break;
-  case '/': funcname = "_divide"; break;
-  case EQ: funcname = "_equal"; break;
-  case '<': funcname = "_less"; break;
-  case '>': funcname = "_greater"; break;
-  case LESSEQ: funcname = "_lesseq"; break;
-  case GREATEREQ: funcname = "_greatereq"; break;
-  }
-  assert(funcname);
-
-  block c = gen_noop();
-  block_append(&c, gen_subexp(a));
-  block_append(&c, gen_subexp(b));
-  block_append(&c, gen_op_call(CALL_1_1, gen_op_block_unbound(CLOSURE_REF, funcname)));
-  return c;
-}
-
-static block gen_format(block a) {
-  return block_join(a, gen_op_call(CALL_1_1, gen_op_block_unbound(CLOSURE_REF, "tostring")));
-}
- 
-static block gen_update(block a, block op, int optype) {
-  block assign = a;
-  block_append(&assign, gen_op_simple(DUP));
-  if (optype) {
-    op = gen_binop(gen_noop(), op, optype);
-  }
-  block_append(&assign, op);
-  return gen_assign(assign);
-}
-
-%}
-
-%%
-TopLevel:
-Exp {
-  *answer = $1;
-} |
-FuncDefs {
-  *answer = $1;
-} 
-
-FuncDefs:
-/* empty */ {
-  $$ = gen_noop();
-} |
-FuncDef FuncDefs {
-  $$ = block_join($1, $2);
-}
-
-Exp:
-FuncDef Exp %prec ';' {
-  $$ = block_bind($1, $2, OP_IS_CALL_PSEUDO);
-} |
-
-Term "as" '$' IDENT '|' Exp {
-  $$ = gen_op_simple(DUP);
-  block_append(&$$, $1);
-  block_append(&$$, block_bind(gen_op_var_unbound(STOREV, jv_string_value($4)), $6, OP_HAS_VARIABLE));
-  jv_free($4);
-} |
-
-"if" Exp "then" Exp ElseBody {
-  $$ = gen_cond($2, $4, $5);
-} |
-"if" Exp error {
-  FAIL(@$, "Possibly unterminated 'if' statment");
-  $$ = $2;
-} |
-
-Exp '=' Exp {
-  block assign = gen_op_simple(DUP);
-  block_append(&assign, $3);
-  block_append(&assign, gen_op_simple(SWAP));
-  block_append(&assign, $1);
-  block_append(&assign, gen_op_simple(SWAP));
-  $$ = gen_assign(assign);
-} |
-
-Exp "or" Exp {
-  $$ = gen_or($1, $3);
-} | 
-
-Exp "and" Exp {
-  $$ = gen_and($1, $3);
-} |
-
-Exp "//" Exp {
-  $$ = gen_definedor($1, $3);
-} |
-
-Exp "//=" Exp {
-  $$ = gen_update($1, gen_definedor(gen_noop(), $3), 0);
-} |
-
-Exp "|=" Exp {
-  $$ = gen_update($1, $3, 0);
-} |
-
-Exp '|' Exp { 
-  $$ = block_join($1, $3); 
-} |
-
-Exp ',' Exp { 
-  $$ = gen_both($1, $3); 
-} |
-
-Exp '+' Exp {
-  $$ = gen_binop($1, $3, '+');
-} |
-
-Exp "+=" Exp {
-  $$ = gen_update($1, $3, '+');
-} |
-
-Exp '-' Exp {
-  $$ = gen_binop($1, $3, '-');
-} |
-
-Exp "-=" Exp {
-  $$ = gen_update($1, $3, '-');
-} |
-
-Exp '*' Exp {
-  $$ = gen_binop($1, $3, '*');
-} |
-
-Exp "*=" Exp {
-  $$ = gen_update($1, $3, '*');
-} |
-
-Exp '/' Exp {
-  $$ = gen_binop($1, $3, '/');
-} |
-
-Exp "/=" Exp {
-  $$ = gen_update($1, $3, '/');
-} |
-
-Exp "==" Exp {
-  $$ = gen_binop($1, $3, EQ);
-} |
-
-Exp '<' Exp {
-  $$ = gen_binop($1, $3, '<');
-} |
-
-Exp '>' Exp {
-  $$ = gen_binop($1, $3, '>');
-} |
-
-Exp "<=" Exp {
-  $$ = gen_binop($1, $3, LESSEQ);
-} |
-
-Exp ">=" Exp {
-  $$ = gen_binop($1, $3, GREATEREQ);
-} |
-
-String {
-  $$ = $1;
-} |
-
-Term { 
-  $$ = $1; 
-}
-
-String:
-QQSTRING_START QQString QQSTRING_END {
-  $$ = $2;
-}
-
-FuncDef:
-"def" IDENT ':' Exp ';' {
-  block body = block_join($4, gen_op_simple(RET));
-  $$ = gen_op_block_defn_rec(CLOSURE_CREATE, jv_string_value($2), body);
-  jv_free($2);
-} |
-
-"def" IDENT '(' IDENT ')' ':' Exp ';' {
-  block body = block_bind(gen_op_block_unbound(CLOSURE_PARAM, jv_string_value($4)), block_join($7, gen_op_simple(RET)), OP_IS_CALL_PSEUDO);
-  $$ = gen_op_block_defn_rec(CLOSURE_CREATE, jv_string_value($2), body);
-  jv_free($2);
-  jv_free($4);
-}
-
-QQString:
-/* empty */ {
-  $$ = gen_op_const(LOADK, jv_string(""));
-} |
-QQString QQSTRING_TEXT {
-  $$ = gen_binop($1, gen_op_const(LOADK, $2), '+');
-} |
-QQString QQSTRING_INTERP_START Exp QQSTRING_INTERP_END {
-  $$ = gen_binop($1, gen_format($3), '+');
-}
-
-
-ElseBody:
-"elif" Exp "then" Exp ElseBody {
-  $$ = gen_cond($2, $4, $5);
-} |
-"else" Exp "end" {
-  $$ = $2;
-}
-
-ExpD:
-ExpD '|' ExpD { 
-  $$ = block_join($1, $3);
-} |
-
-Term {
-  $$ = $1;
-}
-
-
-Term:
-'.' {
-  $$ = gen_noop(); 
-} |
-Term '.' IDENT {
-  $$ = gen_index($1, gen_op_const(LOADK, $3)); 
-} |
-'.' IDENT { 
-  $$ = gen_index(gen_noop(), gen_op_const(LOADK, $2)); 
-} |
-/* FIXME: string literals */
-Term '[' Exp ']' {
-  $$ = gen_index($1, $3); 
-} |
-Term '[' ']' {
-  $$ = block_join($1, gen_op_simple(EACH)); 
-} |
-LITERAL {
-  $$ = gen_op_const(LOADK, $1); 
-} |
-'(' Exp ')' { 
-  $$ = $2; 
-} | 
-'[' Exp ']' { 
-  $$ = gen_collect($2); 
-} |
-'[' ']' { 
-  $$ = gen_op_const(LOADK, jv_array()); 
-} |
-'{' MkDict '}' { 
-  $$ = gen_subexp(gen_op_const(LOADK, jv_object()));
-  block_append(&$$, $2);
-  block_append(&$$, gen_op_simple(POP));
-} |
-'$' IDENT {
-  $$ = gen_location(@$, gen_op_var_unbound(LOADV, jv_string_value($2)));
-  jv_free($2);
-} | 
-IDENT {
-  $$ = gen_location(@$, gen_op_call(CALL_1_1, gen_op_block_unbound(CLOSURE_REF, jv_string_value($1))));
-  jv_free($1);
-} |
-IDENT '(' Exp ')' {
-  $$ = gen_op_call(CALL_1_1, 
-                   block_join(gen_op_block_unbound(CLOSURE_REF, jv_string_value($1)),
-                              block_bind(gen_op_block_defn(CLOSURE_CREATE,
-                                                "lambda",
-                                                           block_join($3, gen_op_simple(RET))),
-                                         gen_noop(), OP_IS_CALL_PSEUDO)));
-  $$ = gen_location(@1, $$);
-  jv_free($1);
-} |
-'(' error ')' { $$ = gen_noop(); } |
-'[' error ']' { $$ = gen_noop(); } |
-Term '[' error ']' { $$ = $1; } |
-'{' error '}' { $$ = gen_noop(); }
-
-MkDict:
-{ 
-  $$=gen_noop(); 
-} |
- MkDictPair { $$ = $1; }
-| MkDictPair ',' MkDict { $$=block_join($1, $3); }
-| error ',' MkDict { $$ = $3; }
-
-MkDictPair
-: IDENT ':' ExpD { 
-  $$ = gen_dictpair(gen_op_const(LOADK, $1), $3);
- }
-| String ':' ExpD {
-  $$ = gen_dictpair($1, $3);
-  }
-| IDENT {
-  $$ = gen_dictpair(gen_op_const(LOADK, jv_copy($1)),
-                    gen_index(gen_noop(), gen_op_const(LOADK, $1)));
-  }
-| '(' Exp ')' ':' ExpD {
-  $$ = gen_dictpair($2, $5);
-  }
-| '(' error ')' ':' ExpD { $$ = $5; }
-%%
-
-int jq_parse(struct locfile* locations, block* answer) {
-  yyscan_t scanner;
-  YY_BUFFER_STATE buf;
-  jq_yylex_init_extra(0, &scanner);
-  buf = jq_yy_scan_bytes(locations->data, locations->length, scanner);
-  int errors = 0;
-  *answer = gen_noop();
-  yyparse(answer, &errors, locations, scanner);
-  jq_yy_delete_buffer(buf, scanner);
-  jq_yylex_destroy(scanner);
-  if (errors > 0) {
-    block_free(*answer);
-    *answer = gen_noop();
-  }
-  return errors;
-}
-
-int jq_parse_library(struct locfile* locations, block* answer) {
-  int errs = jq_parse(locations, answer);
-  if (errs) return errs;
-  if (!block_has_only_binders(*answer, OP_IS_CALL_PSEUDO)) {
-    locfile_locate(locations, UNKNOWN_LOCATION, "error: library should only have function definitions, not a main expression");
-    return 1;
-  }
-  return 0;
-}

scripts/crosscompile

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# This script is used to cross-compile binaries for
+# platforms other than the current one
+
+# Usage: $0 <platformname> <configure options>
+# <platformname> is arbitrary, it is the name
+# of the directory which will be created to contain
+# the output binaries.
+
+# e.g. $0 win32 --host=i686-w64-mingw32
+
+set -e
+cd `dirname "$0"`/../build
+
+jobs=-j4
+case "X$1" in
+X-j*) jobs=$1; shift;;
+esac
+
+plat="$1"
+[ -z "$plat" ] && exit 1
+shift
+
+case "$plat" in
+*/*) echo "platform name must not be a path"; exit 1;;
+*..*) echo "platform name must not be a path"; exit 1;;
+*) plat=$PWD/$plat;;
+esac
+
+[ -d "$plat" ] || mkdir "$plat"
+rm -rf "$plat/tmp"
+mkdir "$plat/tmp"
+cd "$plat/tmp"
+../../../configure "$@"
+make "$jobs" DESTDIR=$plat install
+set -x
+for jq in `find . -type f \( -name jq -o -name jq.exe \) -print`; do
+    cp "$jq" ..
+done
+cd ..
+rm -rf tmp
+

scripts/gen_utf8_tables.py

@@ -1,16 +1,16 @@
 #!/usr/bin/python
 
+# This program was used to generate jv_utf8_tables.gen.h
+
 mask = lambda n: (1 << n) - 1
 
 
 def print_table(type, name, t):
-    assert len(t) == 256
-    print "static const",type, name+"[]", "="
-    first = True
+    print("static const %s %s[] =" % (type, name))
     for i in range(0,len(t),16):
-        print (" {" if i == 0 else "  ") +\
-            ", ".join("0x%02x"%n for n in t[i:i+16]) + \
-            ("," if i + 16 < 256 else "};")
+        print ((" {" if i == 0 else "  ") +
+               ", ".join("0x%02x"%n for n in t[i:i+16]) +
+               ("," if i + 16 < len(t) else "};"))
 
 
 def utf8info(c):
@@ -21,10 +21,11 @@ def utf8info(c):
     if 0xE0 <= c <= 0xEF: return 3, mask(4)
     if 0xF0 <= c <= 0xF4: return 4, mask(3)
     if 0xF4 <= c <= 0xFF: return 0, 0
-        
+
 table = lambda i: [utf8info(c)[i] for c in range(256)]
 
-print "#define UTF8_CONTINUATION_BYTE ((unsigned char)255)"
+print("#define UTF8_CONTINUATION_BYTE ((unsigned char)255)")
 
 print_table("unsigned char", "utf8_coding_length", table(0))
 print_table("unsigned char", "utf8_coding_bits", table(1))
+print_table("int", "utf8_first_codepoint", [0, 0x0, 0x80, 0x800, 0x10000])

scripts/update-website

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# This script builds the website from the docs directory of
+# the current branch and copies it over to the gh-pages
+# branch.
+
+set -eu
+set -o xtrace
+
+# build website
+scriptdir=`dirname "$0"`
+cd "$scriptdir"/../docs
+rm -rf output
+rake build
+cd ..
+
+# copy to /tmp
+tmpdir=$(mktemp -d -t jq.website.XXXXXXXXXX)
+cp -r docs/output/* "$tmpdir"
+cp .gitignore "$tmpdir"
+
+# copy to gh-pages
+git checkout gh-pages
+cp -r "$tmpdir"/* .
+cp "$tmpdir"/.gitignore .
+
+# clean up
+rm -rf "$tmpdir"
+echo SUCCESS

scripts/version

@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+cd `dirname "$0"`
+git rev-parse --verify -q jq-1.0 > /dev/null 2>&1
+git describe --tags --match 'jq-*' --dirty | sed 's/^jq-//'

sig/jq-release.key

@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: jq Release Signing Key 0xAF19040C71523402
+
+mQINBFYayakBEADL6biudAZ3V1//e3gdWMN6lbz+m5o6avu1vnbtCul/MxOF2Ygd
+SeXCn5gV3+F+xdrA3/Mhv9cWXzzDTp0D2U75mHw1n4OcArFvKm/RV5yOlc/wvblp
+WfWd/hCIIZhdHpRWdCko2ByXx9XlBRn46nGyxCFScLcHbicPjq2kIpZ7oad29gs4
+bThj65G5XS48FyqixGHy0o2S0nQXNIyB1XTPm4mwHNAeOMFaYj6nhb6b5vu+RhlK
+syirTGU7pZYd13FM5y9NZrbxfKnGz5bdKPgb4jRi3YmBTKRzlW4IZl3SGO3kPi9a
+wJR4vP+cf1eEAWulrt9i4DA3/3/lpPpFh5bSo7nKW49PdOjfLWzBLtCsVhJReF97
+sSPVpNmf6RrfBXnPlEBw+aU4wGRbmpA9AGV2rKsvxZbU2AqDS93Pn6S0u4XNNnjH
+TGxe2P9gSEH+xNuEyFcDbt0XP6Te3vSE7oMGIPhXq1FKuXygEQGV2fXa2Dovxi+q
+YTvbtzG5PV5lQqeexoNMUHzgHVWib/NIt7JTkBflJt33re7oayZd5DSE5zy/4n5d
+LH9prYJWqVGgb92Lzlk6uYDp3ztBlFdoRR+6L25iUCPRq5yS7J4Rk3ahask2CsQc
+aANz5xkESnS5DcakDoVtbiC1UY8eM+vXui/UF2uYCTLrz+SIIZJHPQ0fdQARAQAB
+tC5qcSBSZWxlYXNlIFNpZ25pbmcgS2V5IDxqcUBzdGVkb2xhbi5naXRodWIuaW8+
+iQI4BBMBAgAiBQJWGsmpAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCv
+GQQMcVI0AoHwD/4s1L10OiimSELwTZ3x+btmKdaFBdlUhjBZd/GDE3P1pV+63D2+
+LhLpZLQ3yOrplUDHGBG02Hx7/lY2YE5rRVNMyR8FqD9aMrOwQE3uERjkwFQ7Q69r
+S6kFLiOxUWDXNQ0wXeZ/Na6uYi6AI/oCYWnDIO3lugDUoXtHanYqK1BvJsBEvWpe
+UB18VcqxBQuOMPD+xNzVDSFn1uYiKKBkv4XJNLHRqdLpwmAVcLDkKTHWEy+223CZ
+4zwahQKw9wPdUlakXP7v+wIxzGXaGk0yJOsYVPykQ4AkoMgvqqxyx23d6hjncR1o
+36muLAiL+qELZ/rxUytduaK1Owr8cNJgPzRAEbeSRdw2hZYyEnHgNPC3atUN0wIk
+khzP/GHMBYIU90CdiWjGvjJeHv047Ty4S9PEYPZLQx1s8cdIeozEFt/lTqFp+9Si
+f2DWUKHpzQ3wfUudTD4pzSy28XJ760Kq54f1cf2CWqp577xrxRfcKKoyufF8pwqf
+sAno03N6MpxiK0qVwZ/0Qb2BfAI2rpxxc98qhuErlBE8WjPj7M93eaHNMTtCqCIG
+Hke6kMjYuwGu8NK/O0SqGqsHoXxxIvlZNda9MCPJo9xl77dphurOq/D/d9rfy/Uk
+5D8ssNUBhM3s6sQl27L1avnSS12UuRdGSQwU33XbAuNG7y0a/zRnX+GqE4kCHAQQ
+AQIABgUCVhrKpwAKCRD5uhQ7lf9tgo26D/0WFFkhmUjSV9K/q8zSSJhuQfzoeM+n
+Z2DfYBfKdawbJH9/Yfg1nIFzih2lnvzk/kx8WbLSDMb0sHn6ZUZ6cVoBvrBxSgah
+bwPF9M8Xf4J/oBYHq8ZYjPHOWnHbEPuoNzPreqOhtSLBtP5dfZlEI6DLR2+WKj22
+EmHfmBFoKZ90N2MQWQLV98DAFfsxS7Bqc9xSCbh405qCIGr/4r4P0BaIdJ2jW/9k
+AHwnsmJnf5lI7dn8BEMYgM3vcG4dyaWNf+eoI3cJnq+Y782KoyFjof4t1bLF2H1C
+vbiJ9xWv4uCeTVlTwiVJFkSUxBgmsyVofcboHF7/06HtVXDpG/ihZEOoqNPKPD4d
+56V2t0hEulUpyqfs0Ic8r+sGWgvDCSqAVrXak2n0ULJ+RkpRB6ekcgOY7HdYKX1H
+UifaytQSxjUBXfo9HAC0Br2fyGh9s5zBcnrIrWHxwQw/RCIIv9CkZB7s6/NFYBKw
+Q27xTpXjHnGoEHNAA2xSyMXw9VoH3qoze/1iraK0zSFGAXpmL57HMBnOrLj7oq+O
+tB/cLd9o4+XFJjXHGAsXoOD5cCADkgMSMcouvPFKySfK0Kz5ScWVSsc5FvG44j/L
+T1WvjBgIrNAeQJ2efPYVmg5f/ALkjgnKy+lkafBk4OwXtWZCTf+9vcOF7FQ2B6N+
+7qQPymxSJxBSEg==
+=AiyG
+-----END PGP PUBLIC KEY BLOCK-----

sig/v1.3/jq-linux-x86.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGzhJAAoJEK8ZBAxxUjQC8xMQAMgSl+2aYa/c/LuYKDWtVnHO
+G16rAq+oruc/IrEwEKqcwqTvK8M7xlAxUt5aPtAY0kRkvxadFtX8vZy1SEqAFcC5
+sw7J+Oswl+5dJF0Y3j3I0hA6JuOe/+RP4r64pGlwQ0mVIJuTWqinzO9JqTOskeXy
+5vSN50A0vFXzDu661UFr1v8q5+b8WhIrJhuOZtaPap33Gu9bS6fz93VBm4LE3a04
+KjDydbNUoyA5HX4QVTgFON8oeVJevtqV3krnsU/ncOeTB0ThT9yywcq8HCbh7dqo
+EhfyATOmk3RZf3RsSAOG5CZ9cFjof6/SqVG8Cbp14MRVMkKi37mvHkqFER/WRtsv
+Ul1OzFfv8Jwv+cItTSB5c80kbbRfrqwf6NgZW9oTxZP3G3I5JjCTYhCaWlzO0wZ1
+QAAJDBAv5GNB4rn9LXGdj2DhcCh00lJY83Bpup4LRc2RuJuJH7IUIkfRW4CAVoRd
+p6w5W4jYNdrrTkhfkNxSqi7FtKN23+eD2r0knPvhsWxyUcXrGhFqaImHmzQWIsX5
+AviEK+nQUcuhTKolsN/97NPkRYUT9C4IVNdI8m1+EsAuwGodSvRrUwBIOoVQlYA7
+MFLZZ23Su/8T5NnruP+iXmy0Y3Nf9W+GLHNn3H+9027zAs5Esd2Hy4R6W65BwWuI
+yYHFx8O6bi5ke72ByCUI
+=ru7X
+-----END PGP SIGNATURE-----

sig/v1.3/jq-linux-x86_64.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGzhxAAoJEK8ZBAxxUjQCb2EP/08Lgfoc0rDv5IirCjXIFWxM
+8C56aVfaF/8gaG75SuN3QUVBuWx3VB60Cgh/msTFrZ/jkWr+tYArNzwNAjI8a9T8
+nE40SJH3kvwVrr9ALSgk9fEvikfZVKwYTc0k4h1hBataE5Z+7Di7VYPUmdLTd/ih
+dcJfDe6zPcYmaW6fl0glP2GLaDuLI3vxAid0MzDS1RU52z+usc/fjXWmaJwPVp76
+Sd8/Uz3X6ZiFwpkfhp6XTcqkQhMZd4GS9cjnPAdRp9HFLI7S2UJ4RNj/YQIHrhQL
+5Ko3KdXEWeSvD8wcr8VcZ66NfmyCls0diEU+TUv1I7VmLzVQGx9/4/uVWpfxry9D
+8MLEHEJTTDT5W3hX47g29JRFJzv8PUyugkpXjQrpSoFbe/3vRxZeQNO9rjTx9t3x
+hdkWIjbwTg8SGH0XK+UNfR50A3VlrlPDpW5Ju2Io7/OuKRWN4i6ktFx0akFMmHUV
+D5u/FhEux7kJCNHnF7a7YJ1Ys4OSPUzoH3z35zhyVcW+iiX7KIKHNamWaPBw3iYa
+MwYVKHT6NUQiVQbTZvWJZXGArEnwq/z6jAjRQNKoTjbcVoYJunY/DZcJjnRIux9T
+yYnTa7IbpWZmWZWQfnb8zuSoXnhaSHZItIeUklH4K03xjpEXW7pGPLPznyDoBQeC
+1WVcwpviS/Y24eSmmxaA
+=MlHu
+-----END PGP SIGNATURE-----

sig/v1.3/jq-osx-x86.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGzh+AAoJEK8ZBAxxUjQCyb4QALrsqZ/QkI2a/uVPnwAh22B4
+mtbplxOS8swCB4g56tG+JMuria9l1ACmpbc9eTJ/Q9z9LLwq3vBkpy0utAQp/iAQ
+ijZbTG7E3S/LtOzZ5MSbkGeyuDWu4YCI7DuxTZH+R43fiA/ShHUHf7rO/vofAjTu
+MZr7TpBRjut5htbkNrUKoYjK97hehvY0S3h1oqMSSuHS4Em9xMvv5bAsEn37+L3g
+o5Y5kHQ55Lu3qH1Uk87VMz+gtO4pxN+ZrNNrY2lX/hwnV7p5YDza2H0uOopBrTi4
+X99x9JzdHoSrySRwS1ZDc+XYDgXP7JO9qDmNh18nXJlyCWFzDHajQS+4Hn0O5zM0
+PHWasVC8tmxT0XXZlG1kPuaCkg0BFh1NXNjCUa7Ru9XHfOkaW4TyKGQa3eboyx56
+q7MDvODUd3JSW4xmLJ7NFSYRCPMRiCMorQ8u8afy2OWt2W13M8OIH378dMcFoubW
+GB00i127dhuI95lwNsTV1seKO59bMbAJjP7ITqqDiOafg6AmTric6BJNakSsrc66
+yCzhOfxqwfeRekPSirrf8nv9D7dW45yLEiXn9Irn+KghdL4KCLCB8dyc6OalITVF
+c01SK5xNzPRfFVzTqMdmi/dYpDL0KSMwg3O3DhPQ0LrRZDXKXj6A4KGAthpVLmRr
+IHj2hlGlr4hqLXUU1wE5
+=I3PU
+-----END PGP SIGNATURE-----

sig/v1.3/jq-osx-x86_64.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGziCAAoJEK8ZBAxxUjQCkGcQAMpxoK6aHzDIeVjp5kQ4MOFu
+dOE0xjXlPpudUfUORKqfsnPvvxJTvqlDrUhMq6d6S1Eic9ZAbfpmHGbw02tvQ7+4
+hvyy/KbfBUcLZRIwZ1eej/rFUXd2fmxPwoj07SpTOgjKF+8duUzSlxBg+Kes77pj
+ZuMO3KUa3isaOp+kufh0+miAqHisEWzQWCfHBrVIwW63L2bf2ZSUvp4JqwfRKfr2
+3hBfoll0M+iaLHr4/wGUIxRL+23afTtvQikyOXzB3rKXf+QmDePZ29isZVg94yi4
+/XiDVmDM/6GpfI7u0fIoDcEgH+LE35HL/CT4zA8IzA/QwB5bCO1bPEA7DfDQq01R
+oghTvH5Qu0eu8tjap7EXAmch25nPys4NzPoIRnbu4i4wQUsFqGzmSFKEuU6pwDIm
+lsEBPbHRcGcaui2KidUNi7iQmje819KgRDhRxX65Bye9sKsD/HvMzQRce1RFYQg3
+uqISuhWu8qj67J/ii2zFF+lo5HgHLqzXKcye1kY5KYq2dTIa3khq89Xkf3trsnNL
+IKZ+8P2eiVDjDr3UPIvVCX1JvNTdcQDMUlmoKk8g1qwuTp2PTi+c6FKicZGUMMnv
+o/hThK2JwnL/Iv0bJHvBU6aCXSnKLTLIdT02UvUppiN/GTMHsagvE0DRA1B1yFim
+/o/n4edysfzI1Pxe0b3c
+=ZOqW
+-----END PGP SIGNATURE-----

sig/v1.3/jq-win32.exe.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGziHAAoJEK8ZBAxxUjQCG6cP/RNQd9g+Te+fgpFvnFDhAVyW
+EKZ+2B+V64m4GzrRFnGwBMqju4kFf0dZ4craagJ2gLVQ74FhvorMtphjX0MYgxtt
+wXyIqImlBake3GEkjUI6XW8QmlFmPix7+2fG4oEdLHwgE2/ii1DFlhTQgYYwH+Be
+z6wo6Nfl9OxykEHG1hl0A4AiHT1ubWogbjD87yZRO2M1rp2nHJu1TujqkjwWLXtr
+0xVBSgtutfYRBvpPGhtLb4nqzkeW+lFW99A2aUo1KroyBdcrEKTJ4XMRqjYJLkSN
+68e4gZqHmR6M1nA4h81bU26lhrN3LbYiOwBu67N5PnSOQE87zFPK6Dac4QyG7vzt
+pR2xht0QwwraxOeIrMrKs9vhUOKm9RDpNcD3z1xa+k6Qej+nP8A2zmMvUz3+C8F9
+ITESyjk/28Eku5jEUs5Niz/znGvuU3A2fk/qHs7U0I8tvNWsxj29GCTzgPDoH3Vs
+sJKuSozoSqecBf+2x23PnGjGttL6BK6lo762qeVw6npCi/nqGFbMWpuopgJ2PiNP
+t2RdNzvX7v1V7ZfBOGl5iAeG/XJ18uD+hplCiUePN7Jv/3bpaJ9jlo//kIwddUP2
+p89zfLPjeptAIxvkWph4ZL59pj7zsid7rSMd0WIOOqE61PKpl5jBgrdiBgKbcmJe
+AIRZewlOq/0l0cVtK10b
+=3nBK
+-----END PGP SIGNATURE-----

sig/v1.3/jq-win64.exe.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGziKAAoJEK8ZBAxxUjQCP14P/jkKiLUgiZkXYVQs+hBJqJD2
+rOsHVGmoxpjnQ8L9gUSxfZ0E80+1iTx/9JNWHs0xEKrvWKmCovfuQd8xfxZ30g5z
+wMa/7QWZtLdfIGkQje79WgA/+xDWSLa0T+dbcMjCwDdYPQyQE5Vf0I7qoNOj2Dcr
+CmkSMO6dtoilv/o2WX1x8Z1K5sqGMl64WyM5yR8sEMRBVuVqWRvELrv9+YMW2UYU
+yXj7tFwulyqZEoUBLlUxZhr7gjah31gBP2qqLeZhq/phdUsi9ckPusW3Un5SMaRf
+xEPo+y83Qrpusm9UDGsm3t90TWva3oMiExjFatFKuKvLbFCZRK0EIqdUOUMlptV6
+kS3xKsvAq+vM53FfwcWx/9gcZQv5XTw7McmWZ9vZmHH24AUjuFFFZLoWxPg73Vek
+HaD5xTsxfYEqGRaJbYoSkSs39fw+tH0ajRoMVcZw2O2c94qAgzR/Qne9t2nQ0ypg
+hOzsIIdIxj9XZShkkVmlK8naf0YH0Wc3Yo3wBxkTy7QKVWtcF+x67wth2XjKHBbh
+lh9Gc3R/CUvRhk9gOSqHYAsy7lEIpFGjuIqYTZcXRO3BCJgjc3hV9jBiIy1iQWGg
+Kuh+egThw8U9z3PueP++yVjImze9Y/+78dc/rHAwXkFIysBs6vle/9ILDl5Komvv
+91rFNBLkjvmJoRw4hUpG
+=WNFH
+-----END PGP SIGNATURE-----

sig/v1.3/sha256sum.txt

@@ -0,0 +1,6 @@
+cf4b0b3e505958843375ac153d84ad6ee40196aa76ee373b0409f858b3cbf925  jq-linux-x86
+dbacac81ebc00a7387e4c5e539a7a475981a1ac6ada20a2f6b1d8f950027751e  jq-linux-x86_64
+4095a48b50b754c8b3199b9c069fa9c3da0e737d8809af3205d1bf69f87cab6e  jq-osx-x86
+bce52800c943ff10d1ffd9c1a7e7aeddbc7bcecd7a2b05c6afb828399dbfa39f  jq-osx-x86_64
+c8e2ffb5b0536a50430ef9b4708a40686e4352db5c01ae90a98ba96660e5bc36  jq-win32.exe
+d041fdfd8b3aa3832eedf2aafad5002f2b47fb59373b71190a01422de825911f  jq-win64.exe

sig/v1.4/jq-linux-x86.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWGzjvAAoJEK8ZBAxxUjQC5KsQAMt1IwBrIn8dvTe44djO3QYk
+H/qaNSRgChJI81GA+B4suTcgh+PUJcHF1EWls7CCfjfp1haocikXpNSuY7mF+43M
+SMdz2ZA4+N542ratUTv7YlG/igIvz6IbDysjowU3QQsCcjthmO6OF/6fd2qRhggB
+3K80AMESOBBi7TkFTLw1G4M8uU6VvN+LWrG6fOcPXoRLlqShGzskDqxpobL1+o6J
+Cf56Z+ZVLQ6DPjW2pxK2R88788DjoJ4j53wsBqzgnHMeGzWVzvQ836rYSD4dhpSn
+YopiAesAYLu0hJszHbJrigt/jUGsNekQ+/ihqGXhbtDVjpYLU7At42b2w2AgjNSK
+GFBJmICTQZapz4o/lCCli82PngGmIVqgf6fc7qZq+HHtrcBeNYjMHMPMJroGqanJ
+DhCnLmE1906RpJ3VvCM5Sd9lSQQpSVzmFAh5MMnprxvsAmDbL+Ty//a/cOU4WPAJ
+MgXH2REmeByg8EX6SPhtshxxdIQf0CX4uh2r1aHQFtg/sNPL/EWGcRq+DVbaz/8R
+TJCfu9Ov0GhJlZSMHbkN9cvrjeE5CNM+7Q66JbhOMp7uOo4I9+JyknNJP7L0Nvot
+IcC6qsw8jMINHexW3RSDbX6b2S+0BskojAxp6IYHv0y82aaJ5I3+4UD3A5+Q34iM
+g1kqYu4WnPOZ+cihvGKO
+=8ZEt
+-----END PGP SIGNATURE-----