]> granicus.if.org Git - jq/log
jq
11 years agoLoad library from ~/.jq 130/head
Brendan Macmillan [Thu, 16 May 2013 17:03:42 +0000 (03:03 +1000)]
Load library from ~/.jq

11 years agoMake jq --version report an actual git revision.
Stephen Dolan [Fri, 24 May 2013 22:34:34 +0000 (23:34 +0100)]
Make jq --version report an actual git revision.

Closes #129.

11 years agoMerge pull request #133 from nicowilliams/option_argfile-rebase0
Stephen Dolan [Fri, 24 May 2013 11:13:45 +0000 (04:13 -0700)]
Merge pull request #133 from nicowilliams/option_argfile-rebase0

Add --argfile variant of --arg (issue #117)

11 years agoAdd --argfile variant of --arg (issue #117) 133/head
Nicolas Williams [Mon, 6 May 2013 22:25:19 +0000 (17:25 -0500)]
Add --argfile variant of --arg (issue #117)

This is useful when one has a database (in JSON form) to query using jq
input data.

    % echo '{"a":1, "c":5}' > db.json
    % echo '"c"'|./jq --argfile f /tmp/a '$f[.]'
    5
    % echo '"a"'|./jq --argfile f /tmp/a '$f[.]'
    1
    % echo '"b"'|./jq --argfile f /tmp/a '$f[.]'
    null
    %

11 years ago'make clean' won't delete jq.1 if it can't be rebuilt.
Stephen Dolan [Thu, 23 May 2013 18:20:19 +0000 (19:20 +0100)]
'make clean' won't delete jq.1 if it can't be rebuilt.

See #131

11 years agojq 1.3 release 126/head jq-1.3
Stephen Dolan [Sun, 19 May 2013 09:48:25 +0000 (10:48 +0100)]
jq 1.3 release

11 years agoEACH need not make a backtrack point on the last iteration
Stephen Dolan [Fri, 17 May 2013 21:49:08 +0000 (22:49 +0100)]
EACH need not make a backtrack point on the last iteration

11 years agoMake array construction use LOADVN (slightly faster)
Stephen Dolan [Thu, 16 May 2013 14:09:59 +0000 (15:09 +0100)]
Make array construction use LOADVN (slightly faster)

11 years agoRemove the insane "fold" operation, replace with saner "reduce".
Stephen Dolan [Thu, 16 May 2013 14:07:53 +0000 (15:07 +0100)]
Remove the insane "fold" operation, replace with saner "reduce".

11 years agoAdd LOADVN opcode.
Stephen Dolan [Thu, 16 May 2013 13:32:18 +0000 (14:32 +0100)]
Add LOADVN opcode.

Does a variable load, but sets the variable to be null afterwards.

11 years agoReverse function. Closes #94.
Stephen Dolan [Thu, 16 May 2013 13:25:28 +0000 (14:25 +0100)]
Reverse function. Closes #94.

11 years agoBetter debug info for struct bytecode.
Stephen Dolan [Wed, 15 May 2013 23:51:17 +0000 (00:51 +0100)]
Better debug info for struct bytecode.

--debug-dump-disasm produces more comprehensible output now.

11 years agoOnly generate code for those builtin functions actually used.
Stephen Dolan [Wed, 15 May 2013 00:37:15 +0000 (01:37 +0100)]
Only generate code for those builtin functions actually used.

Makes output of --debug-dump-disasm much simpler.

11 years agoRemove the YIELD opcode (use RET instead)
Stephen Dolan [Wed, 15 May 2013 00:23:06 +0000 (01:23 +0100)]
Remove the YIELD opcode (use RET instead)

11 years ago'length' function now measures string length in codepoints, not bytes.
Stephen Dolan [Tue, 14 May 2013 23:37:38 +0000 (00:37 +0100)]
'length' function now measures string length in codepoints, not bytes.

11 years agoBugfix for array slices.
Stephen Dolan [Tue, 14 May 2013 23:22:44 +0000 (00:22 +0100)]
Bugfix for array slices.

11 years agoAdd the range function
Stephen Dolan [Tue, 14 May 2013 15:09:10 +0000 (16:09 +0100)]
Add the range function

11 years agoFix some documentation bugs
Stephen Dolan [Mon, 13 May 2013 19:26:44 +0000 (20:26 +0100)]
Fix some documentation bugs

11 years agoArray slicing. Closes #2.
Stephen Dolan [Mon, 13 May 2013 19:16:19 +0000 (20:16 +0100)]
Array slicing. Closes #2.

11 years agoDelete unnecessary _POSIX_SOURCE. Closes #89
Stephen Dolan [Mon, 13 May 2013 15:41:11 +0000 (16:41 +0100)]
Delete unnecessary _POSIX_SOURCE. Closes #89

11 years agoAdd to_entries, from_entries and with_entries functions.
Stephen Dolan [Mon, 13 May 2013 15:15:49 +0000 (16:15 +0100)]
Add to_entries, from_entries and with_entries functions.

Closes #97.

11 years agoFix the //= operator.
Stephen Dolan [Mon, 13 May 2013 15:04:30 +0000 (16:04 +0100)]
Fix the //= operator.

Closes #62.

11 years agoBetter error handling for INSERT opcode
Stephen Dolan [Mon, 13 May 2013 14:42:57 +0000 (15:42 +0100)]
Better error handling for INSERT opcode

jq 'null | {(.a): 1}' no longer crashes.

11 years agoRemove the is_backtrack_frame special case hack.
Stephen Dolan [Mon, 13 May 2013 14:37:57 +0000 (15:37 +0100)]
Remove the is_backtrack_frame special case hack.

11 years agoRefactor path logic.
Stephen Dolan [Mon, 13 May 2013 14:00:05 +0000 (15:00 +0100)]
Refactor path logic.

11 years agoFix a bug triggered by jv_array_slice.
Stephen Dolan [Mon, 13 May 2013 13:10:39 +0000 (14:10 +0100)]
Fix a bug triggered by jv_array_slice.

11 years agoFix bug with path handling (used in assignments).
Stephen Dolan [Sat, 11 May 2013 17:10:21 +0000 (18:10 +0100)]
Fix bug with path handling (used in assignments).

Closes #67

11 years agoMerge branch 'autotools'
Stephen Dolan [Sat, 11 May 2013 14:21:23 +0000 (15:21 +0100)]
Merge branch 'autotools'

11 years agoDelete some Autotools junk and update README. autotools
Stephen Dolan [Sat, 11 May 2013 14:15:56 +0000 (15:15 +0100)]
Delete some Autotools junk and update README.

Autotools autogenerated files that change frequently have been
removed, those that don't are still checked in.

11 years agoRake task to build website including source dist and binaries.
Stephen Dolan [Sat, 11 May 2013 13:57:58 +0000 (14:57 +0100)]
Rake task to build website including source dist and binaries.

11 years agoRake task to build source distribution for website
Stephen Dolan [Sat, 11 May 2013 13:48:39 +0000 (14:48 +0100)]
Rake task to build source distribution for website

11 years agoAdd the docs to the distributed tarballs
Stephen Dolan [Thu, 9 May 2013 19:53:51 +0000 (20:53 +0100)]
Add the docs to the distributed tarballs

11 years agoFix manpage build.
Stephen Dolan [Thu, 9 May 2013 19:43:26 +0000 (20:43 +0100)]
Fix manpage build.

11 years agoAdd some build instructions for how to install doc dependencies.
Stephen Dolan [Thu, 9 May 2013 19:27:12 +0000 (20:27 +0100)]
Add some build instructions for how to install doc dependencies.

jq can now build without Ruby, but you won't get a nice manpage.

11 years agoDon't build the manpage unless there's a working Ruby setup.
Stephen Dolan [Thu, 9 May 2013 14:22:38 +0000 (15:22 +0100)]
Don't build the manpage unless there's a working Ruby setup.

11 years agosupport for out-of-tree tests
Stephen Dolan [Thu, 9 May 2013 12:40:00 +0000 (13:40 +0100)]
support for out-of-tree tests

11 years agoFail properly when attempting to build manpage without rake
Stephen Dolan [Thu, 9 May 2013 12:10:09 +0000 (13:10 +0100)]
Fail properly when attempting to build manpage without rake

11 years agoAutotools hackery so that "make dist" builds lexer and parser.
Stephen Dolan [Thu, 9 May 2013 10:31:17 +0000 (11:31 +0100)]
Autotools hackery so that "make dist" builds lexer and parser.

11 years agoAdd a redundant intialisation to squash a gcc warning.
Stephen Dolan [Thu, 9 May 2013 10:30:49 +0000 (11:30 +0100)]
Add a redundant intialisation to squash a gcc warning.

11 years agoMake manpage building more robust.
Stephen Dolan [Thu, 9 May 2013 01:38:57 +0000 (02:38 +0100)]
Make manpage building more robust.

11 years agoAdd a "binaries" target to the website Rakefile.
Stephen Dolan [Thu, 9 May 2013 01:18:28 +0000 (02:18 +0100)]
Add a "binaries" target to the website Rakefile.

11 years agoMinor docs fix to get rid of Bonsai warnings.
Stephen Dolan [Thu, 9 May 2013 01:01:01 +0000 (02:01 +0100)]
Minor docs fix to get rid of Bonsai warnings.

11 years agoScript for cross-compiling jq binaries for other platforms.
Stephen Dolan [Thu, 9 May 2013 00:50:20 +0000 (01:50 +0100)]
Script for cross-compiling jq binaries for other platforms.

11 years agoUse the version number from configure.ac in the website.
Stephen Dolan [Wed, 8 May 2013 18:57:29 +0000 (19:57 +0100)]
Use the version number from configure.ac in the website.

11 years agoAdd the parser to BUILT_SOURCES
Stephen Dolan [Wed, 8 May 2013 18:57:05 +0000 (19:57 +0100)]
Add the parser to BUILT_SOURCES

11 years agoConfigure whether colour is displayed by default directly in source
Stephen Dolan [Wed, 8 May 2013 18:36:52 +0000 (19:36 +0100)]
Configure whether colour is displayed by default directly in source

11 years agoCheck in a pile of Autotools junk, including the configure script.
Stephen Dolan [Wed, 8 May 2013 17:55:10 +0000 (18:55 +0100)]
Check in a pile of Autotools junk, including the configure script.

11 years agoMerge pull request #115 from nicowilliams/complex
Stephen Dolan [Wed, 8 May 2013 14:07:31 +0000 (07:07 -0700)]
Merge pull request #115 from nicowilliams/complex

Rename complex to nontrivial for safety (#113)

11 years agoClean up autotools config.
Stephen Dolan [Wed, 8 May 2013 01:30:08 +0000 (02:30 +0100)]
Clean up autotools config.

Remove some of @stagrlee's hard work since jq's testsuite is
less silly than when he wrote the autotools config.

11 years agoCheck in jv_utf8_tables.gen.h, it is unlikely to change.
Stephen Dolan [Wed, 8 May 2013 00:02:18 +0000 (01:02 +0100)]
Check in jv_utf8_tables.gen.h, it is unlikely to change.

11 years agoMerge remote-tracking branch 'stagrlee/master' into autotools
Stephen Dolan [Tue, 7 May 2013 23:52:24 +0000 (00:52 +0100)]
Merge remote-tracking branch 'stagrlee/master' into autotools

Conflicts:
Makefile
jq_test.c

11 years agoRename complex to nontrivial for safety (#113) 115/head
Nicolas Williams [Mon, 6 May 2013 04:28:11 +0000 (23:28 -0500)]
Rename complex to nontrivial for safety (#113)

11 years agoMerge pull request #119 from 13ren/master
Stephen Dolan [Tue, 7 May 2013 10:57:47 +0000 (03:57 -0700)]
Merge pull request #119 from 13ren/master

tiny typo fix in manual

11 years agoFix #111: exit(1) when inputs are not valid JSON
Nicolas Williams [Sat, 4 May 2013 22:03:01 +0000 (17:03 -0500)]
Fix #111: exit(1) when inputs are not valid JSON

11 years agoAdd trailing slashes to various internal doc links.
Stephen Dolan [Mon, 6 May 2013 14:03:14 +0000 (15:03 +0100)]
Add trailing slashes to various internal doc links.

Fixes #110

11 years agoAdd a --arg option to allow variables to be passed from the cmdline.
Stephen Dolan [Mon, 6 May 2013 13:21:00 +0000 (14:21 +0100)]
Add a --arg option to allow variables to be passed from the cmdline.

Closes #107

11 years agoAdd the "has" function. Closes #74.
Stephen Dolan [Mon, 6 May 2013 12:46:16 +0000 (13:46 +0100)]
Add the "has" function. Closes #74.

11 years agoMerge pull request #77 from jkleint/patch-1
Stephen Dolan [Mon, 6 May 2013 01:39:59 +0000 (18:39 -0700)]
Merge pull request #77 from jkleint/patch-1

Clarify description of `as`

11 years agoDocument behaviour of .[] on objects.
Stephen Dolan [Mon, 6 May 2013 01:37:34 +0000 (02:37 +0100)]
Document behaviour of .[] on objects.

Closes #57.

11 years agoAdd documentation for "type".
Stephen Dolan [Mon, 6 May 2013 01:34:02 +0000 (02:34 +0100)]
Add documentation for "type".

Closes #75.

11 years agoUpdate gems and use HTTPS to get them.
Stephen Dolan [Mon, 6 May 2013 00:15:33 +0000 (01:15 +0100)]
Update gems and use HTTPS to get them.

11 years agoFix some bad escaping
Stephen Dolan [Mon, 6 May 2013 00:14:53 +0000 (01:14 +0100)]
Fix some bad escaping

11 years agoMerge commit 'e45f93f85f22c73025830a6bd0b2807263068996'
Stephen Dolan [Sun, 5 May 2013 22:58:24 +0000 (23:58 +0100)]
Merge commit 'e45f93f85f22c73025830a6bd0b2807263068996'

See #87

11 years agoRemove JQ_DEBUG #define and jq_test binary, simplifying build.
Stephen Dolan [Sun, 5 May 2013 22:12:10 +0000 (23:12 +0100)]
Remove JQ_DEBUG #define and jq_test binary, simplifying build.

The debugging features previously available via JQ_DEBUG are now
command-line options.

11 years agoWIP
Stephen Dolan [Sun, 5 May 2013 21:59:46 +0000 (22:59 +0100)]
WIP

11 years agoCombine the functionality of jq and jq_test
Stephen Dolan [Sun, 5 May 2013 21:53:45 +0000 (22:53 +0100)]
Combine the functionality of jq and jq_test

One binary is much simpler. ./jq --run-tests now runs the tests.

11 years agoMake a few constant globals actually const.
Stephen Dolan [Sun, 5 May 2013 21:37:46 +0000 (22:37 +0100)]
Make a few constant globals actually const.

This means the .data and .bss sections are empty, a good thing
in a shared library (see #98).

11 years agoMerge pull request #109 from nicowilliams/no_mutable_globals-rebased
Stephen Dolan [Sun, 5 May 2013 19:29:07 +0000 (12:29 -0700)]
Merge pull request #109 from nicowilliams/no_mutable_globals-rebased

Remove globals/make jq_init/next/teardown() an API

11 years agoMerge pull request #93 from shayel/master
Stephen Dolan [Sun, 5 May 2013 19:13:36 +0000 (12:13 -0700)]
Merge pull request #93 from shayel/master

Allow manpage to build

11 years agoBuild and install libjq 109/head
Nicolas Williams [Mon, 29 Apr 2013 01:12:49 +0000 (20:12 -0500)]
Build and install libjq

11 years agoRemove unnecessary #includes
Nicolas Williams [Mon, 29 Apr 2013 01:12:15 +0000 (20:12 -0500)]
Remove unnecessary #includes

11 years agoRemove globals/make jq_init/next/teardown() an API
Nicolas Williams [Sun, 28 Apr 2013 23:33:45 +0000 (18:33 -0500)]
Remove globals/make jq_init/next/teardown() an API

11 years agoAdd missing require to Rakefile 93/head
Shay Elkin [Sun, 24 Mar 2013 12:01:19 +0000 (14:01 +0200)]
Add missing require to Rakefile
Use bundle exec to make manpage
Don't set executable bit on manpage

11 years agofix typo in manual
Simon Elsbrock [Wed, 20 Feb 2013 21:38:50 +0000 (22:38 +0100)]
fix typo in manual

11 years agoget man pages working 80/head
Lee Thompson [Mon, 4 Feb 2013 19:35:42 +0000 (13:35 -0600)]
get man pages working

11 years agoadd man page to release
Lee Thompson [Mon, 4 Feb 2013 13:01:18 +0000 (07:01 -0600)]
add man page to release

11 years agorework build to not distribute tests unless --enable-devel is specificied to autoconf
Lee Thompson [Sun, 3 Feb 2013 20:49:03 +0000 (14:49 -0600)]
rework build to not distribute tests unless --enable-devel is specificied to autoconf

11 years agofix email addresses
Lee Thompson [Sun, 3 Feb 2013 06:35:56 +0000 (00:35 -0600)]
fix email addresses

11 years agouse AM_SILENT_RULES
Lee Thompson [Sun, 3 Feb 2013 06:09:47 +0000 (00:09 -0600)]
use AM_SILENT_RULES

11 years agofix RPM build process
Lee Thompson [Sun, 3 Feb 2013 05:50:43 +0000 (23:50 -0600)]
fix RPM build process

11 years agofix jq_test so that it runs in the distcheck phase of autoconf
Lee Thompson [Sun, 3 Feb 2013 05:05:00 +0000 (23:05 -0600)]
fix jq_test so that it runs in the distcheck phase of autoconf

11 years agomerging upstream stedolan changes
Lee Thompson [Sun, 3 Feb 2013 02:39:23 +0000 (20:39 -0600)]
merging upstream stedolan changes

11 years agouse built in macro to RPM
Lee Thompson [Wed, 30 Jan 2013 01:13:22 +0000 (19:13 -0600)]
use built in macro to RPM

11 years agoClarify description of `as` 77/head
jkleint [Fri, 25 Jan 2013 17:17:56 +0000 (12:17 -0500)]
Clarify description of `as`

It's more of a foreach loop than an identity operation.

Addresses issue #72.

11 years agoUpdate docs/content/3.manual/manual.yml 119/head
13ren [Sun, 13 Jan 2013 06:33:01 +0000 (17:33 +1100)]
Update docs/content/3.manual/manual.yml

There's a , after map ; should be .
#65

11 years agoFix negative number syntax. Add a unary '-' operator.
Stephen Dolan [Thu, 3 Jan 2013 12:53:06 +0000 (12:53 +0000)]
Fix negative number syntax. Add a unary '-' operator.

Closes #63.

11 years agoChange APPEND opcode to directly modify a variable.
Stephen Dolan [Thu, 3 Jan 2013 12:51:33 +0000 (12:51 +0000)]
Change APPEND opcode to directly modify a variable.

Avoids a big O(n^2) loop in constructing arrays. Fixes #61.

12 years agoClean up jv_object_foreach and add jv_array_foreach
Stephen Dolan [Mon, 31 Dec 2012 23:27:00 +0000 (23:27 +0000)]
Clean up jv_object_foreach and add jv_array_foreach

12 years agoIgnore some more stuff.
Stephen Dolan [Mon, 31 Dec 2012 23:25:12 +0000 (23:25 +0000)]
Ignore some more stuff.

12 years agoAdd the `recurse` function. See #37.
Stephen Dolan [Sat, 29 Dec 2012 22:59:07 +0000 (22:59 +0000)]
Add the `recurse` function. See #37.

12 years agoMake null + foo return foo, rather than an error.
Stephen Dolan [Sat, 29 Dec 2012 16:50:58 +0000 (16:50 +0000)]
Make null + foo return foo, rather than an error.

This also allows 'add' to be implemented in jq rather than C.

12 years agoRefactor assignment.
Stephen Dolan [Sat, 29 Dec 2012 16:43:36 +0000 (16:43 +0000)]
Refactor assignment.

New version is much more elegant and probably slower. Uses
library functions implemented in jq rather than dedicated opcodes.

12 years agoImprovements to del(foo).
Stephen Dolan [Sat, 29 Dec 2012 16:13:06 +0000 (16:13 +0000)]
Improvements to del(foo).

del(foo,bar) is now very different from del(foo),del(bar).
See #37.

12 years agoFix a bug in URI-encoding of certain non-ASCII characters.
Stephen Dolan [Sat, 29 Dec 2012 01:37:22 +0000 (01:37 +0000)]
Fix a bug in URI-encoding of certain non-ASCII characters.

Oh how I hate C casting rules.

12 years agoPath manipulation (path/getpath/setpath/delpath) and docs.
Stephen Dolan [Fri, 28 Dec 2012 16:08:29 +0000 (16:08 +0000)]
Path manipulation (path/getpath/setpath/delpath) and docs.

del function should fix #37.

12 years agoSupport for two-argument functions.
Stephen Dolan [Fri, 28 Dec 2012 15:07:27 +0000 (15:07 +0000)]
Support for two-argument functions.

Should probably support n args instead. This is a quick hack.
Also, ';' is a slightly ugly argument separator.

12 years agoFold operation (code/docs/test)
Stephen Dolan [Fri, 28 Dec 2012 15:04:16 +0000 (15:04 +0000)]
Fold operation (code/docs/test)

12 years agoDocs typos.
Stephen Dolan [Fri, 28 Dec 2012 14:21:28 +0000 (14:21 +0000)]
Docs typos.

12 years ago@foo syntax for encoding of strings into various formats.
Stephen Dolan [Thu, 27 Dec 2012 20:49:34 +0000 (20:49 +0000)]
@foo syntax for encoding of strings into various formats.

Fixes part of #47 and #48.

12 years agoFix an embarassing I/O bug.
Stephen Dolan [Thu, 27 Dec 2012 01:57:09 +0000 (01:57 +0000)]
Fix an embarassing I/O bug.

Pulling some I/O out to a function meant that buf changed from
"char buf[4096]" to "char* buf", and "sizeof(buf)" got a lot
less interesting. The upshot of this is that jq read input eight
bytes at a time, which is not the fastest.