Revert OP_CALL nargs incompatibility change

It's too effected I guessed. :<
groonga · Apr 25, 2017 · 85ea3bd · 85ea3bd
1 parent beb1500
commit 85ea3bd
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/lib/expr.c b/lib/expr.c
@@ -903,6 +903,21 @@ grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj, grn_operator op,
     case GRN_OP_CALL :
       {
         grn_obj *proc = NULL;
+        /*
+         * This is for keeping backward compatibility. We want to
+         * handle all "nargs" means that "N items on stack are used (N
+         * items are popped)" but "nargs" for OP_CALL is used as "N
+         * arguments" not "N items on stack are used" historically. It
+         * means that called function isn't included in "nargs".
+         *
+         * We adjust "nargs" here to handle "code->nargs" more easily.
+         * If we don't adjust "nargs" here, we need to care
+         * "code->nargs" at all locations that use "code->nargs". We
+         * need to use "code->nargs + 1" for OP_CALL and "code->nargs"
+         * for not OP_CALL to compute N items should be popped. It's
+         * wired. So we adjust "nargs" here.
+         */
+        nargs++;
         if (e->codes_curr - (nargs - 1) > 0) {
           int i;
           grn_expr_code *code;
@@ -7075,7 +7090,7 @@ parse_query(grn_ctx *ctx, efs_info *q)
           /* dummy token */
           PARSE(GRN_EXPR_TOKEN_QSTRING);
           grn_expr_append_obj(ctx, q->e, all_records, GRN_OP_PUSH, 1);
-          grn_expr_append_op(ctx, q->e, GRN_OP_CALL, 1);
+          grn_expr_append_op(ctx, q->e, GRN_OP_CALL, 0);
         }
       }
       op->op = GRN_OP_AND_NOT;

diff --git a/lib/grn_ecmascript.c b/lib/grn_ecmascript.c
@@ -1946,7 +1946,7 @@ static void yy_reduce(
       case 65: /* call_expression ::= member_expression arguments */
 #line 371 "grn_ecmascript.lemon"
 {
-  grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_CALL, 1 + yymsp[0].minor.yy0);
+  grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_CALL, yymsp[0].minor.yy0);
 }
 #line 1952 "grn_ecmascript.c"
         break;

diff --git a/lib/grn_ecmascript.lemon b/lib/grn_ecmascript.lemon
@@ -369,7 +369,7 @@ lefthand_side_expression ::= call_expression.
 lefthand_side_expression ::= member_expression.
 
 call_expression ::= member_expression arguments(A). {
-  grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_CALL, 1 + A);
+  grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_CALL, A);
 }
 
 member_expression ::= primary_expression.

diff --git a/lib/mrb/scripts/expression_tree/function_call.rb b/lib/mrb/scripts/expression_tree/function_call.rb
@@ -13,7 +13,7 @@ def build(expression)
         @arguments.each do |argument|
           argument.build(expression)
         end
-        expression.append_operator(Operator::CALL, 1 + @arguments.size)
+        expression.append_operator(Operator::CALL, @arguments.size)
       end
 
       def estimate_size(table)

diff --git a/plugins/sharding/range_expression_builder.rb b/plugins/sharding/range_expression_builder.rb
@@ -55,7 +55,7 @@ def build_partial_min_and_max(expression)
         expression.append_constant(@target_range.max, Operator::PUSH, 1)
         expression.append_constant(@target_range.max_border,
                                    Operator::PUSH, 1)
-        expression.append_operator(Operator::CALL, 6)
+        expression.append_operator(Operator::CALL, 5)
         build_condition(expression)
       end
 

diff --git a/plugins/suggest/suggest.c b/plugins/suggest/suggest.c
@@ -462,7 +462,7 @@ correct(grn_ctx *ctx, grn_obj *items, grn_obj *items_boost,
                                   key,
                                   GRN_OP_GET_VALUE, 1);
               grn_expr_append_const(ctx, expr, query, GRN_OP_PUSH, 1);
-              grn_expr_append_op(ctx, expr, GRN_OP_CALL, 3);
+              grn_expr_append_op(ctx, expr, GRN_OP_CALL, 2);
               grn_expr_append_op(ctx, expr, GRN_OP_MINUS_ASSIGN, 2);
 
               if ((tc = grn_table_cursor_open(ctx, res, NULL, 0, NULL, 0, 0, -1, 0))) {