project/jsonpath.git
15 months agoremove obsolete /opt/local include/lib directories on mac os x master
Felix Fietkau [Sat, 2 Jul 2016 08:16:53 +0000 (10:16 +0200)]
remove obsolete /opt/local include/lib directories on mac os x

Signed-off-by: Felix Fietkau <nbd@nbd.name>
15 months agoremove --gc-sections for mac os x builds
Felix Fietkau [Sat, 2 Jul 2016 08:16:34 +0000 (10:16 +0200)]
remove --gc-sections for mac os x builds

Signed-off-by: Felix Fietkau <nbd@nbd.name>
15 months agocmake: Find libubox/list.h header file
Florian Fainelli [Fri, 1 Jul 2016 23:06:16 +0000 (16:06 -0700)]
cmake: Find libubox/list.h header file

Add a CMake FIND_PATH and INCLUDE_DIRECTORIES searching for
libubox/list.h.  Some external toolchains which do not include standard
locations would fail to find the header otherwise.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
16 months agotreewide: replace jow@openwrt.org with jo@mein.io
Jo-Philipp Wich [Tue, 7 Jun 2016 12:29:56 +0000 (14:29 +0200)]
treewide: replace jow@openwrt.org with jo@mein.io

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
16 months agocli: properly format 64bit values
Jo-Philipp Wich [Wed, 1 Jun 2016 14:47:00 +0000 (16:47 +0200)]
cli: properly format 64bit values

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
17 months agoparser: allow root path specifications
Jo-Philipp Wich [Tue, 24 May 2016 15:06:50 +0000 (17:06 +0200)]
parser: allow root path specifications

All a patch specification to be just '@' or '$' - this is mainly useful when
exporting the keys of the toplevel object to the shell.

Example:

    $ echo '{ "abc": 1, "def": 2 }' | jsonpath -e 'keys=@'
    export keys='abc'\ 'def';

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
20 months agomain: Add basic help output
Karl Palsson [Wed, 3 Feb 2016 17:11:57 +0000 (17:11 +0000)]
main: Add basic help output

Add basic usage text to the binary and print it when invoked with -h
or with no arguments at all.

Signed-off-by: Karl Palsson <karlp@remake.is>
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
20 months agomatcher: fix segfault with subscript on non-array element
Jo-Philipp Wich [Wed, 3 Feb 2016 17:32:55 +0000 (18:32 +0100)]
matcher: fix segfault with subscript on non-array element

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
20 months agocontrib: add ParseTrace prototype to parser skeleton
Jo-Philipp Wich [Wed, 3 Feb 2016 16:09:51 +0000 (17:09 +0100)]
contrib: add ParseTrace prototype to parser skeleton

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
23 months agocli: prevent segfault if input file failed to open
Jo-Philipp Wich [Tue, 27 Oct 2015 12:42:00 +0000 (13:42 +0100)]
cli: prevent segfault if input file failed to open

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agocli: implement limit flag
Jo-Philipp Wich [Thu, 19 Jun 2014 11:51:28 +0000 (13:51 +0200)]
cli: implement limit flag

The new "-l" flag allows limiting the number of results getting printed.
This is useful for expressions which match many items when only the first
is desired.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agomatcher.c: properly handle negative array indizes
Jo-Philipp Wich [Thu, 19 Jun 2014 10:08:08 +0000 (12:08 +0200)]
matcher.c: properly handle negative array indizes

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agocli: add a flag to specify arbritary field separators
Jo-Philipp Wich [Thu, 19 Jun 2014 09:21:41 +0000 (11:21 +0200)]
cli: add a flag to specify arbritary field separators

This is useful to join values with a specified char instead of the
default space.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agoImprove error reporting
Jo-Philipp Wich [Wed, 18 Jun 2014 15:59:51 +0000 (17:59 +0200)]
Improve error reporting

Keep track of the exact location the error occured in and switch
the internal error description from a dynamic string buffer to an
integer which either holds negative values for lexer errors or
positives values for grammer violations.

In case of grammer violations the "error_code" member will hold
a bitfield describing the expected tokens.

Also rework the error messages emitted by the cli to be more
precise.

Examples:

$ jsonfilter -s '{}' -e '@.foo bar'
Syntax error: Expecting End of file
In expression @.foo bar
Near here ----------^

$ jsonfilter -s '{}' -e '@.foo\bar'
Syntax error: Unexpected character
In expression @.foo\bar
Near here ---------^

$ jsonfilter -s '{}' -e '@.foo..bar'
Syntax error: Expecting Label or '*'
In expression @.foo..bar
Near here ----------^

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agocli: minor whitespace fix
Jo-Philipp Wich [Wed, 18 Jun 2014 09:33:41 +0000 (11:33 +0200)]
cli: minor whitespace fix

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agoSwitch to sqlite3's lemon parser generator.
Jo-Philipp Wich [Sun, 15 Jun 2014 14:31:14 +0000 (16:31 +0200)]
Switch to sqlite3's lemon parser generator.

This commit drops the flex + bison code in favor to a hand-written
lexer and a new grammar file in lemon syntax.

The change results in a much smaller binary and easier to maintain
code. Code required to build and maintain the AST has been split
off into the ast.c and ast.h files.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agobuild: use -ffunction-sections and --gc-sections
Jo-Philipp Wich [Fri, 13 Jun 2014 13:26:37 +0000 (15:26 +0200)]
build: use -ffunction-sections and --gc-sections

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
3 years agocli: supress printing "null" in non-export mode, output strings unescaped
Jo-Philipp Wich [Mon, 6 Jan 2014 11:55:44 +0000 (11:55 +0000)]
cli: supress printing "null" in non-export mode, output strings unescaped

3 years agoUpdate copyright
Jo-Philipp Wich [Thu, 2 Jan 2014 12:51:59 +0000 (12:51 +0000)]
Update copyright

3 years agoparser: fix error reporting
Jo-Philipp Wich [Wed, 1 Jan 2014 21:39:23 +0000 (21:39 +0000)]
parser: fix error reporting

3 years agolexer, parser, matcher: extend grammar to allow comma separated keys/indexes as more...
Jo-Philipp Wich [Wed, 1 Jan 2014 21:38:08 +0000 (21:38 +0000)]
lexer, parser, matcher: extend grammar to allow comma separated keys/indexes as more readable alternative to or expressions

3 years agocli: gather all found items through a callback function
Jo-Philipp Wich [Wed, 1 Jan 2014 15:44:00 +0000 (15:44 +0000)]
cli: gather all found items through a callback function

3 years agomatcher: add user callback and support implicit index/key compares
Jo-Philipp Wich [Wed, 1 Jan 2014 15:39:20 +0000 (15:39 +0000)]
matcher: add user callback and support implicit index/key compares

- introduced callback argument in jp_match() which is invoked for each found json item
- when chaining strings or numbers in or expressions, implicitely match them against the current key

3 years agolexer: accept single quoted string literals
Jo-Philipp Wich [Tue, 31 Dec 2013 00:07:06 +0000 (00:07 +0000)]
lexer: accept single quoted string literals

3 years agoparser: fix order of declarations
Jo-Philipp Wich [Sun, 29 Dec 2013 21:31:35 +0000 (21:31 +0000)]
parser: fix order of declarations

3 years agocli: implemnt -s flag to pass json source as string argument
Jo-Philipp Wich [Sun, 29 Dec 2013 21:19:11 +0000 (21:19 +0000)]
cli: implemnt -s flag to pass json source as string argument

3 years agocli: additional flags and cleanup
Jo-Philipp Wich [Sun, 29 Dec 2013 21:05:44 +0000 (21:05 +0000)]
cli: additional flags and cleanup

* add -q flag to suppress error messages
* add -t flag to test type of result
* clean up exit codes to indicate success;
- 0 if all -t and -e expression yielded a result
- 1 if at least one -t or -e expression didn't match
- 125 when failed to open input file
- 126 when failed to parse json input
- 127 when the farser fails due to oom

3 years agoparser: change exitcode in case of oom errors
Jo-Philipp Wich [Sun, 29 Dec 2013 21:03:51 +0000 (21:03 +0000)]
parser: change exitcode in case of oom errors

3 years agoAmend gitignore
Jo-Philipp Wich [Sun, 29 Dec 2013 18:07:40 +0000 (18:07 +0000)]
Amend gitignore

3 years agoAdd gitignore file
Jo-Philipp Wich [Sun, 29 Dec 2013 18:07:00 +0000 (18:07 +0000)]
Add gitignore file

3 years agoeliminate global variables and use a private parser/lexer state
Jo-Philipp Wich [Sun, 29 Dec 2013 18:03:10 +0000 (18:03 +0000)]
eliminate global variables and use a private parser/lexer state

3 years agocmake: let generated lexer.c, parser.c depend on their respective source files, clean...
Jo-Philipp Wich [Sun, 29 Dec 2013 18:02:04 +0000 (18:02 +0000)]
cmake: let generated lexer.c, parser.c depend on their respective source files, clean generated headers

3 years agoRemove generated files
Jo-Philipp Wich [Sat, 28 Dec 2013 21:26:59 +0000 (21:26 +0000)]
Remove generated files

3 years agoInitial commit
Jo-Philipp Wich [Sat, 28 Dec 2013 21:25:20 +0000 (21:25 +0000)]
Initial commit