susumu.yata
null+****@clear*****
Mon Nov 16 16:42:11 JST 2015
susumu.yata 2015-11-16 16:42:11 +0900 (Mon, 16 Nov 2015) New Revision: 28871217b533d7468bceafad6209b4c197138c45 https://github.com/groonga/groonga/commit/28871217b533d7468bceafad6209b4c197138c45 Message: grn_ts: rename stack_depth to n_nodes Modified files: lib/ts/ts_expr_builder.c lib/ts/ts_expr_builder.h Modified: lib/ts/ts_expr_builder.c (+4 -4) =================================================================== --- lib/ts/ts_expr_builder.c 2015-11-16 16:29:21 +0900 (74cdaaf) +++ lib/ts/ts_expr_builder.c 2015-11-16 16:42:11 +0900 (e0a7d6a) @@ -628,7 +628,7 @@ grn_ts_expr_builder_push_op(grn_ctx *ctx, grn_ts_expr_builder *builder, } max_n_args = builder->n_nodes; if (builder->n_bridges) { - max_n_args -= builder->bridges[builder->n_bridges - 1].stack_depth; + max_n_args -= builder->bridges[builder->n_bridges - 1].n_nodes; } if (n_args > max_n_args) { GRN_TS_ERR_RETURN(GRN_INVALID_ARGUMENT, @@ -705,7 +705,7 @@ grn_ts_expr_builder_begin_subexpr(grn_ctx *ctx, grn_ts_expr_builder *builder) } max_n_args = builder->n_nodes; if (builder->n_bridges) { - max_n_args -= builder->bridges[builder->n_bridges - 1].stack_depth; + max_n_args -= builder->bridges[builder->n_bridges - 1].n_nodes; } if (!max_n_args) { GRN_TS_ERR_RETURN(GRN_INVALID_ARGUMENT, "invalid argument"); @@ -729,7 +729,7 @@ grn_ts_expr_builder_begin_subexpr(grn_ctx *ctx, grn_ts_expr_builder *builder) grn_ts_expr_bridge_init(ctx, &bridge); bridge.src_table = builder->curr_table; bridge.dest_table = obj; - bridge.stack_depth = builder->n_nodes; + bridge.n_nodes = builder->n_nodes; rc = grn_ts_expr_builder_push_bridge(ctx, builder, &bridge); if (rc != GRN_SUCCESS) { grn_obj_unlink(ctx, obj); @@ -749,7 +749,7 @@ grn_ts_expr_builder_end_subexpr(grn_ctx *ctx, grn_ts_expr_builder *builder) } /* Check whehter or not the subexpression is complete.*/ bridge = &builder->bridges[builder->n_bridges - 1]; - if (builder->n_nodes != (bridge->stack_depth + 1)) { + if (builder->n_nodes != (bridge->n_nodes + 1)) { return GRN_INVALID_ARGUMENT; } /* Creates a bridge node. */ Modified: lib/ts/ts_expr_builder.h (+1 -1) =================================================================== --- lib/ts/ts_expr_builder.h 2015-11-16 16:29:21 +0900 (fbd6f6d) +++ lib/ts/ts_expr_builder.h 2015-11-16 16:42:11 +0900 (e8ceb22) @@ -35,7 +35,7 @@ extern "C" { typedef struct { grn_obj *src_table; /* The source table of a bridge (no ref. count). */ grn_obj *dest_table; /* The destination table of a bridge. */ - size_t stack_depth; /* The stack depth (position) of a bridge. */ + size_t n_nodes; /* The stack depth (position) of a bridge. */ } grn_ts_expr_bridge; typedef struct { -------------- next part -------------- HTML����������������������������...Download