nvgn/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-26 20:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment bug fixes, and fully support Tcl-style multiline comments

Browse Source 
* bugfix: comments were incorrectly being terminated by CR; for example
    jq -n $'1 #foo\r'
  fails to compile because the CR character terminates the comment, and
  CR is not a valid character in jq syntax.

* improvement: comments fully support Tcl-style line continuation.
  Previously this was only "supported" in `-f' scripts, whose first line
  starts with "#!", and second line starts with # and ends with \, only
  for the comment on the second line, only for one extra line.

* man: document comment syntax, which was previously undocumented.

* tests: add regression tests for the bugfix, and some tests for line
  continuation in comments.
This commit is contained in:
Emanuele Torre authored and Nico Williams committed 2023-11-03 15:52:02 -05:00
1 parent f4929f3c19
commit cca1f7d18f
7 files changed
+471 -298
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/content/manual/manual.yml
+63 -1
View File
@@ -229,7 +229,7 @@ sections:
* `-f filename` / `--from-file filename`: * `-f filename` / `--from-file filename`:
Read filter from the file rather than from a command line, like Read filter from the file rather than from a command line, like
awk's -f option. You can also use '#' to make comments. awk's -f option.
* `-L directory`: * `-L directory`:
@@ -3537,6 +3537,68 @@ sections:
(.posts[] | select(.author == "stedolan") | .comments) |= (.posts[] | select(.author == "stedolan") | .comments) |=
. + ["terrible."] . + ["terrible."]
- title: Comments
body: |
You can write comments in your jq filters using `#`.
A `#` character (not part of a string) starts a comment.
All characters from `#` to the end of the line are ignored.
If the end of the line is preceded by an odd number of backslash
characters, the following line is also considered part of the
comment and is ignored.
For example, the following code outputs `[1,3,4,7]`
[
1,
# foo \
2,
# bar \\
3,
4, # baz \\\
5, \
6,
7
# comment \
comment \
comment
]
Backslash continuing the comment on the next line can be useful
when writing the "shebang" for a jq script:
#!/bin/sh --
# sum - Output the sum of the given arguments (or stdin)
# usage: sum [numbers...]
# \
exec jq --args -MRnf "$0" -- "$@"
$ARGS.positional |
reduce (
if . == []
then inputs
else .[]
end |
. as $dot |
try tonumber catch false |
if not or isnan then
@json "sum: Invalid number \($dot).\n" | halt_error(1)
end
) as $n (0; . + $n)
The `exec` line is considered a comment by jq, so it is ignored.
But it is not ignored by `sh`, since in `sh` a backslash at the
end of the line does not continue the comment.
With this trick, when the script is invoked as `sum 1 2`,
`/bin/sh -- /path/to/sum 1 2` will be run, and `sh` will then
run `exec jq --args -MRnf /path/to/sum -- 1 2` replacing itself
with a `jq` interpreter invoked with the specified options (`-M`,
`-R`, `-n`, `--args`), that evaluates the current file (`$0`),
with the arguments (`$@`) that were passed to `sh`.
- title: Modules - title: Modules
body: | body: |
jq.1.prebuilt
Generated
+70 -2
View File
@@ -1,5 +1,5 @@
. .
.TH "JQ" "1" "October 2023" "" "" .TH "JQ" "1" "November 2023" "" ""
. .
.SH "NAME" .SH "NAME"
\fBjq\fR \- Command\-line JSON processor \fBjq\fR \- Command\-line JSON processor
@@ -166,7 +166,7 @@ Use the \fBapplication/json\-seq\fR MIME type scheme for separating JSON texts i
\fB\-f filename\fR / \fB\-\-from\-file filename\fR: \fB\-f filename\fR / \fB\-\-from\-file filename\fR:
. .
.IP .IP
Read filter from the file rather than from a command line, like awk\'s \-f option\. You can also use \'#\' to make comments\. Read filter from the file rather than from a command line, like awk\'s \-f option\.
. .
.TP .TP
\fB\-L directory\fR: \fB\-L directory\fR:
@@ -3955,6 +3955,74 @@ The paths provided by this operation point to each of the posts that "stedolan"
. .
.IP "" 0 .IP "" 0
. .
.SH "COMMENTS"
You can write comments in your jq filters using \fB#\fR\.
.
.P
A \fB#\fR character (not part of a string) starts a comment\. All characters from \fB#\fR to the end of the line are ignored\.
.
.P
If the end of the line is preceded by an odd number of backslash characters, the following line is also considered part of the comment and is ignored\.
.
.P
For example, the following code outputs \fB[1,3,4,7]\fR
.
.IP "" 4
.
.nf
[
1,
# foo \e
2,
# bar \e\e
3,
4, # baz \e\e\e
5, \e
6,
7
# comment \e
comment \e
comment
]
.
.fi
.
.IP "" 0
.
.P
Backslash continuing the comment on the next line can be useful when writing the "shebang" for a jq script:
.
.IP "" 4
.
.nf
#!/bin/sh \-\-
# sum \- Output the sum of the given arguments (or stdin)
# usage: sum [numbers\.\.\.]
# \e
exec jq \-\-args \-MRnf "$0" \-\- "$@"
$ARGS\.positional |
reduce (
if \. == []
then inputs
else \.[]
end |
\. as $dot |
try tonumber catch false |
if not or isnan then
@json "sum: Invalid number \e($dot)\.\en" | halt_error(1)
end
) as $n (0; \. + $n)
.
.fi
.
.IP "" 0
.
.P
The \fBexec\fR line is considered a comment by jq, so it is ignored\. But it is not ignored by \fBsh\fR, since in \fBsh\fR a backslash at the end of the line does not continue the comment\. With this trick, when the script is invoked as \fBsum 1 2\fR, \fB/bin/sh \-\- /path/to/sum 1 2\fR will be run, and \fBsh\fR will then run \fBexec jq \-\-args \-MRnf /path/to/sum \-\- 1 2\fR replacing itself with a \fBjq\fR interpreter invoked with the specified options (\fB\-M\fR, \fB\-R\fR, \fB\-n\fR, \fB\-\-args\fR), that evaluates the current file (\fB$0\fR), with the arguments (\fB$@\fR) that were passed to \fBsh\fR\.
.
.SH "MODULES" .SH "MODULES"
jq has a library/module system\. Modules are files whose names end in \fB\.jq\fR\. jq has a library/module system\. Modules are files whose names end in \fB\.jq\fR\.
. .
src/lexer.c
Generated
+297 -276
View File
@@ -573,8 +573,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
yyg->yy_hold_char = *yy_cp; \ yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 51 #define YY_NUM_RULES 53
#define YY_END_OF_BUFFER 52 #define YY_END_OF_BUFFER 54
/* This struct is not used in this scanner, /* This struct is not used in this scanner,
but its presence is necessary. */ but its presence is necessary. */
struct yy_trans_info struct yy_trans_info
@@ -582,44 +582,44 @@ struct yy_trans_info
flex_int32_t yy_verify; flex_int32_t yy_verify;
flex_int32_t yy_nxt; flex_int32_t yy_nxt;
}; };
static const flex_int16_t yy_accept[163] = static const flex_int16_t yy_accept[168] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 52, 50, 49, 49, 50, 40, 1, 35, 0, 0, 0, 0, 54, 52, 51, 51, 52, 42,
35, 36, 37, 35, 35, 35, 35, 35, 35, 39, 1, 37, 37, 38, 39, 37, 37, 37, 37, 37,
35, 35, 35, 35, 50, 46, 46, 46, 46, 46, 37, 41, 37, 37, 37, 37, 52, 48, 48, 48,
46, 46, 46, 46, 46, 46, 46, 46, 35, 44, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
44, 42, 45, 49, 2, 1, 48, 48, 29, 27, 37, 46, 46, 44, 47, 2, 3, 2, 51, 4,
25, 26, 33, 39, 47, 18, 28, 39, 39, 0, 50, 50, 31, 29, 27, 28, 35, 41, 49, 20,
31, 3, 32, 0, 38, 46, 0, 46, 4, 46, 30, 41, 41, 0, 33, 5, 34, 0, 40, 48,
46, 46, 46, 46, 46, 9, 46, 46, 46, 46, 0, 48, 6, 48, 48, 48, 48, 48, 48, 11,
14, 46, 46, 46, 24, 44, 43, 41, 43, 48, 48, 48, 48, 48, 16, 48, 48, 48, 26, 46,
0, 48, 47, 30, 39, 0, 39, 34, 0, 13, 45, 43, 45, 2, 50, 0, 50, 49, 32, 41,
46, 46, 8, 46, 46, 15, 46, 46, 46, 46, 0, 41, 36, 0, 15, 48, 48, 10, 48, 48,
46, 46, 46, 19, 0, 43, 0, 48, 46, 46, 17, 48, 48, 48, 48, 48, 48, 48, 21, 0,
46, 12, 11, 46, 46, 46, 46, 46, 46, 10, 45, 0, 50, 48, 48, 48, 14, 13, 48, 48,
43, 48, 22, 20, 46, 46, 46, 21, 46, 46, 48, 48, 48, 48, 12, 45, 50, 24, 22, 48,
43, 48, 46, 5, 46, 7, 16, 48, 17, 6, 48, 48, 23, 48, 48, 45, 50, 48, 7, 48,
23, 0 9, 18, 50, 19, 8, 25, 0
} ; } ;
static const YY_CHAR yy_ec[256] = static const YY_CHAR yy_ec[256] =
{ 0, { 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 2, 5, 6, 7, 8, 9, 1, 1, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
11, 12, 13, 14, 15, 16, 17, 18, 18, 18, 1, 2, 4, 5, 6, 7, 8, 1, 1, 9,
18, 18, 18, 18, 18, 18, 18, 19, 20, 21, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17,
22, 23, 24, 25, 26, 26, 26, 26, 27, 26, 17, 17, 17, 17, 17, 17, 17, 18, 19, 20,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 21, 22, 23, 24, 25, 25, 25, 25, 26, 25,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
28, 29, 30, 1, 31, 1, 32, 33, 34, 35, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
27, 28, 29, 1, 30, 1, 31, 32, 33, 34,
36, 37, 26, 38, 39, 26, 40, 41, 42, 43, 35, 36, 25, 37, 38, 25, 39, 40, 41, 42,
44, 45, 26, 46, 47, 48, 49, 26, 26, 26, 43, 44, 25, 45, 46, 47, 48, 25, 25, 25,
50, 26, 51, 52, 53, 1, 1, 1, 1, 1, 49, 25, 50, 51, 52, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -636,152 +636,154 @@ static const YY_CHAR yy_ec[256] =
1, 1, 1, 1, 1 1, 1, 1, 1, 1
} ; } ;
static const YY_CHAR yy_meta[54] = static const YY_CHAR yy_meta[53] =
{ 0, { 0,
1, 1, 2, 2, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 4, 1, 5, 6, 1, 1, 1, 1, 1, 3, 1, 4, 5, 1, 1,
1, 1, 1, 1, 1, 7, 7, 1, 8, 1, 1, 1, 1, 1, 6, 6, 1, 7, 1, 8,
9, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 1,
1, 1, 1 1, 1
} ; } ;
static const flex_int16_t yy_base[178] = static const flex_int16_t yy_base[183] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
51, 52, 329, 330, 57, 59, 306, 330, 0, 296, 50, 51, 54, 55, 331, 332, 57, 59, 309, 332,
304, 330, 330, 303, 302, 330, 301, 47, 47, 50, 332, 299, 307, 332, 332, 306, 305, 332, 304, 48,
300, 299, 298, 302, 0, 299, 48, 37, 52, 51, 48, 51, 303, 302, 301, 305, 0, 302, 49, 52,
53, 54, 60, 56, 55, 59, 57, 63, 295, 0, 53, 54, 56, 57, 63, 62, 58, 67, 55, 69,
0, 330, 75, 87, 330, 0, 297, 73, 330, 330, 298, 0, 0, 332, 79, 332, 332, 89, 100, 332,
330, 330, 330, 89, 0, 293, 330, 90, 94, 100, 300, 89, 332, 332, 332, 332, 332, 94, 0, 296,
330, 330, 330, 297, 0, 294, 291, 87, 287, 92, 332, 96, 106, 116, 332, 332, 332, 300, 0, 297,
81, 95, 100, 101, 104, 283, 108, 112, 115, 114, 296, 76, 295, 90, 91, 98, 97, 106, 100, 294,
280, 116, 118, 119, 330, 0, 266, 330, 263, 271, 108, 118, 121, 124, 293, 126, 119, 128, 332, 0,
268, 121, 0, 330, 125, 255, 250, 330, 0, 245, 282, 332, 281, 332, 288, 284, 129, 0, 332, 131,
123, 122, 240, 126, 138, 238, 139, 140, 125, 141, 281, 278, 332, 0, 273, 131, 132, 270, 137, 141,
145, 146, 148, 235, 158, 223, 0, 152, 229, 153, 268, 143, 138, 145, 149, 146, 150, 153, 265, 161,
151, 220, 208, 154, 157, 159, 160, 161, 163, 207, 242, 0, 154, 247, 157, 156, 244, 239, 161, 162,
196, 164, 204, 203, 166, 162, 169, 202, 173, 180, 164, 165, 168, 169, 237, 224, 170, 232, 228, 171,
191, 186, 168, 200, 192, 199, 196, 193, 195, 194, 172, 181, 209, 182, 183, 196, 192, 188, 205, 193,
171, 330, 228, 237, 240, 246, 251, 256, 265, 274, 203, 202, 196, 198, 195, 173, 332, 228, 236, 239,
279, 284, 289, 291, 296, 300, 304 245, 250, 255, 263, 271, 276, 281, 286, 288, 293,
297, 301
} ; } ;
static const flex_int16_t yy_def[178] = static const flex_int16_t yy_def[183] =
{ 0, { 0,
162, 1, 1, 1, 1, 1, 1, 1, 1, 1, 167, 1, 1, 1, 1, 1, 1, 1, 1, 1,
163, 163, 162, 162, 162, 162, 162, 162, 164, 165, 168, 168, 169, 169, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 166, 162, 162, 167, 170, 167, 167, 167, 167, 167, 167, 167, 171,
162, 162, 162, 162, 167, 168, 168, 168, 168, 168, 167, 167, 167, 167, 167, 167, 172, 173, 173, 173,
168, 168, 168, 168, 168, 168, 168, 168, 162, 169, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
169, 162, 170, 162, 162, 164, 171, 171, 162, 162, 167, 174, 174, 167, 175, 167, 167, 167, 167, 167,
162, 162, 162, 162, 172, 162, 162, 162, 162, 162, 176, 176, 167, 167, 167, 167, 167, 167, 177, 167,
162, 162, 162, 162, 167, 168, 162, 168, 168, 168, 167, 167, 167, 167, 167, 167, 167, 167, 172, 173,
168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 167, 173, 173, 173, 173, 173, 173, 173, 173, 173,
168, 168, 168, 168, 162, 169, 162, 162, 173, 171, 173, 173, 173, 173, 173, 173, 173, 173, 167, 174,
162, 171, 172, 162, 162, 162, 162, 162, 174, 168, 167, 167, 178, 167, 176, 167, 176, 177, 167, 167,
168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 167, 167, 167, 179, 173, 173, 173, 173, 173, 173,
168, 168, 168, 168, 170, 175, 165, 171, 168, 168, 173, 173, 173, 173, 173, 173, 173, 173, 173, 175,
168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 180, 170, 176, 173, 173, 173, 173, 173, 173, 173,
176, 171, 168, 168, 168, 168, 168, 168, 168, 168, 173, 173, 173, 173, 173, 181, 176, 173, 173, 173,
177, 171, 168, 168, 168, 168, 168, 171, 168, 168, 173, 173, 173, 173, 173, 182, 176, 173, 173, 173,
171, 0, 162, 162, 162, 162, 162, 162, 162, 162, 173, 173, 176, 173, 173, 176, 0, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
167, 167
} ; } ;
static const flex_int16_t yy_nxt[384] = static const flex_int16_t yy_nxt[385] =
{ 0, { 0,
14, 15, 16, 14, 17, 18, 19, 20, 21, 22, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
23, 24, 25, 26, 27, 28, 29, 30, 26, 26, 26, 27, 28, 29, 30, 31, 32, 28, 28, 33,
31, 32, 33, 34, 35, 36, 36, 22, 14, 23, 34, 35, 36, 37, 38, 38, 24, 16, 25, 38,
36, 37, 38, 39, 40, 41, 42, 36, 43, 36, 39, 40, 41, 42, 43, 44, 38, 45, 38, 46,
44, 45, 36, 46, 36, 47, 36, 48, 36, 36, 47, 38, 48, 38, 49, 38, 50, 38, 38, 24,
22, 49, 23, 51, 51, 77, 52, 52, 54, 54, 51, 25, 53, 53, 54, 54, 57, 57, 59, 59,
54, 54, 63, 66, 64, 68, 77, 69, 67, 77, 59, 59, 67, 70, 68, 72, 81, 73, 71, 81,
77, 77, 77, 77, 77, 77, 70, 77, 77, 53, 81, 81, 81, 81, 81, 81, 74, 55, 55, 81,
53, 77, 80, 81, 98, 70, 82, 89, 54, 54, 81, 58, 58, 85, 81, 74, 81, 102, 86, 96,
78, 101, 92, 83, 79, 84, 86, 85, 90, 77, 82, 104, 93, 81, 83, 87, 84, 88, 90, 89,
93, 87, 88, 102, 91, 77, 64, 105, 94, 68, 94, 59, 59, 91, 92, 97, 106, 81, 81, 115,
77, 69, 106, 77, 106, 70, 70, 107, 77, 77, 68, 95, 110, 98, 81, 81, 104, 81, 107, 74,
70, 110, 77, 99, 70, 70, 77, 111, 112, 70, 72, 74, 73, 81, 116, 81, 103, 111, 74, 111,
77, 113, 77, 77, 77, 116, 77, 77, 114, 101, 74, 74, 112, 118, 119, 81, 81, 117, 81, 121,
77, 77, 105, 77, 77, 119, 115, 120, 121, 117, 74, 81, 120, 81, 122, 81, 106, 110, 81, 81,
122, 70, 118, 123, 130, 131, 77, 77, 77, 77, 124, 123, 125, 128, 81, 81, 74, 126, 81, 127,
70, 128, 132, 77, 77, 136, 77, 162, 124, 77, 81, 135, 81, 81, 136, 74, 81, 81, 133, 167,
101, 77, 77, 133, 134, 77, 137, 77, 77, 77, 81, 106, 137, 81, 81, 138, 129, 139, 81, 81,
77, 77, 101, 135, 77, 145, 77, 77, 144, 101, 140, 81, 81, 142, 141, 81, 81, 106, 81, 81,
140, 77, 143, 138, 139, 142, 150, 152, 77, 153, 106, 150, 149, 143, 145, 148, 147, 144, 81, 81,
148, 149, 146, 155, 101, 159, 99, 147, 156, 154, 81, 155, 157, 158, 153, 81, 151, 154, 103, 106,
77, 101, 77, 77, 77, 157, 158, 77, 77, 125, 81, 152, 81, 106, 160, 81, 161, 162, 159, 81,
77, 77, 77, 161, 125, 77, 77, 160, 50, 50, 81, 163, 81, 130, 164, 166, 81, 165, 52, 52,
50, 50, 50, 50, 50, 50, 50, 56, 77, 56, 52, 52, 52, 52, 52, 52, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 57, 77, 57, 65, 56, 56, 56, 56, 61, 81, 61, 69, 69, 81,
65, 125, 65, 77, 65, 75, 77, 75, 77, 75, 69, 130, 69, 79, 81, 79, 81, 79, 80, 80,
76, 76, 76, 77, 76, 96, 96, 107, 96, 96, 80, 81, 80, 100, 81, 100, 100, 100, 100, 130,
96, 96, 107, 96, 97, 97, 97, 97, 97, 97, 100, 101, 101, 101, 101, 101, 101, 101, 101, 105,
97, 97, 97, 100, 100, 100, 127, 100, 103, 101, 105, 105, 81, 105, 108, 81, 108, 81, 108, 131,
103, 125, 103, 126, 125, 126, 126, 129, 77, 129, 81, 131, 131, 134, 112, 134, 146, 112, 146, 146,
141, 77, 141, 141, 151, 77, 151, 151, 97, 109, 156, 132, 156, 156, 101, 106, 101, 101, 130, 130,
97, 97, 77, 108, 104, 101, 95, 77, 74, 73, 81, 81, 81, 114, 81, 113, 109, 106, 99, 81,
72, 71, 62, 61, 60, 59, 58, 55, 162, 13, 78, 77, 76, 75, 66, 65, 64, 63, 62, 60,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 15, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162 167, 167, 167, 167
} ; } ;
static const flex_int16_t yy_chk[384] = static const flex_int16_t yy_chk[385] =
{ 0, { 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 11, 12, 38, 11, 12, 15, 15, 1, 1, 11, 12, 11, 12, 13, 14, 17, 17,
16, 16, 28, 29, 28, 30, 37, 30, 29, 40, 18, 18, 30, 31, 30, 32, 39, 32, 31, 40,
39, 41, 42, 45, 44, 47, 30, 46, 43, 11, 41, 42, 49, 43, 44, 47, 32, 11, 12, 46,
12, 48, 38, 39, 53, 30, 40, 44, 54, 54, 45, 13, 14, 41, 48, 32, 50, 55, 42, 49,
37, 58, 47, 41, 37, 41, 43, 42, 45, 81, 39, 58, 46, 82, 39, 43, 40, 43, 45, 44,
48, 43, 43, 58, 46, 78, 64, 68, 48, 69, 47, 59, 59, 45, 45, 50, 62, 84, 85, 82,
80, 69, 70, 82, 70, 64, 68, 70, 83, 84, 68, 48, 72, 50, 87, 86, 58, 89, 62, 68,
69, 78, 85, 53, 64, 68, 87, 80, 81, 69, 73, 72, 73, 88, 84, 91, 55, 74, 68, 74,
88, 82, 90, 89, 92, 84, 93, 94, 83, 102, 72, 73, 74, 86, 87, 92, 97, 85, 93, 88,
112, 111, 105, 119, 114, 88, 83, 89, 90, 85, 73, 94, 87, 96, 89, 98, 107, 110, 116, 117,
92, 105, 87, 93, 111, 112, 115, 117, 118, 120, 92, 91, 93, 97, 119, 123, 110, 94, 120, 96,
105, 102, 114, 121, 122, 119, 123, 125, 94, 131, 122, 116, 124, 126, 117, 110, 125, 127, 107, 130,
128, 130, 134, 115, 117, 135, 120, 136, 137, 138, 128, 133, 119, 136, 135, 120, 98, 122, 139, 140,
146, 139, 142, 118, 145, 134, 153, 147, 131, 161, 123, 141, 142, 125, 124, 143, 144, 147, 150, 151,
123, 149, 130, 121, 122, 128, 139, 142, 150, 145, 166, 139, 136, 126, 128, 135, 133, 127, 152, 154,
137, 138, 135, 147, 152, 153, 125, 136, 149, 146, 155, 144, 147, 150, 142, 158, 140, 143, 130, 157,
155, 158, 160, 159, 157, 150, 152, 156, 154, 151, 160, 141, 165, 163, 152, 164, 154, 155, 151, 162,
148, 144, 143, 158, 141, 140, 133, 155, 163, 163, 161, 157, 159, 156, 158, 163, 153, 160, 168, 168,
163, 163, 163, 163, 163, 163, 163, 164, 132, 164, 168, 168, 168, 168, 168, 168, 169, 169, 169, 169,
164, 164, 164, 164, 164, 164, 165, 129, 165, 166, 169, 169, 169, 169, 170, 149, 170, 171, 171, 148,
166, 126, 166, 124, 166, 167, 116, 167, 113, 167, 171, 146, 171, 172, 145, 172, 138, 172, 173, 173,
168, 168, 168, 110, 168, 169, 169, 107, 169, 169, 173, 137, 173, 174, 134, 174, 174, 174, 174, 131,
169, 169, 106, 169, 170, 170, 170, 170, 170, 170, 174, 175, 175, 175, 175, 175, 175, 175, 175, 176,
170, 170, 170, 171, 171, 171, 101, 171, 172, 100, 176, 176, 129, 176, 177, 121, 177, 118, 177, 178,
172, 99, 172, 173, 97, 173, 173, 174, 91, 174, 115, 178, 178, 179, 112, 179, 180, 111, 180, 180,
175, 86, 175, 175, 176, 79, 176, 176, 177, 77, 181, 106, 181, 181, 182, 105, 182, 182, 103, 101,
177, 177, 76, 74, 66, 57, 49, 36, 34, 33, 95, 90, 83, 81, 80, 78, 70, 61, 51, 38,
32, 31, 27, 25, 24, 21, 20, 17, 13, 162, 36, 35, 34, 33, 29, 27, 26, 23, 22, 19,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 15, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
162, 162, 162 167, 167, 167, 167
} ; } ;
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
@@ -808,14 +810,14 @@ struct lexer_param;
yyset_extra(yylloc->end, yyscanner); \ yyset_extra(yylloc->end, yyscanner); \
} while (0); } while (0);
#line 811 "src/lexer.c" #line 813 "src/lexer.c"
#line 25 "src/lexer.l" #line 26 "src/lexer.l"
static int enter(int opening, int state, yyscan_t yyscanner); static int enter(int opening, int state, yyscan_t yyscanner);
static int try_exit(int closing, int state, yyscan_t yyscanner); static int try_exit(int closing, int state, yyscan_t yyscanner);
#line 816 "src/lexer.c"
#define YY_NO_INPUT 1
#line 818 "src/lexer.c" #line 818 "src/lexer.c"
#define YY_NO_INPUT 1
#line 820 "src/lexer.c"
#define INITIAL 0 #define INITIAL 0
#define IN_PAREN 1 #define IN_PAREN 1
@@ -823,6 +825,7 @@ struct lexer_param;
#define IN_BRACE 3 #define IN_BRACE 3
#define IN_QQINTERP 4 #define IN_QQINTERP 4
#define IN_QQSTRING 5 #define IN_QQSTRING 5
#define IN_COMMENT 6
#ifndef YY_NO_UNISTD_H #ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way /* Special case for "unistd.h", since it is non-ANSI. We include it way
@@ -1106,10 +1109,10 @@ YY_DECL
} }
{ {
#line 38 "src/lexer.l" #line 39 "src/lexer.l"
#line 1112 "src/lexer.c" #line 1115 "src/lexer.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{ {
@@ -1136,13 +1139,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 163 ) if ( yy_current_state >= 168 )
yy_c = yy_meta[yy_c]; yy_c = yy_meta[yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
++yy_cp; ++yy_cp;
} }
while ( yy_base[yy_current_state] != 330 ); while ( yy_base[yy_current_state] != 332 );
yy_find_action: yy_find_action:
yy_act = yy_accept[yy_current_state]; yy_act = yy_accept[yy_current_state];
@@ -1168,235 +1171,253 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
YY_RULE_SETUP YY_RULE_SETUP
#line 40 "src/lexer.l" #line 41 "src/lexer.l"
{ /* comments */ } { yy_push_state(IN_COMMENT, yyscanner); }
YY_BREAK YY_BREAK
case 2: case 2:
YY_RULE_SETUP /* rule 2 can match eol */
#line 42 "src/lexer.l"
{ return NEQ; }
YY_BREAK
case 3:
YY_RULE_SETUP YY_RULE_SETUP
#line 43 "src/lexer.l" #line 43 "src/lexer.l"
{ return EQ; } { }
YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
#line 44 "src/lexer.l"
{ yy_pop_state(yyscanner); }
YY_BREAK
case YY_STATE_EOF(IN_COMMENT):
#line 46 "src/lexer.l"
{ yy_pop_state(yyscanner); }
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 44 "src/lexer.l" #line 48 "src/lexer.l"
{ return AS; } { return NEQ; }
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
#line 45 "src/lexer.l" #line 49 "src/lexer.l"
{ return IMPORT; } { return EQ; }
YY_BREAK YY_BREAK
case 6: case 6:
YY_RULE_SETUP YY_RULE_SETUP
#line 46 "src/lexer.l" #line 50 "src/lexer.l"
{ return INCLUDE; } { return AS; }
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 47 "src/lexer.l" #line 51 "src/lexer.l"
{ return MODULE; } { return IMPORT; }
YY_BREAK YY_BREAK
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 48 "src/lexer.l" #line 52 "src/lexer.l"
{ return DEF; } { return INCLUDE; }
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 49 "src/lexer.l" #line 53 "src/lexer.l"
{ return IF; } { return MODULE; }
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 50 "src/lexer.l" #line 54 "src/lexer.l"
{ return THEN; } { return DEF; }
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 51 "src/lexer.l" #line 55 "src/lexer.l"
{ return ELSE; } { return IF; }
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 52 "src/lexer.l" #line 56 "src/lexer.l"
{ return ELSE_IF; } { return THEN; }
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 53 "src/lexer.l" #line 57 "src/lexer.l"
{ return AND; } { return ELSE; }
YY_BREAK YY_BREAK
case 14: case 14:
YY_RULE_SETUP YY_RULE_SETUP
#line 54 "src/lexer.l" #line 58 "src/lexer.l"
{ return OR; } { return ELSE_IF; }
YY_BREAK YY_BREAK
case 15: case 15:
YY_RULE_SETUP YY_RULE_SETUP
#line 55 "src/lexer.l" #line 59 "src/lexer.l"
{ return END; } { return AND; }
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
#line 56 "src/lexer.l" #line 60 "src/lexer.l"
{ return REDUCE; } { return OR; }
YY_BREAK YY_BREAK
case 17: case 17:
YY_RULE_SETUP YY_RULE_SETUP
#line 57 "src/lexer.l" #line 61 "src/lexer.l"
{ return FOREACH; } { return END; }
YY_BREAK YY_BREAK
case 18: case 18:
YY_RULE_SETUP YY_RULE_SETUP
#line 58 "src/lexer.l" #line 62 "src/lexer.l"
{ return DEFINEDOR; } { return REDUCE; }
YY_BREAK YY_BREAK
case 19: case 19:
YY_RULE_SETUP YY_RULE_SETUP
#line 59 "src/lexer.l" #line 63 "src/lexer.l"
{ return TRY; } { return FOREACH; }
YY_BREAK YY_BREAK
case 20: case 20:
YY_RULE_SETUP YY_RULE_SETUP
#line 60 "src/lexer.l" #line 64 "src/lexer.l"
{ return CATCH; } { return DEFINEDOR; }
YY_BREAK YY_BREAK
case 21: case 21:
YY_RULE_SETUP YY_RULE_SETUP
#line 61 "src/lexer.l" #line 65 "src/lexer.l"
{ return LABEL; } { return TRY; }
YY_BREAK YY_BREAK
case 22: case 22:
YY_RULE_SETUP YY_RULE_SETUP
#line 62 "src/lexer.l" #line 66 "src/lexer.l"
{ return BREAK; } { return CATCH; }
YY_BREAK YY_BREAK
case 23: case 23:
YY_RULE_SETUP YY_RULE_SETUP
#line 63 "src/lexer.l" #line 67 "src/lexer.l"
{ return LOC; } { return LABEL; }
YY_BREAK YY_BREAK
case 24: case 24:
YY_RULE_SETUP YY_RULE_SETUP
#line 64 "src/lexer.l" #line 68 "src/lexer.l"
{ return SETPIPE; } { return BREAK; }
YY_BREAK YY_BREAK
case 25: case 25:
YY_RULE_SETUP YY_RULE_SETUP
#line 65 "src/lexer.l" #line 69 "src/lexer.l"
{ return SETPLUS; } { return LOC; }
YY_BREAK YY_BREAK
case 26: case 26:
YY_RULE_SETUP YY_RULE_SETUP
#line 66 "src/lexer.l" #line 70 "src/lexer.l"
{ return SETMINUS; } { return SETPIPE; }
YY_BREAK YY_BREAK
case 27: case 27:
YY_RULE_SETUP YY_RULE_SETUP
#line 67 "src/lexer.l" #line 71 "src/lexer.l"
{ return SETMULT; } { return SETPLUS; }
YY_BREAK YY_BREAK
case 28: case 28:
YY_RULE_SETUP YY_RULE_SETUP
#line 68 "src/lexer.l" #line 72 "src/lexer.l"
{ return SETDIV; } { return SETMINUS; }
YY_BREAK YY_BREAK
case 29: case 29:
YY_RULE_SETUP YY_RULE_SETUP
#line 69 "src/lexer.l" #line 73 "src/lexer.l"
{ return SETMOD; } { return SETMULT; }
YY_BREAK YY_BREAK
case 30: case 30:
YY_RULE_SETUP YY_RULE_SETUP
#line 70 "src/lexer.l" #line 74 "src/lexer.l"
{ return SETDEFINEDOR; } { return SETDIV; }
YY_BREAK YY_BREAK
case 31: case 31:
YY_RULE_SETUP YY_RULE_SETUP
#line 71 "src/lexer.l" #line 75 "src/lexer.l"
{ return LESSEQ; } { return SETMOD; }
YY_BREAK YY_BREAK
case 32: case 32:
YY_RULE_SETUP YY_RULE_SETUP
#line 72 "src/lexer.l" #line 76 "src/lexer.l"
{ return GREATEREQ; } { return SETDEFINEDOR; }
YY_BREAK YY_BREAK
case 33: case 33:
YY_RULE_SETUP YY_RULE_SETUP
#line 73 "src/lexer.l" #line 77 "src/lexer.l"
{ return REC; } { return LESSEQ; }
YY_BREAK YY_BREAK
case 34: case 34:
YY_RULE_SETUP YY_RULE_SETUP
#line 74 "src/lexer.l" #line 78 "src/lexer.l"
{ return ALTERNATION; } { return GREATEREQ; }
YY_BREAK YY_BREAK
case 35: case 35:
YY_RULE_SETUP YY_RULE_SETUP
#line 75 "src/lexer.l" #line 79 "src/lexer.l"
{ return yytext[0];} { return REC; }
YY_BREAK YY_BREAK
case 36: case 36:
YY_RULE_SETUP YY_RULE_SETUP
#line 77 "src/lexer.l" #line 80 "src/lexer.l"
{ { return ALTERNATION; }
return enter(yytext[0], YY_START, yyscanner);
}
YY_BREAK YY_BREAK
case 37: case 37:
YY_RULE_SETUP YY_RULE_SETUP
#line 81 "src/lexer.l" #line 81 "src/lexer.l"
{ { return yytext[0];}
return try_exit(yytext[0], YY_START, yyscanner);
}
YY_BREAK YY_BREAK
case 38: case 38:
YY_RULE_SETUP YY_RULE_SETUP
#line 85 "src/lexer.l" #line 83 "src/lexer.l"
{ {
yylval->literal = jv_string_sized(yytext + 1, yyleng - 1); return FORMAT; return enter(yytext[0], YY_START, yyscanner);
} }
YY_BREAK YY_BREAK
case 39: case 39:
YY_RULE_SETUP YY_RULE_SETUP
#line 89 "src/lexer.l" #line 87 "src/lexer.l"
{ {
yylval->literal = jv_parse_sized(yytext, yyleng); return LITERAL; return try_exit(yytext[0], YY_START, yyscanner);
} }
YY_BREAK YY_BREAK
case 40: case 40:
YY_RULE_SETUP YY_RULE_SETUP
#line 93 "src/lexer.l" #line 91 "src/lexer.l"
{
yylval->literal = jv_string_sized(yytext + 1, yyleng - 1); return FORMAT;
}
YY_BREAK
case 41:
YY_RULE_SETUP
#line 95 "src/lexer.l"
{
yylval->literal = jv_parse_sized(yytext, yyleng); return LITERAL;
}
YY_BREAK
case 42:
YY_RULE_SETUP
#line 99 "src/lexer.l"
{ {
yy_push_state(IN_QQSTRING, yyscanner); yy_push_state(IN_QQSTRING, yyscanner);
return QQSTRING_START; return QQSTRING_START;
} }
YY_BREAK YY_BREAK
case 41: case 43:
YY_RULE_SETUP YY_RULE_SETUP
#line 99 "src/lexer.l" #line 105 "src/lexer.l"
{ {
return enter(QQSTRING_INTERP_START, YY_START, yyscanner); return enter(QQSTRING_INTERP_START, YY_START, yyscanner);
} }
YY_BREAK YY_BREAK
case 42: case 44:
YY_RULE_SETUP YY_RULE_SETUP
#line 102 "src/lexer.l" #line 108 "src/lexer.l"
{ {
yy_pop_state(yyscanner); yy_pop_state(yyscanner);
return QQSTRING_END; return QQSTRING_END;
} }
YY_BREAK YY_BREAK
case 43: case 45:
/* rule 43 can match eol */ /* rule 45 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 106 "src/lexer.l" #line 112 "src/lexer.l"
{ {
/* pass escapes to the json parser */ /* pass escapes to the json parser */
jv escapes = jv_string_fmt("\"%.*s\"", (int)yyleng, yytext); jv escapes = jv_string_fmt("\"%.*s\"", (int)yyleng, yytext);
@@ -1405,55 +1426,55 @@ YY_RULE_SETUP
return QQSTRING_TEXT; return QQSTRING_TEXT;
} }
YY_BREAK YY_BREAK
case 44: case 46:
/* rule 44 can match eol */ /* rule 46 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 113 "src/lexer.l" #line 119 "src/lexer.l"
{ {
yylval->literal = jv_string_sized(yytext, yyleng); yylval->literal = jv_string_sized(yytext, yyleng);
return QQSTRING_TEXT; return QQSTRING_TEXT;
} }
YY_BREAK YY_BREAK
case 45: case 47:
YY_RULE_SETUP YY_RULE_SETUP
#line 117 "src/lexer.l" #line 123 "src/lexer.l"
{ {
return INVALID_CHARACTER; return INVALID_CHARACTER;
} }
YY_BREAK YY_BREAK
case 46:
YY_RULE_SETUP
#line 123 "src/lexer.l"
{ yylval->literal = jv_string(yytext); return IDENT;}
YY_BREAK
case 47:
YY_RULE_SETUP
#line 124 "src/lexer.l"
{ yylval->literal = jv_string(yytext+1); return FIELD;}
YY_BREAK
case 48: case 48:
YY_RULE_SETUP YY_RULE_SETUP
#line 125 "src/lexer.l" #line 129 "src/lexer.l"
{ yylval->literal = jv_string(yytext+1); return BINDING;} { yylval->literal = jv_string(yytext); return IDENT;}
YY_BREAK YY_BREAK
case 49: case 49:
/* rule 49 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 127 "src/lexer.l" #line 130 "src/lexer.l"
{} { yylval->literal = jv_string(yytext+1); return FIELD;}
YY_BREAK YY_BREAK
case 50: case 50:
YY_RULE_SETUP YY_RULE_SETUP
#line 129 "src/lexer.l" #line 131 "src/lexer.l"
{ return INVALID_CHARACTER; } { yylval->literal = jv_string(yytext+1); return BINDING;}
YY_BREAK YY_BREAK
case 51: case 51:
/* rule 51 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 131 "src/lexer.l" #line 133 "src/lexer.l"
{}
YY_BREAK
case 52:
YY_RULE_SETUP
#line 135 "src/lexer.l"
{ return INVALID_CHARACTER; }
YY_BREAK
case 53:
YY_RULE_SETUP
#line 137 "src/lexer.l"
YY_FATAL_ERROR( "flex scanner jammed" ); YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK YY_BREAK
#line 1456 "src/lexer.c" #line 1477 "src/lexer.c"
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(IN_PAREN): case YY_STATE_EOF(IN_PAREN):
case YY_STATE_EOF(IN_BRACKET): case YY_STATE_EOF(IN_BRACKET):
@@ -1757,7 +1778,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 163 ) if ( yy_current_state >= 168 )
yy_c = yy_meta[yy_c]; yy_c = yy_meta[yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1786,11 +1807,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 163 ) if ( yy_current_state >= 168 )
yy_c = yy_meta[yy_c]; yy_c = yy_meta[yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
yy_is_jam = (yy_current_state == 162); yy_is_jam = (yy_current_state == 167);
(void)yyg; (void)yyg;
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
@@ -2625,7 +2646,7 @@ static int yy_flex_strlen (const char * s , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
#line 131 "src/lexer.l" #line 137 "src/lexer.l"
/* perhaps these should be calls... */ /* perhaps these should be calls... */
/* /*
src/lexer.h
Generated
+3 -2
View File
@@ -462,6 +462,7 @@ void yyfree ( void * , yyscan_t yyscanner );
#define IN_BRACE 3 #define IN_BRACE 3
#define IN_QQINTERP 4 #define IN_QQINTERP 4
#define IN_QQSTRING 5 #define IN_QQSTRING 5
#define IN_COMMENT 6
#endif #endif
@@ -731,9 +732,9 @@ extern int yylex \
#undef yyTABLES_NAME #undef yyTABLES_NAME
#endif #endif
#line 131 "src/lexer.l" #line 137 "src/lexer.l"
#line 737 "src/lexer.h" #line 738 "src/lexer.h"
#undef jq_yyIN_HEADER #undef jq_yyIN_HEADER
#endif /* jq_yyHEADER_H */ #endif /* jq_yyHEADER_H */
src/lexer.l
+7 -1
View File
@@ -21,6 +21,7 @@ struct lexer_param;
%s IN_BRACE %s IN_BRACE
%s IN_QQINTERP %s IN_QQINTERP
%x IN_QQSTRING %x IN_QQSTRING
%x IN_COMMENT
%{ %{
static int enter(int opening, int state, yyscan_t yyscanner); static int enter(int opening, int state, yyscan_t yyscanner);
static int try_exit(int closing, int state, yyscan_t yyscanner); static int try_exit(int closing, int state, yyscan_t yyscanner);
@@ -37,7 +38,12 @@ struct lexer_param;
%% %%
"#"[^\r\n]* { /* comments */ } "#" { yy_push_state(IN_COMMENT, yyscanner); }
<IN_COMMENT>{
\\[\\\n]|. { }
\n { yy_pop_state(yyscanner); }
}
<IN_COMMENT><<EOF>> { yy_pop_state(yyscanner); }
"!=" { return NEQ; } "!=" { return NEQ; }
"==" { return EQ; } "==" { return EQ; }
src/main.c
+1 -16
View File
@@ -178,21 +178,6 @@ enum {
#define jq_exit_with_status(r) exit(abs(r)) #define jq_exit_with_status(r) exit(abs(r))
#define jq_exit(r) exit( r > 0 ? r : 0 ) #define jq_exit(r) exit( r > 0 ? r : 0 )
static const char *skip_shebang(const char *p) {
if (strncmp(p, "#!", sizeof("#!") - 1) != 0)
return p;
const char *n = strchr(p, '\n');
if (n == NULL || n[1] != '#')
return p;
n = strchr(n + 1, '\n');
if (n == NULL || n[1] == '#' || n[1] == '\0' || n[-1] != '\\' || n[-2] == '\\')
return p;
n = strchr(n + 1, '\n');
if (n == NULL)
return p;
return n+1;
}
static int process(jq_state *jq, jv value, int flags, int dumpopts, int options) { static int process(jq_state *jq, jv value, int flags, int dumpopts, int options) {
int ret = JQ_OK_NO_OUTPUT; // No valid results && -e -> exit(4) int ret = JQ_OK_NO_OUTPUT; // No valid results && -e -> exit(4)
jq_start(jq, value, flags); jq_start(jq, value, flags);
@@ -685,7 +670,7 @@ int main(int argc, char* argv[]) {
program_arguments = jv_object_set(program_arguments, program_arguments = jv_object_set(program_arguments,
jv_string("JQ_BUILD_CONFIGURATION"), jv_string("JQ_BUILD_CONFIGURATION"),
jv_string(JQ_CONFIG)); /* named arguments */ jv_string(JQ_CONFIG)); /* named arguments */
compiled = jq_compile_args(jq, skip_shebang(jv_string_value(data)), jv_copy(program_arguments)); compiled = jq_compile_args(jq, jv_string_value(data), jv_copy(program_arguments));
free(program_origin); free(program_origin);
jv_free(data); jv_free(data);
} else { } else {
tests/shtest
+30
View File
@@ -579,6 +579,36 @@ if ( ! $msys && ! $mingw ) && locale -a > /dev/null; then
fi fi
fi fi
# Comments!
if ! x=$($JQ -n '123 # comment') || [ "$x" != 123 ]; then
echo 'comment did not work'
exit 1
fi
cr=$(printf \\r)
if ! x=$($JQ -n "1 # foo$cr + 2") || [ "$x" != 1 ]; then
echo 'regression: carriage return terminates comment'
exit 1
fi
if ! x=$($JQ -cn '[
1,
# foo \
2,
# bar \\
3,
4, # baz \\\
5, \
6,
7
# comment \
comment \
comment
]') || [ "$x" != '[1,3,4,7]' ]; then
echo 'multiline comment was not handled correctly'
exit 1
fi
# Allow passing the inline jq script before -- #2919 # Allow passing the inline jq script before -- #2919
if ! r=$($JQ --args -rn -- '$ARGS.positional[0]' bar) || [ "$r" != bar ]; then if ! r=$($JQ --args -rn -- '$ARGS.positional[0]' bar) || [ "$r" != bar ]; then
echo "passing the inline script after -- didn't work" echo "passing the inline script after -- didn't work"