Kouhei Sutou
null+****@clear*****
Mon Oct 19 15:21:08 JST 2015
Kouhei Sutou 2015-10-19 15:21:08 +0900 (Mon, 19 Oct 2015) New Revision: a5e8ba7b70775099054ee12308e1b097074ac961 https://github.com/groonga/groonga/commit/a5e8ba7b70775099054ee12308e1b097074ac961 Message: Add grn_obj_is_tokenizer_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:00:32 +0900 (4036ab3) +++ include/groonga/obj.h 2015-10-19 15:21:08 +0900 (4534409) @@ -27,6 +27,7 @@ GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_table(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_type(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_proc(grn_ctx *ctx, grn_obj *obj); +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); Modified: lib/obj.c (+13 -0) =================================================================== --- lib/obj.c 2015-10-19 15:00:32 +0900 (5cbcbab) +++ lib/obj.c 2015-10-19 15:21:08 +0900 (c4d1fc2) @@ -77,6 +77,19 @@ grn_obj_is_proc(grn_ctx *ctx, grn_obj *obj) } grn_bool +grn_obj_is_tokenizer_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_TOKENIZER; +} + +grn_bool grn_obj_is_function_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:00:32 +0900 (6585f9c) +++ test/unit/core/test-object.c 2015-10-19 15:21:08 +0900 (01c37b7) @@ -33,6 +33,8 @@ void data_is_type(void); void test_is_type(gconstpointer data); void data_is_proc(void); void test_is_proc(gconstpointer data); +void data_is_tokenizer_proc(void); +void test_is_tokenizer_proc(gconstpointer data); void data_is_function_proc(void); void test_is_function_proc(gconstpointer data); void data_is_selector_proc(void); @@ -232,6 +234,38 @@ test_is_proc(gconstpointer data) } void +data_is_tokenizer_proc(void) +{ +#define ADD_DATUM(expected, name) \ + gcut_add_datum((expected ? \ + "tokenizer-proc - " name : \ + "not tokenizer-proc - " name), \ + "expected", G_TYPE_BOOLEAN, expected, \ + "name", G_TYPE_STRING, name, \ + NULL) + + ADD_DATUM(TRUE, "TokenBigram"); + ADD_DATUM(FALSE, "status"); + +#undef ADD_DATUM +} + +void +test_is_tokenizer_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_tokenizer_proc(context, object)); + } else { + cut_assert_false(grn_obj_is_tokenizer_proc(context, object)); + } +} + +void data_is_function_proc(void) { #define ADD_DATUM(expected, name) \ -------------- next part -------------- HTML����������������������������...Download