navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from dgryski/master

Browse Source 
Add != (not equal) to list of supported binops
This commit is contained in:
Stephen Dolan committed 2012-10-24 02:43:54 -07:00
2 parents 5a64a29774 0adf4638d1
commit 033d9b2fd5
9 files changed
+3048 -2933
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

builtin.c
+6
View File
@@ -120,6 +120,11 @@ static void f_equal(jv input[], jv output[]) {
output[0] = jv_bool(jv_equal(input[2], input[1])); output[0] = jv_bool(jv_equal(input[2], input[1]));
} }
static void f_notequal(jv input[], jv output[]) {
jv_free(input[0]);
output[0] = jv_bool(jv_equal(input[2], input[1]) == 0);
}
static void order_cmp(jv input[], jv output[], int op) { static void order_cmp(jv input[], jv output[], int op) {
jv_free(input[0]); jv_free(input[0]);
jv a = input[2]; jv a = input[2];
@@ -284,6 +289,7 @@ static struct cfunction function_list[] = {
{f_tostring, "tostring", CALL_BUILTIN_1_1}, {f_tostring, "tostring", CALL_BUILTIN_1_1},
{f_keys, "keys", CALL_BUILTIN_1_1}, {f_keys, "keys", CALL_BUILTIN_1_1},
{f_equal, "_equal", CALL_BUILTIN_3_1}, {f_equal, "_equal", CALL_BUILTIN_3_1},
{f_notequal, "_notequal", CALL_BUILTIN_3_1},
{f_less, "_less", CALL_BUILTIN_3_1}, {f_less, "_less", CALL_BUILTIN_3_1},
{f_greater, "_greater", CALL_BUILTIN_3_1}, {f_greater, "_greater", CALL_BUILTIN_3_1},
{f_lesseq, "_lesseq", CALL_BUILTIN_3_1}, {f_lesseq, "_lesseq", CALL_BUILTIN_3_1},
lexer.gen.c
+202 -206
View File
@@ -9,7 +9,7 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35 #define YY_FLEX_SUBMINOR_VERSION 37
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
@@ -159,15 +159,7 @@ typedef void* yyscan_t;
/* Size of default input buffer. */ /* Size of default input buffer. */
#ifndef YY_BUF_SIZE #ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384 #define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif #endif
/* The state buf must be large enough to hold one state per character in the main buffer. /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -179,6 +171,11 @@ typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif #endif
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
@@ -201,11 +198,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state struct yy_buffer_state
@@ -223,7 +215,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
*/ */
int yy_n_chars; yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it, /* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to * and can realloc() it to grow it, and should free() it to
@@ -302,7 +294,7 @@ static void jq_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner
YY_BUFFER_STATE jq_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE jq_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE jq_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE jq_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
void *jq_yyalloc (yy_size_t ,yyscan_t yyscanner ); void *jq_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *jq_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); void *jq_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -334,7 +326,7 @@ void jq_yyfree (void * ,yyscan_t yyscanner );
/* Begin user sect3 */ /* Begin user sect3 */
#define jq_yywrap(n) 1 #define jq_yywrap(yyscanner) 1
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR; typedef unsigned char YY_CHAR;
@@ -358,8 +350,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 34 #define YY_NUM_RULES 35
#define YY_END_OF_BUFFER 35 #define YY_END_OF_BUFFER 36
/* 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
@@ -367,17 +359,17 @@ 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 yyconst flex_int16_t yy_accept[86] = static yyconst flex_int16_t yy_accept[88] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 35, 33, 32, 32, 25, 1, 21, 22, 0, 0, 36, 34, 33, 33, 34, 26, 1, 22,
23, 21, 21, 21, 21, 21, 24, 21, 21, 21, 23, 24, 22, 22, 22, 22, 22, 25, 22, 22,
31, 31, 31, 31, 31, 31, 31, 21, 29, 29, 22, 32, 32, 32, 32, 32, 32, 32, 22, 30,
27, 30, 32, 1, 16, 14, 24, 15, 0, 12, 30, 28, 31, 33, 2, 1, 17, 15, 25, 16,
17, 19, 2, 20, 31, 31, 3, 31, 31, 31, 0, 13, 18, 20, 3, 21, 32, 32, 4, 32,
5, 10, 31, 13, 29, 28, 26, 28, 0, 24, 32, 32, 6, 11, 32, 14, 30, 29, 27, 29,
18, 9, 4, 31, 31, 11, 31, 0, 28, 8, 0, 25, 19, 10, 5, 32, 32, 12, 32, 0,
7, 6, 28, 28, 0 29, 9, 8, 7, 29, 29, 0
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst flex_int32_t yy_ec[256] =
@@ -385,17 +377,17 @@ static yyconst flex_int32_t yy_ec[256] =
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, 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, 1, 5, 6, 7, 1, 1, 1, 8, 1, 2, 5, 6, 7, 8, 1, 1, 1, 9,
9, 10, 11, 12, 13, 14, 15, 16, 16, 16, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17,
16, 16, 16, 16, 16, 16, 16, 17, 18, 19, 17, 17, 17, 17, 17, 17, 17, 18, 19, 20,
20, 21, 1, 1, 22, 22, 22, 22, 23, 22, 21, 22, 1, 1, 23, 23, 23, 23, 24, 23,
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
24, 25, 26, 1, 27, 1, 28, 22, 22, 29, 25, 26, 27, 1, 28, 1, 29, 23, 23, 30,
30, 31, 22, 32, 33, 22, 22, 34, 22, 35, 31, 32, 23, 33, 34, 23, 23, 35, 23, 36,
36, 22, 22, 37, 38, 39, 40, 22, 22, 22, 37, 23, 23, 38, 39, 40, 41, 23, 23, 23,
22, 22, 41, 42, 43, 1, 1, 1, 1, 1, 23, 23, 42, 43, 44, 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,
@@ -412,91 +404,91 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1 1, 1, 1, 1, 1
} ; } ;
static yyconst flex_int32_t yy_meta[44] = static yyconst flex_int32_t yy_meta[45] =
{ 0, { 0,
1, 1, 2, 2, 3, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 3, 1, 1, 1, 1,
1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1,
1, 4, 4, 1, 5, 1, 6, 4, 4, 4, 1, 1, 4, 4, 1, 5, 1, 6, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1, 1, 1 4, 1, 1, 1
} ; } ;
static yyconst flex_int16_t yy_base[95] = static yyconst flex_int16_t yy_base[97] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
41, 42, 142, 143, 46, 48, 143, 0, 143, 143, 42, 43, 144, 145, 48, 50, 122, 145, 0, 145,
143, 121, 120, 38, 39, 41, 49, 119, 118, 117, 145, 145, 121, 120, 39, 40, 42, 50, 119, 118,
0, 22, 106, 36, 104, 97, 101, 112, 0, 0, 117, 0, 23, 91, 37, 88, 78, 77, 80, 0,
143, 51, 71, 0, 143, 143, 62, 143, 64, 96, 0, 145, 38, 73, 145, 0, 145, 145, 63, 145,
143, 143, 143, 143, 0, 85, 0, 79, 48, 75, 71, 79, 145, 145, 145, 145, 0, 69, 0, 66,
0, 0, 65, 143, 0, 69, 143, 68, 74, 73, 27, 67, 0, 0, 65, 145, 0, 69, 145, 67,
143, 0, 0, 57, 57, 0, 49, 56, 58, 0, 75, 74, 145, 0, 0, 58, 58, 0, 50, 61,
0, 0, 57, 43, 143, 96, 102, 105, 111, 117, 58, 0, 0, 0, 56, 51, 145, 102, 108, 111,
120, 122, 124, 126 117, 123, 126, 128, 130, 132
} ; } ;
static yyconst flex_int16_t yy_def[95] = static yyconst flex_int16_t yy_def[97] =
{ 0, { 0,
85, 1, 1, 1, 1, 1, 1, 1, 1, 1, 87, 1, 1, 1, 1, 1, 1, 1, 1, 1,
86, 86, 85, 85, 85, 85, 85, 87, 85, 85, 88, 88, 87, 87, 87, 87, 87, 87, 89, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
88, 88, 88, 88, 88, 88, 88, 85, 89, 89, 87, 90, 90, 90, 90, 90, 90, 90, 87, 91,
85, 90, 85, 87, 85, 85, 85, 85, 85, 85, 91, 87, 92, 87, 87, 89, 87, 87, 87, 87,
85, 85, 85, 85, 88, 88, 88, 88, 88, 88, 87, 87, 87, 87, 87, 87, 90, 90, 90, 90,
88, 88, 88, 85, 89, 85, 85, 91, 85, 85, 90, 90, 90, 90, 90, 87, 91, 87, 87, 93,
85, 88, 88, 88, 88, 88, 88, 90, 92, 88, 87, 87, 87, 90, 90, 90, 90, 90, 90, 92,
88, 88, 93, 94, 0, 85, 85, 85, 85, 85, 94, 90, 90, 90, 95, 96, 0, 87, 87, 87,
85, 85, 85, 85 87, 87, 87, 87, 87, 87
} ; } ;
static yyconst flex_int16_t yy_nxt[187] = static yyconst flex_int16_t yy_nxt[190] =
{ 0, { 0,
14, 15, 16, 14, 17, 18, 19, 20, 21, 22, 14, 15, 16, 14, 17, 18, 19, 20, 21, 22,
23, 19, 24, 25, 26, 27, 19, 19, 28, 29, 23, 24, 20, 25, 26, 27, 28, 20, 20, 29,
30, 31, 31, 20, 14, 21, 31, 32, 33, 34, 30, 31, 32, 32, 21, 14, 22, 32, 33, 34,
31, 31, 35, 31, 31, 36, 31, 31, 37, 31, 35, 32, 32, 36, 32, 32, 37, 32, 32, 38,
20, 38, 21, 40, 40, 41, 41, 43, 43, 43, 32, 21, 39, 22, 41, 41, 69, 42, 42, 44,
43, 47, 47, 47, 47, 50, 56, 48, 67, 57, 44, 44, 44, 49, 49, 49, 49, 52, 58, 50,
51, 49, 47, 85, 47, 42, 42, 78, 49, 59, 76, 59, 53, 51, 49, 77, 49, 43, 43, 87,
60, 49, 43, 43, 69, 47, 69, 47, 49, 70, 51, 61, 62, 51, 44, 44, 80, 49, 70, 49,
74, 78, 78, 82, 49, 75, 81, 80, 70, 70, 51, 80, 71, 80, 71, 84, 51, 72, 83, 82,
68, 49, 78, 78, 77, 68, 39, 39, 39, 39, 72, 72, 80, 51, 80, 79, 78, 75, 74, 73,
39, 39, 44, 76, 44, 44, 44, 44, 55, 73, 66, 70, 40, 40, 40, 40, 40, 40, 46, 65,
55, 65, 65, 72, 65, 71, 65, 66, 66, 66, 46, 46, 46, 46, 57, 64, 57, 67, 67, 63,
66, 66, 66, 79, 79, 83, 83, 84, 84, 66, 67, 60, 67, 68, 68, 68, 68, 68, 68, 81,
66, 64, 63, 62, 61, 58, 54, 53, 52, 46, 81, 85, 85, 86, 86, 68, 68, 56, 55, 54,
45, 85, 13, 85, 85, 85, 85, 85, 85, 85, 48, 47, 45, 87, 13, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85 87, 87, 87, 87, 87, 87, 87, 87, 87
} ; } ;
static yyconst flex_int16_t yy_chk[187] = static yyconst flex_int16_t yy_chk[190] =
{ 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, 11, 12, 11, 12, 15, 15, 16, 1, 1, 1, 1, 11, 12, 43, 11, 12, 15,
16, 24, 25, 24, 25, 26, 32, 24, 42, 32, 15, 16, 16, 25, 26, 25, 26, 27, 33, 25,
26, 25, 27, 78, 27, 11, 12, 84, 25, 34, 61, 33, 27, 26, 28, 61, 28, 11, 12, 80,
34, 27, 43, 43, 49, 47, 49, 47, 27, 49, 26, 35, 35, 28, 44, 44, 86, 49, 43, 49,
59, 83, 79, 77, 47, 59, 75, 74, 70, 69, 28, 85, 51, 81, 51, 79, 49, 51, 77, 76,
42, 47, 68, 66, 63, 78, 86, 86, 86, 86, 72, 71, 70, 49, 68, 65, 62, 60, 58, 52,
86, 86, 87, 60, 87, 87, 87, 87, 88, 58, 39, 80, 88, 88, 88, 88, 88, 88, 89, 38,
88, 89, 89, 56, 89, 50, 89, 90, 90, 90, 89, 89, 89, 89, 90, 37, 90, 91, 91, 36,
90, 90, 90, 91, 91, 92, 92, 93, 93, 94, 91, 34, 91, 92, 92, 92, 92, 92, 92, 93,
94, 38, 37, 36, 35, 33, 30, 29, 28, 23, 93, 94, 94, 95, 95, 96, 96, 31, 30, 29,
22, 13, 85, 85, 85, 85, 85, 85, 85, 85, 24, 23, 17, 13, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
85, 85, 85, 85, 85, 85 87, 87, 87, 87, 87, 87, 87, 87, 87
} ; } ;
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
@@ -509,6 +501,9 @@ static yyconst flex_int16_t yy_chk[187] =
#line 1 "lexer.l" #line 1 "lexer.l"
#line 2 "lexer.l" #line 2 "lexer.l"
#include "compile.h" #include "compile.h"
struct lexer_param;
#include "parser.gen.h" /* Generated by bison. */ #include "parser.gen.h" /* Generated by bison. */
#define YY_USER_ACTION \ #define YY_USER_ACTION \
@@ -523,11 +518,11 @@ static yyconst flex_int16_t yy_chk[187] =
#line 20 "lexer.l" #line 23 "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);
#define YY_NO_INPUT 1 #define YY_NO_INPUT 1
#line 531 "lexer.gen.c" #line 526 "lexer.gen.c"
#define INITIAL 0 #define INITIAL 0
#define IN_PAREN 1 #define IN_PAREN 1
@@ -559,8 +554,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */ size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char; char yy_hold_char;
int yy_n_chars; yy_size_t yy_n_chars;
int yyleng_r; yy_size_t yyleng_r;
char *yy_c_buf_p; char *yy_c_buf_p;
int yy_init; int yy_init;
int yy_start; int yy_start;
@@ -617,7 +612,7 @@ FILE *jq_yyget_out (yyscan_t yyscanner );
void jq_yyset_out (FILE * out_str ,yyscan_t yyscanner ); void jq_yyset_out (FILE * out_str ,yyscan_t yyscanner );
int jq_yyget_leng (yyscan_t yyscanner ); yy_size_t jq_yyget_leng (yyscan_t yyscanner );
char *jq_yyget_text (yyscan_t yyscanner ); char *jq_yyget_text (yyscan_t yyscanner );
@@ -625,6 +620,10 @@ int jq_yyget_lineno (yyscan_t yyscanner );
void jq_yyset_lineno (int line_number ,yyscan_t yyscanner ); void jq_yyset_lineno (int line_number ,yyscan_t yyscanner );
int jq_yyget_column (yyscan_t yyscanner );
void jq_yyset_column (int column_no ,yyscan_t yyscanner );
YYSTYPE * jq_yyget_lval (yyscan_t yyscanner ); YYSTYPE * jq_yyget_lval (yyscan_t yyscanner );
void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -671,12 +670,7 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */ /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE #ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192 #define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif #endif
/* Copy whatever the last rule matched to the standard output. */ /* Copy whatever the last rule matched to the standard output. */
@@ -780,10 +774,10 @@ YY_DECL
register int yy_act; register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
#line 32 "lexer.l" #line 35 "lexer.l"
#line 787 "lexer.gen.c" #line 781 "lexer.gen.c"
yylval = yylval_param; yylval = yylval_param;
@@ -840,13 +834,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 >= 86 ) if ( yy_current_state >= 88 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp; ++yy_cp;
} }
while ( yy_base[yy_current_state] != 143 ); while ( yy_base[yy_current_state] != 145 );
yy_find_action: yy_find_action:
yy_act = yy_accept[yy_current_state]; yy_act = yy_accept[yy_current_state];
@@ -872,158 +866,163 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
YY_RULE_SETUP YY_RULE_SETUP
#line 34 "lexer.l" #line 37 "lexer.l"
{ /* comments */ } { /* comments */ }
YY_BREAK YY_BREAK
case 2: case 2:
YY_RULE_SETUP YY_RULE_SETUP
#line 36 "lexer.l" #line 39 "lexer.l"
{ return EQ; } { return NEQ; }
YY_BREAK YY_BREAK
case 3: case 3:
YY_RULE_SETUP YY_RULE_SETUP
#line 37 "lexer.l" #line 40 "lexer.l"
{ return AS; } { return EQ; }
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 38 "lexer.l" #line 41 "lexer.l"
{ return DEF; } { return AS; }
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
#line 39 "lexer.l" #line 42 "lexer.l"
{ return IF; } { return DEF; }
YY_BREAK YY_BREAK
case 6: case 6:
YY_RULE_SETUP YY_RULE_SETUP
#line 40 "lexer.l" #line 43 "lexer.l"
{ return THEN; } { return IF; }
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 41 "lexer.l" #line 44 "lexer.l"
{ return ELSE; } { return THEN; }
YY_BREAK YY_BREAK
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 42 "lexer.l" #line 45 "lexer.l"
{ return ELSE_IF; } { return ELSE; }
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 43 "lexer.l" #line 46 "lexer.l"
{ return AND; } { return ELSE_IF; }
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 44 "lexer.l" #line 47 "lexer.l"
{ return OR; } { return AND; }
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 45 "lexer.l" #line 48 "lexer.l"
{ return END; } { return OR; }
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 46 "lexer.l" #line 49 "lexer.l"
{ return DEFINEDOR; } { return END; }
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 47 "lexer.l" #line 50 "lexer.l"
{ return SETPIPE; } { return DEFINEDOR; }
YY_BREAK YY_BREAK
case 14: case 14:
YY_RULE_SETUP YY_RULE_SETUP
#line 48 "lexer.l" #line 51 "lexer.l"
{ return SETPLUS; } { return SETPIPE; }
YY_BREAK YY_BREAK
case 15: case 15:
YY_RULE_SETUP YY_RULE_SETUP
#line 49 "lexer.l" #line 52 "lexer.l"
{ return SETMINUS; } { return SETPLUS; }
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
#line 50 "lexer.l" #line 53 "lexer.l"
{ return SETMULT; } { return SETMINUS; }
YY_BREAK YY_BREAK
case 17: case 17:
YY_RULE_SETUP YY_RULE_SETUP
#line 51 "lexer.l" #line 54 "lexer.l"
{ return SETDIV; } { return SETMULT; }
YY_BREAK YY_BREAK
case 18: case 18:
YY_RULE_SETUP YY_RULE_SETUP
#line 52 "lexer.l" #line 55 "lexer.l"
{ return SETDEFINEDOR; } { return SETDIV; }
YY_BREAK YY_BREAK
case 19: case 19:
YY_RULE_SETUP YY_RULE_SETUP
#line 53 "lexer.l" #line 56 "lexer.l"
{ return LESSEQ; } { return SETDEFINEDOR; }
YY_BREAK YY_BREAK
case 20: case 20:
YY_RULE_SETUP YY_RULE_SETUP
#line 54 "lexer.l" #line 57 "lexer.l"
{ return GREATEREQ; } { return LESSEQ; }
YY_BREAK YY_BREAK
case 21: case 21:
YY_RULE_SETUP YY_RULE_SETUP
#line 55 "lexer.l" #line 58 "lexer.l"
{ return yytext[0];} { return GREATEREQ; }
YY_BREAK YY_BREAK
case 22: case 22:
YY_RULE_SETUP YY_RULE_SETUP
#line 57 "lexer.l" #line 59 "lexer.l"
{ { return yytext[0];}
return enter(yytext[0], YY_START, yyscanner);
}
YY_BREAK YY_BREAK
case 23: case 23:
YY_RULE_SETUP YY_RULE_SETUP
#line 61 "lexer.l" #line 61 "lexer.l"
{ {
return try_exit(yytext[0], YY_START, yyscanner); return enter(yytext[0], YY_START, yyscanner);
} }
YY_BREAK YY_BREAK
case 24: case 24:
YY_RULE_SETUP YY_RULE_SETUP
#line 66 "lexer.l" #line 65 "lexer.l"
{ {
yylval->literal = jv_parse_sized(yytext, yyleng); return LITERAL; return try_exit(yytext[0], YY_START, yyscanner);
} }
YY_BREAK YY_BREAK
case 25: case 25:
YY_RULE_SETUP YY_RULE_SETUP
#line 70 "lexer.l" #line 70 "lexer.l"
{
yylval->literal = jv_parse_sized(yytext, yyleng); return LITERAL;
}
YY_BREAK
case 26:
YY_RULE_SETUP
#line 74 "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 26: case 27:
YY_RULE_SETUP YY_RULE_SETUP
#line 76 "lexer.l" #line 80 "lexer.l"
{ {
return enter(QQSTRING_INTERP_START, YY_START, yyscanner); return enter(QQSTRING_INTERP_START, YY_START, yyscanner);
} }
YY_BREAK YY_BREAK
case 27: case 28:
YY_RULE_SETUP YY_RULE_SETUP
#line 79 "lexer.l" #line 83 "lexer.l"
{ {
yy_pop_state(yyscanner); yy_pop_state(yyscanner);
return QQSTRING_END; return QQSTRING_END;
} }
YY_BREAK YY_BREAK
case 28: case 29:
/* rule 28 can match eol */ /* rule 29 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 83 "lexer.l" #line 87 "lexer.l"
{ {
/* pass escapes to the json parser */ /* pass escapes to the json parser */
jv escapes = jv_string_fmt("\"%.*s\"", yyleng, yytext); jv escapes = jv_string_fmt("\"%.*s\"", yyleng, yytext);
@@ -1032,45 +1031,45 @@ YY_RULE_SETUP
return QQSTRING_TEXT; return QQSTRING_TEXT;
} }
YY_BREAK YY_BREAK
case 29: case 30:
/* rule 29 can match eol */ /* rule 30 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 90 "lexer.l" #line 94 "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 30: case 31:
YY_RULE_SETUP YY_RULE_SETUP
#line 94 "lexer.l" #line 98 "lexer.l"
{ {
return INVALID_CHARACTER; return INVALID_CHARACTER;
} }
YY_BREAK YY_BREAK
case 31:
YY_RULE_SETUP
#line 100 "lexer.l"
{ yylval->literal = jv_string(yytext); return IDENT;}
YY_BREAK
case 32: case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
#line 102 "lexer.l"
{}
YY_BREAK
case 33:
YY_RULE_SETUP YY_RULE_SETUP
#line 104 "lexer.l" #line 104 "lexer.l"
{ return INVALID_CHARACTER; } { yylval->literal = jv_string(yytext); return IDENT;}
YY_BREAK
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
#line 106 "lexer.l"
{}
YY_BREAK YY_BREAK
case 34: case 34:
YY_RULE_SETUP YY_RULE_SETUP
#line 106 "lexer.l" #line 108 "lexer.l"
{ return INVALID_CHARACTER; }
YY_BREAK
case 35:
YY_RULE_SETUP
#line 110 "lexer.l"
YY_FATAL_ERROR( "flex scanner jammed" ); YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK YY_BREAK
#line 1074 "lexer.gen.c" #line 1073 "lexer.gen.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):
@@ -1262,21 +1261,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ {
int num_to_read = yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 ) while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */ { /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */ /* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER; YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset = int yy_c_buf_p_offset =
(int) (yyg->yy_c_buf_p - b->yy_ch_buf); (int) (yyg->yy_c_buf_p - b->yy_ch_buf);
if ( b->yy_is_our_buffer ) if ( b->yy_is_our_buffer )
{ {
int new_size = b->yy_buf_size * 2; yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 ) if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8; b->yy_buf_size += b->yy_buf_size / 8;
@@ -1307,7 +1306,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Read in more data. */ /* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
yyg->yy_n_chars, (size_t) num_to_read ); yyg->yy_n_chars, num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
} }
@@ -1369,7 +1368,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 >= 86 ) if ( yy_current_state >= 88 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1398,12 +1397,13 @@ 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 >= 86 ) if ( yy_current_state >= 88 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 85); yy_is_jam = (yy_current_state == 87);
(void)yyg;
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
} }
@@ -1432,7 +1432,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ /* need more input */ { /* need more input */
int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p; ++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) ) switch ( yy_get_next_buffer( yyscanner ) )
@@ -1596,10 +1596,6 @@ static void jq_yy_load_buffer_state (yyscan_t yyscanner)
jq_yyfree((void *) b ,yyscanner ); jq_yyfree((void *) b ,yyscanner );
} }
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* Initializes or reinitializes a buffer. /* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer, * This function is sometimes called more than once on the same buffer,
* such as during a jq_yyrestart() or at EOF. * such as during a jq_yyrestart() or at EOF.
@@ -1716,7 +1712,7 @@ void jq_yypop_buffer_state (yyscan_t yyscanner)
*/ */
static void jq_yyensure_buffer_stack (yyscan_t yyscanner) static void jq_yyensure_buffer_stack (yyscan_t yyscanner)
{ {
int num_to_alloc; yy_size_t num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) { if (!yyg->yy_buffer_stack) {
@@ -1814,7 +1810,7 @@ YY_BUFFER_STATE jq_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
@@ -1969,7 +1965,7 @@ FILE *jq_yyget_out (yyscan_t yyscanner)
/** Get the length of the current token. /** Get the length of the current token.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
int jq_yyget_leng (yyscan_t yyscanner) yy_size_t jq_yyget_leng (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng; return yyleng;
@@ -2005,7 +2001,7 @@ void jq_yyset_lineno (int line_number , yyscan_t yyscanner)
/* lineno is only valid if an input buffer exists. */ /* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
yy_fatal_error( "jq_yyset_lineno called with no buffer" , yyscanner); YY_FATAL_ERROR( "jq_yyset_lineno called with no buffer" );
yylineno = line_number; yylineno = line_number;
} }
@@ -2020,7 +2016,7 @@ void jq_yyset_column (int column_no , yyscan_t yyscanner)
/* column is only valid if an input buffer exists. */ /* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
yy_fatal_error( "jq_yyset_column called with no buffer" , yyscanner); YY_FATAL_ERROR( "jq_yyset_column called with no buffer" );
yycolumn = column_no; yycolumn = column_no;
} }
@@ -2256,7 +2252,7 @@ void jq_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
#line 106 "lexer.l" #line 110 "lexer.l"
/* perhaps these should be calls... */ /* perhaps these should be calls... */
lexer.gen.h
+11 -20
View File
@@ -13,7 +13,7 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35 #define YY_FLEX_SUBMINOR_VERSION 37
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
@@ -132,15 +132,7 @@ typedef void* yyscan_t;
/* Size of default input buffer. */ /* Size of default input buffer. */
#ifndef YY_BUF_SIZE #ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384 #define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif #endif
#ifndef YY_TYPEDEF_YY_BUFFER_STATE #ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -170,7 +162,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
*/ */
int yy_n_chars; yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it, /* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to * and can realloc() it to grow it, and should free() it to
@@ -214,7 +206,7 @@ void jq_yypop_buffer_state (yyscan_t yyscanner );
YY_BUFFER_STATE jq_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE jq_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE jq_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE jq_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
void *jq_yyalloc (yy_size_t ,yyscan_t yyscanner ); void *jq_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *jq_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); void *jq_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -222,7 +214,7 @@ void jq_yyfree (void * ,yyscan_t yyscanner );
/* Begin user sect3 */ /* Begin user sect3 */
#define jq_yywrap(n) 1 #define jq_yywrap(yyscanner) 1
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r #define yytext_ptr yytext_r
@@ -272,7 +264,7 @@ FILE *jq_yyget_out (yyscan_t yyscanner );
void jq_yyset_out (FILE * out_str ,yyscan_t yyscanner ); void jq_yyset_out (FILE * out_str ,yyscan_t yyscanner );
int jq_yyget_leng (yyscan_t yyscanner ); yy_size_t jq_yyget_leng (yyscan_t yyscanner );
char *jq_yyget_text (yyscan_t yyscanner ); char *jq_yyget_text (yyscan_t yyscanner );
@@ -280,6 +272,10 @@ int jq_yyget_lineno (yyscan_t yyscanner );
void jq_yyset_lineno (int line_number ,yyscan_t yyscanner ); void jq_yyset_lineno (int line_number ,yyscan_t yyscanner );
int jq_yyget_column (yyscan_t yyscanner );
void jq_yyset_column (int column_no ,yyscan_t yyscanner );
YYSTYPE * jq_yyget_lval (yyscan_t yyscanner ); YYSTYPE * jq_yyget_lval (yyscan_t yyscanner );
void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -314,12 +310,7 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
/* Amount of stuff to slurp up with each read. */ /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE #ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192 #define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif #endif
/* Number of entries by which start-condition stack grows. */ /* Number of entries by which start-condition stack grows. */
@@ -354,9 +345,9 @@ extern int jq_yylex \
#undef YY_DECL #undef YY_DECL
#endif #endif
#line 106 "lexer.l" #line 110 "lexer.l"
#line 361 "lexer.gen.h" #line 352 "lexer.gen.h"
#undef jq_yyIN_HEADER #undef jq_yyIN_HEADER
#endif /* jq_yyHEADER_H */ #endif /* jq_yyHEADER_H */
lexer.l
+4
View File
@@ -1,5 +1,8 @@
%{ %{
#include "compile.h" #include "compile.h"
struct lexer_param;
#include "parser.gen.h" /* Generated by bison. */ #include "parser.gen.h" /* Generated by bison. */
#define YY_USER_ACTION \ #define YY_USER_ACTION \
@@ -33,6 +36,7 @@
"#"[^\r\n]* { /* comments */ } "#"[^\r\n]* { /* comments */ }
"!=" { return NEQ; }
"==" { return EQ; } "==" { return EQ; }
"as" { return AS; } "as" { return AS; }
"def" { return DEF; } "def" { return DEF; }
parser.gen.c
+727 -795
View File
File diff suppressed because it is too large. Load diff
parser.gen.h
+57 -40
View File
@@ -1,8 +1,8 @@
/* A Bison parser, made by GNU Bison 2.5. */ /* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison interface for Yacc-like parsers in C /* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -30,10 +30,18 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
#ifndef YY_PARSER_GEN_H
# define YY_PARSER_GEN_H
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int yydebug;
#endif
/* "%code requires" blocks. */ /* "%code requires" blocks. */
/* Line 2049 of yacc.c */
/* Line 2068 of yacc.c */ #line 9 "parser.y"
#line 6 "parser.y"
#include "locfile.h" #include "locfile.h"
#define YYLTYPE location #define YYLTYPE location
@@ -49,9 +57,8 @@
} while (0) } while (0)
/* Line 2049 of yacc.c */
/* Line 2068 of yacc.c */ #line 62 "parser.gen.h"
#line 55 "parser.gen.h"
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
@@ -63,56 +70,52 @@
IDENT = 259, IDENT = 259,
LITERAL = 260, LITERAL = 260,
EQ = 261, EQ = 261,
DEFINEDOR = 262, NEQ = 262,
AS = 263, DEFINEDOR = 263,
DEF = 264, AS = 264,
IF = 265, DEF = 265,
THEN = 266, IF = 266,
ELSE = 267, THEN = 267,
ELSE_IF = 268, ELSE = 268,
END = 269, ELSE_IF = 269,
AND = 270, END = 270,
OR = 271, AND = 271,
SETPIPE = 272, OR = 272,
SETPLUS = 273, SETPIPE = 273,
SETMINUS = 274, SETPLUS = 274,
SETMULT = 275, SETMINUS = 275,
SETDIV = 276, SETMULT = 276,
SETDEFINEDOR = 277, SETDIV = 277,
LESSEQ = 278, SETDEFINEDOR = 278,
GREATEREQ = 279, LESSEQ = 279,
QQSTRING_START = 280, GREATEREQ = 280,
QQSTRING_TEXT = 281, QQSTRING_START = 281,
QQSTRING_INTERP_START = 282, QQSTRING_TEXT = 282,
QQSTRING_INTERP_END = 283, QQSTRING_INTERP_START = 283,
QQSTRING_END = 284 QQSTRING_INTERP_END = 284,
QQSTRING_END = 285
}; };
#endif #endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE typedef union YYSTYPE
{ {
/* Line 2049 of yacc.c */
/* Line 2068 of yacc.c */ #line 27 "parser.y"
#line 24 "parser.y"
jv literal; jv literal;
block blk; block blk;
/* Line 2049 of yacc.c */
/* Line 2068 of yacc.c */ #line 113 "parser.gen.h"
#line 108 "parser.gen.h"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
#endif #endif
#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE typedef struct YYLTYPE
{ {
@@ -127,4 +130,18 @@ typedef struct YYLTYPE
#endif #endif
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
#else
int yyparse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int yyparse (block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr);
#else
int yyparse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !YY_PARSER_GEN_H */
parser.gen.info
+1989 -1855
View File
File diff suppressed because it is too large. Load diff
parser.y
+29 -16
View File
@@ -2,6 +2,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "compile.h" #include "compile.h"
struct lexer_param;
%} %}
%code requires { %code requires {
#include "locfile.h" #include "locfile.h"
@@ -32,17 +35,18 @@
%parse-param {block* answer} %parse-param {block* answer}
%parse-param {int* errors} %parse-param {int* errors}
%parse-param {struct locfile* locations} %parse-param {struct locfile* locations}
%parse-param {yyscan_t lexer} %parse-param {struct lexer_param* lexer_param_ptr}
%lex-param {block* answer} %lex-param {block* answer}
%lex-param {int* errors} %lex-param {int* errors}
%lex-param {struct locfile* locations} %lex-param {struct locfile* locations}
%lex-param {yyscan_t lexer} %lex-param {struct lexer_param* lexer_param_ptr}
%token INVALID_CHARACTER %token INVALID_CHARACTER
%token <literal> IDENT %token <literal> IDENT
%token <literal> LITERAL %token <literal> LITERAL
%token EQ "==" %token EQ "=="
%token NEQ "!="
%token DEFINEDOR "//" %token DEFINEDOR "//"
%token AS "as" %token AS "as"
%token DEF "def" %token DEF "def"
@@ -76,7 +80,7 @@
%nonassoc '=' SETPIPE SETPLUS SETMINUS SETMULT SETDIV SETDEFINEDOR %nonassoc '=' SETPIPE SETPLUS SETMINUS SETMULT SETDIV SETDEFINEDOR
%left OR %left OR
%left AND %left AND
%nonassoc EQ '<' '>' LESSEQ GREATEREQ %nonassoc NEQ EQ '<' '>' LESSEQ GREATEREQ
%left '+' '-' %left '+' '-'
%left '*' '/' %left '*' '/'
@@ -84,21 +88,25 @@
%type <blk> Exp Term MkDict MkDictPair ExpD ElseBody QQString FuncDef FuncDefs String %type <blk> Exp Term MkDict MkDictPair ExpD ElseBody QQString FuncDef FuncDefs String
%{ %{
#include "lexer.gen.h" #include "lexer.gen.h"
#define FAIL(loc, msg) \ struct lexer_param {
do { \ yyscan_t lexer;
location l = loc; \ };
yyerror(&l, answer, errors, locations, lexer, msg); \ #define FAIL(loc, msg) \
/*YYERROR*/; \ do { \
location l = loc; \
yyerror(&l, answer, errors, locations, lexer_param_ptr, msg); \
/*YYERROR*/; \
} while (0) } while (0)
void yyerror(YYLTYPE* loc, block* answer, int* errors, void yyerror(YYLTYPE* loc, block* answer, int* errors,
struct locfile* locations, yyscan_t lexer, const char *s){ struct locfile* locations, struct lexer_param* lexer_param_ptr, const char *s){
(*errors)++; (*errors)++;
locfile_locate(locations, *loc, "error: %s", s); locfile_locate(locations, *loc, "error: %s", s);
} }
int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors, int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors,
struct locfile* locations, yyscan_t lexer) { struct locfile* locations, struct lexer_param* lexer_param_ptr) {
yyscan_t lexer = lexer_param_ptr->lexer;
while (1) { while (1) {
int tok = jq_yylex(yylval, yylloc, lexer); int tok = jq_yylex(yylval, yylloc, lexer);
if (tok == INVALID_CHARACTER) { if (tok == INVALID_CHARACTER) {
@@ -139,6 +147,7 @@ static block gen_binop(block a, block b, int op) {
case '*': funcname = "_multiply"; break; case '*': funcname = "_multiply"; break;
case '/': funcname = "_divide"; break; case '/': funcname = "_divide"; break;
case EQ: funcname = "_equal"; break; case EQ: funcname = "_equal"; break;
case NEQ: funcname = "_notequal"; break;
case '<': funcname = "_less"; break; case '<': funcname = "_less"; break;
case '>': funcname = "_greater"; break; case '>': funcname = "_greater"; break;
case LESSEQ: funcname = "_lesseq"; break; case LESSEQ: funcname = "_lesseq"; break;
@@ -279,6 +288,10 @@ Exp "==" Exp {
$$ = gen_binop($1, $3, EQ); $$ = gen_binop($1, $3, EQ);
} | } |
Exp "!=" Exp {
$$ = gen_binop($1, $3, NEQ);
} |
Exp '<' Exp { Exp '<' Exp {
$$ = gen_binop($1, $3, '<'); $$ = gen_binop($1, $3, '<');
} | } |
@@ -435,15 +448,15 @@ MkDictPair
%% %%
int jq_parse(struct locfile* locations, block* answer) { int jq_parse(struct locfile* locations, block* answer) {
yyscan_t scanner; struct lexer_param scanner;
YY_BUFFER_STATE buf; YY_BUFFER_STATE buf;
jq_yylex_init_extra(0, &scanner); jq_yylex_init_extra(0, &scanner.lexer);
buf = jq_yy_scan_bytes(locations->data, locations->length, scanner); buf = jq_yy_scan_bytes(locations->data, locations->length, scanner.lexer);
int errors = 0; int errors = 0;
*answer = gen_noop(); *answer = gen_noop();
yyparse(answer, &errors, locations, scanner); yyparse(answer, &errors, locations, &scanner);
jq_yy_delete_buffer(buf, scanner); jq_yy_delete_buffer(buf, scanner.lexer);
jq_yylex_destroy(scanner); jq_yylex_destroy(scanner.lexer);
if (errors > 0) { if (errors > 0) {
block_free(*answer); block_free(*answer);
*answer = gen_noop(); *answer = gen_noop();
testdata
+23 -1
View File
@@ -372,4 +372,26 @@ def inc(x): x |= .+1; inc(.[].a)
[10 >= 0, 10 >= 10, 10 >= 20, 10 <= 0, 10 <= 10, 10 <= 20] [10 >= 0, 10 >= 10, 10 >= 20, 10 <= 0, 10 <= 10, 10 <= 20]
{} {}
[true,true,false,false,true,true] [true,true,false,false,true,true]
# And some in/equality tests
[ 10 == 10, 10 != 10, 10 != 11, 10 == 11]
{}
[true,false,true,false]
["hello" == "hello", "hello" != "hello", "hello" == "world", "hello" != "world" ]
{}
[true,false,false,true]
[[1,2,3] == [1,2,3], [1,2,3] != [1,2,3], [1,2,3] == [4,5,6], [1,2,3] != [4,5,6]]
{}
[true,false,false,true]
[{"foo":42} == {"foo":42},{"foo":42} != {"foo":42}, {"foo":42} != {"bar":42}, {"foo":42} == {"bar":42}]
{}
[true,false,true,false]
# ugly complicated thing
[{"foo":[1,2,{"bar":18},"world"]} == {"foo":[1,2,{"bar":18},"world"]},{"foo":[1,2,{"bar":18},"world"]} == {"foo":[1,2,{"bar":19},"world"]}]
{}
[true,false]