Kouhei Sutou
null+****@clear*****
Wed Feb 19 14:55:09 JST 2014
Kouhei Sutou 2014-02-19 14:55:09 +0900 (Wed, 19 Feb 2014) New Revision: ca4e2e9abb0f40388455560349e6c0971c1835a0 https://github.com/groonga/groonga/commit/ca4e2e9abb0f40388455560349e6c0971c1835a0 Message: Fix wrong operator OPEN_BRACKET and OPEN_BRACE aren't flags. They are values. Modified files: lib/db.c Modified: lib/db.c (+3 -3) =================================================================== --- lib/db.c 2014-02-19 12:06:30 +0900 (25ea056) +++ lib/db.c 2014-02-19 14:55:09 +0900 (0f1847b) @@ -9465,7 +9465,7 @@ values_add(grn_ctx *ctx, grn_loader *loader) static grn_obj * values_next(grn_ctx *ctx, grn_obj *value) { - if (value->header.domain & OPEN_BRACKET) { + if (value->header.domain == OPEN_BRACKET) { value += GRN_UINT32_VALUE(value); } return value + 1; @@ -9625,7 +9625,7 @@ bracket_close(grn_ctx *ctx, grn_loader *loader) GRN_UINT32_POP(&loader->level, begin); value = ((grn_obj *)(GRN_TEXT_VALUE(&loader->values))) + begin; ve = ((grn_obj *)(GRN_TEXT_VALUE(&loader->values))) + loader->values_size; - GRN_ASSERT(value->header.domain & OPEN_BRACKET); + GRN_ASSERT(value->header.domain == OPEN_BRACKET); GRN_UINT32_SET(ctx, value, loader->values_size - begin - 1); value++; if (GRN_BULK_VSIZE(&loader->level) <= sizeof(uint32_t) * loader->emit_level) { @@ -9769,7 +9769,7 @@ brace_close(grn_ctx *ctx, grn_loader *loader) GRN_UINT32_POP(&loader->level, begin); value = ((grn_obj *)(GRN_TEXT_VALUE(&loader->values))) + begin; ve = ((grn_obj *)(GRN_TEXT_VALUE(&loader->values))) + loader->values_size; - GRN_ASSERT(value->header.domain & OPEN_BRACKET); + GRN_ASSERT(value->header.domain == OPEN_BRACKET); GRN_UINT32_SET(ctx, value, loader->values_size - begin - 1); value++; if (GRN_BULK_VSIZE(&loader->level) <= sizeof(uint32_t) * loader->emit_level) { -------------- next part -------------- HTML����������������������������...Download