Kouhei Sutou
null+****@clear*****
Mon Oct 19 15:25:50 JST 2015
Kouhei Sutou 2015-10-19 15:25:50 +0900 (Mon, 19 Oct 2015) New Revision: 552643239e17538c88c2b700c3934c71f06ad7eb https://github.com/groonga/groonga/commit/552643239e17538c88c2b700c3934c71f06ad7eb Message: Add grn_obj_is_normalizer_proc() Modified files: include/groonga/obj.h lib/obj.c test/unit/core/test-object.c Modified: include/groonga/obj.h (+1 -0) =================================================================== --- include/groonga/obj.h 2015-10-19 15:22:17 +0900 (4534409) +++ include/groonga/obj.h 2015-10-19 15:25:50 +0900 (6e1e4a4) @@ -31,6 +31,7 @@ GRN_API grn_bool grn_obj_is_tokenizer_proc(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_function_proc(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_selector_proc(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_selector_only_proc(grn_ctx *ctx, grn_obj *obj); +GRN_API grn_bool grn_obj_is_normalizer_proc(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_scorer_proc(grn_ctx *ctx, grn_obj *obj); GRN_API grn_rc grn_obj_cast(grn_ctx *ctx, Modified: lib/obj.c (+13 -0) =================================================================== --- lib/obj.c 2015-10-19 15:22:17 +0900 (c4d1fc2) +++ lib/obj.c 2015-10-19 15:25:50 +0900 (39c9818) @@ -129,6 +129,19 @@ grn_obj_is_selector_only_proc(grn_ctx *ctx, grn_obj *obj) } grn_bool +grn_obj_is_normalizer_proc(grn_ctx *ctx, grn_obj *obj) +{ + grn_proc *proc; + + if (!grn_obj_is_proc(ctx, obj)) { + return GRN_FALSE; + } + + proc = (grn_proc *)obj; + return proc->type == GRN_PROC_NORMALIZER; +} + +grn_bool grn_obj_is_scorer_proc(grn_ctx *ctx, grn_obj *obj) { grn_proc *proc; Modified: test/unit/core/test-object.c (+34 -0) =================================================================== --- test/unit/core/test-object.c 2015-10-19 15:22:17 +0900 (01c37b7) +++ test/unit/core/test-object.c 2015-10-19 15:25:50 +0900 (8982ff8) @@ -39,6 +39,8 @@ void data_is_function_proc(void); void test_is_function_proc(gconstpointer data); void data_is_selector_proc(void); void test_is_selector_proc(gconstpointer data); +void data_is_normalizer_proc(void); +void test_is_normalizer_proc(gconstpointer data); void data_is_scorer_proc(void); void test_is_scorer_proc(gconstpointer data); @@ -330,6 +332,38 @@ test_is_selector_proc(gconstpointer data) } void +data_is_normalizer_proc(void) +{ +#define ADD_DATUM(expected, name) \ + gcut_add_datum((expected ? \ + "normalizer-proc - " name : \ + "not normalizer-proc - " name), \ + "expected", G_TYPE_BOOLEAN, expected, \ + "name", G_TYPE_STRING, name, \ + NULL) + + ADD_DATUM(TRUE, "NormalizerAuto"); + ADD_DATUM(FALSE, "TokenBigram"); + +#undef ADD_DATUM +} + +void +test_is_normalizer_proc(gconstpointer data) +{ + const gchar *name; + grn_obj *object; + + name = gcut_data_get_string(data, "name"); + object = grn_ctx_get(context, name, strlen(name)); + if (gcut_data_get_string(data, "expected")) { + cut_assert_true(grn_obj_is_normalizer_proc(context, object)); + } else { + cut_assert_false(grn_obj_is_normalizer_proc(context, object)); + } +} + +void data_is_scorer_proc(void) { #define ADD_DATUM(expected, name) \ -------------- next part -------------- HTML����������������������������...Download