Lex $foo as a single token, instead of using '$' IDENT
Previously, bindings were parsed as the combination of two tokens: '$' IDENT This meant that using a keyword as variable name (e.g. $then, $label) did not work. Attempts were made to allow $keyword to work by adding some '$' Keyword rules in the parser, but this did not allow $keyword in all places: jq --arg label foo -n '$label' # ok jq -n '"foo" as $label | .' # error Treating $foo as a single token is much simpler, in my opinion. This patch also changes how LOC is lexed: "$__loc__" instead of as "__loc__" that gets combined with '$' in the parser. This patch also disallows having spaces after '$' when recalling a variable `$ foo' since that was probably just an unintentional side effect of the implementation, and it was not documented. Fixes #2675
This commit is contained in:
Emanuele Torre authored and Nico Williams committed
1 parent
c08ecbaf23
commit
193f432e08
7 files changed
+1574
-1608
No files matched your search
Generated
+165
-156
@@ -281,7 +281,6 @@ typedef int16_t flex_int16_t;
|
||||
typedef uint16_t flex_uint16_t;
|
||||
typedef int32_t flex_int32_t;
|
||||
typedef uint32_t flex_uint32_t;
|
||||
typedef uint64_t flex_uint64_t;
|
||||
#else
|
||||
typedef signed char flex_int8_t;
|
||||
typedef short int flex_int16_t;
|
||||
@@ -446,7 +445,7 @@ struct yy_buffer_state
|
||||
/* Number of characters read into yy_ch_buf, not including EOB
|
||||
* characters.
|
||||
*/
|
||||
yy_size_t yy_n_chars;
|
||||
int yy_n_chars;
|
||||
|
||||
/* Whether we "own" the buffer - i.e., we know we created it,
|
||||
* and can realloc() it to grow it, and should free() it to
|
||||
@@ -523,7 +522,7 @@ static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner
|
||||
|
||||
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
|
||||
YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
|
||||
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len , yyscan_t yyscanner );
|
||||
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
|
||||
|
||||
void *yyalloc ( yy_size_t , yyscan_t yyscanner );
|
||||
void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
|
||||
@@ -570,12 +569,12 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
|
||||
*/
|
||||
#define YY_DO_BEFORE_ACTION \
|
||||
yyg->yytext_ptr = yy_bp; \
|
||||
yyleng = (yy_size_t) (yy_cp - yy_bp); \
|
||||
yyleng = (int) (yy_cp - yy_bp); \
|
||||
yyg->yy_hold_char = *yy_cp; \
|
||||
*yy_cp = '\0'; \
|
||||
yyg->yy_c_buf_p = yy_cp;
|
||||
#define YY_NUM_RULES 50
|
||||
#define YY_END_OF_BUFFER 51
|
||||
#define YY_NUM_RULES 51
|
||||
#define YY_END_OF_BUFFER 52
|
||||
/* This struct is not used in this scanner,
|
||||
but its presence is necessary. */
|
||||
struct yy_trans_info
|
||||
@@ -583,25 +582,26 @@ struct yy_trans_info
|
||||
flex_int32_t yy_verify;
|
||||
flex_int32_t yy_nxt;
|
||||
};
|
||||
static const flex_int16_t yy_accept[158] =
|
||||
static const flex_int16_t yy_accept[163] =
|
||||
{ 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 51, 49, 48, 48, 49, 40, 1, 35,
|
||||
35, 36, 37, 35, 35, 35, 35, 35, 39, 35,
|
||||
35, 35, 35, 49, 46, 46, 46, 46, 46, 46,
|
||||
0, 0, 52, 50, 49, 49, 50, 40, 1, 35,
|
||||
35, 36, 37, 35, 35, 35, 35, 35, 35, 39,
|
||||
35, 35, 35, 35, 50, 46, 46, 46, 46, 46,
|
||||
46, 46, 46, 46, 46, 46, 46, 46, 35, 44,
|
||||
44, 42, 45, 48, 2, 1, 29, 27, 25, 26,
|
||||
33, 39, 47, 18, 28, 39, 39, 0, 31, 3,
|
||||
32, 0, 38, 46, 0, 46, 46, 4, 46, 46,
|
||||
46, 46, 46, 46, 9, 46, 46, 46, 46, 14,
|
||||
46, 46, 46, 24, 44, 43, 41, 43, 47, 30,
|
||||
44, 42, 45, 49, 2, 1, 48, 48, 29, 27,
|
||||
25, 26, 33, 39, 47, 18, 28, 39, 39, 0,
|
||||
31, 3, 32, 0, 38, 46, 0, 46, 4, 46,
|
||||
46, 46, 46, 46, 46, 9, 46, 46, 46, 46,
|
||||
14, 46, 46, 46, 24, 44, 43, 41, 43, 48,
|
||||
|
||||
39, 0, 39, 34, 0, 46, 13, 46, 46, 8,
|
||||
46, 46, 15, 46, 46, 46, 46, 46, 46, 46,
|
||||
19, 0, 43, 46, 46, 46, 46, 12, 11, 46,
|
||||
46, 46, 46, 46, 46, 10, 43, 46, 22, 20,
|
||||
46, 46, 46, 21, 46, 46, 43, 46, 46, 5,
|
||||
46, 7, 16, 23, 17, 6, 0
|
||||
0, 48, 47, 30, 39, 0, 39, 34, 0, 13,
|
||||
46, 46, 8, 46, 46, 15, 46, 46, 46, 46,
|
||||
46, 46, 46, 19, 0, 43, 0, 48, 46, 46,
|
||||
46, 12, 11, 46, 46, 46, 46, 46, 46, 10,
|
||||
43, 48, 22, 20, 46, 46, 46, 21, 46, 46,
|
||||
43, 48, 46, 5, 46, 7, 16, 48, 17, 6,
|
||||
23, 0
|
||||
} ;
|
||||
|
||||
static const YY_CHAR yy_ec[256] =
|
||||
@@ -646,96 +646,99 @@ static const YY_CHAR yy_meta[54] =
|
||||
1, 1, 1
|
||||
} ;
|
||||
|
||||
static const flex_int16_t yy_base[171] =
|
||||
static const flex_int16_t yy_base[178] =
|
||||
{ 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
51, 52, 319, 320, 57, 59, 296, 320, 0, 320,
|
||||
295, 320, 320, 294, 293, 292, 47, 47, 50, 291,
|
||||
290, 289, 293, 0, 290, 48, 51, 37, 52, 53,
|
||||
54, 55, 59, 56, 63, 57, 68, 71, 286, 0,
|
||||
0, 320, 75, 89, 320, 0, 320, 320, 320, 320,
|
||||
320, 87, 0, 285, 320, 92, 95, 103, 320, 320,
|
||||
320, 289, 0, 286, 285, 74, 101, 284, 89, 81,
|
||||
93, 87, 108, 113, 283, 116, 114, 118, 119, 282,
|
||||
120, 121, 122, 320, 0, 271, 320, 270, 0, 320,
|
||||
51, 52, 329, 330, 57, 59, 306, 330, 0, 296,
|
||||
304, 330, 330, 303, 302, 330, 301, 47, 47, 50,
|
||||
300, 299, 298, 302, 0, 299, 48, 37, 52, 51,
|
||||
53, 54, 60, 56, 55, 59, 57, 63, 295, 0,
|
||||
0, 330, 75, 87, 330, 0, 297, 73, 330, 330,
|
||||
330, 330, 330, 89, 0, 293, 330, 90, 94, 100,
|
||||
330, 330, 330, 297, 0, 294, 291, 87, 287, 92,
|
||||
81, 95, 100, 101, 104, 283, 108, 112, 115, 114,
|
||||
280, 116, 118, 119, 330, 0, 266, 330, 263, 271,
|
||||
|
||||
126, 280, 279, 320, 0, 123, 277, 126, 130, 274,
|
||||
128, 127, 270, 133, 131, 137, 141, 147, 149, 151,
|
||||
266, 161, 253, 259, 154, 155, 161, 256, 254, 157,
|
||||
160, 162, 163, 164, 166, 242, 227, 171, 233, 228,
|
||||
167, 165, 168, 226, 172, 173, 213, 188, 174, 221,
|
||||
178, 211, 199, 198, 197, 196, 320, 219, 228, 234,
|
||||
239, 244, 253, 262, 267, 272, 274, 279, 283, 287
|
||||
268, 121, 0, 330, 125, 255, 250, 330, 0, 245,
|
||||
123, 122, 240, 126, 138, 238, 139, 140, 125, 141,
|
||||
145, 146, 148, 235, 158, 223, 0, 152, 229, 153,
|
||||
151, 220, 208, 154, 157, 159, 160, 161, 163, 207,
|
||||
196, 164, 204, 203, 166, 162, 169, 202, 173, 180,
|
||||
191, 186, 168, 200, 192, 199, 196, 193, 195, 194,
|
||||
171, 330, 228, 237, 240, 246, 251, 256, 265, 274,
|
||||
279, 284, 289, 291, 296, 300, 304
|
||||
} ;
|
||||
|
||||
static const flex_int16_t yy_def[171] =
|
||||
static const flex_int16_t yy_def[178] =
|
||||
{ 0,
|
||||
157, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
158, 158, 157, 157, 157, 157, 157, 157, 159, 157,
|
||||
157, 157, 157, 157, 157, 157, 160, 157, 157, 157,
|
||||
157, 157, 157, 161, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 157, 163,
|
||||
163, 157, 164, 157, 157, 159, 157, 157, 157, 157,
|
||||
157, 157, 165, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 161, 162, 157, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 157, 163, 157, 157, 166, 165, 157,
|
||||
162, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
163, 163, 162, 162, 162, 162, 162, 162, 164, 165,
|
||||
162, 162, 162, 162, 162, 162, 162, 166, 162, 162,
|
||||
162, 162, 162, 162, 167, 168, 168, 168, 168, 168,
|
||||
168, 168, 168, 168, 168, 168, 168, 168, 162, 169,
|
||||
169, 162, 170, 162, 162, 164, 171, 171, 162, 162,
|
||||
162, 162, 162, 162, 172, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 167, 168, 162, 168, 168, 168,
|
||||
168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
|
||||
168, 168, 168, 168, 162, 169, 162, 162, 173, 171,
|
||||
|
||||
157, 157, 157, 157, 167, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 164, 168, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 169, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 170, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 0, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157
|
||||
162, 171, 172, 162, 162, 162, 162, 162, 174, 168,
|
||||
168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
|
||||
168, 168, 168, 168, 170, 175, 165, 171, 168, 168,
|
||||
168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
|
||||
176, 171, 168, 168, 168, 168, 168, 168, 168, 168,
|
||||
177, 171, 168, 168, 168, 168, 168, 171, 168, 168,
|
||||
171, 0, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162
|
||||
} ;
|
||||
|
||||
static const flex_int16_t yy_nxt[374] =
|
||||
static const flex_int16_t yy_nxt[384] =
|
||||
{ 0,
|
||||
14, 15, 16, 14, 17, 18, 19, 20, 21, 22,
|
||||
23, 24, 25, 20, 26, 27, 28, 29, 20, 20,
|
||||
30, 31, 32, 33, 34, 35, 35, 22, 14, 23,
|
||||
36, 37, 38, 39, 40, 41, 42, 35, 43, 35,
|
||||
44, 45, 35, 46, 35, 47, 35, 48, 35, 35,
|
||||
22, 49, 23, 51, 51, 75, 52, 52, 54, 54,
|
||||
54, 54, 61, 64, 62, 66, 75, 67, 65, 75,
|
||||
75, 75, 75, 75, 75, 75, 68, 75, 76, 53,
|
||||
53, 75, 79, 80, 97, 68, 75, 88, 81, 75,
|
||||
54, 54, 75, 77, 82, 85, 83, 78, 84, 75,
|
||||
23, 24, 25, 26, 27, 28, 29, 30, 26, 26,
|
||||
31, 32, 33, 34, 35, 36, 36, 22, 14, 23,
|
||||
36, 37, 38, 39, 40, 41, 42, 36, 43, 36,
|
||||
44, 45, 36, 46, 36, 47, 36, 48, 36, 36,
|
||||
22, 49, 23, 51, 51, 77, 52, 52, 54, 54,
|
||||
54, 54, 63, 66, 64, 68, 77, 69, 67, 77,
|
||||
77, 77, 77, 77, 77, 77, 70, 77, 77, 53,
|
||||
53, 77, 80, 81, 98, 70, 82, 89, 54, 54,
|
||||
78, 101, 92, 83, 79, 84, 86, 85, 90, 77,
|
||||
|
||||
86, 87, 90, 91, 62, 75, 89, 75, 92, 101,
|
||||
66, 75, 67, 68, 106, 102, 93, 102, 68, 75,
|
||||
103, 68, 68, 98, 108, 111, 75, 68, 109, 110,
|
||||
68, 75, 75, 112, 75, 107, 75, 75, 75, 75,
|
||||
75, 75, 113, 101, 75, 75, 75, 116, 75, 75,
|
||||
117, 75, 68, 118, 119, 75, 120, 126, 114, 75,
|
||||
115, 68, 129, 127, 128, 75, 125, 75, 130, 75,
|
||||
157, 121, 75, 75, 131, 75, 133, 132, 75, 75,
|
||||
75, 75, 75, 75, 75, 75, 75, 138, 141, 75,
|
||||
75, 75, 75, 136, 139, 134, 75, 135, 140, 146,
|
||||
93, 87, 88, 102, 91, 77, 64, 105, 94, 68,
|
||||
77, 69, 106, 77, 106, 70, 70, 107, 77, 77,
|
||||
70, 110, 77, 99, 70, 70, 77, 111, 112, 70,
|
||||
77, 113, 77, 77, 77, 116, 77, 77, 114, 101,
|
||||
77, 77, 105, 77, 77, 119, 115, 120, 121, 117,
|
||||
122, 70, 118, 123, 130, 131, 77, 77, 77, 77,
|
||||
70, 128, 132, 77, 77, 136, 77, 162, 124, 77,
|
||||
101, 77, 77, 133, 134, 77, 137, 77, 77, 77,
|
||||
77, 77, 101, 135, 77, 145, 77, 77, 144, 101,
|
||||
140, 77, 143, 138, 139, 142, 150, 152, 77, 153,
|
||||
|
||||
149, 148, 151, 144, 145, 142, 75, 152, 153, 98,
|
||||
143, 155, 150, 156, 75, 75, 75, 75, 154, 50,
|
||||
50, 50, 50, 50, 50, 50, 50, 50, 56, 75,
|
||||
56, 56, 56, 56, 56, 56, 56, 63, 63, 75,
|
||||
63, 122, 63, 73, 75, 73, 75, 73, 74, 74,
|
||||
74, 75, 74, 95, 95, 122, 95, 95, 95, 95,
|
||||
75, 95, 96, 96, 96, 96, 96, 96, 96, 96,
|
||||
96, 99, 75, 99, 75, 99, 123, 75, 123, 123,
|
||||
124, 122, 124, 137, 75, 137, 137, 147, 75, 147,
|
||||
147, 96, 75, 96, 96, 75, 103, 103, 122, 122,
|
||||
148, 149, 146, 155, 101, 159, 99, 147, 156, 154,
|
||||
77, 101, 77, 77, 77, 157, 158, 77, 77, 125,
|
||||
77, 77, 77, 161, 125, 77, 77, 160, 50, 50,
|
||||
50, 50, 50, 50, 50, 50, 50, 56, 77, 56,
|
||||
56, 56, 56, 56, 56, 56, 57, 77, 57, 65,
|
||||
65, 125, 65, 77, 65, 75, 77, 75, 77, 75,
|
||||
76, 76, 76, 77, 76, 96, 96, 107, 96, 96,
|
||||
96, 96, 107, 96, 97, 97, 97, 97, 97, 97,
|
||||
97, 97, 97, 100, 100, 100, 127, 100, 103, 101,
|
||||
103, 125, 103, 126, 125, 126, 126, 129, 77, 129,
|
||||
|
||||
75, 75, 75, 105, 75, 104, 100, 94, 75, 72,
|
||||
71, 70, 69, 60, 59, 58, 57, 55, 157, 13,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157
|
||||
141, 77, 141, 141, 151, 77, 151, 151, 97, 109,
|
||||
97, 97, 77, 108, 104, 101, 95, 77, 74, 73,
|
||||
72, 71, 62, 61, 60, 59, 58, 55, 162, 13,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162
|
||||
} ;
|
||||
|
||||
static const flex_int16_t yy_chk[374] =
|
||||
static const flex_int16_t yy_chk[384] =
|
||||
{ 0,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
@@ -743,41 +746,42 @@ static const flex_int16_t yy_chk[374] =
|
||||
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,
|
||||
16, 16, 27, 28, 27, 29, 36, 29, 28, 37,
|
||||
39, 40, 41, 42, 44, 46, 29, 43, 36, 11,
|
||||
12, 45, 38, 39, 53, 29, 47, 44, 40, 48,
|
||||
54, 54, 76, 37, 41, 43, 41, 37, 42, 80,
|
||||
16, 16, 28, 29, 28, 30, 37, 30, 29, 40,
|
||||
39, 41, 42, 45, 44, 47, 30, 46, 43, 11,
|
||||
12, 48, 38, 39, 53, 30, 40, 44, 54, 54,
|
||||
37, 58, 47, 41, 37, 41, 43, 42, 45, 81,
|
||||
|
||||
43, 43, 46, 47, 62, 82, 45, 79, 48, 66,
|
||||
67, 81, 67, 62, 76, 68, 48, 68, 66, 77,
|
||||
68, 67, 62, 53, 79, 82, 83, 66, 80, 81,
|
||||
67, 84, 87, 82, 86, 77, 88, 89, 91, 92,
|
||||
93, 106, 83, 101, 108, 112, 111, 87, 109, 115,
|
||||
88, 114, 101, 89, 91, 116, 92, 108, 84, 117,
|
||||
86, 101, 112, 109, 111, 118, 106, 119, 114, 120,
|
||||
122, 93, 125, 126, 115, 130, 117, 116, 131, 127,
|
||||
132, 133, 134, 142, 135, 141, 143, 125, 130, 138,
|
||||
145, 146, 149, 120, 126, 118, 151, 119, 127, 135,
|
||||
48, 43, 43, 58, 46, 78, 64, 68, 48, 69,
|
||||
80, 69, 70, 82, 70, 64, 68, 70, 83, 84,
|
||||
69, 78, 85, 53, 64, 68, 87, 80, 81, 69,
|
||||
88, 82, 90, 89, 92, 84, 93, 94, 83, 102,
|
||||
112, 111, 105, 119, 114, 88, 83, 89, 90, 85,
|
||||
92, 105, 87, 93, 111, 112, 115, 117, 118, 120,
|
||||
105, 102, 114, 121, 122, 119, 123, 125, 94, 131,
|
||||
128, 130, 134, 115, 117, 135, 120, 136, 137, 138,
|
||||
146, 139, 142, 118, 145, 134, 153, 147, 131, 161,
|
||||
123, 149, 130, 121, 122, 128, 139, 142, 150, 145,
|
||||
|
||||
141, 138, 143, 133, 134, 131, 148, 145, 146, 122,
|
||||
132, 149, 142, 151, 156, 155, 154, 153, 148, 158,
|
||||
158, 158, 158, 158, 158, 158, 158, 158, 159, 152,
|
||||
159, 159, 159, 159, 159, 159, 159, 160, 160, 150,
|
||||
160, 147, 160, 161, 144, 161, 140, 161, 162, 162,
|
||||
162, 139, 162, 163, 163, 137, 163, 163, 163, 163,
|
||||
136, 163, 164, 164, 164, 164, 164, 164, 164, 164,
|
||||
164, 165, 129, 165, 128, 165, 166, 124, 166, 166,
|
||||
167, 123, 167, 168, 121, 168, 168, 169, 113, 169,
|
||||
169, 170, 110, 170, 170, 107, 103, 102, 98, 96,
|
||||
137, 138, 135, 147, 152, 153, 125, 136, 149, 146,
|
||||
155, 158, 160, 159, 157, 150, 152, 156, 154, 151,
|
||||
148, 144, 143, 158, 141, 140, 133, 155, 163, 163,
|
||||
163, 163, 163, 163, 163, 163, 163, 164, 132, 164,
|
||||
164, 164, 164, 164, 164, 164, 165, 129, 165, 166,
|
||||
166, 126, 166, 124, 166, 167, 116, 167, 113, 167,
|
||||
168, 168, 168, 110, 168, 169, 169, 107, 169, 169,
|
||||
169, 169, 106, 169, 170, 170, 170, 170, 170, 170,
|
||||
170, 170, 170, 171, 171, 171, 101, 171, 172, 100,
|
||||
172, 99, 172, 173, 97, 173, 173, 174, 91, 174,
|
||||
|
||||
90, 85, 78, 75, 74, 72, 64, 49, 35, 33,
|
||||
32, 31, 30, 26, 25, 24, 21, 17, 13, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
|
||||
157, 157, 157
|
||||
175, 86, 175, 175, 176, 79, 176, 176, 177, 77,
|
||||
177, 177, 76, 74, 66, 57, 49, 36, 34, 33,
|
||||
32, 31, 27, 25, 24, 21, 20, 17, 13, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
|
||||
162, 162, 162
|
||||
} ;
|
||||
|
||||
/* The intent behind this definition is that it'll catch
|
||||
@@ -804,14 +808,14 @@ struct lexer_param;
|
||||
yyset_extra(yylloc->end, yyscanner); \
|
||||
} while (0);
|
||||
|
||||
#line 807 "src/lexer.c"
|
||||
#line 811 "src/lexer.c"
|
||||
|
||||
#line 25 "src/lexer.l"
|
||||
static int enter(int opening, int state, yyscan_t yyscanner);
|
||||
static int try_exit(int closing, int state, yyscan_t yyscanner);
|
||||
#line 812 "src/lexer.c"
|
||||
#line 816 "src/lexer.c"
|
||||
#define YY_NO_INPUT 1
|
||||
#line 814 "src/lexer.c"
|
||||
#line 818 "src/lexer.c"
|
||||
|
||||
#define INITIAL 0
|
||||
#define IN_PAREN 1
|
||||
@@ -843,8 +847,8 @@ struct yyguts_t
|
||||
size_t yy_buffer_stack_max; /**< capacity of stack. */
|
||||
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
|
||||
char yy_hold_char;
|
||||
yy_size_t yy_n_chars;
|
||||
yy_size_t yyleng_r;
|
||||
int yy_n_chars;
|
||||
int yyleng_r;
|
||||
char *yy_c_buf_p;
|
||||
int yy_init;
|
||||
int yy_start;
|
||||
@@ -901,7 +905,7 @@ FILE *yyget_out ( yyscan_t yyscanner );
|
||||
|
||||
void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
|
||||
|
||||
yy_size_t yyget_leng ( yyscan_t yyscanner );
|
||||
int yyget_leng ( yyscan_t yyscanner );
|
||||
|
||||
char *yyget_text ( yyscan_t yyscanner );
|
||||
|
||||
@@ -986,7 +990,7 @@ static int input ( yyscan_t yyscanner );
|
||||
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
|
||||
{ \
|
||||
int c = '*'; \
|
||||
yy_size_t n; \
|
||||
int n; \
|
||||
for ( n = 0; n < max_size && \
|
||||
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
|
||||
buf[n] = (char) c; \
|
||||
@@ -1105,7 +1109,7 @@ YY_DECL
|
||||
#line 38 "src/lexer.l"
|
||||
|
||||
|
||||
#line 1108 "src/lexer.c"
|
||||
#line 1112 "src/lexer.c"
|
||||
|
||||
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
|
||||
{
|
||||
@@ -1132,13 +1136,13 @@ yy_match:
|
||||
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
|
||||
{
|
||||
yy_current_state = (int) yy_def[yy_current_state];
|
||||
if ( yy_current_state >= 158 )
|
||||
if ( yy_current_state >= 163 )
|
||||
yy_c = yy_meta[yy_c];
|
||||
}
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
||||
++yy_cp;
|
||||
}
|
||||
while ( yy_base[yy_current_state] != 320 );
|
||||
while ( yy_base[yy_current_state] != 330 );
|
||||
|
||||
yy_find_action:
|
||||
yy_act = yy_accept[yy_current_state];
|
||||
@@ -1429,22 +1433,27 @@ YY_RULE_SETUP
|
||||
{ yylval->literal = jv_string(yytext+1); return FIELD;}
|
||||
YY_BREAK
|
||||
case 48:
|
||||
/* rule 48 can match eol */
|
||||
YY_RULE_SETUP
|
||||
#line 126 "src/lexer.l"
|
||||
{}
|
||||
#line 125 "src/lexer.l"
|
||||
{ yylval->literal = jv_string(yytext+1); return BINDING;}
|
||||
YY_BREAK
|
||||
case 49:
|
||||
/* rule 49 can match eol */
|
||||
YY_RULE_SETUP
|
||||
#line 128 "src/lexer.l"
|
||||
{ return INVALID_CHARACTER; }
|
||||
#line 127 "src/lexer.l"
|
||||
{}
|
||||
YY_BREAK
|
||||
case 50:
|
||||
YY_RULE_SETUP
|
||||
#line 130 "src/lexer.l"
|
||||
#line 129 "src/lexer.l"
|
||||
{ return INVALID_CHARACTER; }
|
||||
YY_BREAK
|
||||
case 51:
|
||||
YY_RULE_SETUP
|
||||
#line 131 "src/lexer.l"
|
||||
YY_FATAL_ERROR( "flex scanner jammed" );
|
||||
YY_BREAK
|
||||
#line 1447 "src/lexer.c"
|
||||
#line 1456 "src/lexer.c"
|
||||
case YY_STATE_EOF(INITIAL):
|
||||
case YY_STATE_EOF(IN_PAREN):
|
||||
case YY_STATE_EOF(IN_BRACKET):
|
||||
@@ -1637,7 +1646,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
||||
|
||||
else
|
||||
{
|
||||
yy_size_t num_to_read =
|
||||
int num_to_read =
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
|
||||
|
||||
while ( num_to_read <= 0 )
|
||||
@@ -1651,7 +1660,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
||||
|
||||
if ( b->yy_is_our_buffer )
|
||||
{
|
||||
yy_size_t new_size = b->yy_buf_size * 2;
|
||||
int new_size = b->yy_buf_size * 2;
|
||||
|
||||
if ( new_size <= 0 )
|
||||
b->yy_buf_size += b->yy_buf_size / 8;
|
||||
@@ -1709,7 +1718,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
||||
|
||||
if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
|
||||
/* Extend the array by 50%, plus the number we really need. */
|
||||
yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
|
||||
int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
|
||||
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner );
|
||||
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
|
||||
@@ -1748,7 +1757,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
||||
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
|
||||
{
|
||||
yy_current_state = (int) yy_def[yy_current_state];
|
||||
if ( yy_current_state >= 158 )
|
||||
if ( yy_current_state >= 163 )
|
||||
yy_c = yy_meta[yy_c];
|
||||
}
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
||||
@@ -1777,11 +1786,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
||||
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
|
||||
{
|
||||
yy_current_state = (int) yy_def[yy_current_state];
|
||||
if ( yy_current_state >= 158 )
|
||||
if ( yy_current_state >= 163 )
|
||||
yy_c = yy_meta[yy_c];
|
||||
}
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
||||
yy_is_jam = (yy_current_state == 157);
|
||||
yy_is_jam = (yy_current_state == 162);
|
||||
|
||||
(void)yyg;
|
||||
return yy_is_jam ? 0 : yy_current_state;
|
||||
@@ -1816,7 +1825,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
||||
|
||||
else
|
||||
{ /* need more input */
|
||||
yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
|
||||
int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr);
|
||||
++yyg->yy_c_buf_p;
|
||||
|
||||
switch ( yy_get_next_buffer( yyscanner ) )
|
||||
@@ -2194,12 +2203,12 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
|
||||
* @param yyscanner The scanner object.
|
||||
* @return the newly allocated buffer state object.
|
||||
*/
|
||||
YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
|
||||
YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner)
|
||||
{
|
||||
YY_BUFFER_STATE b;
|
||||
char *buf;
|
||||
yy_size_t n;
|
||||
yy_size_t i;
|
||||
int i;
|
||||
|
||||
/* Get memory for full buffer, including space for trailing EOB's. */
|
||||
n = (yy_size_t) (_yybytes_len + 2);
|
||||
@@ -2284,7 +2293,7 @@ static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner)
|
||||
do \
|
||||
{ \
|
||||
/* Undo effects of setting up yytext. */ \
|
||||
yy_size_t yyless_macro_arg = (n); \
|
||||
int yyless_macro_arg = (n); \
|
||||
YY_LESS_LINENO(yyless_macro_arg);\
|
||||
yytext[yyleng] = yyg->yy_hold_char; \
|
||||
yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
|
||||
@@ -2352,7 +2361,7 @@ FILE *yyget_out (yyscan_t yyscanner)
|
||||
/** Get the length of the current token.
|
||||
* @param yyscanner The scanner object.
|
||||
*/
|
||||
yy_size_t yyget_leng (yyscan_t yyscanner)
|
||||
int yyget_leng (yyscan_t yyscanner)
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
return yyleng;
|
||||
@@ -2616,7 +2625,7 @@ static int yy_flex_strlen (const char * s , yyscan_t yyscanner)
|
||||
|
||||
#define YYTABLES_NAME "yytables"
|
||||
|
||||
#line 130 "src/lexer.l"
|
||||
#line 131 "src/lexer.l"
|
||||
|
||||
/* perhaps these should be calls... */
|
||||
/*
|
||||
|
||||
Generated
+5
-6
@@ -285,7 +285,6 @@ typedef int16_t flex_int16_t;
|
||||
typedef uint16_t flex_uint16_t;
|
||||
typedef int32_t flex_int32_t;
|
||||
typedef uint32_t flex_uint32_t;
|
||||
typedef uint64_t flex_uint64_t;
|
||||
#else
|
||||
typedef signed char flex_int8_t;
|
||||
typedef short int flex_int16_t;
|
||||
@@ -399,7 +398,7 @@ struct yy_buffer_state
|
||||
/* Number of characters read into yy_ch_buf, not including EOB
|
||||
* characters.
|
||||
*/
|
||||
yy_size_t yy_n_chars;
|
||||
int yy_n_chars;
|
||||
|
||||
/* Whether we "own" the buffer - i.e., we know we created it,
|
||||
* and can realloc() it to grow it, and should free() it to
|
||||
@@ -443,7 +442,7 @@ void yypop_buffer_state ( yyscan_t yyscanner );
|
||||
|
||||
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
|
||||
YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
|
||||
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len , yyscan_t yyscanner );
|
||||
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
|
||||
|
||||
void *yyalloc ( yy_size_t , yyscan_t yyscanner );
|
||||
void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
|
||||
@@ -501,7 +500,7 @@ FILE *yyget_out ( yyscan_t yyscanner );
|
||||
|
||||
void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
|
||||
|
||||
yy_size_t yyget_leng ( yyscan_t yyscanner );
|
||||
int yyget_leng ( yyscan_t yyscanner );
|
||||
|
||||
char *yyget_text ( yyscan_t yyscanner );
|
||||
|
||||
@@ -732,9 +731,9 @@ extern int yylex \
|
||||
#undef yyTABLES_NAME
|
||||
#endif
|
||||
|
||||
#line 130 "src/lexer.l"
|
||||
#line 131 "src/lexer.l"
|
||||
|
||||
|
||||
#line 738 "src/lexer.h"
|
||||
#line 737 "src/lexer.h"
|
||||
#undef jq_yyIN_HEADER
|
||||
#endif /* jq_yyHEADER_H */
|
||||
+2
-1
@@ -60,7 +60,7 @@ struct lexer_param;
|
||||
"catch" { return CATCH; }
|
||||
"label" { return LABEL; }
|
||||
"break" { return BREAK; }
|
||||
"__loc__" { return LOC; }
|
||||
"$__loc__" { return LOC; }
|
||||
"|=" { return SETPIPE; }
|
||||
"+=" { return SETPLUS; }
|
||||
"-=" { return SETMINUS; }
|
||||
@@ -122,6 +122,7 @@ struct lexer_param;
|
||||
|
||||
([a-zA-Z_][a-zA-Z_0-9]*::)*[a-zA-Z_][a-zA-Z_0-9]* { yylval->literal = jv_string(yytext); return IDENT;}
|
||||
\.[a-zA-Z_][a-zA-Z_0-9]* { yylval->literal = jv_string(yytext+1); return FIELD;}
|
||||
\$([a-zA-Z_][a-zA-Z_0-9]*::)*[a-zA-Z_][a-zA-Z_0-9]* { yylval->literal = jv_string(yytext+1); return BINDING;}
|
||||
|
||||
[ \n\t]+ {}
|
||||
|
||||
|
||||
Generated
+1256
-1308
File diff suppressed because it is too large.
Load diff
Generated
+87
-85
@@ -76,48 +76,49 @@ struct lexer_param;
|
||||
INVALID_CHARACTER = 258, /* INVALID_CHARACTER */
|
||||
IDENT = 259, /* IDENT */
|
||||
FIELD = 260, /* FIELD */
|
||||
LITERAL = 261, /* LITERAL */
|
||||
FORMAT = 262, /* FORMAT */
|
||||
REC = 263, /* ".." */
|
||||
SETMOD = 264, /* "%=" */
|
||||
EQ = 265, /* "==" */
|
||||
NEQ = 266, /* "!=" */
|
||||
DEFINEDOR = 267, /* "//" */
|
||||
AS = 268, /* "as" */
|
||||
DEF = 269, /* "def" */
|
||||
MODULE = 270, /* "module" */
|
||||
IMPORT = 271, /* "import" */
|
||||
INCLUDE = 272, /* "include" */
|
||||
IF = 273, /* "if" */
|
||||
THEN = 274, /* "then" */
|
||||
ELSE = 275, /* "else" */
|
||||
ELSE_IF = 276, /* "elif" */
|
||||
REDUCE = 277, /* "reduce" */
|
||||
FOREACH = 278, /* "foreach" */
|
||||
END = 279, /* "end" */
|
||||
AND = 280, /* "and" */
|
||||
OR = 281, /* "or" */
|
||||
TRY = 282, /* "try" */
|
||||
CATCH = 283, /* "catch" */
|
||||
LABEL = 284, /* "label" */
|
||||
BREAK = 285, /* "break" */
|
||||
LOC = 286, /* "__loc__" */
|
||||
SETPIPE = 287, /* "|=" */
|
||||
SETPLUS = 288, /* "+=" */
|
||||
SETMINUS = 289, /* "-=" */
|
||||
SETMULT = 290, /* "*=" */
|
||||
SETDIV = 291, /* "/=" */
|
||||
SETDEFINEDOR = 292, /* "//=" */
|
||||
LESSEQ = 293, /* "<=" */
|
||||
GREATEREQ = 294, /* ">=" */
|
||||
ALTERNATION = 295, /* "?//" */
|
||||
QQSTRING_START = 296, /* QQSTRING_START */
|
||||
QQSTRING_TEXT = 297, /* QQSTRING_TEXT */
|
||||
QQSTRING_INTERP_START = 298, /* QQSTRING_INTERP_START */
|
||||
QQSTRING_INTERP_END = 299, /* QQSTRING_INTERP_END */
|
||||
QQSTRING_END = 300, /* QQSTRING_END */
|
||||
FUNCDEF = 301, /* FUNCDEF */
|
||||
NONOPT = 302 /* NONOPT */
|
||||
BINDING = 261, /* BINDING */
|
||||
LITERAL = 262, /* LITERAL */
|
||||
FORMAT = 263, /* FORMAT */
|
||||
REC = 264, /* ".." */
|
||||
SETMOD = 265, /* "%=" */
|
||||
EQ = 266, /* "==" */
|
||||
NEQ = 267, /* "!=" */
|
||||
DEFINEDOR = 268, /* "//" */
|
||||
AS = 269, /* "as" */
|
||||
DEF = 270, /* "def" */
|
||||
MODULE = 271, /* "module" */
|
||||
IMPORT = 272, /* "import" */
|
||||
INCLUDE = 273, /* "include" */
|
||||
IF = 274, /* "if" */
|
||||
THEN = 275, /* "then" */
|
||||
ELSE = 276, /* "else" */
|
||||
ELSE_IF = 277, /* "elif" */
|
||||
REDUCE = 278, /* "reduce" */
|
||||
FOREACH = 279, /* "foreach" */
|
||||
END = 280, /* "end" */
|
||||
AND = 281, /* "and" */
|
||||
OR = 282, /* "or" */
|
||||
TRY = 283, /* "try" */
|
||||
CATCH = 284, /* "catch" */
|
||||
LABEL = 285, /* "label" */
|
||||
BREAK = 286, /* "break" */
|
||||
LOC = 287, /* "$__loc__" */
|
||||
SETPIPE = 288, /* "|=" */
|
||||
SETPLUS = 289, /* "+=" */
|
||||
SETMINUS = 290, /* "-=" */
|
||||
SETMULT = 291, /* "*=" */
|
||||
SETDIV = 292, /* "/=" */
|
||||
SETDEFINEDOR = 293, /* "//=" */
|
||||
LESSEQ = 294, /* "<=" */
|
||||
GREATEREQ = 295, /* ">=" */
|
||||
ALTERNATION = 296, /* "?//" */
|
||||
QQSTRING_START = 297, /* QQSTRING_START */
|
||||
QQSTRING_TEXT = 298, /* QQSTRING_TEXT */
|
||||
QQSTRING_INTERP_START = 299, /* QQSTRING_INTERP_START */
|
||||
QQSTRING_INTERP_END = 300, /* QQSTRING_INTERP_END */
|
||||
QQSTRING_END = 301, /* QQSTRING_END */
|
||||
FUNCDEF = 302, /* FUNCDEF */
|
||||
NONOPT = 303 /* NONOPT */
|
||||
};
|
||||
typedef enum yytokentype yytoken_kind_t;
|
||||
#endif
|
||||
@@ -129,48 +130,49 @@ struct lexer_param;
|
||||
#define INVALID_CHARACTER 258
|
||||
#define IDENT 259
|
||||
#define FIELD 260
|
||||
#define LITERAL 261
|
||||
#define FORMAT 262
|
||||
#define REC 263
|
||||
#define SETMOD 264
|
||||
#define EQ 265
|
||||
#define NEQ 266
|
||||
#define DEFINEDOR 267
|
||||
#define AS 268
|
||||
#define DEF 269
|
||||
#define MODULE 270
|
||||
#define IMPORT 271
|
||||
#define INCLUDE 272
|
||||
#define IF 273
|
||||
#define THEN 274
|
||||
#define ELSE 275
|
||||
#define ELSE_IF 276
|
||||
#define REDUCE 277
|
||||
#define FOREACH 278
|
||||
#define END 279
|
||||
#define AND 280
|
||||
#define OR 281
|
||||
#define TRY 282
|
||||
#define CATCH 283
|
||||
#define LABEL 284
|
||||
#define BREAK 285
|
||||
#define LOC 286
|
||||
#define SETPIPE 287
|
||||
#define SETPLUS 288
|
||||
#define SETMINUS 289
|
||||
#define SETMULT 290
|
||||
#define SETDIV 291
|
||||
#define SETDEFINEDOR 292
|
||||
#define LESSEQ 293
|
||||
#define GREATEREQ 294
|
||||
#define ALTERNATION 295
|
||||
#define QQSTRING_START 296
|
||||
#define QQSTRING_TEXT 297
|
||||
#define QQSTRING_INTERP_START 298
|
||||
#define QQSTRING_INTERP_END 299
|
||||
#define QQSTRING_END 300
|
||||
#define FUNCDEF 301
|
||||
#define NONOPT 302
|
||||
#define BINDING 261
|
||||
#define LITERAL 262
|
||||
#define FORMAT 263
|
||||
#define REC 264
|
||||
#define SETMOD 265
|
||||
#define EQ 266
|
||||
#define NEQ 267
|
||||
#define DEFINEDOR 268
|
||||
#define AS 269
|
||||
#define DEF 270
|
||||
#define MODULE 271
|
||||
#define IMPORT 272
|
||||
#define INCLUDE 273
|
||||
#define IF 274
|
||||
#define THEN 275
|
||||
#define ELSE 276
|
||||
#define ELSE_IF 277
|
||||
#define REDUCE 278
|
||||
#define FOREACH 279
|
||||
#define END 280
|
||||
#define AND 281
|
||||
#define OR 282
|
||||
#define TRY 283
|
||||
#define CATCH 284
|
||||
#define LABEL 285
|
||||
#define BREAK 286
|
||||
#define LOC 287
|
||||
#define SETPIPE 288
|
||||
#define SETPLUS 289
|
||||
#define SETMINUS 290
|
||||
#define SETMULT 291
|
||||
#define SETDIV 292
|
||||
#define SETDEFINEDOR 293
|
||||
#define LESSEQ 294
|
||||
#define GREATEREQ 295
|
||||
#define ALTERNATION 296
|
||||
#define QQSTRING_START 297
|
||||
#define QQSTRING_TEXT 298
|
||||
#define QQSTRING_INTERP_START 299
|
||||
#define QQSTRING_INTERP_END 300
|
||||
#define QQSTRING_END 301
|
||||
#define FUNCDEF 302
|
||||
#define NONOPT 303
|
||||
|
||||
/* Value type. */
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
@@ -181,7 +183,7 @@ union YYSTYPE
|
||||
jv literal;
|
||||
block blk;
|
||||
|
||||
#line 185 "src/parser.h"
|
||||
#line 187 "src/parser.h"
|
||||
|
||||
};
|
||||
typedef union YYSTYPE YYSTYPE;
|
||||
|
||||
+37
-52
@@ -49,6 +49,7 @@ struct lexer_param;
|
||||
%token INVALID_CHARACTER
|
||||
%token <literal> IDENT
|
||||
%token <literal> FIELD
|
||||
%token <literal> BINDING
|
||||
%token <literal> LITERAL
|
||||
%token <literal> FORMAT
|
||||
%token REC ".."
|
||||
@@ -74,7 +75,7 @@ struct lexer_param;
|
||||
%token CATCH "catch"
|
||||
%token LABEL "label"
|
||||
%token BREAK "break"
|
||||
%token LOC "__loc__"
|
||||
%token LOC "$__loc__"
|
||||
%token SETPIPE "|="
|
||||
%token SETPLUS "+="
|
||||
%token SETMINUS "-="
|
||||
@@ -385,10 +386,10 @@ Term "as" Patterns '|' Exp {
|
||||
$$ = $2;
|
||||
} |
|
||||
|
||||
"label" '$' IDENT '|' Exp {
|
||||
jv v = jv_string_fmt("*label-%s", jv_string_value($3));
|
||||
$$ = gen_location(@$, locations, gen_label(jv_string_value(v), $5));
|
||||
jv_free($3);
|
||||
"label" BINDING '|' Exp {
|
||||
jv v = jv_string_fmt("*label-%s", jv_string_value($2));
|
||||
$$ = gen_location(@$, locations, gen_label(jv_string_value(v), $4));
|
||||
jv_free($2);
|
||||
jv_free(v);
|
||||
} |
|
||||
|
||||
@@ -525,13 +526,13 @@ ImportWhat Exp ';' {
|
||||
}
|
||||
|
||||
ImportWhat:
|
||||
"import" ImportFrom "as" '$' IDENT {
|
||||
"import" ImportFrom "as" BINDING {
|
||||
jv v = block_const($2);
|
||||
// XXX Make gen_import take only blocks and the int is_data so we
|
||||
// don't have to free so much stuff here
|
||||
$$ = gen_import(jv_string_value(v), jv_string_value($5), 1);
|
||||
$$ = gen_import(jv_string_value(v), jv_string_value($4), 1);
|
||||
block_free($2);
|
||||
jv_free($5);
|
||||
jv_free($4);
|
||||
jv_free(v);
|
||||
} |
|
||||
"import" ImportFrom "as" IDENT {
|
||||
@@ -579,13 +580,9 @@ Params ';' Param {
|
||||
}
|
||||
|
||||
Param:
|
||||
'$' IDENT {
|
||||
$$ = gen_param_regular(jv_string_value($2));
|
||||
jv_free($2);
|
||||
} |
|
||||
'$' Keyword {
|
||||
$$ = gen_param_regular(jv_string_value($2));
|
||||
jv_free($2);
|
||||
BINDING {
|
||||
$$ = gen_param_regular(jv_string_value($1));
|
||||
jv_free($1);
|
||||
} |
|
||||
IDENT {
|
||||
$$ = gen_param(jv_string_value($1));
|
||||
@@ -646,13 +643,13 @@ Term:
|
||||
REC {
|
||||
$$ = gen_call("recurse", gen_noop());
|
||||
} |
|
||||
BREAK '$' IDENT {
|
||||
jv v = jv_string_fmt("*label-%s", jv_string_value($3)); // impossible symbol
|
||||
BREAK BINDING {
|
||||
jv v = jv_string_fmt("*label-%s", jv_string_value($2)); // impossible symbol
|
||||
$$ = gen_location(@$, locations,
|
||||
BLOCK(gen_op_unbound(LOADV, jv_string_value(v)),
|
||||
gen_call("error", gen_noop())));
|
||||
jv_free(v);
|
||||
jv_free($3);
|
||||
jv_free($2);
|
||||
} |
|
||||
BREAK error {
|
||||
FAIL(@$, "break requires a label to break to");
|
||||
@@ -774,22 +771,17 @@ FORMAT {
|
||||
* DO NOT USE!! I will break your jq code if you do use this outside
|
||||
* src/builtin.jq.
|
||||
*/
|
||||
'$' '$' '$' '$' IDENT {
|
||||
$$ = gen_location(@$, locations, gen_op_unbound(LOADVN, jv_string_value($5)));
|
||||
jv_free($5);
|
||||
'$' '$' '$' BINDING {
|
||||
$$ = gen_location(@$, locations, gen_op_unbound(LOADVN, jv_string_value($4)));
|
||||
jv_free($4);
|
||||
} |
|
||||
'$' IDENT {
|
||||
$$ = gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($2)));
|
||||
jv_free($2);
|
||||
BINDING {
|
||||
$$ = gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($1)));
|
||||
jv_free($1);
|
||||
} |
|
||||
'$' Keyword {
|
||||
if (strcmp(jv_string_value($2), "__loc__") == 0) {
|
||||
$$ = gen_const(JV_OBJECT(jv_string("file"), jv_copy(locations->fname),
|
||||
jv_string("line"), jv_number(locfile_get_line(locations, @$.start) + 1)));
|
||||
} else {
|
||||
$$ = gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($2)));
|
||||
}
|
||||
jv_free($2);
|
||||
"$__loc__" {
|
||||
$$ = gen_const(JV_OBJECT(jv_string("file"), jv_copy(locations->fname),
|
||||
jv_string("line"), jv_number(locfile_get_line(locations, @$.start) + 1)));
|
||||
} |
|
||||
IDENT {
|
||||
const char *s = jv_string_value($1);
|
||||
@@ -843,9 +835,9 @@ Pattern {
|
||||
}
|
||||
|
||||
Pattern:
|
||||
'$' IDENT {
|
||||
$$ = gen_op_unbound(STOREV, jv_string_value($2));
|
||||
jv_free($2);
|
||||
BINDING {
|
||||
$$ = gen_op_unbound(STOREV, jv_string_value($1));
|
||||
jv_free($1);
|
||||
} |
|
||||
'[' ArrayPats ']' {
|
||||
$$ = BLOCK($2, gen_op_simple(POP));
|
||||
@@ -871,11 +863,11 @@ ObjPats ',' ObjPat {
|
||||
}
|
||||
|
||||
ObjPat:
|
||||
'$' IDENT {
|
||||
$$ = gen_object_matcher(gen_const($2), gen_op_unbound(STOREV, jv_string_value($2)));
|
||||
BINDING {
|
||||
$$ = gen_object_matcher(gen_const($1), gen_op_unbound(STOREV, jv_string_value($1)));
|
||||
} |
|
||||
'$' IDENT ':' Pattern {
|
||||
$$ = gen_object_matcher(gen_const($2), BLOCK(gen_op_simple(DUP), gen_op_unbound(STOREV, jv_string_value($2)), $4));
|
||||
BINDING ':' Pattern {
|
||||
$$ = gen_object_matcher(gen_const($1), BLOCK(gen_op_simple(DUP), gen_op_unbound(STOREV, jv_string_value($1)), $3));
|
||||
} |
|
||||
IDENT ':' Pattern {
|
||||
$$ = gen_object_matcher(gen_const($1), $3);
|
||||
@@ -953,9 +945,6 @@ Keyword:
|
||||
} |
|
||||
"break" {
|
||||
$$ = jv_string("break");
|
||||
} |
|
||||
"__loc__" {
|
||||
$$ = jv_string("__loc__");
|
||||
}
|
||||
|
||||
MkDict:
|
||||
@@ -980,17 +969,13 @@ IDENT ':' ExpD {
|
||||
$$ = gen_dictpair($1, BLOCK(gen_op_simple(POP), gen_op_simple(DUP2),
|
||||
gen_op_simple(DUP2), gen_op_simple(INDEX)));
|
||||
}
|
||||
| '$' IDENT ':' ExpD {
|
||||
$$ = gen_dictpair(gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($2))),
|
||||
$4);
|
||||
| BINDING ':' ExpD {
|
||||
$$ = gen_dictpair(gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($1))),
|
||||
$3);
|
||||
}
|
||||
| '$' IDENT {
|
||||
$$ = gen_dictpair(gen_const($2),
|
||||
gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($2))));
|
||||
}
|
||||
| '$' Keyword {
|
||||
$$ = gen_dictpair(gen_const($2),
|
||||
gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($2))));
|
||||
| BINDING {
|
||||
$$ = gen_dictpair(gen_const($1),
|
||||
gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($1))));
|
||||
}
|
||||
| IDENT {
|
||||
$$ = gen_dictpair(gen_const(jv_copy($1)),
|
||||
|
||||
@@ -1770,3 +1770,25 @@ false
|
||||
1
|
||||
1
|
||||
|
||||
|
||||
# Using a keyword as variable/label name
|
||||
|
||||
123 as $label | $label
|
||||
null
|
||||
123
|
||||
|
||||
[ label $if | range(10) | ., (select(. == 5) | break $if) ]
|
||||
null
|
||||
[0,1,2,3,4,5]
|
||||
|
||||
reduce .[] as $then (4 as $else | $else; . as $elif | . + $then * $elif)
|
||||
[1,2,3]
|
||||
96
|
||||
|
||||
1 as $foreach | 2 as $and | 3 as $or | { $foreach, $and, $or, a }
|
||||
{"a":4,"b":5}
|
||||
{"foreach":1,"and":2,"or":3,"a":4}
|
||||
|
||||
[ foreach .[] as $try (1 as $catch | $catch - 1; . + $try; .) ]
|
||||
[10,9,8,7]
|
||||
[10,19,27,34]
|
||||
Reference in new issue
Block a user