wanabe
null+****@clear*****
Fri Oct 4 01:40:05 JST 2013
wanabe 2013-10-04 01:40:05 +0900 (Fri, 04 Oct 2013) New Revision: 564b29c7b0f671030b6c4e5c3fd715aaa01af3b1 https://github.com/groonga/groonga/commit/564b29c7b0f671030b6c4e5c3fd715aaa01af3b1 Merged f61480e: Merge pull request #109 from wanabe/scaninfo-api2 Message: Move definition of SCAN_XXX, enum scan_stat and typedef of scan_info from expr.c into expr.h Modified files: lib/expr.c lib/expr.h Modified: lib/expr.c (+2 -15) =================================================================== --- lib/expr.c 2013-10-03 18:31:52 +0900 (e7a33f9) +++ lib/expr.c 2013-10-04 01:40:05 +0900 (fb10c4b) @@ -3787,12 +3787,7 @@ res_add(grn_ctx *ctx, grn_hash *s, grn_rset_posinfo *pi, uint32_t score, } } -#define SCAN_ACCESSOR (0x01) -#define SCAN_PUSH (0x02) -#define SCAN_POP (0x04) -#define SCAN_PRE_CONST (0x08) - -typedef struct { +struct _grn_scan_info { uint32_t start; uint32_t end; int32_t nargs; @@ -3803,15 +3798,7 @@ typedef struct { grn_obj index; grn_obj *query; grn_obj *args[8]; -} scan_info; - -typedef enum { - SCAN_START = 0, - SCAN_VAR, - SCAN_COL1, - SCAN_COL2, - SCAN_CONST -} scan_stat; +}; #define SI_FREE(si) do {\ GRN_OBJ_FIN(ctx, &(si)->wv);\ Modified: lib/expr.h (+15 -0) =================================================================== --- lib/expr.h 2013-10-03 18:31:52 +0900 (c4af4b8) +++ lib/expr.h 2013-10-04 01:40:05 +0900 (ad6cf3b) @@ -23,6 +23,21 @@ extern "C" { #endif +#define SCAN_ACCESSOR (0x01) +#define SCAN_PUSH (0x02) +#define SCAN_POP (0x04) +#define SCAN_PRE_CONST (0x08) + +typedef enum { + SCAN_START = 0, + SCAN_VAR, + SCAN_COL1, + SCAN_COL2, + SCAN_CONST +} scan_stat; + +typedef struct _grn_scan_info scan_info; + #ifdef __cplusplus } #endif -------------- next part -------------- HTML����������������������������...Download