]> granicus.if.org Git - jq/log
jq
11 years agocount should be length 210/head
Peter van Dijk [Thu, 7 Nov 2013 15:39:44 +0000 (16:39 +0100)]
count should be length

Example refers to a count function, which does not exist. Replacing it with length works.

11 years agoMerge pull request #193 from ryo1kato/fix-docs
Stephen Dolan [Thu, 7 Nov 2013 12:41:01 +0000 (04:41 -0800)]
Merge pull request #193 from ryo1kato/fix-docs

Docs: add description of --from-file option

11 years agoFix a crash on group_by of empty list. Fixes #208.
Stephen Dolan [Thu, 7 Nov 2013 12:18:48 +0000 (12:18 +0000)]
Fix a crash on group_by of empty list. Fixes #208.

11 years agoDocs: add description of --from-file option 193/head
Ryoichi KATO [Wed, 16 Oct 2013 12:42:29 +0000 (21:42 +0900)]
Docs: add description of --from-file option

11 years agoMerge pull request #188 from Juanxo/patch-1
Stephen Dolan [Mon, 7 Oct 2013 13:59:50 +0000 (06:59 -0700)]
Merge pull request #188 from Juanxo/patch-1

Fix typo on error message

11 years agoFix typo on error message 188/head
Juan Guerrero [Sun, 6 Oct 2013 15:52:04 +0000 (17:52 +0200)]
Fix typo on error message

11 years agoMerge pull request #185 from qoelet/master
Stephen Dolan [Fri, 20 Sep 2013 13:05:42 +0000 (06:05 -0700)]
Merge pull request #185 from qoelet/master

Add missing -i flag in build instructions

11 years agoAdd missing -i flag in build instructions 185/head
Kenny Shen [Fri, 20 Sep 2013 02:34:57 +0000 (10:34 +0800)]
Add missing -i flag in build instructions

11 years agoMerge pull request #182 from mdaines/sqrt-builtin
Stephen Dolan [Sat, 14 Sep 2013 23:34:52 +0000 (16:34 -0700)]
Merge pull request #182 from mdaines/sqrt-builtin

Add builtin for calculating square root

11 years agoAdd test showing calculation of standard deviation 182/head
Michael Daines [Sat, 14 Sep 2013 21:48:19 +0000 (17:48 -0400)]
Add test showing calculation of standard deviation

11 years agoMerge branch 'libjq'
Stephen Dolan [Sat, 14 Sep 2013 18:30:39 +0000 (19:30 +0100)]
Merge branch 'libjq'

Conflicts:
Makefile.am
configure.ac

11 years agoMerge pull request #181 from mdaines/patch-1
Stephen Dolan [Fri, 13 Sep 2013 22:24:22 +0000 (15:24 -0700)]
Merge pull request #181 from mdaines/patch-1

Fix typo

11 years agoFix typo 181/head
Mike Daines [Fri, 13 Sep 2013 16:15:52 +0000 (12:15 -0400)]
Fix typo

11 years agoMerge pull request #171 from joelittlejohn/fix-makefile
Stephen Dolan [Fri, 13 Sep 2013 16:02:42 +0000 (09:02 -0700)]
Merge pull request #171 from joelittlejohn/fix-makefile

Fix Makefile after refactoring of stacks in 05d90517b02

11 years agoMerge pull request #175 from lipidity/fix-build
Stephen Dolan [Fri, 13 Sep 2013 16:02:24 +0000 (09:02 -0700)]
Merge pull request #175 from lipidity/fix-build

Call AM_INIT_AUTOMAKE once only

11 years agoAdd sqrt operator
Michael Daines [Thu, 12 Sep 2013 00:22:56 +0000 (20:22 -0400)]
Add sqrt operator

11 years agoCall AM_INIT_AUTOMAKE once only 175/head
Ankur [Sun, 1 Sep 2013 08:58:26 +0000 (18:58 +1000)]
Call AM_INIT_AUTOMAKE once only

Fixes build with automake-1.14

11 years agoFix Makefile after refactoring of stacks in 05d90517b02 171/head
Joe Littlejohn [Mon, 19 Aug 2013 12:40:08 +0000 (13:40 +0100)]
Fix Makefile after refactoring of stacks in 05d90517b02

11 years agoRemove #includes from jv.h libjq
Stephen Dolan [Sun, 23 Jun 2013 13:23:07 +0000 (14:23 +0100)]
Remove #includes from jv.h

11 years agoFix the jv_parser interface.
Stephen Dolan [Sun, 23 Jun 2013 11:26:49 +0000 (12:26 +0100)]
Fix the jv_parser interface.

11 years agoUse libtool's built-in symbol exporting rather than a mapfile.
Stephen Dolan [Sun, 23 Jun 2013 11:10:58 +0000 (12:10 +0100)]
Use libtool's built-in symbol exporting rather than a mapfile.

11 years agoMove gen_utf8_tables to scripts
Stephen Dolan [Sun, 23 Jun 2013 11:08:22 +0000 (12:08 +0100)]
Move gen_utf8_tables to scripts

11 years agoMove libtool m4 junk to config/ and delete some autogenerated files.
Stephen Dolan [Sun, 23 Jun 2013 10:47:42 +0000 (11:47 +0100)]
Move libtool m4 junk to config/ and delete some autogenerated files.

11 years agoRemove Autoconf-generated config.h.
Stephen Dolan [Sun, 23 Jun 2013 10:16:41 +0000 (11:16 +0100)]
Remove Autoconf-generated config.h.

11 years agoMerge branch 'header-cleanup' into libjq
Stephen Dolan [Sat, 22 Jun 2013 22:27:16 +0000 (23:27 +0100)]
Merge branch 'header-cleanup' into libjq

Conflicts:
Makefile.am

11 years agoBuild libjq only once, and link it statically to ./jq
Stephen Dolan [Sat, 22 Jun 2013 19:53:28 +0000 (20:53 +0100)]
Build libjq only once, and link it statically to ./jq

This means ./jq is a real binary rather than a libtool turd.

11 years agoFix distcheck.
Stephen Dolan [Sat, 22 Jun 2013 19:53:03 +0000 (20:53 +0100)]
Fix distcheck.

Update list of files to be distributed.

11 years agoMerge pull request #162 from stedolan/utf8-fixes
Stephen Dolan [Sat, 22 Jun 2013 16:30:59 +0000 (09:30 -0700)]
Merge pull request #162 from stedolan/utf8-fixes

Utf8 fixes. Closes #161

11 years agoReject all overlong UTF8 sequences. 162/head
Stephen Dolan [Sat, 22 Jun 2013 12:42:56 +0000 (13:42 +0100)]
Reject all overlong UTF8 sequences.

11 years agoFix various UTF8 parsing bugs.
Stephen Dolan [Sat, 22 Jun 2013 12:34:24 +0000 (13:34 +0100)]
Fix various UTF8 parsing bugs.

In particular, parse bad UTF8 by replacing the broken bits with U+FFFD
and resychronise correctly after broken sequences.

11 years agoFix example in manual for `floor`. See #155.
Stephen Dolan [Sat, 22 Jun 2013 11:17:28 +0000 (12:17 +0100)]
Fix example in manual for `floor`. See #155.

11 years agoDocument floor
Nicolas Williams [Wed, 19 Jun 2013 06:12:11 +0000 (01:12 -0500)]
Document floor

11 years agoAdd floor operator
Nicolas Williams [Tue, 18 Jun 2013 01:50:45 +0000 (20:50 -0500)]
Add floor operator

11 years agoDocument mod
Nicolas Williams [Wed, 19 Jun 2013 06:11:57 +0000 (01:11 -0500)]
Document mod

11 years agoAdd mod (and setmod) operators
Nicolas Williams [Tue, 18 Jun 2013 01:21:37 +0000 (20:21 -0500)]
Add mod (and setmod) operators

11 years agoUpdate .gitignore 153/head
Nicolas Williams [Fri, 21 Jun 2013 17:41:57 +0000 (12:41 -0500)]
Update .gitignore

11 years agoAdd libjq autoconf goo
Nicolas Williams [Sun, 16 Jun 2013 13:25:12 +0000 (08:25 -0500)]
Add libjq autoconf goo

11 years agoQuiet setup.sh re: tmp dir
Nicolas Williams [Sun, 16 Jun 2013 13:24:52 +0000 (08:24 -0500)]
Quiet setup.sh re: tmp dir

11 years agoMerge pull request #157 from nicowilliams/argfile-fixes
Stephen Dolan [Fri, 21 Jun 2013 16:40:32 +0000 (09:40 -0700)]
Merge pull request #157 from nicowilliams/argfile-fixes

Argfile fixes

11 years agoMove cfunction invocation code to the interpreter loop. header-cleanup
Stephen Dolan [Fri, 21 Jun 2013 11:06:28 +0000 (12:06 +0100)]
Move cfunction invocation code to the interpreter loop.

11 years agoFix serious bug in handling of --argfile 157/head
Nicolas Williams [Tue, 18 Jun 2013 03:32:44 +0000 (22:32 -0500)]
Fix serious bug in handling of --argfile

11 years agoFix leaks in jv_load_file()
Nicolas Williams [Tue, 18 Jun 2013 03:32:54 +0000 (22:32 -0500)]
Fix leaks in jv_load_file()

11 years agoFold opcode.{c,h} into bytecode.{c,h}
Stephen Dolan [Tue, 18 Jun 2013 00:36:18 +0000 (01:36 +0100)]
Fold opcode.{c,h} into bytecode.{c,h}

11 years agoSimplify block functions for variables
Stephen Dolan [Tue, 18 Jun 2013 00:07:18 +0000 (01:07 +0100)]
Simplify block functions for variables

11 years agoSaner build instructions in README.md
Stephen Dolan [Mon, 17 Jun 2013 23:28:50 +0000 (00:28 +0100)]
Saner build instructions in README.md

Closes #144

11 years agoRemove some initialise-to-zero code.
Stephen Dolan [Mon, 17 Jun 2013 23:17:20 +0000 (00:17 +0100)]
Remove some initialise-to-zero code.

This lets valgrind find more bugs - if a field isn't given a
well-defined value valgrind will now find it instead of seeing it
set to zero with memset.

11 years agoMerge branch 'stack-refactor-merge'
Stephen Dolan [Mon, 17 Jun 2013 23:13:44 +0000 (00:13 +0100)]
Merge branch 'stack-refactor-merge'

11 years agoMerge branch 'stack-refactor'
Stephen Dolan [Mon, 17 Jun 2013 23:06:00 +0000 (00:06 +0100)]
Merge branch 'stack-refactor'

Conflicts:
execute.c

11 years agoMerge pull request #154 from nicowilliams/no-fopen-re
Stephen Dolan [Mon, 17 Jun 2013 22:34:01 +0000 (15:34 -0700)]
Merge pull request #154 from nicowilliams/no-fopen-re

Remove accidentally introduced use of fopen "e"

11 years agoRemove accidentally introduced use of fopen "e" 154/head
Nicolas Williams [Mon, 17 Jun 2013 22:27:25 +0000 (17:27 -0500)]
Remove accidentally introduced use of fopen "e"

11 years agoMerge pull request #114 from nicowilliams/nomem_handler
Stephen Dolan [Sun, 16 Jun 2013 13:20:27 +0000 (06:20 -0700)]
Merge pull request #114 from nicowilliams/nomem_handler

Add jv_nomem_handler()

11 years agoRemove last remnant of main.h 114/head
Nicolas Williams [Sun, 16 Jun 2013 13:06:52 +0000 (08:06 -0500)]
Remove last remnant of main.h

11 years agoAllow --run-tests to take a file argument
Nicolas Williams [Sat, 15 Jun 2013 06:55:47 +0000 (01:55 -0500)]
Allow --run-tests to take a file argument

11 years agoFixup API to get closer to a libjq
Nicolas Williams [Thu, 6 Jun 2013 22:26:15 +0000 (17:26 -0500)]
Fixup API to get closer to a libjq

11 years agoMerge pull request #150 from nicowilliams/jv_load_file
Stephen Dolan [Sat, 15 Jun 2013 12:29:17 +0000 (05:29 -0700)]
Merge pull request #150 from nicowilliams/jv_load_file

Move slurp_file() into library as jv_load_file()

11 years agoMove slurp_file() into library as jv_load_file() 150/head
Nicolas Williams [Sat, 15 Jun 2013 05:08:59 +0000 (00:08 -0500)]
Move slurp_file() into library as jv_load_file()

Needed as part of creating a libjq.

11 years agoClean up lots of stack and frame logic.
Stephen Dolan [Fri, 14 Jun 2013 21:08:18 +0000 (22:08 +0100)]
Clean up lots of stack and frame logic.

Move frame defs to execute.c

11 years agoSimplify frame logic.
Stephen Dolan [Fri, 14 Jun 2013 00:20:24 +0000 (01:20 +0100)]
Simplify frame logic.

11 years agoUnify all stacks. Passes tests, but needs cleanup.
Stephen Dolan [Thu, 13 Jun 2013 20:50:32 +0000 (21:50 +0100)]
Unify all stacks. Passes tests, but needs cleanup.

11 years agoSupport ."foo" syntax for accessing fields. See #141.
Stephen Dolan [Tue, 11 Jun 2013 21:26:39 +0000 (22:26 +0100)]
Support ."foo" syntax for accessing fields. See #141.

11 years agoUnify frame and data stacks
Stephen Dolan [Mon, 10 Jun 2013 00:17:58 +0000 (01:17 +0100)]
Unify frame and data stacks

11 years agoSpeed up cached configure (./configure -C)
Stephen Dolan [Wed, 5 Jun 2013 15:40:01 +0000 (16:40 +0100)]
Speed up cached configure (./configure -C)

11 years agoClean up flex lines in build
Stephen Dolan [Wed, 5 Jun 2013 12:43:23 +0000 (13:43 +0100)]
Clean up flex lines in build

11 years agoLex and parse .foo better.
Stephen Dolan [Wed, 5 Jun 2013 12:41:11 +0000 (13:41 +0100)]
Lex and parse .foo better.

'.as' is now valid, '. foo' is now invalid. See #141.

11 years agoMerge pull request #142 from lanthaler/master
Stephen Dolan [Tue, 4 Jun 2013 11:13:24 +0000 (04:13 -0700)]
Merge pull request #142 from lanthaler/master

Update README.md

11 years agoUpdate README.md 142/head
Markus Lanthaler [Tue, 4 Jun 2013 11:04:42 +0000 (13:04 +0200)]
Update README.md

Update the link to the documentation. All GitHub pages are now using the github.io domain.

11 years agoMake jq --version print to stdout, not stderr
Stephen Dolan [Mon, 3 Jun 2013 22:22:59 +0000 (23:22 +0100)]
Make jq --version print to stdout, not stderr

11 years agoBetter error handling for .foo case in parser. See #141.
Stephen Dolan [Mon, 3 Jun 2013 22:08:17 +0000 (23:08 +0100)]
Better error handling for .foo case in parser. See #141.

11 years agoLet the parser rather than the lexer handle invalid characters.
Stephen Dolan [Mon, 3 Jun 2013 22:07:13 +0000 (23:07 +0100)]
Let the parser rather than the lexer handle invalid characters.

11 years agoAdd command-line option to sort object keys.
Stephen Dolan [Wed, 29 May 2013 10:43:55 +0000 (11:43 +0100)]
Add command-line option to sort object keys.

Closes #79.

11 years agoClean up Makefile.am (distcheck, rebuild version.h less often)
Stephen Dolan [Sat, 25 May 2013 22:46:20 +0000 (23:46 +0100)]
Clean up Makefile.am (distcheck, rebuild version.h less often)

11 years agoMerge pull request #139 from 13ren/stopwarning
Stephen Dolan [Sat, 1 Jun 2013 14:30:15 +0000 (07:30 -0700)]
Merge pull request #139 from 13ren/stopwarning

Stop warning on fgets, jq_test.c:42

11 years agoStop warning on fgets, simple version 139/head
Brendan Macmillan [Sat, 1 Jun 2013 01:00:26 +0000 (11:00 +1000)]
Stop warning on fgets, simple version

11 years agoStop warning on fgets, complex version
Brendan Macmillan [Fri, 31 May 2013 04:21:55 +0000 (14:21 +1000)]
Stop warning on fgets, complex version

11 years agoSquash a warning on some GCC versions
Stephen Dolan [Fri, 31 May 2013 11:15:58 +0000 (12:15 +0100)]
Squash a warning on some GCC versions

11 years agoSupport for printing object keys in sorted order.
Stephen Dolan [Wed, 29 May 2013 10:43:23 +0000 (11:43 +0100)]
Support for printing object keys in sorted order.

No command-line option to enable this yet. See #79.

11 years agoMerge pull request #135 from 13ren/locfile_bugfix
Stephen Dolan [Wed, 29 May 2013 10:38:15 +0000 (03:38 -0700)]
Merge pull request #135 from 13ren/locfile_bugfix

Locfile bugfix

11 years agoMerge pull request #130 from 13ren/libload_2
Stephen Dolan [Wed, 29 May 2013 10:37:36 +0000 (03:37 -0700)]
Merge pull request #130 from 13ren/libload_2

libload_2 (update to pull request #126, for issue  #112)

11 years agoBugfix multiline off-by-one (locfile.c) 135/head
Brendan Macmillan [Tue, 28 May 2013 04:11:24 +0000 (14:11 +1000)]
Bugfix multiline off-by-one (locfile.c)

11 years agolocfile.h -> locfile.h + locfile.c
Brendan Macmillan [Sun, 26 May 2013 02:42:04 +0000 (12:42 +1000)]
locfile.h -> locfile.h + locfile.c

clean up includes of a few files

11 years agoHack bugfix for multiline off-by-one (locfile.c)
Brendan Macmillan [Mon, 27 May 2013 00:00:01 +0000 (10:00 +1000)]
Hack bugfix for multiline off-by-one (locfile.c)

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.