Kouhei Sutou
null+****@clear*****
Thu Oct 10 22:09:18 JST 2013
Kouhei Sutou 2013-10-10 22:09:18 +0900 (Thu, 10 Oct 2013) New Revision: 636ca9fb67e204137ac0b237b8f59050142902bc https://github.com/groonga/groonga/commit/636ca9fb67e204137ac0b237b8f59050142902bc Message: mrb: reduce mrb_ec scope Modified files: lib/mrb/mrb_expr.c Modified: lib/mrb/mrb_expr.c (+6 -3) =================================================================== --- lib/mrb/mrb_expr.c 2013-10-10 22:08:33 +0900 (c8a1857) +++ lib/mrb/mrb_expr.c 2013-10-10 22:09:18 +0900 (e6b6477) @@ -177,11 +177,11 @@ scan_info_build(grn_ctx *ctx, grn_obj *expr, int *n, grn_expr *e = (grn_expr *)(*p); for (j = e->codes_curr, ec = e->codes; j--; ec++) { int32_t weight; - mrb_value mrb_ec = mrb_grn_expr_code_new(mrb, ec); if (ec->value) { switch (ec->value->header.type) { case GRN_ACCESSOR : if (grn_column_index(ctx, ec->value, c->op, &index, 1, &sid)) { + mrb_value mrb_ec = mrb_grn_expr_code_new(mrb, ec); weight = mrb_fixnum(mrb_funcall(mrb, mrb_ec, "weight", 0)); grn_scan_info_set_flags(si, grn_scan_info_get_flags(si) | SCAN_ACCESSOR); mrb_si = mrb_grn_scan_info_new(mrb, si); @@ -201,6 +201,7 @@ scan_info_build(grn_ctx *ctx, grn_obj *expr, int *n, case GRN_COLUMN_FIX_SIZE : case GRN_COLUMN_VAR_SIZE : if (grn_column_index(ctx, ec->value, c->op, &index, 1, &sid)) { + mrb_value mrb_ec = mrb_grn_expr_code_new(mrb, ec); weight = mrb_fixnum(mrb_funcall(mrb, mrb_ec, "weight", 0)); mrb_si = mrb_grn_scan_info_new(mrb, si); mrb_funcall(mrb, mrb_si, "put_index", 3, @@ -220,8 +221,10 @@ scan_info_build(grn_ctx *ctx, grn_obj *expr, int *n, j -= 2; ec += 2; } - mrb_ec = mrb_grn_expr_code_new(mrb, ec); - weight = mrb_fixnum(mrb_funcall(mrb, mrb_ec, "weight", 0)); + { + mrb_value mrb_ec = mrb_grn_expr_code_new(mrb, ec); + weight = mrb_fixnum(mrb_funcall(mrb, mrb_ec, "weight", 0)); + } mrb_si = mrb_grn_scan_info_new(mrb, si); mrb_funcall(mrb, mrb_si, "put_index", 3, mrb_cptr_value(mrb, index), -------------- next part -------------- HTML����������������������������...Download