Skip to content

Commit 02e0216

Browse files
yaacovyaacov
committed
lint
Signed-off-by: yaacov <kobi.zamir@gmail.com>
1 parent 58b6d48 commit 02e0216

File tree

3 files changed

+127
-138
lines changed

3 files changed

+127
-138
lines changed

‎v6/pkg/parser/tsl_parser.y‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ char *error_string = NULL;
3232

3333
%}
3434

35+
/* Bison semantic value type */
36+
%union {
37+
ast_node *node;
38+
double num;
39+
char *str;
40+
}
41+
3542
/* Token definitions */
3643
%token K_LIKE K_ILIKE K_AND K_OR K_BETWEEN K_IN K_IS K_NULL
3744
%token K_NOT K_TRUE K_FALSE
@@ -51,13 +58,6 @@ char *error_string = NULL;
5158
%left STAR SLASH PERCENT /* * / % */
5259
%right K_NOT /* unary NOT */
5360

54-
/* Bison semantic value type */
55-
%union {
56-
ast_node *node;
57-
double num;
58-
char *str;
59-
}
60-
6161
/* Nonterminal types */
6262
%type <node> input expr or_expr and_expr comparison_expr
6363
%type <node> additive_expr multiplicative_expr not_expr unary_expr

‎v6/pkg/tsl/lex.yy.c‎

Lines changed: 119 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -364,22 +364,21 @@ struct yy_trans_info
364364
flex_int32_t yy_verify;
365365
flex_int32_t yy_nxt;
366366
};
367-
static const flex_int16_t yy_accept[123] =
367+
static const flex_int16_t yy_accept[121] =
368368
{ 0,
369369
0, 0, 44, 42, 41, 40, 41, 42, 42, 37,
370370
42, 30, 31, 35, 33, 32, 34, 36, 22, 13,
371371
17, 15, 29, 29, 29, 29, 29, 29, 29, 29,
372372
29, 38, 39, 42, 42, 41, 40, 16, 0, 27,
373-
0, 26, 22, 23, 22, 0, 25, 12, 14, 0,
374-
29, 29, 0, 29, 29, 29, 6, 7, 29, 29,
375-
29, 4, 29, 0, 28, 19, 18, 23, 22, 0,
376-
24, 25, 29, 3, 0, 0, 0, 29, 29, 29,
377-
29, 9, 29, 29, 22, 29, 29, 29, 29, 29,
378-
1, 8, 10, 0, 29, 11, 2, 0, 29, 0,
379-
380-
5, 0, 0, 21, 0, 0, 0, 0, 0, 0,
381-
0, 0, 0, 0, 0, 20, 0, 0, 0, 0,
382-
0, 0
373+
0, 26, 22, 23, 22, 0, 25, 12, 14, 29,
374+
29, 0, 29, 29, 29, 6, 7, 29, 29, 29,
375+
4, 29, 0, 28, 19, 18, 23, 22, 0, 24,
376+
25, 3, 0, 0, 0, 29, 29, 29, 29, 9,
377+
29, 29, 22, 29, 29, 29, 29, 29, 1, 8,
378+
10, 0, 29, 11, 2, 0, 29, 0, 5, 0,
379+
380+
0, 21, 0, 0, 0, 0, 0, 0, 0, 0,
381+
0, 0, 0, 20, 0, 0, 0, 0, 0, 0
383382
} ;
384383

385384
static const YY_CHAR yy_ec[256] =
@@ -416,140 +415,130 @@ static const YY_CHAR yy_ec[256] =
416415

417416
static const YY_CHAR yy_meta[60] =
418417
{ 0,
419-
1, 1, 1, 1, 1, 1, 1, 1, 2, 1,
420-
3, 1, 1, 3, 4, 4, 4, 1, 1, 1,
421-
1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
422-
4, 4, 4, 4, 4, 4, 4, 4, 4, 2,
423-
1, 4, 1, 4, 4, 4, 4, 4, 4, 4,
424-
4, 4, 4, 4, 4, 4, 4, 4, 1
418+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
419+
2, 1, 1, 2, 3, 3, 3, 1, 1, 1,
420+
1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
421+
3, 3, 3, 3, 3, 3, 3, 3, 3, 4,
422+
1, 3, 1, 3, 3, 3, 3, 3, 3, 3,
423+
3, 3, 3, 3, 3, 3, 3, 3, 1
425424
} ;
426425

427-
static const flex_int16_t yy_base[128] =
426+
static const flex_int16_t yy_base[126] =
428427
{ 0,
429-
0, 0, 305, 330, 58, 61, 64, 284, 297, 330,
430-
294, 330, 330, 330, 284, 330, 283, 330, 54, 52,
431-
330, 279, 65, 66, 67, 72, 68, 69, 93, 87,
432-
102, 330, 330, 254, 65, 84, 135, 330, 290, 330,
433-
287, 330, 277, 117, 276, 137, 66, 330, 330, 279,
434-
74, 115, 111, 122, 126, 123, 120, 135, 139, 150,
435-
156, 159, 161, 245, 330, 330, 330, 167, 269, 259,
436-
257, 330, 330, 162, 230, 163, 171, 171, 185, 191,
437-
196, 176, 199, 206, 196, 215, 217, 218, 219, 228,
438-
224, 229, 233, 253, 251, 238, 239, 250, 240, 249,
439-
440-
242, 245, 244, 220, 235, 218, 216, 202, 175, 173,
441-
166, 164, 269, 159, 108, 330, 76, 273, 73, 72,
442-
62, 330, 312, 316, 319, 323, 325
428+
0, 0, 280, 281, 58, 61, 64, 259, 272, 281,
429+
269, 281, 281, 281, 259, 281, 258, 281, 54, 52,
430+
281, 254, 43, 51, 233, 48, 54, 47, 60, 68,
431+
78, 281, 281, 229, 94, 117, 121, 281, 265, 281,
432+
262, 281, 252, 109, 251, 116, 78, 281, 281, 227,
433+
104, 123, 75, 107, 112, 226, 225, 113, 106, 117,
434+
224, 114, 220, 281, 281, 281, 147, 245, 244, 226,
435+
281, 202, 200, 125, 138, 129, 141, 130, 146, 200,
436+
151, 148, 64, 199, 198, 152, 158, 164, 197, 196,
437+
195, 217, 174, 192, 191, 213, 175, 215, 188, 209,
438+
439+
208, 188, 206, 203, 200, 199, 196, 194, 193, 184,
440+
194, 172, 168, 281, 99, 205, 85, 62, 57, 281,
441+
244, 248, 250, 254, 257
443442
} ;
444443

445-
static const flex_int16_t yy_def[128] =
444+
static const flex_int16_t yy_def[126] =
446445
{ 0,
447-
122, 1, 122, 122, 122, 122, 122, 122, 123, 122,
448-
124, 122, 122, 122, 122, 122, 122, 122, 122, 122,
449-
122, 122, 125, 125, 125, 125, 125, 125, 125, 125,
450-
125, 122, 122, 126, 122, 122, 122, 122, 123, 122,
451-
124, 122, 19, 122, 19, 122, 122, 122, 122, 122,
452-
125, 125, 127, 125, 125, 125, 125, 125, 125, 125,
453-
125, 125, 125, 126, 122, 122, 122, 122, 19, 122,
454-
122, 122, 122, 125, 122, 127, 127, 125, 125, 125,
455-
125, 125, 125, 125, 19, 125, 125, 125, 125, 125,
456-
125, 125, 125, 122, 125, 125, 125, 122, 125, 122,
457-
458-
125, 122, 122, 122, 122, 122, 122, 122, 122, 122,
459-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
460-
122, 0, 122, 122, 122, 122, 122
446+
120, 1, 120, 120, 120, 120, 120, 120, 121, 120,
447+
122, 120, 120, 120, 120, 120, 120, 120, 120, 120,
448+
120, 120, 123, 123, 123, 123, 123, 123, 123, 123,
449+
123, 120, 120, 124, 120, 120, 120, 120, 121, 120,
450+
122, 120, 19, 120, 19, 120, 120, 120, 120, 123,
451+
123, 125, 123, 123, 123, 123, 123, 123, 123, 123,
452+
123, 123, 124, 120, 120, 120, 120, 19, 120, 120,
453+
120, 123, 120, 125, 125, 123, 123, 123, 123, 123,
454+
123, 123, 19, 123, 123, 123, 123, 123, 123, 123,
455+
123, 120, 123, 123, 123, 120, 123, 120, 123, 120,
456+
457+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
458+
120, 120, 120, 120, 120, 120, 120, 120, 120, 0,
459+
120, 120, 120, 120, 120
461460
} ;
462461

463-
static const flex_int16_t yy_nxt[390] =
462+
static const flex_int16_t yy_nxt[341] =
464463
{ 0,
465464
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
466465
14, 15, 16, 17, 4, 18, 19, 4, 20, 21,
467466
22, 23, 24, 25, 25, 25, 26, 25, 27, 25,
468467
28, 29, 30, 25, 25, 31, 25, 25, 25, 32,
469468
33, 25, 34, 23, 24, 25, 25, 26, 27, 25,
470469
28, 29, 30, 25, 25, 31, 25, 25, 35, 36,
471-
36, 36, 36, 36, 36, 36, 37, 36, 44, 66,
472-
45, 48, 38, 50, 50, 50, 50, 50, 116, 46,
473-
50, 47, 50, 47, 67, 36, 36, 36, 121, 47,
474-
120, 54, 119, 55, 72, 50, 52, 59, 56, 57,
475-
476-
46, 50, 58, 47, 53, 53, 53, 53, 53, 47,
477-
50, 53, 54, 53, 72, 55, 52, 59, 56, 57,
478-
62, 75, 58, 50, 118, 60, 53, 77, 50, 61,
479-
50, 50, 53, 68, 50, 63, 36, 36, 36, 74,
480-
62, 53, 46, 50, 47, 60, 47, 50, 70, 61,
481-
70, 80, 47, 71, 53, 63, 79, 78, 50, 53,
482-
74, 53, 53, 46, 50, 53, 47, 50, 81, 50,
483-
50, 80, 47, 122, 53, 117, 79, 78, 53, 50,
484-
113, 122, 112, 68, 50, 82, 83, 77, 81, 53,
485-
111, 110, 46, 50, 47, 53, 47, 84, 53, 50,
486-
487-
53, 53, 47, 86, 50, 82, 83, 50, 88, 94,
488-
53, 87, 43, 46, 50, 53, 47, 84, 109, 89,
489-
90, 91, 47, 50, 53, 50, 50, 50, 88, 92,
490-
53, 93, 50, 108, 107, 53, 50, 50, 53, 89,
491-
90, 50, 91, 95, 96, 53, 50, 50, 50, 92,
492-
50, 106, 93, 97, 53, 105, 53, 53, 53, 50,
493-
104, 103, 102, 53, 95, 96, 100, 53, 53, 98,
494-
86, 101, 53, 71, 97, 71, 99, 53, 53, 53,
495-
114, 53, 114, 115, 114, 85, 114, 65, 73, 118,
496-
53, 101, 69, 43, 42, 40, 65, 99, 49, 43,
497-
498-
43, 42, 40, 38, 122, 122, 122, 116, 122, 122,
499-
122, 116, 39, 39, 39, 39, 41, 41, 41, 41,
500-
51, 122, 51, 64, 64, 64, 64, 76, 76, 3,
501-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
502-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
503-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
504-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
505-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
506-
122, 122, 122, 122, 122, 122, 122, 122, 122
470+
36, 36, 36, 36, 36, 36, 37, 36, 44, 54,
471+
45, 48, 38, 114, 51, 58, 53, 92, 119, 46,
472+
43, 47, 52, 47, 55, 56, 52, 52, 57, 47,
473+
52, 54, 59, 52, 51, 58, 60, 53, 65, 52,
474+
475+
46, 61, 118, 47, 55, 56, 71, 52, 57, 47,
476+
76, 62, 59, 66, 52, 117, 60, 52, 36, 36,
477+
36, 61, 36, 36, 36, 67, 71, 69, 72, 69,
478+
76, 62, 70, 73, 46, 120, 47, 77, 47, 75,
479+
78, 80, 79, 52, 47, 52, 52, 81, 120, 72,
480+
82, 52, 52, 52, 75, 46, 52, 77, 47, 88,
481+
78, 80, 79, 67, 47, 84, 86, 81, 52, 52,
482+
82, 89, 46, 91, 47, 87, 47, 93, 85, 88,
483+
52, 90, 47, 94, 116, 52, 86, 52, 115, 95,
484+
52, 52, 89, 46, 91, 87, 47, 52, 93, 97,
485+
486+
111, 90, 47, 52, 94, 112, 99, 112, 113, 110,
487+
95, 109, 108, 52, 52, 107, 112, 106, 112, 105,
488+
97, 116, 104, 103, 102, 101, 99, 52, 100, 98,
489+
52, 52, 114, 96, 52, 52, 52, 52, 52, 52,
490+
84, 52, 70, 114, 39, 39, 39, 39, 41, 41,
491+
41, 41, 50, 50, 63, 63, 63, 63, 74, 74,
492+
70, 83, 64, 52, 52, 52, 52, 68, 43, 42,
493+
40, 64, 52, 49, 43, 43, 42, 40, 38, 120,
494+
3, 120, 120, 120, 120, 120, 120, 120, 120, 120,
495+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
496+
497+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
498+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
499+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
500+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120
507501
} ;
508502

509-
static const flex_int16_t yy_chk[390] =
503+
static const flex_int16_t yy_chk[341] =
510504
{ 0,
511505
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
512506
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
513507
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
514508
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
515509
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
516510
1, 1, 1, 1, 1, 1, 1, 1, 1, 5,
517-
5, 5, 6, 6, 6, 7, 7, 7, 19, 35,
518-
19, 20, 20, 23, 24, 25, 27, 28, 121, 19,
519-
26, 19, 51, 19, 35, 36, 36, 36, 120, 19,
520-
119, 24, 117, 26, 47, 30, 23, 28, 27, 27,
521-
522-
19, 29, 27, 19, 23, 24, 25, 27, 28, 19,
523-
31, 26, 24, 51, 47, 26, 23, 28, 27, 27,
524-
30, 53, 27, 52, 115, 29, 30, 53, 57, 29,
525-
54, 56, 29, 44, 55, 31, 37, 37, 37, 52,
526-
30, 31, 44, 58, 44, 29, 44, 59, 46, 29,
527-
46, 56, 44, 46, 52, 31, 55, 54, 60, 57,
528-
52, 54, 56, 44, 61, 55, 44, 62, 59, 63,
529-
74, 56, 44, 76, 58, 114, 55, 54, 59, 78,
530-
112, 77, 111, 68, 82, 60, 61, 77, 59, 60,
531-
110, 109, 68, 79, 68, 61, 68, 63, 62, 80,
532-
533-
63, 74, 68, 76, 81, 60, 61, 83, 78, 85,
534-
78, 77, 85, 68, 84, 82, 68, 63, 108, 79,
535-
80, 81, 68, 86, 79, 87, 88, 89, 78, 83,
536-
80, 84, 91, 107, 106, 81, 90, 92, 83, 79,
537-
80, 93, 81, 88, 89, 84, 96, 97, 99, 83,
538-
101, 105, 84, 90, 86, 104, 87, 88, 89, 95,
539-
103, 102, 100, 91, 88, 89, 98, 90, 92, 94,
540-
75, 99, 93, 71, 90, 70, 95, 96, 97, 99,
541-
113, 101, 113, 113, 118, 69, 118, 64, 50, 118,
542-
95, 99, 45, 43, 41, 39, 34, 95, 22, 17,
543-
544-
15, 11, 9, 8, 3, 0, 0, 113, 0, 0,
545-
0, 118, 123, 123, 123, 123, 124, 124, 124, 124,
546-
125, 0, 125, 126, 126, 126, 126, 127, 127, 122,
547-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
548-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
549-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
550-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
551-
122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
552-
122, 122, 122, 122, 122, 122, 122, 122, 122
511+
5, 5, 6, 6, 6, 7, 7, 7, 19, 26,
512+
19, 20, 20, 119, 23, 28, 24, 83, 118, 19,
513+
83, 19, 23, 19, 27, 27, 28, 26, 27, 19,
514+
24, 26, 29, 27, 23, 28, 29, 24, 35, 29,
515+
516+
19, 30, 117, 19, 27, 27, 47, 30, 27, 19,
517+
53, 31, 29, 35, 53, 115, 29, 31, 36, 36,
518+
36, 30, 37, 37, 37, 44, 47, 46, 51, 46,
519+
53, 31, 46, 52, 44, 74, 44, 54, 44, 52,
520+
55, 59, 58, 51, 44, 59, 54, 60, 75, 51,
521+
62, 55, 58, 62, 75, 44, 60, 54, 44, 78,
522+
55, 59, 58, 67, 44, 74, 76, 60, 76, 78,
523+
62, 79, 67, 82, 67, 77, 67, 86, 75, 78,
524+
77, 81, 67, 87, 113, 79, 76, 82, 112, 88,
525+
81, 86, 79, 67, 82, 77, 67, 87, 86, 93,
526+
527+
110, 81, 67, 88, 87, 111, 97, 111, 111, 109,
528+
88, 108, 107, 93, 97, 106, 116, 105, 116, 104,
529+
93, 116, 103, 102, 101, 100, 97, 99, 98, 96,
530+
95, 94, 111, 92, 91, 90, 89, 85, 84, 80,
531+
73, 72, 70, 116, 121, 121, 121, 121, 122, 122,
532+
122, 122, 123, 123, 124, 124, 124, 124, 125, 125,
533+
69, 68, 63, 61, 57, 56, 50, 45, 43, 41,
534+
39, 34, 25, 22, 17, 15, 11, 9, 8, 3,
535+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
536+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
537+
538+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
539+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
540+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
541+
120, 120, 120, 120, 120, 120, 120, 120, 120, 120
553542
} ;
554543

555544
static yy_state_type yy_last_accepting_state;
@@ -605,13 +594,13 @@ char* strip_quotes(char* text, int offset) {
605594
s[len - (offset * 2)] = '\0';
606595
return s;
607596
}
608-
#line 608 "../tsl/lex.yy.c"
597+
#line 597 "../tsl/lex.yy.c"
609598
/* Basic building blocks */
610599
/* Date and time components */
611600
/* Identifier patterns */
612601
/* Numeric patterns */
613602
#define YY_NO_INPUT 1
614-
#line 614 "../tsl/lex.yy.c"
603+
#line 603 "../tsl/lex.yy.c"
615604

616605
#define INITIAL 0
617606

@@ -831,7 +820,7 @@ YY_DECL
831820

832821
#line 80 "tsl_lexer.l"
833822
/* Keywords (case-insensitive) */
834-
#line 834 "../tsl/lex.yy.c"
823+
#line 823 "../tsl/lex.yy.c"
835824

836825
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
837826
{
@@ -858,13 +847,13 @@ YY_DECL
858847
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
859848
{
860849
yy_current_state = (int) yy_def[yy_current_state];
861-
if ( yy_current_state >= 123 )
850+
if ( yy_current_state >= 121 )
862851
yy_c = yy_meta[yy_c];
863852
}
864853
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
865854
++yy_cp;
866855
}
867-
while ( yy_base[yy_current_state] != 330 );
856+
while ( yy_base[yy_current_state] != 281 );
868857

869858
yy_find_action:
870859
yy_act = yy_accept[yy_current_state];
@@ -1137,7 +1126,7 @@ YY_RULE_SETUP
11371126
#line 163 "tsl_lexer.l"
11381127
ECHO;
11391128
YY_BREAK
1140-
#line 1140 "../tsl/lex.yy.c"
1129+
#line 1129 "../tsl/lex.yy.c"
11411130
case YY_STATE_EOF(INITIAL):
11421131
yyterminate();
11431132

@@ -1434,7 +1423,7 @@ static int yy_get_next_buffer (void)
14341423
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
14351424
{
14361425
yy_current_state = (int) yy_def[yy_current_state];
1437-
if ( yy_current_state >= 123 )
1426+
if ( yy_current_state >= 121 )
14381427
yy_c = yy_meta[yy_c];
14391428
}
14401429
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1462,11 +1451,11 @@ static int yy_get_next_buffer (void)
14621451
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
14631452
{
14641453
yy_current_state = (int) yy_def[yy_current_state];
1465-
if ( yy_current_state >= 123 )
1454+
if ( yy_current_state >= 121 )
14661455
yy_c = yy_meta[yy_c];
14671456
}
14681457
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
1469-
yy_is_jam = (yy_current_state == 122);
1458+
yy_is_jam = (yy_current_state == 120);
14701459

14711460
return yy_is_jam ? 0 : yy_current_state;
14721461
}

‎v6/pkg/tsl/tsl_parser.tab.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ extern int yydebug;
9696
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
9797
union YYSTYPE
9898
{
99-
#line 55 "tsl_parser.y"
99+
#line 36 "tsl_parser.y"
100100

101101
ast_node *node;
102102
double num;

0 commit comments

Comments
 (0)