Susumu Yata
null+****@clear*****
Fri Feb 19 12:36:22 JST 2016
Susumu Yata 2016-02-19 12:36:22 +0900 (Fri, 19 Feb 2016) New Revision: d9c1af6946bf1c36a49c6f0c54ae191bd24b2c15 https://github.com/groonga/groonga/commit/d9c1af6946bf1c36a49c6f0c54ae191bd24b2c15 Message: expr: replace DFI macros with functions for readability GitHub: #484 Modified files: lib/expr.c lib/grn_ecmascript.c lib/grn_ecmascript.h lib/grn_ecmascript.lemon Modified: lib/expr.c (+62 -53) =================================================================== --- lib/expr.c 2016-02-19 00:12:59 +0900 (f7da12a) +++ lib/expr.c 2016-02-19 12:36:22 +0900 (509ce93) @@ -426,26 +426,33 @@ typedef struct { unsigned char type; } grn_expr_dfi; -#define DFI_POP(e,d) do {\ - if (GRN_BULK_VSIZE(&(e)->dfi) >= sizeof(grn_expr_dfi)) {\ - GRN_BULK_INCR_LEN((&(e)->dfi), -(sizeof(grn_expr_dfi)));\ - (d) = (grn_expr_dfi *)(GRN_BULK_CURR(&(e)->dfi));\ - (e)->code0 = (d)->code;\ - } else {\ - (d) = NULL;\ - (e)->code0 = NULL;\ - }\ -} while (0) +static grn_expr_dfi * +grn_expr_dfi_pop(grn_expr *expr) { + if (GRN_BULK_VSIZE(&expr->dfi) >= sizeof(grn_expr_dfi)) { + grn_expr_dfi *dfi; + GRN_BULK_INCR_LEN(&expr->dfi, -sizeof(grn_expr_dfi)); + dfi = (grn_expr_dfi *)GRN_BULK_CURR(&expr->dfi); + expr->code0 = dfi->code; + return dfi; + } else { + expr->code0 = NULL; + return NULL; + } +} -#define DFI_PUT(e,t,d,c) do {\ - grn_expr_dfi dfi;\ - dfi.type = (t);\ - dfi.domain = (d);\ - dfi.code = (c);\ - if ((e)->code0) { (e)->code0->modify = (c) ? ((c) - (e)->code0) : 0; }\ - grn_bulk_write(ctx, &(e)->dfi, (char *)&dfi, sizeof(grn_expr_dfi));\ - (e)->code0 = NULL;\ -} while (0) +static void +grn_expr_dfi_put(grn_ctx *ctx, grn_expr *expr, uint8_t type, grn_id domain, + grn_expr_code *code) { + grn_expr_dfi dfi; + dfi.type = type; + dfi.domain = domain; + dfi.code = code; + if (expr->code0) { + expr->code0->modify = code ? (code - expr->code0) : 0; + } + grn_bulk_write(ctx, &expr->dfi, (char *)&dfi, sizeof(grn_expr_dfi)); + expr->code0 = NULL; +} grn_obj * grn_expr_create(grn_ctx *ctx, const char *name, unsigned int name_size) @@ -679,7 +686,7 @@ grn_expr_get_var_by_offset(grn_ctx *ctx, grn_obj *expr, unsigned int offset) grn_id domain; \ unsigned char type; \ grn_obj *x; \ - DFI_POP(e, dfi); \ + dfi = grn_expr_dfi_pop(e); \ code_ = dfi->code; \ domain = dfi->domain; \ type = dfi->type; \ @@ -727,7 +734,7 @@ grn_expr_get_var_by_offset(grn_ctx *ctx, grn_obj *expr, unsigned int offset) } else { \ PUSH_CODE(e, op, obj, nargs, code); \ } \ - DFI_PUT(e, type, domain, code_); \ + grn_expr_dfi_put(ctx, e, type, domain, code_); \ } while (0) #define PUSH_N_ARGS_ARITHMETIC_OP(e, op, obj, nargs, code) do { \ @@ -735,10 +742,10 @@ grn_expr_get_var_by_offset(grn_ctx *ctx, grn_obj *expr, unsigned int offset) { \ int i = nargs; \ while (i--) { \ - DFI_POP(e, dfi); \ + dfi = grn_expr_dfi_pop(e); \ } \ } \ - DFI_PUT(e, type, domain, code); \ + grn_expr_dfi_put(ctx, e, type, domain, code); \ } while (0) static void @@ -782,7 +789,8 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, case GRN_OP_PUSH : if (obj) { PUSH_CODE(e, op, obj, nargs, code); - DFI_PUT(e, obj->header.type, GRN_OBJ_GET_DOMAIN(obj), code); + grn_expr_dfi_put(ctx, e, obj->header.type, GRN_OBJ_GET_DOMAIN(obj), + code); } else { ERR(GRN_INVALID_ARGUMENT, "obj not assigned for GRN_OP_PUSH"); goto exit; @@ -797,7 +805,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, goto exit; } else { PUSH_CODE(e, op, obj, nargs, code); - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); } break; case GRN_OP_CALL : @@ -851,11 +859,12 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, PUSH_CODE(e, op, obj, nargs, code); { int i = nargs; - while (i--) { DFI_POP(e, dfi); } + while (i--) { dfi = grn_expr_dfi_pop(e); } } - if (!obj) { DFI_POP(e, dfi); } + if (!obj) { dfi = grn_expr_dfi_pop(e); } // todo : increment e->values_tail. - DFI_PUT(e, type, domain, code); /* cannot identify type of return value */ + /* cannot identify type of return value */ + grn_expr_dfi_put(ctx, e, type, domain, code); e->cacheable = 0; break; case GRN_OP_INTERN : @@ -871,7 +880,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } } PUSH_CODE(e, op, obj, nargs, code); - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_EQUAL : PUSH_CODE(e, op, obj, nargs, code); @@ -883,12 +892,12 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, xd = GRN_OBJ_GET_DOMAIN(obj); x = obj; } else { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); x = dfi->code->value; xd = dfi->domain; } while (i--) { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); y = dfi->code->value; yd = dfi->domain; } @@ -908,7 +917,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } } } - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_TABLE_CREATE : case GRN_OP_EXPR_GET_VAR : @@ -942,10 +951,10 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, PUSH_CODE(e, op, obj, nargs, code); if (nargs) { int i = nargs - 1; - if (!obj) { DFI_POP(e, dfi); } - while (i--) { DFI_POP(e, dfi); } + if (!obj) { dfi = grn_expr_dfi_pop(e); } + while (i--) { dfi = grn_expr_dfi_pop(e); } } - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_AND : case GRN_OP_OR : @@ -960,7 +969,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, { int i = nargs; while (i--) { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); if (dfi) { dfi->code->flags |= GRN_EXPR_CODE_RELATIONAL_EXPRESSION; } else { @@ -968,7 +977,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } } } - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_NOT : if (nargs == 1) { @@ -988,7 +997,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } break; case GRN_OP_BITWISE_NOT : - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); if (dfi) { type = dfi->type; domain = dfi->domain; @@ -1006,7 +1015,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } } PUSH_CODE(e, op, obj, nargs, code); - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_STAR : case GRN_OP_SLASH : @@ -1024,7 +1033,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, case GRN_OP_INCR_POST : case GRN_OP_DECR_POST : { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); if (dfi) { type = dfi->type; domain = dfi->domain; @@ -1040,7 +1049,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } PUSH_CODE(e, op, obj, nargs, code); } - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_GET_VALUE : { @@ -1050,7 +1059,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, grn_obj *v = grn_expr_get_var_by_offset(ctx, expr, 0); if (v) { vdomain = GRN_OBJ_GET_DOMAIN(v); } } else { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); vdomain = dfi->domain; } if (vdomain && CONSTP(obj) && obj->header.type == GRN_BULK) { @@ -1068,12 +1077,12 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, PUSH_CODE(e, op, obj, nargs, code); } else { grn_expr_dfi *dfi0; - DFI_POP(e, dfi0); + dfi0 = grn_expr_dfi_pop(e); if (nargs == 1) { grn_obj *v = grn_expr_get_var_by_offset(ctx, expr, 0); if (v) { vdomain = GRN_OBJ_GET_DOMAIN(v); } } else { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); vdomain = dfi->domain; } if (dfi0->code->op == GRN_OP_PUSH) { @@ -1098,7 +1107,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } } } - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_ASSIGN : case GRN_OP_STAR_ASSIGN : @@ -1117,13 +1126,13 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, type = obj->header.type; domain = GRN_OBJ_GET_DOMAIN(obj); } else { - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); if (dfi) { type = dfi->type; domain = dfi->domain; } } - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); if (dfi && (dfi->code)) { if (dfi->code->op == GRN_OP_GET_VALUE) { dfi->code->op = GRN_OP_GET_REF; @@ -1135,22 +1144,22 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } PUSH_CODE(e, op, obj, nargs, code); } - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; case GRN_OP_JUMP : - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); PUSH_CODE(e, op, obj, nargs, code); break; case GRN_OP_CJUMP : - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); PUSH_CODE(e, op, obj, nargs, code); break; case GRN_OP_COMMA : PUSH_CODE(e, op, obj, nargs, code); break; case GRN_OP_GET_MEMBER : - DFI_POP(e, dfi); - DFI_POP(e, dfi); + dfi = grn_expr_dfi_pop(e); + dfi = grn_expr_dfi_pop(e); if (dfi) { type = dfi->type; domain = dfi->domain; @@ -1161,7 +1170,7 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op, } } PUSH_CODE(e, op, obj, nargs, code); - DFI_PUT(e, type, domain, code); + grn_expr_dfi_put(ctx, e, type, domain, code); break; default : break; Modified: lib/grn_ecmascript.c (+360 -358) =================================================================== --- lib/grn_ecmascript.c 2016-02-19 00:12:59 +0900 (21b5631) +++ lib/grn_ecmascript.c 2016-02-19 12:36:22 +0900 (d5210f4) @@ -143,7 +143,7 @@ static const YYMINORTYPE yyzerominor = { 0 }; ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. */ -#define YY_ACTTAB_COUNT (1661) +#define YY_ACTTAB_COUNT (1673) static const YYACTIONTYPE yy_action[] = { /* 0 */ 3, 72, 53, 52, 51, 228, 2, 80, 81, 128, /* 10 */ 1, 124, 70, 155, 25, 197, 200, 221, 88, 123, @@ -183,135 +183,136 @@ static const YYACTIONTYPE yy_action[] = { /* 350 */ 44, 43, 42, 41, 40, 39, 38, 37, 368, 368, /* 360 */ 65, 64, 151, 368, 368, 68, 67, 66, 63, 62, /* 370 */ 61, 60, 59, 58, 191, 190, 189, 188, 187, 4, - /* 380 */ 115, 368, 150, 368, 197, 200, 221, 88, 123, 122, + /* 380 */ 115, 179, 150, 368, 197, 200, 221, 88, 123, 122, /* 390 */ 138, 137, 136, 117, 85, 100, 113, 101, 186, 217, - /* 400 */ 203, 75, 368, 179, 196, 192, 197, 167, 221, 88, + /* 400 */ 203, 75, 368, 107, 196, 192, 197, 167, 221, 88, /* 410 */ 123, 122, 138, 137, 136, 117, 85, 100, 113, 101, /* 420 */ 186, 217, 203, 75, 368, 7, 196, 192, 193, 71, - /* 430 */ 368, 368, 172, 111, 197, 149, 221, 88, 123, 122, - /* 440 */ 138, 137, 136, 117, 85, 100, 113, 101, 186, 217, - /* 450 */ 203, 75, 232, 7, 196, 192, 193, 71, 177, 107, - /* 460 */ 178, 368, 152, 368, 368, 368, 28, 368, 368, 65, - /* 470 */ 64, 368, 368, 368, 68, 67, 66, 63, 62, 61, - /* 480 */ 60, 59, 58, 191, 190, 189, 188, 187, 4, 368, - /* 490 */ 144, 132, 368, 368, 368, 368, 368, 65, 64, 368, - /* 500 */ 368, 368, 68, 67, 66, 63, 62, 61, 60, 59, - /* 510 */ 58, 191, 190, 189, 188, 187, 4, 197, 222, 221, - /* 520 */ 88, 123, 122, 138, 137, 136, 117, 85, 100, 113, - /* 530 */ 101, 186, 217, 203, 75, 368, 368, 196, 192, 197, - /* 540 */ 220, 221, 88, 123, 122, 138, 137, 136, 117, 85, - /* 550 */ 100, 113, 101, 186, 217, 203, 75, 368, 368, 196, - /* 560 */ 192, 197, 142, 221, 88, 123, 122, 138, 137, 136, - /* 570 */ 117, 85, 100, 113, 101, 186, 217, 203, 75, 368, - /* 580 */ 368, 196, 192, 197, 219, 221, 88, 123, 122, 138, - /* 590 */ 137, 136, 117, 85, 100, 113, 101, 186, 217, 203, - /* 600 */ 75, 368, 368, 196, 192, 197, 180, 221, 88, 123, - /* 610 */ 122, 138, 137, 136, 117, 85, 100, 113, 101, 186, - /* 620 */ 217, 203, 75, 368, 368, 196, 192, 197, 168, 221, - /* 630 */ 88, 123, 122, 138, 137, 136, 117, 85, 100, 113, - /* 640 */ 101, 186, 217, 203, 75, 368, 368, 196, 192, 197, - /* 650 */ 166, 221, 88, 123, 122, 138, 137, 136, 117, 85, - /* 660 */ 100, 113, 101, 186, 217, 203, 75, 368, 368, 196, - /* 670 */ 192, 197, 165, 221, 88, 123, 122, 138, 137, 136, - /* 680 */ 117, 85, 100, 113, 101, 186, 217, 203, 75, 368, - /* 690 */ 368, 196, 192, 197, 164, 221, 88, 123, 122, 138, - /* 700 */ 137, 136, 117, 85, 100, 113, 101, 186, 217, 203, - /* 710 */ 75, 368, 368, 196, 192, 197, 163, 221, 88, 123, - /* 720 */ 122, 138, 137, 136, 117, 85, 100, 113, 101, 186, - /* 730 */ 217, 203, 75, 368, 368, 196, 192, 197, 162, 221, - /* 740 */ 88, 123, 122, 138, 137, 136, 117, 85, 100, 113, - /* 750 */ 101, 186, 217, 203, 75, 368, 368, 196, 192, 197, - /* 760 */ 161, 221, 88, 123, 122, 138, 137, 136, 117, 85, - /* 770 */ 100, 113, 101, 186, 217, 203, 75, 368, 368, 196, - /* 780 */ 192, 197, 160, 221, 88, 123, 122, 138, 137, 136, - /* 790 */ 117, 85, 100, 113, 101, 186, 217, 203, 75, 368, - /* 800 */ 368, 196, 192, 197, 159, 221, 88, 123, 122, 138, - /* 810 */ 137, 136, 117, 85, 100, 113, 101, 186, 217, 203, - /* 820 */ 75, 368, 368, 196, 192, 197, 158, 221, 88, 123, - /* 830 */ 122, 138, 137, 136, 117, 85, 100, 113, 101, 186, - /* 840 */ 217, 203, 75, 368, 368, 196, 192, 197, 157, 221, - /* 850 */ 88, 123, 122, 138, 137, 136, 117, 85, 100, 113, - /* 860 */ 101, 186, 217, 203, 75, 368, 368, 196, 192, 197, - /* 870 */ 156, 221, 88, 123, 122, 138, 137, 136, 117, 85, - /* 880 */ 100, 113, 101, 186, 217, 203, 75, 234, 368, 196, - /* 890 */ 192, 197, 183, 221, 88, 123, 122, 138, 137, 136, - /* 900 */ 117, 85, 100, 113, 101, 186, 217, 203, 75, 368, - /* 910 */ 368, 196, 192, 197, 174, 221, 88, 123, 122, 138, - /* 920 */ 137, 136, 117, 85, 100, 113, 101, 186, 217, 203, - /* 930 */ 75, 368, 7, 196, 192, 127, 71, 197, 76, 368, - /* 940 */ 119, 233, 110, 138, 137, 136, 117, 85, 100, 113, - /* 950 */ 101, 186, 217, 203, 75, 5, 368, 196, 192, 231, - /* 960 */ 368, 368, 83, 82, 79, 228, 73, 368, 81, 143, - /* 970 */ 9, 368, 70, 368, 368, 368, 65, 64, 368, 368, - /* 980 */ 368, 68, 67, 66, 63, 62, 61, 60, 59, 58, - /* 990 */ 126, 190, 125, 188, 187, 4, 197, 368, 368, 119, - /* 1000 */ 368, 368, 141, 137, 136, 117, 85, 100, 113, 101, - /* 1010 */ 186, 217, 203, 75, 368, 197, 196, 192, 119, 368, - /* 1020 */ 368, 133, 137, 136, 117, 85, 100, 113, 101, 186, - /* 1030 */ 217, 203, 75, 368, 197, 196, 192, 119, 368, 368, - /* 1040 */ 368, 140, 136, 117, 85, 100, 113, 101, 186, 217, - /* 1050 */ 203, 75, 368, 368, 196, 192, 27, 22, 21, 20, - /* 1060 */ 19, 18, 17, 16, 15, 14, 13, 12, 197, 368, - /* 1070 */ 368, 119, 368, 368, 368, 368, 139, 117, 85, 100, - /* 1080 */ 113, 101, 186, 217, 203, 75, 368, 368, 196, 192, - /* 1090 */ 368, 197, 368, 368, 119, 368, 368, 368, 205, 204, - /* 1100 */ 121, 85, 100, 113, 101, 186, 217, 203, 75, 368, - /* 1110 */ 197, 196, 192, 119, 368, 368, 368, 368, 368, 368, - /* 1120 */ 87, 100, 113, 101, 186, 217, 203, 75, 368, 197, - /* 1130 */ 196, 192, 119, 368, 368, 368, 368, 368, 368, 86, - /* 1140 */ 100, 113, 101, 186, 217, 203, 75, 368, 197, 196, - /* 1150 */ 192, 119, 368, 368, 368, 368, 368, 368, 368, 106, - /* 1160 */ 113, 101, 186, 217, 203, 75, 368, 197, 196, 192, - /* 1170 */ 119, 368, 368, 368, 368, 368, 368, 368, 104, 113, - /* 1180 */ 101, 186, 217, 203, 75, 368, 197, 196, 192, 119, - /* 1190 */ 368, 368, 368, 368, 368, 368, 368, 102, 113, 101, - /* 1200 */ 186, 217, 203, 75, 368, 197, 196, 192, 119, 368, - /* 1210 */ 368, 368, 368, 368, 368, 368, 99, 113, 101, 186, - /* 1220 */ 217, 203, 75, 368, 197, 196, 192, 119, 368, 368, - /* 1230 */ 368, 368, 368, 368, 368, 98, 113, 101, 186, 217, - /* 1240 */ 203, 75, 368, 197, 196, 192, 119, 368, 368, 368, - /* 1250 */ 368, 368, 368, 368, 97, 113, 101, 186, 217, 203, - /* 1260 */ 75, 368, 197, 196, 192, 119, 368, 368, 368, 368, - /* 1270 */ 368, 368, 368, 96, 113, 101, 186, 217, 203, 75, - /* 1280 */ 368, 197, 196, 192, 119, 368, 368, 368, 368, 368, - /* 1290 */ 368, 368, 95, 113, 101, 186, 217, 203, 75, 368, - /* 1300 */ 197, 196, 192, 119, 368, 368, 368, 368, 368, 368, - /* 1310 */ 368, 94, 113, 101, 186, 217, 203, 75, 368, 197, - /* 1320 */ 196, 192, 119, 368, 368, 368, 368, 368, 368, 368, - /* 1330 */ 93, 113, 101, 186, 217, 203, 75, 368, 197, 196, - /* 1340 */ 192, 119, 368, 368, 368, 368, 368, 368, 368, 92, - /* 1350 */ 113, 101, 186, 217, 203, 75, 368, 197, 196, 192, - /* 1360 */ 119, 368, 368, 368, 368, 368, 368, 368, 91, 113, - /* 1370 */ 101, 186, 217, 203, 75, 368, 197, 196, 192, 119, - /* 1380 */ 368, 368, 368, 368, 368, 368, 368, 90, 113, 101, - /* 1390 */ 186, 217, 203, 75, 368, 197, 196, 192, 119, 368, - /* 1400 */ 368, 368, 368, 368, 368, 368, 89, 113, 101, 186, - /* 1410 */ 217, 203, 75, 368, 197, 196, 192, 119, 368, 368, - /* 1420 */ 368, 368, 368, 368, 368, 368, 120, 101, 186, 217, - /* 1430 */ 203, 75, 368, 197, 196, 192, 119, 368, 368, 368, - /* 1440 */ 368, 368, 368, 368, 368, 116, 101, 186, 217, 203, - /* 1450 */ 75, 368, 197, 196, 192, 119, 368, 368, 368, 368, - /* 1460 */ 368, 368, 368, 368, 114, 101, 186, 217, 203, 75, - /* 1470 */ 368, 197, 196, 192, 119, 368, 368, 368, 368, 368, - /* 1480 */ 197, 368, 368, 119, 105, 186, 217, 203, 75, 368, - /* 1490 */ 368, 196, 192, 103, 186, 217, 203, 75, 368, 197, - /* 1500 */ 196, 192, 119, 368, 368, 368, 368, 368, 368, 197, - /* 1510 */ 368, 368, 119, 218, 217, 203, 75, 368, 197, 196, - /* 1520 */ 192, 119, 368, 216, 217, 203, 75, 368, 197, 196, - /* 1530 */ 192, 119, 215, 217, 203, 75, 368, 197, 196, 192, - /* 1540 */ 119, 368, 214, 217, 203, 75, 368, 197, 196, 192, - /* 1550 */ 119, 213, 217, 203, 75, 368, 197, 196, 192, 119, - /* 1560 */ 368, 212, 217, 203, 75, 368, 197, 196, 192, 119, - /* 1570 */ 211, 217, 203, 75, 368, 197, 196, 192, 119, 368, - /* 1580 */ 210, 217, 203, 75, 368, 197, 196, 192, 119, 209, - /* 1590 */ 217, 203, 75, 368, 368, 196, 192, 368, 368, 208, - /* 1600 */ 217, 203, 75, 368, 197, 196, 192, 119, 368, 368, - /* 1610 */ 368, 368, 197, 368, 368, 119, 368, 368, 207, 217, - /* 1620 */ 203, 75, 368, 368, 196, 192, 206, 217, 203, 75, - /* 1630 */ 368, 197, 196, 192, 119, 368, 368, 368, 368, 197, - /* 1640 */ 368, 368, 119, 368, 368, 198, 217, 203, 75, 368, - /* 1650 */ 368, 196, 192, 194, 217, 203, 75, 368, 368, 196, - /* 1660 */ 192, + /* 430 */ 368, 368, 172, 111, 144, 132, 177, 368, 178, 368, + /* 440 */ 368, 368, 368, 197, 149, 221, 88, 123, 122, 138, + /* 450 */ 137, 136, 117, 85, 100, 113, 101, 186, 217, 203, + /* 460 */ 75, 368, 7, 196, 192, 193, 71, 368, 368, 65, + /* 470 */ 64, 152, 368, 368, 68, 67, 66, 63, 62, 61, + /* 480 */ 60, 59, 58, 191, 190, 189, 188, 187, 4, 231, + /* 490 */ 232, 233, 83, 82, 79, 228, 73, 368, 81, 143, + /* 500 */ 9, 368, 70, 368, 28, 5, 65, 64, 368, 368, + /* 510 */ 368, 68, 67, 66, 63, 62, 61, 60, 59, 58, + /* 520 */ 191, 190, 189, 188, 187, 4, 197, 222, 221, 88, + /* 530 */ 123, 122, 138, 137, 136, 117, 85, 100, 113, 101, + /* 540 */ 186, 217, 203, 75, 368, 368, 196, 192, 197, 220, + /* 550 */ 221, 88, 123, 122, 138, 137, 136, 117, 85, 100, + /* 560 */ 113, 101, 186, 217, 203, 75, 368, 368, 196, 192, + /* 570 */ 197, 142, 221, 88, 123, 122, 138, 137, 136, 117, + /* 580 */ 85, 100, 113, 101, 186, 217, 203, 75, 368, 368, + /* 590 */ 196, 192, 368, 368, 197, 219, 221, 88, 123, 122, + /* 600 */ 138, 137, 136, 117, 85, 100, 113, 101, 186, 217, + /* 610 */ 203, 75, 368, 368, 196, 192, 197, 180, 221, 88, + /* 620 */ 123, 122, 138, 137, 136, 117, 85, 100, 113, 101, + /* 630 */ 186, 217, 203, 75, 368, 368, 196, 192, 197, 168, + /* 640 */ 221, 88, 123, 122, 138, 137, 136, 117, 85, 100, + /* 650 */ 113, 101, 186, 217, 203, 75, 368, 368, 196, 192, + /* 660 */ 197, 166, 221, 88, 123, 122, 138, 137, 136, 117, + /* 670 */ 85, 100, 113, 101, 186, 217, 203, 75, 368, 368, + /* 680 */ 196, 192, 197, 165, 221, 88, 123, 122, 138, 137, + /* 690 */ 136, 117, 85, 100, 113, 101, 186, 217, 203, 75, + /* 700 */ 368, 368, 196, 192, 197, 164, 221, 88, 123, 122, + /* 710 */ 138, 137, 136, 117, 85, 100, 113, 101, 186, 217, + /* 720 */ 203, 75, 368, 368, 196, 192, 197, 163, 221, 88, + /* 730 */ 123, 122, 138, 137, 136, 117, 85, 100, 113, 101, + /* 740 */ 186, 217, 203, 75, 368, 368, 196, 192, 197, 162, + /* 750 */ 221, 88, 123, 122, 138, 137, 136, 117, 85, 100, + /* 760 */ 113, 101, 186, 217, 203, 75, 368, 368, 196, 192, + /* 770 */ 197, 161, 221, 88, 123, 122, 138, 137, 136, 117, + /* 780 */ 85, 100, 113, 101, 186, 217, 203, 75, 368, 368, + /* 790 */ 196, 192, 197, 160, 221, 88, 123, 122, 138, 137, + /* 800 */ 136, 117, 85, 100, 113, 101, 186, 217, 203, 75, + /* 810 */ 368, 368, 196, 192, 197, 159, 221, 88, 123, 122, + /* 820 */ 138, 137, 136, 117, 85, 100, 113, 101, 186, 217, + /* 830 */ 203, 75, 368, 368, 196, 192, 197, 158, 221, 88, + /* 840 */ 123, 122, 138, 137, 136, 117, 85, 100, 113, 101, + /* 850 */ 186, 217, 203, 75, 368, 368, 196, 192, 197, 157, + /* 860 */ 221, 88, 123, 122, 138, 137, 136, 117, 85, 100, + /* 870 */ 113, 101, 186, 217, 203, 75, 368, 368, 196, 192, + /* 880 */ 197, 156, 221, 88, 123, 122, 138, 137, 136, 117, + /* 890 */ 85, 100, 113, 101, 186, 217, 203, 75, 234, 368, + /* 900 */ 196, 192, 197, 183, 221, 88, 123, 122, 138, 137, + /* 910 */ 136, 117, 85, 100, 113, 101, 186, 217, 203, 75, + /* 920 */ 368, 368, 196, 192, 197, 174, 221, 88, 123, 122, + /* 930 */ 138, 137, 136, 117, 85, 100, 113, 101, 186, 217, + /* 940 */ 203, 75, 368, 7, 196, 192, 127, 71, 197, 76, + /* 950 */ 368, 119, 368, 110, 138, 137, 136, 117, 85, 100, + /* 960 */ 113, 101, 186, 217, 203, 75, 368, 368, 196, 192, + /* 970 */ 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + /* 980 */ 368, 368, 368, 368, 368, 368, 368, 65, 64, 368, + /* 990 */ 368, 368, 68, 67, 66, 63, 62, 61, 60, 59, + /* 1000 */ 58, 126, 190, 125, 188, 187, 4, 197, 368, 368, + /* 1010 */ 119, 368, 368, 141, 137, 136, 117, 85, 100, 113, + /* 1020 */ 101, 186, 217, 203, 75, 368, 197, 196, 192, 119, + /* 1030 */ 368, 368, 133, 137, 136, 117, 85, 100, 113, 101, + /* 1040 */ 186, 217, 203, 75, 368, 197, 196, 192, 119, 368, + /* 1050 */ 368, 368, 140, 136, 117, 85, 100, 113, 101, 186, + /* 1060 */ 217, 203, 75, 368, 368, 196, 192, 368, 27, 22, + /* 1070 */ 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, + /* 1080 */ 197, 368, 368, 119, 368, 368, 368, 368, 139, 117, + /* 1090 */ 85, 100, 113, 101, 186, 217, 203, 75, 368, 368, + /* 1100 */ 196, 192, 368, 197, 368, 368, 119, 368, 368, 368, + /* 1110 */ 205, 204, 121, 85, 100, 113, 101, 186, 217, 203, + /* 1120 */ 75, 368, 197, 196, 192, 119, 368, 368, 368, 368, + /* 1130 */ 368, 368, 87, 100, 113, 101, 186, 217, 203, 75, + /* 1140 */ 368, 197, 196, 192, 119, 368, 368, 368, 368, 368, + /* 1150 */ 368, 86, 100, 113, 101, 186, 217, 203, 75, 368, + /* 1160 */ 197, 196, 192, 119, 368, 368, 368, 368, 368, 368, + /* 1170 */ 368, 106, 113, 101, 186, 217, 203, 75, 368, 197, + /* 1180 */ 196, 192, 119, 368, 368, 368, 368, 368, 368, 368, + /* 1190 */ 104, 113, 101, 186, 217, 203, 75, 368, 197, 196, + /* 1200 */ 192, 119, 368, 368, 368, 368, 368, 368, 368, 102, + /* 1210 */ 113, 101, 186, 217, 203, 75, 368, 197, 196, 192, + /* 1220 */ 119, 368, 368, 368, 368, 368, 368, 368, 99, 113, + /* 1230 */ 101, 186, 217, 203, 75, 368, 197, 196, 192, 119, + /* 1240 */ 368, 368, 368, 368, 368, 368, 368, 98, 113, 101, + /* 1250 */ 186, 217, 203, 75, 368, 197, 196, 192, 119, 368, + /* 1260 */ 368, 368, 368, 368, 368, 368, 97, 113, 101, 186, + /* 1270 */ 217, 203, 75, 368, 197, 196, 192, 119, 368, 368, + /* 1280 */ 368, 368, 368, 368, 368, 96, 113, 101, 186, 217, + /* 1290 */ 203, 75, 368, 197, 196, 192, 119, 368, 368, 368, + /* 1300 */ 368, 368, 368, 368, 95, 113, 101, 186, 217, 203, + /* 1310 */ 75, 368, 197, 196, 192, 119, 368, 368, 368, 368, + /* 1320 */ 368, 368, 368, 94, 113, 101, 186, 217, 203, 75, + /* 1330 */ 368, 197, 196, 192, 119, 368, 368, 368, 368, 368, + /* 1340 */ 368, 368, 93, 113, 101, 186, 217, 203, 75, 368, + /* 1350 */ 197, 196, 192, 119, 368, 368, 368, 368, 368, 368, + /* 1360 */ 368, 92, 113, 101, 186, 217, 203, 75, 368, 197, + /* 1370 */ 196, 192, 119, 368, 368, 368, 368, 368, 368, 368, + /* 1380 */ 91, 113, 101, 186, 217, 203, 75, 368, 197, 196, + /* 1390 */ 192, 119, 368, 368, 368, 368, 368, 368, 368, 90, + /* 1400 */ 113, 101, 186, 217, 203, 75, 368, 197, 196, 192, + /* 1410 */ 119, 368, 368, 368, 368, 368, 368, 368, 89, 113, + /* 1420 */ 101, 186, 217, 203, 75, 368, 197, 196, 192, 119, + /* 1430 */ 368, 368, 368, 368, 368, 368, 368, 368, 120, 101, + /* 1440 */ 186, 217, 203, 75, 368, 197, 196, 192, 119, 368, + /* 1450 */ 368, 368, 368, 368, 368, 368, 368, 116, 101, 186, + /* 1460 */ 217, 203, 75, 368, 197, 196, 192, 119, 368, 368, + /* 1470 */ 368, 368, 368, 368, 368, 368, 114, 101, 186, 217, + /* 1480 */ 203, 75, 368, 197, 196, 192, 119, 368, 368, 368, + /* 1490 */ 368, 368, 197, 368, 368, 119, 105, 186, 217, 203, + /* 1500 */ 75, 368, 368, 196, 192, 103, 186, 217, 203, 75, + /* 1510 */ 368, 197, 196, 192, 119, 368, 368, 368, 368, 368, + /* 1520 */ 368, 197, 368, 368, 119, 218, 217, 203, 75, 368, + /* 1530 */ 197, 196, 192, 119, 368, 216, 217, 203, 75, 368, + /* 1540 */ 197, 196, 192, 119, 215, 217, 203, 75, 368, 197, + /* 1550 */ 196, 192, 119, 368, 214, 217, 203, 75, 368, 197, + /* 1560 */ 196, 192, 119, 213, 217, 203, 75, 368, 197, 196, + /* 1570 */ 192, 119, 368, 212, 217, 203, 75, 368, 197, 196, + /* 1580 */ 192, 119, 211, 217, 203, 75, 368, 197, 196, 192, + /* 1590 */ 119, 368, 210, 217, 203, 75, 368, 197, 196, 192, + /* 1600 */ 119, 209, 217, 203, 75, 368, 368, 196, 192, 368, + /* 1610 */ 368, 208, 217, 203, 75, 368, 197, 196, 192, 119, + /* 1620 */ 368, 368, 368, 368, 197, 368, 368, 119, 368, 368, + /* 1630 */ 207, 217, 203, 75, 368, 368, 196, 192, 206, 217, + /* 1640 */ 203, 75, 368, 197, 196, 192, 119, 368, 368, 368, + /* 1650 */ 368, 197, 368, 368, 119, 368, 368, 198, 217, 203, + /* 1660 */ 75, 368, 368, 196, 192, 194, 217, 203, 75, 368, + /* 1670 */ 368, 196, 192, }; static const YYCODETYPE yy_lookahead[] = { /* 0 */ 1, 2, 48, 49, 50, 6, 7, 9, 9, 10, @@ -352,152 +353,153 @@ static const YYCODETYPE yy_lookahead[] = { /* 350 */ 40, 41, 42, 43, 44, 45, 46, 47, 113, 113, /* 360 */ 51, 52, 53, 113, 113, 56, 57, 58, 59, 60, /* 370 */ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, - /* 380 */ 78, 113, 73, 113, 82, 83, 84, 85, 86, 87, + /* 380 */ 78, 10, 73, 113, 82, 83, 84, 85, 86, 87, /* 390 */ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - /* 400 */ 98, 99, 113, 10, 102, 103, 82, 83, 84, 85, + /* 400 */ 98, 99, 113, 80, 102, 103, 82, 83, 84, 85, /* 410 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, /* 420 */ 96, 97, 98, 99, 113, 7, 102, 103, 10, 11, - /* 430 */ 113, 113, 14, 109, 82, 83, 84, 85, 86, 87, - /* 440 */ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - /* 450 */ 98, 99, 0, 7, 102, 103, 10, 11, 65, 80, - /* 460 */ 67, 113, 110, 113, 113, 113, 14, 113, 113, 51, - /* 470 */ 52, 113, 113, 113, 56, 57, 58, 59, 60, 61, - /* 480 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 113, - /* 490 */ 111, 112, 113, 113, 113, 113, 113, 51, 52, 113, - /* 500 */ 113, 113, 56, 57, 58, 59, 60, 61, 62, 63, - /* 510 */ 64, 65, 66, 67, 68, 69, 70, 82, 83, 84, - /* 520 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - /* 530 */ 95, 96, 97, 98, 99, 113, 113, 102, 103, 82, - /* 540 */ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - /* 550 */ 93, 94, 95, 96, 97, 98, 99, 113, 113, 102, - /* 560 */ 103, 82, 83, 84, 85, 86, 87, 88, 89, 90, - /* 570 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 113, - /* 580 */ 113, 102, 103, 82, 83, 84, 85, 86, 87, 88, - /* 590 */ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - /* 600 */ 99, 113, 113, 102, 103, 82, 83, 84, 85, 86, - /* 610 */ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - /* 620 */ 97, 98, 99, 113, 113, 102, 103, 82, 83, 84, - /* 630 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - /* 640 */ 95, 96, 97, 98, 99, 113, 113, 102, 103, 82, - /* 650 */ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - /* 660 */ 93, 94, 95, 96, 97, 98, 99, 113, 113, 102, - /* 670 */ 103, 82, 83, 84, 85, 86, 87, 88, 89, 90, - /* 680 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 113, - /* 690 */ 113, 102, 103, 82, 83, 84, 85, 86, 87, 88, - /* 700 */ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - /* 710 */ 99, 113, 113, 102, 103, 82, 83, 84, 85, 86, - /* 720 */ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - /* 730 */ 97, 98, 99, 113, 113, 102, 103, 82, 83, 84, - /* 740 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - /* 750 */ 95, 96, 97, 98, 99, 113, 113, 102, 103, 82, - /* 760 */ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - /* 770 */ 93, 94, 95, 96, 97, 98, 99, 113, 113, 102, - /* 780 */ 103, 82, 83, 84, 85, 86, 87, 88, 89, 90, - /* 790 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 113, - /* 800 */ 113, 102, 103, 82, 83, 84, 85, 86, 87, 88, - /* 810 */ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - /* 820 */ 99, 113, 113, 102, 103, 82, 83, 84, 85, 86, - /* 830 */ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - /* 840 */ 97, 98, 99, 113, 113, 102, 103, 82, 83, 84, - /* 850 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - /* 860 */ 95, 96, 97, 98, 99, 113, 113, 102, 103, 82, - /* 870 */ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - /* 880 */ 93, 94, 95, 96, 97, 98, 99, 0, 113, 102, - /* 890 */ 103, 82, 83, 84, 85, 86, 87, 88, 89, 90, - /* 900 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 113, - /* 910 */ 113, 102, 103, 82, 83, 84, 85, 86, 87, 88, - /* 920 */ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - /* 930 */ 99, 113, 7, 102, 103, 10, 11, 82, 51, 113, - /* 940 */ 85, 0, 87, 88, 89, 90, 91, 92, 93, 94, - /* 950 */ 95, 96, 97, 98, 99, 14, 113, 102, 103, 0, - /* 960 */ 113, 113, 3, 4, 5, 6, 7, 113, 9, 10, - /* 970 */ 11, 113, 13, 113, 113, 113, 51, 52, 113, 113, - /* 980 */ 113, 56, 57, 58, 59, 60, 61, 62, 63, 64, - /* 990 */ 65, 66, 67, 68, 69, 70, 82, 113, 113, 85, - /* 1000 */ 113, 113, 88, 89, 90, 91, 92, 93, 94, 95, - /* 1010 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, - /* 1020 */ 113, 88, 89, 90, 91, 92, 93, 94, 95, 96, - /* 1030 */ 97, 98, 99, 113, 82, 102, 103, 85, 113, 113, - /* 1040 */ 113, 89, 90, 91, 92, 93, 94, 95, 96, 97, - /* 1050 */ 98, 99, 113, 113, 102, 103, 15, 16, 17, 18, - /* 1060 */ 19, 20, 21, 22, 23, 24, 25, 26, 82, 113, - /* 1070 */ 113, 85, 113, 113, 113, 113, 90, 91, 92, 93, - /* 1080 */ 94, 95, 96, 97, 98, 99, 113, 113, 102, 103, - /* 1090 */ 113, 82, 113, 113, 85, 113, 113, 113, 57, 58, - /* 1100 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 113, - /* 1110 */ 82, 102, 103, 85, 113, 113, 113, 113, 113, 113, - /* 1120 */ 92, 93, 94, 95, 96, 97, 98, 99, 113, 82, - /* 1130 */ 102, 103, 85, 113, 113, 113, 113, 113, 113, 92, - /* 1140 */ 93, 94, 95, 96, 97, 98, 99, 113, 82, 102, - /* 1150 */ 103, 85, 113, 113, 113, 113, 113, 113, 113, 93, - /* 1160 */ 94, 95, 96, 97, 98, 99, 113, 82, 102, 103, - /* 1170 */ 85, 113, 113, 113, 113, 113, 113, 113, 93, 94, - /* 1180 */ 95, 96, 97, 98, 99, 113, 82, 102, 103, 85, - /* 1190 */ 113, 113, 113, 113, 113, 113, 113, 93, 94, 95, - /* 1200 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, - /* 1210 */ 113, 113, 113, 113, 113, 113, 93, 94, 95, 96, - /* 1220 */ 97, 98, 99, 113, 82, 102, 103, 85, 113, 113, - /* 1230 */ 113, 113, 113, 113, 113, 93, 94, 95, 96, 97, - /* 1240 */ 98, 99, 113, 82, 102, 103, 85, 113, 113, 113, - /* 1250 */ 113, 113, 113, 113, 93, 94, 95, 96, 97, 98, - /* 1260 */ 99, 113, 82, 102, 103, 85, 113, 113, 113, 113, - /* 1270 */ 113, 113, 113, 93, 94, 95, 96, 97, 98, 99, - /* 1280 */ 113, 82, 102, 103, 85, 113, 113, 113, 113, 113, - /* 1290 */ 113, 113, 93, 94, 95, 96, 97, 98, 99, 113, - /* 1300 */ 82, 102, 103, 85, 113, 113, 113, 113, 113, 113, - /* 1310 */ 113, 93, 94, 95, 96, 97, 98, 99, 113, 82, - /* 1320 */ 102, 103, 85, 113, 113, 113, 113, 113, 113, 113, - /* 1330 */ 93, 94, 95, 96, 97, 98, 99, 113, 82, 102, - /* 1340 */ 103, 85, 113, 113, 113, 113, 113, 113, 113, 93, - /* 1350 */ 94, 95, 96, 97, 98, 99, 113, 82, 102, 103, - /* 1360 */ 85, 113, 113, 113, 113, 113, 113, 113, 93, 94, - /* 1370 */ 95, 96, 97, 98, 99, 113, 82, 102, 103, 85, - /* 1380 */ 113, 113, 113, 113, 113, 113, 113, 93, 94, 95, - /* 1390 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, - /* 1400 */ 113, 113, 113, 113, 113, 113, 93, 94, 95, 96, - /* 1410 */ 97, 98, 99, 113, 82, 102, 103, 85, 113, 113, - /* 1420 */ 113, 113, 113, 113, 113, 113, 94, 95, 96, 97, - /* 1430 */ 98, 99, 113, 82, 102, 103, 85, 113, 113, 113, - /* 1440 */ 113, 113, 113, 113, 113, 94, 95, 96, 97, 98, - /* 1450 */ 99, 113, 82, 102, 103, 85, 113, 113, 113, 113, - /* 1460 */ 113, 113, 113, 113, 94, 95, 96, 97, 98, 99, - /* 1470 */ 113, 82, 102, 103, 85, 113, 113, 113, 113, 113, - /* 1480 */ 82, 113, 113, 85, 95, 96, 97, 98, 99, 113, - /* 1490 */ 113, 102, 103, 95, 96, 97, 98, 99, 113, 82, - /* 1500 */ 102, 103, 85, 113, 113, 113, 113, 113, 113, 82, - /* 1510 */ 113, 113, 85, 96, 97, 98, 99, 113, 82, 102, - /* 1520 */ 103, 85, 113, 96, 97, 98, 99, 113, 82, 102, - /* 1530 */ 103, 85, 96, 97, 98, 99, 113, 82, 102, 103, - /* 1540 */ 85, 113, 96, 97, 98, 99, 113, 82, 102, 103, - /* 1550 */ 85, 96, 97, 98, 99, 113, 82, 102, 103, 85, - /* 1560 */ 113, 96, 97, 98, 99, 113, 82, 102, 103, 85, - /* 1570 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, - /* 1580 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 96, - /* 1590 */ 97, 98, 99, 113, 113, 102, 103, 113, 113, 96, - /* 1600 */ 97, 98, 99, 113, 82, 102, 103, 85, 113, 113, - /* 1610 */ 113, 113, 82, 113, 113, 85, 113, 113, 96, 97, - /* 1620 */ 98, 99, 113, 113, 102, 103, 96, 97, 98, 99, - /* 1630 */ 113, 82, 102, 103, 85, 113, 113, 113, 113, 82, - /* 1640 */ 113, 113, 85, 113, 113, 96, 97, 98, 99, 113, - /* 1650 */ 113, 102, 103, 96, 97, 98, 99, 113, 113, 102, - /* 1660 */ 103, + /* 430 */ 113, 113, 14, 109, 111, 112, 65, 113, 67, 113, + /* 440 */ 113, 113, 113, 82, 83, 84, 85, 86, 87, 88, + /* 450 */ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + /* 460 */ 99, 113, 7, 102, 103, 10, 11, 113, 113, 51, + /* 470 */ 52, 110, 113, 113, 56, 57, 58, 59, 60, 61, + /* 480 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 0, + /* 490 */ 0, 0, 3, 4, 5, 6, 7, 113, 9, 10, + /* 500 */ 11, 113, 13, 113, 14, 14, 51, 52, 113, 113, + /* 510 */ 113, 56, 57, 58, 59, 60, 61, 62, 63, 64, + /* 520 */ 65, 66, 67, 68, 69, 70, 82, 83, 84, 85, + /* 530 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + /* 540 */ 96, 97, 98, 99, 113, 113, 102, 103, 82, 83, + /* 550 */ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + /* 560 */ 94, 95, 96, 97, 98, 99, 113, 113, 102, 103, + /* 570 */ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + /* 580 */ 92, 93, 94, 95, 96, 97, 98, 99, 113, 113, + /* 590 */ 102, 103, 113, 113, 82, 83, 84, 85, 86, 87, + /* 600 */ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + /* 610 */ 98, 99, 113, 113, 102, 103, 82, 83, 84, 85, + /* 620 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + /* 630 */ 96, 97, 98, 99, 113, 113, 102, 103, 82, 83, + /* 640 */ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + /* 650 */ 94, 95, 96, 97, 98, 99, 113, 113, 102, 103, + /* 660 */ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + /* 670 */ 92, 93, 94, 95, 96, 97, 98, 99, 113, 113, + /* 680 */ 102, 103, 82, 83, 84, 85, 86, 87, 88, 89, + /* 690 */ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + /* 700 */ 113, 113, 102, 103, 82, 83, 84, 85, 86, 87, + /* 710 */ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + /* 720 */ 98, 99, 113, 113, 102, 103, 82, 83, 84, 85, + /* 730 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + /* 740 */ 96, 97, 98, 99, 113, 113, 102, 103, 82, 83, + /* 750 */ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + /* 760 */ 94, 95, 96, 97, 98, 99, 113, 113, 102, 103, + /* 770 */ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + /* 780 */ 92, 93, 94, 95, 96, 97, 98, 99, 113, 113, + /* 790 */ 102, 103, 82, 83, 84, 85, 86, 87, 88, 89, + /* 800 */ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + /* 810 */ 113, 113, 102, 103, 82, 83, 84, 85, 86, 87, + /* 820 */ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + /* 830 */ 98, 99, 113, 113, 102, 103, 82, 83, 84, 85, + /* 840 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + /* 850 */ 96, 97, 98, 99, 113, 113, 102, 103, 82, 83, + /* 860 */ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + /* 870 */ 94, 95, 96, 97, 98, 99, 113, 113, 102, 103, + /* 880 */ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + /* 890 */ 92, 93, 94, 95, 96, 97, 98, 99, 0, 113, + /* 900 */ 102, 103, 82, 83, 84, 85, 86, 87, 88, 89, + /* 910 */ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + /* 920 */ 113, 113, 102, 103, 82, 83, 84, 85, 86, 87, + /* 930 */ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + /* 940 */ 98, 99, 113, 7, 102, 103, 10, 11, 82, 51, + /* 950 */ 113, 85, 113, 87, 88, 89, 90, 91, 92, 93, + /* 960 */ 94, 95, 96, 97, 98, 99, 113, 113, 102, 103, + /* 970 */ 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + /* 980 */ 113, 113, 113, 113, 113, 113, 113, 51, 52, 113, + /* 990 */ 113, 113, 56, 57, 58, 59, 60, 61, 62, 63, + /* 1000 */ 64, 65, 66, 67, 68, 69, 70, 82, 113, 113, + /* 1010 */ 85, 113, 113, 88, 89, 90, 91, 92, 93, 94, + /* 1020 */ 95, 96, 97, 98, 99, 113, 82, 102, 103, 85, + /* 1030 */ 113, 113, 88, 89, 90, 91, 92, 93, 94, 95, + /* 1040 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, + /* 1050 */ 113, 113, 89, 90, 91, 92, 93, 94, 95, 96, + /* 1060 */ 97, 98, 99, 113, 113, 102, 103, 113, 15, 16, + /* 1070 */ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + /* 1080 */ 82, 113, 113, 85, 113, 113, 113, 113, 90, 91, + /* 1090 */ 92, 93, 94, 95, 96, 97, 98, 99, 113, 113, + /* 1100 */ 102, 103, 113, 82, 113, 113, 85, 113, 113, 113, + /* 1110 */ 57, 58, 91, 92, 93, 94, 95, 96, 97, 98, + /* 1120 */ 99, 113, 82, 102, 103, 85, 113, 113, 113, 113, + /* 1130 */ 113, 113, 92, 93, 94, 95, 96, 97, 98, 99, + /* 1140 */ 113, 82, 102, 103, 85, 113, 113, 113, 113, 113, + /* 1150 */ 113, 92, 93, 94, 95, 96, 97, 98, 99, 113, + /* 1160 */ 82, 102, 103, 85, 113, 113, 113, 113, 113, 113, + /* 1170 */ 113, 93, 94, 95, 96, 97, 98, 99, 113, 82, + /* 1180 */ 102, 103, 85, 113, 113, 113, 113, 113, 113, 113, + /* 1190 */ 93, 94, 95, 96, 97, 98, 99, 113, 82, 102, + /* 1200 */ 103, 85, 113, 113, 113, 113, 113, 113, 113, 93, + /* 1210 */ 94, 95, 96, 97, 98, 99, 113, 82, 102, 103, + /* 1220 */ 85, 113, 113, 113, 113, 113, 113, 113, 93, 94, + /* 1230 */ 95, 96, 97, 98, 99, 113, 82, 102, 103, 85, + /* 1240 */ 113, 113, 113, 113, 113, 113, 113, 93, 94, 95, + /* 1250 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, + /* 1260 */ 113, 113, 113, 113, 113, 113, 93, 94, 95, 96, + /* 1270 */ 97, 98, 99, 113, 82, 102, 103, 85, 113, 113, + /* 1280 */ 113, 113, 113, 113, 113, 93, 94, 95, 96, 97, + /* 1290 */ 98, 99, 113, 82, 102, 103, 85, 113, 113, 113, + /* 1300 */ 113, 113, 113, 113, 93, 94, 95, 96, 97, 98, + /* 1310 */ 99, 113, 82, 102, 103, 85, 113, 113, 113, 113, + /* 1320 */ 113, 113, 113, 93, 94, 95, 96, 97, 98, 99, + /* 1330 */ 113, 82, 102, 103, 85, 113, 113, 113, 113, 113, + /* 1340 */ 113, 113, 93, 94, 95, 96, 97, 98, 99, 113, + /* 1350 */ 82, 102, 103, 85, 113, 113, 113, 113, 113, 113, + /* 1360 */ 113, 93, 94, 95, 96, 97, 98, 99, 113, 82, + /* 1370 */ 102, 103, 85, 113, 113, 113, 113, 113, 113, 113, + /* 1380 */ 93, 94, 95, 96, 97, 98, 99, 113, 82, 102, + /* 1390 */ 103, 85, 113, 113, 113, 113, 113, 113, 113, 93, + /* 1400 */ 94, 95, 96, 97, 98, 99, 113, 82, 102, 103, + /* 1410 */ 85, 113, 113, 113, 113, 113, 113, 113, 93, 94, + /* 1420 */ 95, 96, 97, 98, 99, 113, 82, 102, 103, 85, + /* 1430 */ 113, 113, 113, 113, 113, 113, 113, 113, 94, 95, + /* 1440 */ 96, 97, 98, 99, 113, 82, 102, 103, 85, 113, + /* 1450 */ 113, 113, 113, 113, 113, 113, 113, 94, 95, 96, + /* 1460 */ 97, 98, 99, 113, 82, 102, 103, 85, 113, 113, + /* 1470 */ 113, 113, 113, 113, 113, 113, 94, 95, 96, 97, + /* 1480 */ 98, 99, 113, 82, 102, 103, 85, 113, 113, 113, + /* 1490 */ 113, 113, 82, 113, 113, 85, 95, 96, 97, 98, + /* 1500 */ 99, 113, 113, 102, 103, 95, 96, 97, 98, 99, + /* 1510 */ 113, 82, 102, 103, 85, 113, 113, 113, 113, 113, + /* 1520 */ 113, 82, 113, 113, 85, 96, 97, 98, 99, 113, + /* 1530 */ 82, 102, 103, 85, 113, 96, 97, 98, 99, 113, + /* 1540 */ 82, 102, 103, 85, 96, 97, 98, 99, 113, 82, + /* 1550 */ 102, 103, 85, 113, 96, 97, 98, 99, 113, 82, + /* 1560 */ 102, 103, 85, 96, 97, 98, 99, 113, 82, 102, + /* 1570 */ 103, 85, 113, 96, 97, 98, 99, 113, 82, 102, + /* 1580 */ 103, 85, 96, 97, 98, 99, 113, 82, 102, 103, + /* 1590 */ 85, 113, 96, 97, 98, 99, 113, 82, 102, 103, + /* 1600 */ 85, 96, 97, 98, 99, 113, 113, 102, 103, 113, + /* 1610 */ 113, 96, 97, 98, 99, 113, 82, 102, 103, 85, + /* 1620 */ 113, 113, 113, 113, 82, 113, 113, 85, 113, 113, + /* 1630 */ 96, 97, 98, 99, 113, 113, 102, 103, 96, 97, + /* 1640 */ 98, 99, 113, 82, 102, 103, 85, 113, 113, 113, + /* 1650 */ 113, 82, 113, 113, 85, 113, 113, 96, 97, 98, + /* 1660 */ 99, 113, 113, 102, 103, 96, 97, 98, 99, 113, + /* 1670 */ 113, 102, 103, }; #define YY_SHIFT_USE_DFLT (-47) #define YY_SHIFT_COUNT (143) #define YY_SHIFT_MIN (-46) -#define YY_SHIFT_MAX (1041) +#define YY_SHIFT_MAX (1053) static const short yy_shift_ofst[] = { - /* 0 */ -1, 925, 115, 309, 418, 309, 446, 446, 446, 446, - /* 10 */ 244, 179, 446, 446, 446, 446, 446, 446, 446, 446, - /* 20 */ 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, - /* 30 */ 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, - /* 40 */ 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, - /* 50 */ 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, - /* 60 */ 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, - /* 70 */ 151, 393, 333, 36, 393, 156, 333, 281, 959, 36, - /* 80 */ 36, 36, 36, 36, 268, 310, 310, 310, 1041, -46, + /* 0 */ -1, 936, 115, 309, 418, 309, 455, 455, 455, 455, + /* 10 */ 244, 179, 455, 455, 455, 455, 455, 455, 455, 455, + /* 20 */ 455, 455, 455, 455, 455, 455, 455, 455, 455, 455, + /* 30 */ 455, 455, 455, 455, 455, 455, 455, 455, 455, 455, + /* 40 */ 455, 455, 455, 455, 455, 455, 455, 455, 455, 455, + /* 50 */ 455, 455, 455, 455, 455, 455, 455, 455, 455, 455, + /* 60 */ 455, 455, 455, 455, 455, 455, 455, 455, 455, 455, + /* 70 */ 151, 371, 333, 36, 371, 156, 333, 281, 489, 36, + /* 80 */ 36, 36, 36, 36, 268, 310, 310, 310, 1053, -46, /* 90 */ -46, -46, -46, -46, -46, -46, -46, -46, -46, -46, - /* 100 */ -46, 76, -46, 76, -46, 76, -46, 887, 941, 452, + /* 100 */ -46, 76, -46, 76, -46, 76, -46, 898, 491, 490, /* 110 */ 34, 219, 220, 66, 66, 215, 66, 41, 154, 94, /* 120 */ 66, 41, 34, 160, 145, 251, 250, 231, -2, 190, /* 130 */ 185, 123, 111, 98, 182, 132, 101, 93, 98, 101, @@ -506,16 +508,16 @@ static const short yy_shift_ofst[] = { #define YY_REDUCE_USE_DFLT (-70) #define YY_REDUCE_COUNT (84) #define YY_REDUCE_MIN (-69) -#define YY_REDUCE_MAX (1557) +#define YY_REDUCE_MAX (1569) static const short yy_reduce_ofst[] = { - /* 0 */ -6, -67, 17, 112, 51, 352, 324, 302, 239, 178, - /* 10 */ 831, 809, 787, 765, 743, 721, 699, 677, 655, 633, - /* 20 */ 611, 589, 567, 545, 523, 501, 479, 457, 435, 855, - /* 30 */ 933, 914, 952, 986, 1009, 1047, 1028, 1313, 1294, 1275, - /* 40 */ 1256, 1237, 1218, 1199, 1180, 1161, 1142, 1123, 1104, 1085, - /* 50 */ 1066, 1370, 1351, 1332, 1398, 1389, 1557, 1549, 1530, 1522, - /* 60 */ 1503, 1493, 1484, 1474, 1465, 1455, 1446, 1436, 1427, 1417, - /* 70 */ -69, -54, 379, -33, 105, 152, 58, 259, 259, 237, + /* 0 */ -6, -67, 17, 112, 51, 361, 324, 302, 239, 178, + /* 10 */ 842, 820, 798, 776, 754, 732, 710, 688, 666, 644, + /* 20 */ 622, 600, 578, 556, 534, 512, 488, 466, 444, 866, + /* 30 */ 944, 925, 963, 998, 1021, 1059, 1040, 1325, 1306, 1287, + /* 40 */ 1268, 1249, 1230, 1211, 1192, 1173, 1154, 1135, 1116, 1097, + /* 50 */ 1078, 1382, 1363, 1344, 1410, 1401, 1569, 1561, 1542, 1534, + /* 60 */ 1515, 1505, 1496, 1486, 1477, 1467, 1458, 1448, 1439, 1429, + /* 70 */ -69, -54, 323, -33, 105, 152, 58, 259, 259, 237, /* 80 */ 218, 217, 216, 202, 189, }; static const YYACTIONTYPE yy_default[] = { @@ -890,7 +892,7 @@ static void yy_destructor( (void)efsi; -#line 894 "grn_ecmascript.c" +#line 896 "grn_ecmascript.c" } break; default: break; /* If no destructor action specified: do nothing */ @@ -1322,7 +1324,7 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, grn_int32_value_at(&efsi->op_stack, -1), 2); } -#line 1326 "grn_ecmascript.c" +#line 1328 "grn_ecmascript.c" break; case 6: /* query ::= query LOGICAL_AND query_element */ case 35: /* logical_and_expression ::= logical_and_expression LOGICAL_AND bitwise_or_expression */ yytestcase(yyruleno==35); @@ -1330,7 +1332,7 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_AND, 2); } -#line 1334 "grn_ecmascript.c" +#line 1336 "grn_ecmascript.c" break; case 7: /* query ::= query LOGICAL_AND_NOT query_element */ case 36: /* logical_and_expression ::= logical_and_expression LOGICAL_AND_NOT bitwise_or_expression */ yytestcase(yyruleno==36); @@ -1338,7 +1340,7 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_AND_NOT, 2); } -#line 1342 "grn_ecmascript.c" +#line 1344 "grn_ecmascript.c" break; case 8: /* query ::= query LOGICAL_OR query_element */ case 33: /* logical_or_expression ::= logical_or_expression LOGICAL_OR logical_and_expression */ yytestcase(yyruleno==33); @@ -1346,7 +1348,7 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_OR, 2); } -#line 1350 "grn_ecmascript.c" +#line 1352 "grn_ecmascript.c" break; case 11: /* query_element ::= RELATIVE_OP query_element */ #line 65 "grn_ecmascript.lemon" @@ -1354,7 +1356,7 @@ static void yy_reduce( int mode; GRN_INT32_POP(&efsi->mode_stack, mode); } -#line 1358 "grn_ecmascript.c" +#line 1360 "grn_ecmascript.c" break; case 12: /* query_element ::= IDENTIFIER RELATIVE_OP query_element */ #line 69 "grn_ecmascript.lemon" @@ -1381,7 +1383,7 @@ static void yy_reduce( break; } } -#line 1385 "grn_ecmascript.c" +#line 1387 "grn_ecmascript.c" break; case 13: /* query_element ::= BRACEL expression BRACER */ case 14: /* query_element ::= EVAL primary_expression */ yytestcase(yyruleno==14); @@ -1389,98 +1391,98 @@ static void yy_reduce( { efsi->flags = efsi->default_flags; } -#line 1393 "grn_ecmascript.c" +#line 1395 "grn_ecmascript.c" break; case 16: /* expression ::= expression COMMA assignment_expression */ #line 100 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_COMMA, 2); } -#line 1400 "grn_ecmascript.c" +#line 1402 "grn_ecmascript.c" break; case 18: /* assignment_expression ::= lefthand_side_expression ASSIGN assignment_expression */ #line 105 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_ASSIGN, 2); } -#line 1407 "grn_ecmascript.c" +#line 1409 "grn_ecmascript.c" break; case 19: /* assignment_expression ::= lefthand_side_expression STAR_ASSIGN assignment_expression */ #line 108 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_STAR_ASSIGN, 2); } -#line 1414 "grn_ecmascript.c" +#line 1416 "grn_ecmascript.c" break; case 20: /* assignment_expression ::= lefthand_side_expression SLASH_ASSIGN assignment_expression */ #line 111 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SLASH_ASSIGN, 2); } -#line 1421 "grn_ecmascript.c" +#line 1423 "grn_ecmascript.c" break; case 21: /* assignment_expression ::= lefthand_side_expression MOD_ASSIGN assignment_expression */ #line 114 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MOD_ASSIGN, 2); } -#line 1428 "grn_ecmascript.c" +#line 1430 "grn_ecmascript.c" break; case 22: /* assignment_expression ::= lefthand_side_expression PLUS_ASSIGN assignment_expression */ #line 117 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PLUS_ASSIGN, 2); } -#line 1435 "grn_ecmascript.c" +#line 1437 "grn_ecmascript.c" break; case 23: /* assignment_expression ::= lefthand_side_expression MINUS_ASSIGN assignment_expression */ #line 120 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MINUS_ASSIGN, 2); } -#line 1442 "grn_ecmascript.c" +#line 1444 "grn_ecmascript.c" break; case 24: /* assignment_expression ::= lefthand_side_expression SHIFTL_ASSIGN assignment_expression */ #line 123 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTL_ASSIGN, 2); } -#line 1449 "grn_ecmascript.c" +#line 1451 "grn_ecmascript.c" break; case 25: /* assignment_expression ::= lefthand_side_expression SHIFTR_ASSIGN assignment_expression */ #line 126 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTR_ASSIGN, 2); } -#line 1456 "grn_ecmascript.c" +#line 1458 "grn_ecmascript.c" break; case 26: /* assignment_expression ::= lefthand_side_expression SHIFTRR_ASSIGN assignment_expression */ #line 129 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTRR_ASSIGN, 2); } -#line 1463 "grn_ecmascript.c" +#line 1465 "grn_ecmascript.c" break; case 27: /* assignment_expression ::= lefthand_side_expression AND_ASSIGN assignment_expression */ #line 132 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_AND_ASSIGN, 2); } -#line 1470 "grn_ecmascript.c" +#line 1472 "grn_ecmascript.c" break; case 28: /* assignment_expression ::= lefthand_side_expression XOR_ASSIGN assignment_expression */ #line 135 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_XOR_ASSIGN, 2); } -#line 1477 "grn_ecmascript.c" +#line 1479 "grn_ecmascript.c" break; case 29: /* assignment_expression ::= lefthand_side_expression OR_ASSIGN assignment_expression */ #line 138 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_OR_ASSIGN, 2); } -#line 1484 "grn_ecmascript.c" +#line 1486 "grn_ecmascript.c" break; case 31: /* conditional_expression ::= logical_or_expression QUESTION assignment_expression COLON assignment_expression */ #line 143 "grn_ecmascript.lemon" @@ -1489,77 +1491,77 @@ static void yy_reduce( e->codes[yymsp[-3].minor.yy0].nargs = yymsp[-1].minor.yy0 - yymsp[-3].minor.yy0; e->codes[yymsp[-1].minor.yy0].nargs = e->codes_curr - yymsp[-1].minor.yy0 - 1; } -#line 1493 "grn_ecmascript.c" +#line 1495 "grn_ecmascript.c" break; case 38: /* bitwise_or_expression ::= bitwise_or_expression BITWISE_OR bitwise_xor_expression */ #line 163 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_OR, 2); } -#line 1500 "grn_ecmascript.c" +#line 1502 "grn_ecmascript.c" break; case 40: /* bitwise_xor_expression ::= bitwise_xor_expression BITWISE_XOR bitwise_and_expression */ #line 168 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_XOR, 2); } -#line 1507 "grn_ecmascript.c" +#line 1509 "grn_ecmascript.c" break; case 42: /* bitwise_and_expression ::= bitwise_and_expression BITWISE_AND equality_expression */ #line 173 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_AND, 2); } -#line 1514 "grn_ecmascript.c" +#line 1516 "grn_ecmascript.c" break; case 44: /* equality_expression ::= equality_expression EQUAL relational_expression */ #line 178 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_EQUAL, 2); } -#line 1521 "grn_ecmascript.c" +#line 1523 "grn_ecmascript.c" break; case 45: /* equality_expression ::= equality_expression NOT_EQUAL relational_expression */ #line 181 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NOT_EQUAL, 2); } -#line 1528 "grn_ecmascript.c" +#line 1530 "grn_ecmascript.c" break; case 47: /* relational_expression ::= relational_expression LESS shift_expression */ #line 186 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_LESS, 2); } -#line 1535 "grn_ecmascript.c" +#line 1537 "grn_ecmascript.c" break; case 48: /* relational_expression ::= relational_expression GREATER shift_expression */ #line 189 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_GREATER, 2); } -#line 1542 "grn_ecmascript.c" +#line 1544 "grn_ecmascript.c" break; case 49: /* relational_expression ::= relational_expression LESS_EQUAL shift_expression */ #line 192 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_LESS_EQUAL, 2); } -#line 1549 "grn_ecmascript.c" +#line 1551 "grn_ecmascript.c" break; case 50: /* relational_expression ::= relational_expression GREATER_EQUAL shift_expression */ #line 195 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_GREATER_EQUAL, 2); } -#line 1556 "grn_ecmascript.c" +#line 1558 "grn_ecmascript.c" break; case 51: /* relational_expression ::= relational_expression IN shift_expression */ #line 198 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_IN, 2); } -#line 1563 "grn_ecmascript.c" +#line 1565 "grn_ecmascript.c" break; case 52: /* relational_expression ::= relational_expression MATCH shift_expression */ case 134: /* adjust_match_expression ::= IDENTIFIER MATCH STRING */ yytestcase(yyruleno==134); @@ -1567,84 +1569,84 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MATCH, 2); } -#line 1571 "grn_ecmascript.c" +#line 1573 "grn_ecmascript.c" break; case 53: /* relational_expression ::= relational_expression NEAR shift_expression */ #line 204 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NEAR, 2); } -#line 1578 "grn_ecmascript.c" +#line 1580 "grn_ecmascript.c" break; case 54: /* relational_expression ::= relational_expression NEAR2 shift_expression */ #line 207 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NEAR2, 2); } -#line 1585 "grn_ecmascript.c" +#line 1587 "grn_ecmascript.c" break; case 55: /* relational_expression ::= relational_expression SIMILAR shift_expression */ #line 210 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SIMILAR, 2); } -#line 1592 "grn_ecmascript.c" +#line 1594 "grn_ecmascript.c" break; case 56: /* relational_expression ::= relational_expression TERM_EXTRACT shift_expression */ #line 213 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_TERM_EXTRACT, 2); } -#line 1599 "grn_ecmascript.c" +#line 1601 "grn_ecmascript.c" break; case 57: /* relational_expression ::= relational_expression LCP shift_expression */ #line 216 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_LCP, 2); } -#line 1606 "grn_ecmascript.c" +#line 1608 "grn_ecmascript.c" break; case 58: /* relational_expression ::= relational_expression PREFIX shift_expression */ #line 219 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PREFIX, 2); } -#line 1613 "grn_ecmascript.c" +#line 1615 "grn_ecmascript.c" break; case 59: /* relational_expression ::= relational_expression SUFFIX shift_expression */ #line 222 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SUFFIX, 2); } -#line 1620 "grn_ecmascript.c" +#line 1622 "grn_ecmascript.c" break; case 60: /* relational_expression ::= relational_expression REGEXP shift_expression */ #line 225 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_REGEXP, 2); } -#line 1627 "grn_ecmascript.c" +#line 1629 "grn_ecmascript.c" break; case 62: /* shift_expression ::= shift_expression SHIFTL additive_expression */ #line 230 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTL, 2); } -#line 1634 "grn_ecmascript.c" +#line 1636 "grn_ecmascript.c" break; case 63: /* shift_expression ::= shift_expression SHIFTR additive_expression */ #line 233 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTR, 2); } -#line 1641 "grn_ecmascript.c" +#line 1643 "grn_ecmascript.c" break; case 64: /* shift_expression ::= shift_expression SHIFTRR additive_expression */ #line 236 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTRR, 2); } -#line 1648 "grn_ecmascript.c" +#line 1650 "grn_ecmascript.c" break; case 66: /* additive_expression ::= additive_expression PLUS multiplicative_expression */ case 131: /* adjuster ::= adjuster PLUS adjust_expression */ yytestcase(yyruleno==131); @@ -1652,14 +1654,14 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PLUS, 2); } -#line 1656 "grn_ecmascript.c" +#line 1658 "grn_ecmascript.c" break; case 67: /* additive_expression ::= additive_expression MINUS multiplicative_expression */ #line 244 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MINUS, 2); } -#line 1663 "grn_ecmascript.c" +#line 1665 "grn_ecmascript.c" break; case 69: /* multiplicative_expression ::= multiplicative_expression STAR unary_expression */ case 133: /* adjust_expression ::= adjust_match_expression STAR DECIMAL */ yytestcase(yyruleno==133); @@ -1667,28 +1669,28 @@ static void yy_reduce( { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_STAR, 2); } -#line 1671 "grn_ecmascript.c" +#line 1673 "grn_ecmascript.c" break; case 70: /* multiplicative_expression ::= multiplicative_expression SLASH unary_expression */ #line 252 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SLASH, 2); } -#line 1678 "grn_ecmascript.c" +#line 1680 "grn_ecmascript.c" break; case 71: /* multiplicative_expression ::= multiplicative_expression MOD unary_expression */ #line 255 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MOD, 2); } -#line 1685 "grn_ecmascript.c" +#line 1687 "grn_ecmascript.c" break; case 73: /* unary_expression ::= DELETE unary_expression */ #line 260 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_DELETE, 1); } -#line 1692 "grn_ecmascript.c" +#line 1694 "grn_ecmascript.c" break; case 74: /* unary_expression ::= INCR unary_expression */ #line 263 "grn_ecmascript.lemon" @@ -1698,9 +1700,9 @@ static void yy_reduce( grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be incremented (%.*s)", @@ -1709,7 +1711,7 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_INCR, 1); } } -#line 1713 "grn_ecmascript.c" +#line 1715 "grn_ecmascript.c" break; case 75: /* unary_expression ::= DECR unary_expression */ #line 280 "grn_ecmascript.lemon" @@ -1719,9 +1721,9 @@ static void yy_reduce( grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be decremented (%.*s)", @@ -1730,63 +1732,63 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_DECR, 1); } } -#line 1734 "grn_ecmascript.c" +#line 1736 "grn_ecmascript.c" break; case 76: /* unary_expression ::= PLUS unary_expression */ #line 297 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PLUS, 1); } -#line 1741 "grn_ecmascript.c" +#line 1743 "grn_ecmascript.c" break; case 77: /* unary_expression ::= MINUS unary_expression */ #line 300 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MINUS, 1); } -#line 1748 "grn_ecmascript.c" +#line 1750 "grn_ecmascript.c" break; case 78: /* unary_expression ::= NOT unary_expression */ #line 303 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NOT, 1); } -#line 1755 "grn_ecmascript.c" +#line 1757 "grn_ecmascript.c" break; case 79: /* unary_expression ::= BITWISE_NOT unary_expression */ #line 306 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_NOT, 1); } -#line 1762 "grn_ecmascript.c" +#line 1764 "grn_ecmascript.c" break; case 80: /* unary_expression ::= ADJUST unary_expression */ #line 309 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_ADJUST, 1); } -#line 1769 "grn_ecmascript.c" +#line 1771 "grn_ecmascript.c" break; case 81: /* unary_expression ::= EXACT unary_expression */ #line 312 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_EXACT, 1); } -#line 1776 "grn_ecmascript.c" +#line 1778 "grn_ecmascript.c" break; case 82: /* unary_expression ::= PARTIAL unary_expression */ #line 315 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PARTIAL, 1); } -#line 1783 "grn_ecmascript.c" +#line 1785 "grn_ecmascript.c" break; case 83: /* unary_expression ::= UNSPLIT unary_expression */ #line 318 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_UNSPLIT, 1); } -#line 1790 "grn_ecmascript.c" +#line 1792 "grn_ecmascript.c" break; case 85: /* postfix_expression ::= lefthand_side_expression INCR */ #line 323 "grn_ecmascript.lemon" @@ -1796,9 +1798,9 @@ static void yy_reduce( grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be incremented (%.*s)", @@ -1807,7 +1809,7 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_INCR_POST, 1); } } -#line 1811 "grn_ecmascript.c" +#line 1813 "grn_ecmascript.c" break; case 86: /* postfix_expression ::= lefthand_side_expression DECR */ #line 340 "grn_ecmascript.lemon" @@ -1817,9 +1819,9 @@ static void yy_reduce( grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be decremented (%.*s)", @@ -1828,14 +1830,14 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_DECR_POST, 1); } } -#line 1832 "grn_ecmascript.c" +#line 1834 "grn_ecmascript.c" break; case 89: /* call_expression ::= member_expression arguments */ #line 361 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_CALL, yymsp[0].minor.yy0); } -#line 1839 "grn_ecmascript.c" +#line 1841 "grn_ecmascript.c" break; case 109: /* object_literal ::= BRACEL property_name_and_value_list BRACER */ #line 389 "grn_ecmascript.lemon" @@ -1845,7 +1847,7 @@ static void yy_reduce( grn_expr_append_const_ptr(ctx, (grn_obj *)e, (grn_obj *)efsi->hash_args, GRN_OP_PUSH, 1); } -#line 1849 "grn_ecmascript.c" +#line 1851 "grn_ecmascript.c" break; case 113: /* property_name_and_value ::= property_name COLON assignment_expression */ #line 400 "grn_ecmascript.lemon" @@ -1888,41 +1890,41 @@ static void yy_reduce( } } } -#line 1892 "grn_ecmascript.c" +#line 1894 "grn_ecmascript.c" break; case 117: /* member_expression_part ::= BRACKETL expression BRACKETR */ #line 444 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_GET_MEMBER, 2); } -#line 1899 "grn_ecmascript.c" +#line 1901 "grn_ecmascript.c" break; case 119: /* arguments ::= PARENL argument_list PARENR */ #line 449 "grn_ecmascript.lemon" { yygotominor.yy0 = yymsp[-1].minor.yy0; } -#line 1904 "grn_ecmascript.c" +#line 1906 "grn_ecmascript.c" break; case 120: /* argument_list ::= */ #line 450 "grn_ecmascript.lemon" { yygotominor.yy0 = 0; } -#line 1909 "grn_ecmascript.c" +#line 1911 "grn_ecmascript.c" break; case 121: /* argument_list ::= assignment_expression */ #line 451 "grn_ecmascript.lemon" { yygotominor.yy0 = 1; } -#line 1914 "grn_ecmascript.c" +#line 1916 "grn_ecmascript.c" break; case 122: /* argument_list ::= argument_list COMMA assignment_expression */ #line 452 "grn_ecmascript.lemon" { yygotominor.yy0 = yymsp[-2].minor.yy0 + 1; } -#line 1919 "grn_ecmascript.c" +#line 1921 "grn_ecmascript.c" break; case 123: /* output_columns ::= */ #line 454 "grn_ecmascript.lemon" { yygotominor.yy0 = 0; } -#line 1926 "grn_ecmascript.c" +#line 1928 "grn_ecmascript.c" break; case 124: /* output_columns ::= output_column */ #line 457 "grn_ecmascript.lemon" @@ -1933,7 +1935,7 @@ static void yy_reduce( yygotominor.yy0 = 1; } } -#line 1937 "grn_ecmascript.c" +#line 1939 "grn_ecmascript.c" break; case 125: /* output_columns ::= output_columns COMMA output_column */ #line 465 "grn_ecmascript.lemon" @@ -1947,7 +1949,7 @@ static void yy_reduce( yygotominor.yy0 = 1; } } -#line 1951 "grn_ecmascript.c" +#line 1953 "grn_ecmascript.c" break; case 126: /* output_column ::= STAR */ #line 476 "grn_ecmascript.lemon" @@ -1988,21 +1990,21 @@ static void yy_reduce( yygotominor.yy0 = GRN_TRUE; } } -#line 1992 "grn_ecmascript.c" +#line 1994 "grn_ecmascript.c" break; case 127: /* output_column ::= NONEXISTENT_COLUMN */ #line 513 "grn_ecmascript.lemon" { yygotominor.yy0 = GRN_TRUE; } -#line 1999 "grn_ecmascript.c" +#line 2001 "grn_ecmascript.c" break; case 128: /* output_column ::= assignment_expression */ #line 516 "grn_ecmascript.lemon" { yygotominor.yy0 = GRN_FALSE; } -#line 2006 "grn_ecmascript.c" +#line 2008 "grn_ecmascript.c" break; default: /* (0) input ::= query */ yytestcase(yyruleno==0); @@ -2142,7 +2144,7 @@ static void yy_syntax_error( GRN_OBJ_FIN(ctx, &message); } } -#line 2146 "grn_ecmascript.c" +#line 2148 "grn_ecmascript.c" grn_expr_parserARG_STORE; /* Suppress warning about unused %extra_argument variable */ } Modified: lib/grn_ecmascript.h (+73 -73) =================================================================== --- lib/grn_ecmascript.h 2016-02-19 00:12:59 +0900 (9051290) +++ lib/grn_ecmascript.h 2016-02-19 12:36:22 +0900 (6280690) @@ -1,73 +1,73 @@ -#define GRN_EXPR_TOKEN_START_OUTPUT_COLUMNS 1 -#define GRN_EXPR_TOKEN_START_ADJUSTER 2 -#define GRN_EXPR_TOKEN_LOGICAL_AND 3 -#define GRN_EXPR_TOKEN_LOGICAL_AND_NOT 4 -#define GRN_EXPR_TOKEN_LOGICAL_OR 5 -#define GRN_EXPR_TOKEN_QSTRING 6 -#define GRN_EXPR_TOKEN_PARENL 7 -#define GRN_EXPR_TOKEN_PARENR 8 -#define GRN_EXPR_TOKEN_RELATIVE_OP 9 -#define GRN_EXPR_TOKEN_IDENTIFIER 10 -#define GRN_EXPR_TOKEN_BRACEL 11 -#define GRN_EXPR_TOKEN_BRACER 12 -#define GRN_EXPR_TOKEN_EVAL 13 -#define GRN_EXPR_TOKEN_COMMA 14 -#define GRN_EXPR_TOKEN_ASSIGN 15 -#define GRN_EXPR_TOKEN_STAR_ASSIGN 16 -#define GRN_EXPR_TOKEN_SLASH_ASSIGN 17 -#define GRN_EXPR_TOKEN_MOD_ASSIGN 18 -#define GRN_EXPR_TOKEN_PLUS_ASSIGN 19 -#define GRN_EXPR_TOKEN_MINUS_ASSIGN 20 -#define GRN_EXPR_TOKEN_SHIFTL_ASSIGN 21 -#define GRN_EXPR_TOKEN_SHIFTR_ASSIGN 22 -#define GRN_EXPR_TOKEN_SHIFTRR_ASSIGN 23 -#define GRN_EXPR_TOKEN_AND_ASSIGN 24 -#define GRN_EXPR_TOKEN_XOR_ASSIGN 25 -#define GRN_EXPR_TOKEN_OR_ASSIGN 26 -#define GRN_EXPR_TOKEN_QUESTION 27 -#define GRN_EXPR_TOKEN_COLON 28 -#define GRN_EXPR_TOKEN_BITWISE_OR 29 -#define GRN_EXPR_TOKEN_BITWISE_XOR 30 -#define GRN_EXPR_TOKEN_BITWISE_AND 31 -#define GRN_EXPR_TOKEN_EQUAL 32 -#define GRN_EXPR_TOKEN_NOT_EQUAL 33 -#define GRN_EXPR_TOKEN_LESS 34 -#define GRN_EXPR_TOKEN_GREATER 35 -#define GRN_EXPR_TOKEN_LESS_EQUAL 36 -#define GRN_EXPR_TOKEN_GREATER_EQUAL 37 -#define GRN_EXPR_TOKEN_IN 38 -#define GRN_EXPR_TOKEN_MATCH 39 -#define GRN_EXPR_TOKEN_NEAR 40 -#define GRN_EXPR_TOKEN_NEAR2 41 -#define GRN_EXPR_TOKEN_SIMILAR 42 -#define GRN_EXPR_TOKEN_TERM_EXTRACT 43 -#define GRN_EXPR_TOKEN_LCP 44 -#define GRN_EXPR_TOKEN_PREFIX 45 -#define GRN_EXPR_TOKEN_SUFFIX 46 -#define GRN_EXPR_TOKEN_REGEXP 47 -#define GRN_EXPR_TOKEN_SHIFTL 48 -#define GRN_EXPR_TOKEN_SHIFTR 49 -#define GRN_EXPR_TOKEN_SHIFTRR 50 -#define GRN_EXPR_TOKEN_PLUS 51 -#define GRN_EXPR_TOKEN_MINUS 52 -#define GRN_EXPR_TOKEN_STAR 53 -#define GRN_EXPR_TOKEN_SLASH 54 -#define GRN_EXPR_TOKEN_MOD 55 -#define GRN_EXPR_TOKEN_DELETE 56 -#define GRN_EXPR_TOKEN_INCR 57 -#define GRN_EXPR_TOKEN_DECR 58 -#define GRN_EXPR_TOKEN_NOT 59 -#define GRN_EXPR_TOKEN_BITWISE_NOT 60 -#define GRN_EXPR_TOKEN_ADJUST 61 -#define GRN_EXPR_TOKEN_EXACT 62 -#define GRN_EXPR_TOKEN_PARTIAL 63 -#define GRN_EXPR_TOKEN_UNSPLIT 64 -#define GRN_EXPR_TOKEN_DECIMAL 65 -#define GRN_EXPR_TOKEN_HEX_INTEGER 66 -#define GRN_EXPR_TOKEN_STRING 67 -#define GRN_EXPR_TOKEN_BOOLEAN 68 -#define GRN_EXPR_TOKEN_NULL 69 -#define GRN_EXPR_TOKEN_BRACKETL 70 -#define GRN_EXPR_TOKEN_BRACKETR 71 -#define GRN_EXPR_TOKEN_DOT 72 -#define GRN_EXPR_TOKEN_NONEXISTENT_COLUMN 73 +#define GRN_EXPR_TOKEN_START_OUTPUT_COLUMNS 1 +#define GRN_EXPR_TOKEN_START_ADJUSTER 2 +#define GRN_EXPR_TOKEN_LOGICAL_AND 3 +#define GRN_EXPR_TOKEN_LOGICAL_AND_NOT 4 +#define GRN_EXPR_TOKEN_LOGICAL_OR 5 +#define GRN_EXPR_TOKEN_QSTRING 6 +#define GRN_EXPR_TOKEN_PARENL 7 +#define GRN_EXPR_TOKEN_PARENR 8 +#define GRN_EXPR_TOKEN_RELATIVE_OP 9 +#define GRN_EXPR_TOKEN_IDENTIFIER 10 +#define GRN_EXPR_TOKEN_BRACEL 11 +#define GRN_EXPR_TOKEN_BRACER 12 +#define GRN_EXPR_TOKEN_EVAL 13 +#define GRN_EXPR_TOKEN_COMMA 14 +#define GRN_EXPR_TOKEN_ASSIGN 15 +#define GRN_EXPR_TOKEN_STAR_ASSIGN 16 +#define GRN_EXPR_TOKEN_SLASH_ASSIGN 17 +#define GRN_EXPR_TOKEN_MOD_ASSIGN 18 +#define GRN_EXPR_TOKEN_PLUS_ASSIGN 19 +#define GRN_EXPR_TOKEN_MINUS_ASSIGN 20 +#define GRN_EXPR_TOKEN_SHIFTL_ASSIGN 21 +#define GRN_EXPR_TOKEN_SHIFTR_ASSIGN 22 +#define GRN_EXPR_TOKEN_SHIFTRR_ASSIGN 23 +#define GRN_EXPR_TOKEN_AND_ASSIGN 24 +#define GRN_EXPR_TOKEN_XOR_ASSIGN 25 +#define GRN_EXPR_TOKEN_OR_ASSIGN 26 +#define GRN_EXPR_TOKEN_QUESTION 27 +#define GRN_EXPR_TOKEN_COLON 28 +#define GRN_EXPR_TOKEN_BITWISE_OR 29 +#define GRN_EXPR_TOKEN_BITWISE_XOR 30 +#define GRN_EXPR_TOKEN_BITWISE_AND 31 +#define GRN_EXPR_TOKEN_EQUAL 32 +#define GRN_EXPR_TOKEN_NOT_EQUAL 33 +#define GRN_EXPR_TOKEN_LESS 34 +#define GRN_EXPR_TOKEN_GREATER 35 +#define GRN_EXPR_TOKEN_LESS_EQUAL 36 +#define GRN_EXPR_TOKEN_GREATER_EQUAL 37 +#define GRN_EXPR_TOKEN_IN 38 +#define GRN_EXPR_TOKEN_MATCH 39 +#define GRN_EXPR_TOKEN_NEAR 40 +#define GRN_EXPR_TOKEN_NEAR2 41 +#define GRN_EXPR_TOKEN_SIMILAR 42 +#define GRN_EXPR_TOKEN_TERM_EXTRACT 43 +#define GRN_EXPR_TOKEN_LCP 44 +#define GRN_EXPR_TOKEN_PREFIX 45 +#define GRN_EXPR_TOKEN_SUFFIX 46 +#define GRN_EXPR_TOKEN_REGEXP 47 +#define GRN_EXPR_TOKEN_SHIFTL 48 +#define GRN_EXPR_TOKEN_SHIFTR 49 +#define GRN_EXPR_TOKEN_SHIFTRR 50 +#define GRN_EXPR_TOKEN_PLUS 51 +#define GRN_EXPR_TOKEN_MINUS 52 +#define GRN_EXPR_TOKEN_STAR 53 +#define GRN_EXPR_TOKEN_SLASH 54 +#define GRN_EXPR_TOKEN_MOD 55 +#define GRN_EXPR_TOKEN_DELETE 56 +#define GRN_EXPR_TOKEN_INCR 57 +#define GRN_EXPR_TOKEN_DECR 58 +#define GRN_EXPR_TOKEN_NOT 59 +#define GRN_EXPR_TOKEN_BITWISE_NOT 60 +#define GRN_EXPR_TOKEN_ADJUST 61 +#define GRN_EXPR_TOKEN_EXACT 62 +#define GRN_EXPR_TOKEN_PARTIAL 63 +#define GRN_EXPR_TOKEN_UNSPLIT 64 +#define GRN_EXPR_TOKEN_DECIMAL 65 +#define GRN_EXPR_TOKEN_HEX_INTEGER 66 +#define GRN_EXPR_TOKEN_STRING 67 +#define GRN_EXPR_TOKEN_BOOLEAN 68 +#define GRN_EXPR_TOKEN_NULL 69 +#define GRN_EXPR_TOKEN_BRACKETL 70 +#define GRN_EXPR_TOKEN_BRACKETR 71 +#define GRN_EXPR_TOKEN_DOT 72 +#define GRN_EXPR_TOKEN_NONEXISTENT_COLUMN 73 Modified: lib/grn_ecmascript.lemon (+8 -8) =================================================================== --- lib/grn_ecmascript.lemon 2016-02-19 00:12:59 +0900 (080188f) +++ lib/grn_ecmascript.lemon 2016-02-19 12:36:22 +0900 (77dc67c) @@ -266,9 +266,9 @@ unary_expression ::= INCR unary_expression. { grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be incremented (%.*s)", @@ -283,9 +283,9 @@ unary_expression ::= DECR unary_expression. { grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be decremented (%.*s)", @@ -326,9 +326,9 @@ postfix_expression ::= lefthand_side_expression INCR. { grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be incremented (%.*s)", @@ -343,9 +343,9 @@ postfix_expression ::= lefthand_side_expression DECR. { grn_expr_dfi *dfi_; unsigned int const_p; - DFI_POP(e, dfi_); + dfi_ = grn_expr_dfi_pop(e); const_p = CONSTP(dfi_->code->value); - DFI_PUT(e, dfi_->type, dfi_->domain, dfi_->code); + grn_expr_dfi_put(ctx, e, dfi_->type, dfi_->domain, dfi_->code); if (const_p) { ERR(GRN_SYNTAX_ERROR, "constant can't be decremented (%.*s)",
