Kouhei Sutou
null+****@clear*****
Thu Oct 30 18:33:03 JST 2014
Kouhei Sutou 2014-10-30 18:33:03 +0900 (Thu, 30 Oct 2014) New Revision: 24d5e41a0af53251244b1b3dd20d4d9d4938b295 https://github.com/groonga/groonga/commit/24d5e41a0af53251244b1b3dd20d4d9d4938b295 Message: Add "grn_" prefix to internal headers It is for avoiding system header name conflict. For example, both Groonga and Windows uses "io.h". Exceptions: * groonga_in.h -> * grn.h * normalizer_in.h -> * grn_normalizer.h * plugin_in.h -> * grn_plugin.h * string_in.h -> * grn_string.h Modified files: benchmark/bench-geo-distance.c benchmark/bench-geo-select.c benchmark/bench-range-select.c include/groonga/plugin.h lib/Makefile.am lib/com.c lib/ctx.c lib/ctx_impl_mrb.c lib/dat.cpp lib/db.c lib/error.c lib/expr.c lib/geo.c lib/hash.c lib/ii.c lib/io.c lib/mrb.c lib/mrb/mrb_accessor.c lib/mrb/mrb_accessor.h lib/mrb/mrb_bulk.c lib/mrb/mrb_bulk.h lib/mrb/mrb_column.c lib/mrb/mrb_column.h lib/mrb/mrb_converter.c lib/mrb/mrb_converter.h lib/mrb/mrb_ctx.c lib/mrb/mrb_ctx.h lib/mrb/mrb_error.c lib/mrb/mrb_error.h lib/mrb/mrb_expr.c lib/mrb/mrb_expr.h lib/mrb/mrb_fixed_size_column.c lib/mrb/mrb_fixed_size_column.h lib/mrb/mrb_id.c lib/mrb/mrb_id.h lib/mrb/mrb_index_column.c lib/mrb/mrb_index_column.h lib/mrb/mrb_logger.c lib/mrb/mrb_logger.h lib/mrb/mrb_obj.c lib/mrb/mrb_obj.h lib/mrb/mrb_operator.c lib/mrb/mrb_operator.h lib/mrb/mrb_procedure.c lib/mrb/mrb_procedure.h lib/mrb/mrb_variable_size_column.c lib/mrb/mrb_variable_size_column.h lib/mrb/mrb_void.c lib/mrb/mrb_void.h lib/normalizer.c lib/output.c lib/pat.c lib/plugin.c lib/proc.c lib/snip.c lib/sources.am lib/store.c lib/str.c lib/string.c lib/token.c lib/token_filter.c lib/tokenizer.c lib/util.c plugins/query_expanders/tsv.c plugins/suggest/suggest.c plugins/table/table.c plugins/token_filters/stem.c plugins/token_filters/stop_word.c plugins/tokenizers/mecab.c src/grnslap.c src/groonga.c src/groonga_benchmark.c src/suggest/groonga_suggest_create_dataset.c src/suggest/groonga_suggest_httpd.c src/suggest/groonga_suggest_learner.c test/unit/core/dat/test-dat-cursor.cpp test/unit/core/dat/test-dat-pat.cpp test/unit/core/dat/test-dat.cpp test/unit/core/test-cast-basic.c test/unit/core/test-cast-table.c test/unit/core/test-command-column-create.c test/unit/core/test-command-column-rename.c test/unit/core/test-command-define-selector.c test/unit/core/test-command-delete.c test/unit/core/test-command-dump.c test/unit/core/test-command-load.c test/unit/core/test-command-select-filter-invalid.c test/unit/core/test-command-select-filter.c test/unit/core/test-command-select-prefix-search.c test/unit/core/test-command-select-query.c test/unit/core/test-command-select-sort.c test/unit/core/test-command-select.c test/unit/core/test-command-table-create.c test/unit/core/test-command-table-rename.c test/unit/core/test-command-truncate.c test/unit/core/test-context.c test/unit/core/test-database-create.c test/unit/core/test-database.c test/unit/core/test-expr-parse.c test/unit/core/test-expr-query.c test/unit/core/test-expr-script.c test/unit/core/test-expr.c test/unit/core/test-function-edit-distance.c test/unit/core/test-function.c test/unit/core/test-geo-in-rectangle-border.c test/unit/core/test-geo-in-rectangle.c test/unit/core/test-geo.c test/unit/core/test-hash-sort.c test/unit/core/test-hash.h test/unit/core/test-inspect.c test/unit/core/test-inverted-index.c test/unit/core/test-log.c test/unit/core/test-patricia-trie.h test/unit/core/test-plugin.c test/unit/core/test-store-ja.c test/unit/core/test-stress.c test/unit/core/test-table-hook.c test/unit/core/test-table-patricia-trie-cursor.c test/unit/core/test-table-select.c test/unit/core/test-text.c test/unit/core/test-tiny-array.c test/unit/fixtures/plugins/string.c test/unit/fixtures/stress/test-stress-hash.c test/unit/fixtures/stress/test-stress-patricia-trie.c test/unit/lib/grn-assertions.c test/unit/lib/grn-test-hash-assertions.c test/unit/lib/grn-test-hash-factory.h test/unit/lib/grn-test-utils.c test/unit/util/test-string.c Renamed files: lib/grn.h (from lib/groonga_in.h) lib/grn_com.h (from lib/com.h) lib/grn_ctx.h (from lib/ctx.h) lib/grn_ctx_impl.h (from lib/ctx_impl.h) lib/grn_ctx_impl_mrb.h (from lib/ctx_impl_mrb.h) lib/grn_dat.h (from lib/dat.h) lib/grn_db.h (from lib/db.h) lib/grn_ecmascript.c (from lib/ecmascript.c) lib/grn_ecmascript.h (from lib/ecmascript.h) lib/grn_ecmascript.lemon (from lib/ecmascript.lemon) lib/grn_error.h (from lib/error.h) lib/grn_expr.h (from lib/expr.h) lib/grn_geo.h (from lib/geo.h) lib/grn_hash.h (from lib/hash.h) lib/grn_ii.h (from lib/ii.h) lib/grn_io.h (from lib/io.h) lib/grn_mrb.h (from lib/mrb.h) lib/grn_normalizer.h (from lib/normalizer_in.h) lib/grn_output.h (from lib/output.h) lib/grn_pat.h (from lib/pat.h) lib/grn_plugin.h (from lib/plugin_in.h) lib/grn_proc.h (from lib/proc.h) lib/grn_snip.h (from lib/snip.h) lib/grn_store.h (from lib/store.h) lib/grn_str.h (from lib/str.h) lib/grn_string.h (from lib/string_in.h) lib/grn_token.h (from lib/token.h) lib/grn_util.h (from lib/util.h) Modified: benchmark/bench-geo-distance.c (+1 -1) =================================================================== --- benchmark/bench-geo-distance.c 2014-10-30 17:57:25 +0900 (8e1d819) +++ benchmark/bench-geo-distance.c 2014-10-30 18:33:03 +0900 (72d1d79) @@ -49,7 +49,7 @@ #include <string.h> -#include <db.h> +#include <grn_db.h> #include <groonga.h> #include "lib/benchmark.h" Modified: benchmark/bench-geo-select.c (+1 -1) =================================================================== --- benchmark/bench-geo-select.c 2014-10-30 17:57:25 +0900 (b934f22) +++ benchmark/bench-geo-select.c 2014-10-30 18:33:03 +0900 (7b57eaa) @@ -58,7 +58,7 @@ #include <string.h> -#include <db.h> +#include <grn_db.h> #include <groonga.h> #include "lib/benchmark.h" Modified: benchmark/bench-range-select.c (+1 -1) =================================================================== --- benchmark/bench-range-select.c 2014-10-30 17:57:25 +0900 (4c0b500) +++ benchmark/bench-range-select.c 2014-10-30 18:33:03 +0900 (d45d453) @@ -53,7 +53,7 @@ #include <stdio.h> #include <string.h> -#include <db.h> +#include <grn_db.h> #include <groonga.h> #include "lib/benchmark.h" Modified: include/groonga/plugin.h (+3 -3) =================================================================== --- include/groonga/plugin.h 2014-10-30 17:57:25 +0900 (98676ac) +++ include/groonga/plugin.h 2014-10-30 18:33:03 +0900 (2505d00) @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_PLUGIN_H -#define GRN_PLUGIN_H +#ifndef GROONGA_PLUGIN_H +#define GROONGA_PLUGIN_H #include <stddef.h> @@ -149,4 +149,4 @@ GRN_API grn_obj * grn_plugin_command_create(grn_ctx *ctx, } #endif -#endif /* GRN_PLUGIN_H */ +#endif /* GROONGA_PLUGIN_H */ Modified: lib/Makefile.am (+4 -4) =================================================================== --- lib/Makefile.am 2014-10-30 17:57:25 +0900 (047c41a) +++ lib/Makefile.am 2014-10-30 18:33:03 +0900 (d71ccbd) @@ -29,7 +29,7 @@ libgroonga_la_LIBADD = \ if WITH_LEMON BUILT_SOURCES = \ - ecmascript.c + grn_ecmascript.c SUFFIXES = .lemon .c @@ -38,9 +38,9 @@ SUFFIXES = .lemon .c endif EXTRA_DIST = \ - ecmascript.c \ - ecmascript.h \ - ecmascript.lemon \ + grn_ecmascript.c \ + grn_ecmascript.h \ + grn_ecmascript.lemon \ CMakeLists.txt CLEANFILES = *.gcno *.gcda Modified: lib/com.c (+4 -4) =================================================================== --- lib/com.c 2014-10-30 17:57:25 +0900 (5e20c27) +++ lib/com.c 2014-10-30 18:33:03 +0900 (30d2b1c) @@ -15,11 +15,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <stdio.h> #include <string.h> -#include "ctx_impl.h" +#include "grn_ctx_impl.h" #ifdef WIN32 # include <ws2tcpip.h> @@ -38,8 +38,8 @@ # endif /* HAVE_SIGNAL_H */ #endif /* WIN32 */ -#include "ctx.h" -#include "com.h" +#include "grn_ctx.h" +#include "grn_com.h" #ifndef PF_INET #define PF_INET AF_INET Modified: lib/ctx.c (+9 -9) =================================================================== --- lib/ctx.c 2014-10-30 17:57:25 +0900 (cb41d40) +++ lib/ctx.c 2014-10-30 18:33:03 +0900 (dd360e2) @@ -16,16 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <string.h> -#include "token.h" -#include "ctx_impl.h" -#include "pat.h" -#include "plugin_in.h" -#include "snip.h" -#include "output.h" -#include "normalizer_in.h" -#include "ctx_impl_mrb.h" +#include "grn_token.h" +#include "grn_ctx_impl.h" +#include "grn_pat.h" +#include "grn_plugin.h" +#include "grn_snip.h" +#include "grn_output.h" +#include "grn_normalizer.h" +#include "grn_ctx_impl_mrb.h" #include <stdio.h> #include <stdarg.h> #include <time.h> Modified: lib/ctx_impl_mrb.c (+3 -3) =================================================================== --- lib/ctx_impl_mrb.c 2014-10-30 17:57:25 +0900 (e6541ae) +++ lib/ctx_impl_mrb.c 2014-10-30 18:33:03 +0900 (777040d) @@ -18,10 +18,10 @@ #include <string.h> -#include "ctx_impl_mrb.h" -#include "ctx_impl.h" +#include "grn_ctx_impl_mrb.h" +#include "grn_ctx_impl.h" -#include "mrb.h" +#include "grn_mrb.h" #include "mrb/mrb_error.h" #include "mrb/mrb_id.h" #include "mrb/mrb_operator.h" Modified: lib/dat.cpp (+6 -6) =================================================================== --- lib/dat.cpp 2014-10-30 17:57:25 +0900 (8588857) +++ lib/dat.cpp 2014-10-30 18:33:03 +0900 (16dfadb) @@ -14,16 +14,16 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <sys/types.h> #include <sys/stat.h> #include <cstring> #include <new> -#include "str.h" -#include "io.h" -#include "dat.h" -#include "util.h" -#include "normalizer_in.h" +#include "grn_str.h" +#include "grn_io.h" +#include "grn_dat.h" +#include "grn_util.h" +#include "grn_normalizer.h" #include "dat/trie.hpp" #include "dat/cursor-factory.hpp" Modified: lib/db.c (+15 -15) =================================================================== --- lib/db.c 2014-10-30 17:57:25 +0900 (3b2391e) +++ lib/db.c 2014-10-30 18:33:03 +0900 (1e2b838) @@ -14,21 +14,21 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" -#include "db.h" -#include "hash.h" -#include "pat.h" -#include "dat.h" -#include "ii.h" -#include "ctx_impl.h" -#include "token.h" -#include "proc.h" -#include "plugin_in.h" -#include "geo.h" -#include "snip.h" -#include "string_in.h" -#include "normalizer_in.h" -#include "util.h" +#include "grn.h" +#include "grn_db.h" +#include "grn_hash.h" +#include "grn_pat.h" +#include "grn_dat.h" +#include "grn_ii.h" +#include "grn_ctx_impl.h" +#include "grn_token.h" +#include "grn_proc.h" +#include "grn_plugin.h" +#include "grn_geo.h" +#include "grn_snip.h" +#include "grn_string.h" +#include "grn_normalizer.h" +#include "grn_util.h" #include <string.h> #include <float.h> Modified: lib/error.c (+1 -1) =================================================================== --- lib/error.c 2014-10-30 17:57:25 +0900 (322b29b) +++ lib/error.c 2014-10-30 18:33:03 +0900 (4fb1270) @@ -15,7 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "error.h" +#include "grn_error.h" #ifdef HAVE_ERRNO_H #include <errno.h> Modified: lib/expr.c (+12 -12) =================================================================== --- lib/expr.c 2014-10-30 17:57:25 +0900 (978e7f9) +++ lib/expr.c 2014-10-30 18:33:03 +0900 (6930ce0) @@ -15,17 +15,17 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" -#include "db.h" -#include "ctx_impl.h" +#include "grn.h" +#include "grn_db.h" +#include "grn_ctx_impl.h" #include <string.h> #include <float.h> -#include "ii.h" -#include "geo.h" -#include "expr.h" -#include "util.h" -#include "normalizer_in.h" -#include "mrb.h" +#include "grn_ii.h" +#include "grn_geo.h" +#include "grn_expr.h" +#include "grn_util.h" +#include "grn_normalizer.h" +#include "grn_mrb.h" #include "mrb/mrb_expr.h" static inline int @@ -5410,7 +5410,7 @@ grn_int32_value_at(grn_obj *obj, int offset) /* grn_expr_create_from_str */ -#include "snip.h" +#include "grn_snip.h" typedef struct { grn_ctx *ctx; @@ -5938,8 +5938,8 @@ section_weight_cb(grn_ctx *ctx, grn_hash *r, const void *rid, int sid, void *arg } #endif -#include "ecmascript.h" -#include "ecmascript.c" +#include "grn_ecmascript.h" +#include "grn_ecmascript.c" static grn_rc grn_expr_parser_open(grn_ctx *ctx) Modified: lib/geo.c (+3 -3) =================================================================== --- lib/geo.c 2014-10-30 17:57:25 +0900 (1bb6214) +++ lib/geo.c 2014-10-30 18:33:03 +0900 (b830137) @@ -15,9 +15,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "geo.h" -#include "pat.h" -#include "util.h" +#include "grn_geo.h" +#include "grn_pat.h" +#include "grn_util.h" #include <string.h> #include <stdlib.h> Renamed: lib/grn.h (+4 -4) 99% =================================================================== --- lib/groonga_in.h 2014-10-30 17:57:25 +0900 (0c22b27) +++ lib/grn.h 2014-10-30 18:33:03 +0900 (51f5fe2) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_IN_H -#define GROONGA_IN_H +#ifndef GRN_H +#define GRN_H #ifdef HAVE_CONFIG_H #include <config.h> @@ -752,7 +752,7 @@ GRN_API void grn_sleep(uint32_t seconds); GRN_API void grn_nanosleep(uint64_t nanoseconds); #ifndef GROONGA_H -# include "groonga.h" +# include <groonga.h> #endif /* GROONGA_H */ -#endif /* GROONGA_IN_H */ +#endif /* GRN_H */ Renamed: lib/grn_com.h (+5 -5) 98% =================================================================== --- lib/com.h 2014-10-30 17:57:25 +0900 (c0690cc) +++ lib/grn_com.h 2014-10-30 18:33:03 +0900 (8f09e1f) @@ -18,16 +18,16 @@ #ifndef GRN_COM_H #define GRN_COM_H -#ifndef GROONGA_H -#include "groonga_in.h" -#endif /* GROONGA_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_STR_H -#include "str.h" +#include "grn_str.h" #endif /* GRN_STR_H */ #ifndef GRN_HASH_H -#include "hash.h" +#include "grn_hash.h" #endif /* GRN_HASH_H */ #ifdef HAVE_NETDB_H Renamed: lib/grn_ctx.h (+4 -4) 99% =================================================================== --- lib/ctx.h 2014-10-30 17:57:25 +0900 (656abfa) +++ lib/grn_ctx.h 2014-10-30 18:33:03 +0900 (c2c0e08) @@ -18,9 +18,9 @@ #ifndef GRN_CTX_H #define GRN_CTX_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifdef HAVE_ERRNO_H #include <errno.h> @@ -36,7 +36,7 @@ #endif /* HAVE_EXECINFO_H */ #ifndef GRN_IO_H -#include "io.h" +#include "grn_io.h" #endif /* GRN_IO_H */ #ifdef __cplusplus Renamed: lib/grn_ctx_impl.h (+2 -2) 98% =================================================================== --- lib/ctx_impl.h 2014-10-30 17:57:25 +0900 (33f1402) +++ lib/grn_ctx_impl.h 2014-10-30 18:33:03 +0900 (b50d40b) @@ -19,11 +19,11 @@ #define GRN_CTX_IMPL_H #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_COM_H -#include "com.h" +#include "grn_com.h" #endif /* GRN_COM_H */ #ifdef GRN_WITH_MESSAGE_PACK Renamed: lib/grn_ctx_impl_mrb.h (+2 -2) 95% =================================================================== --- lib/ctx_impl_mrb.h 2014-10-30 17:57:25 +0900 (6810d1f) +++ lib/grn_ctx_impl_mrb.h 2014-10-30 18:33:03 +0900 (61cf088) @@ -19,8 +19,8 @@ #ifndef GRN_CTX_IMPL_MRB_H #define GRN_CTX_IMPL_MRB_H -#include "groonga_in.h" -#include "ctx.h" +#include "grn.h" +#include "grn_ctx.h" #ifdef __cplusplus extern "C" { Renamed: lib/grn_dat.h (+4 -4) 96% =================================================================== --- lib/dat.h 2014-10-30 17:57:25 +0900 (d0c44b7) +++ lib/grn_dat.h 2014-10-30 18:33:03 +0900 (223ecd8) @@ -17,11 +17,11 @@ #ifndef GRN_DAT_H #define GRN_DAT_H -#ifndef GROONGA_IN_H -# include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +# include "grn.h" +#endif /* GRN_H */ -#include "db.h" +#include "grn_db.h" #ifdef __cplusplus extern "C" { Renamed: lib/grn_db.h (+5 -5) 99% =================================================================== --- lib/db.h 2014-10-30 17:57:25 +0900 (1f2926b) +++ lib/grn_db.h 2014-10-30 18:33:03 +0900 (068c4e7) @@ -17,16 +17,16 @@ #ifndef GRN_DB_H #define GRN_DB_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_STORE_H -#include "store.h" +#include "grn_store.h" #endif /* GRN_STORE_H */ #include <groonga/token_filter.h> Renamed: lib/grn_ecmascript.c (+150 -150) 95% =================================================================== --- lib/ecmascript.c 2014-10-30 17:57:25 +0900 (e973f12) +++ lib/grn_ecmascript.c 2014-10-30 18:33:03 +0900 (80c596b) @@ -4,10 +4,10 @@ /* First off, code is included that follows the "include" declaration ** in the input grammar file. */ #include <stdio.h> -#line 4 "ecmascript.lemon" +#line 4 "grn_ecmascript.lemon" #define assert GRN_ASSERT -#line 11 "ecmascript.c" +#line 11 "grn_ecmascript.c" /* Next is all token values, in a form suitable for use by makeheaders. ** This section will be null unless lemon is run with the -m switch. */ @@ -867,11 +867,11 @@ static void yy_destructor( */ case 74: /* suppress_unused_variable_warning */ { -#line 11 "ecmascript.lemon" +#line 11 "grn_ecmascript.lemon" (void)efsi; -#line 875 "ecmascript.c" +#line 875 "grn_ecmascript.c" } break; default: break; /* If no destructor action specified: do nothing */ @@ -1295,46 +1295,46 @@ static void yy_reduce( ** break; */ case 5: /* query ::= query query_element */ -#line 46 "ecmascript.lemon" +#line 46 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, grn_int32_value_at(&efsi->op_stack, -1), 2); } -#line 1303 "ecmascript.c" +#line 1303 "grn_ecmascript.c" break; case 6: /* query ::= query LOGICAL_AND query_element */ case 35: /* logical_and_expression ::= logical_and_expression LOGICAL_AND bitwise_or_expression */ yytestcase(yyruleno==35); -#line 49 "ecmascript.lemon" +#line 49 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_AND, 2); } -#line 1311 "ecmascript.c" +#line 1311 "grn_ecmascript.c" break; case 7: /* query ::= query LOGICAL_AND_NOT query_element */ case 36: /* logical_and_expression ::= logical_and_expression LOGICAL_AND_NOT bitwise_or_expression */ yytestcase(yyruleno==36); -#line 52 "ecmascript.lemon" +#line 52 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_AND_NOT, 2); } -#line 1319 "ecmascript.c" +#line 1319 "grn_ecmascript.c" break; case 8: /* query ::= query LOGICAL_OR query_element */ case 33: /* logical_or_expression ::= logical_or_expression LOGICAL_OR logical_and_expression */ yytestcase(yyruleno==33); -#line 55 "ecmascript.lemon" +#line 55 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_OR, 2); } -#line 1327 "ecmascript.c" +#line 1327 "grn_ecmascript.c" break; case 11: /* query_element ::= RELATIVE_OP query_element */ -#line 62 "ecmascript.lemon" +#line 62 "grn_ecmascript.lemon" { int mode; GRN_INT32_POP(&efsi->mode_stack, mode); } -#line 1335 "ecmascript.c" +#line 1335 "grn_ecmascript.c" break; case 12: /* query_element ::= IDENTIFIER RELATIVE_OP query_element */ -#line 66 "ecmascript.lemon" +#line 66 "grn_ecmascript.lemon" { int mode; grn_obj *c; @@ -1358,310 +1358,310 @@ static void yy_reduce( break; } } -#line 1362 "ecmascript.c" +#line 1362 "grn_ecmascript.c" break; case 13: /* query_element ::= BRACEL expression BRACER */ case 14: /* query_element ::= EVAL primary_expression */ yytestcase(yyruleno==14); -#line 89 "ecmascript.lemon" +#line 89 "grn_ecmascript.lemon" { efsi->flags = efsi->default_flags; } -#line 1370 "ecmascript.c" +#line 1370 "grn_ecmascript.c" break; case 16: /* expression ::= expression COMMA assignment_expression */ -#line 97 "ecmascript.lemon" +#line 97 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_COMMA, 2); } -#line 1377 "ecmascript.c" +#line 1377 "grn_ecmascript.c" break; case 18: /* assignment_expression ::= lefthand_side_expression ASSIGN assignment_expression */ -#line 102 "ecmascript.lemon" +#line 102 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_ASSIGN, 2); } -#line 1384 "ecmascript.c" +#line 1384 "grn_ecmascript.c" break; case 19: /* assignment_expression ::= lefthand_side_expression STAR_ASSIGN assignment_expression */ -#line 105 "ecmascript.lemon" +#line 105 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_STAR_ASSIGN, 2); } -#line 1391 "ecmascript.c" +#line 1391 "grn_ecmascript.c" break; case 20: /* assignment_expression ::= lefthand_side_expression SLASH_ASSIGN assignment_expression */ -#line 108 "ecmascript.lemon" +#line 108 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SLASH_ASSIGN, 2); } -#line 1398 "ecmascript.c" +#line 1398 "grn_ecmascript.c" break; case 21: /* assignment_expression ::= lefthand_side_expression MOD_ASSIGN assignment_expression */ -#line 111 "ecmascript.lemon" +#line 111 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MOD_ASSIGN, 2); } -#line 1405 "ecmascript.c" +#line 1405 "grn_ecmascript.c" break; case 22: /* assignment_expression ::= lefthand_side_expression PLUS_ASSIGN assignment_expression */ -#line 114 "ecmascript.lemon" +#line 114 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PLUS_ASSIGN, 2); } -#line 1412 "ecmascript.c" +#line 1412 "grn_ecmascript.c" break; case 23: /* assignment_expression ::= lefthand_side_expression MINUS_ASSIGN assignment_expression */ -#line 117 "ecmascript.lemon" +#line 117 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MINUS_ASSIGN, 2); } -#line 1419 "ecmascript.c" +#line 1419 "grn_ecmascript.c" break; case 24: /* assignment_expression ::= lefthand_side_expression SHIFTL_ASSIGN assignment_expression */ -#line 120 "ecmascript.lemon" +#line 120 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTL_ASSIGN, 2); } -#line 1426 "ecmascript.c" +#line 1426 "grn_ecmascript.c" break; case 25: /* assignment_expression ::= lefthand_side_expression SHIFTR_ASSIGN assignment_expression */ -#line 123 "ecmascript.lemon" +#line 123 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTR_ASSIGN, 2); } -#line 1433 "ecmascript.c" +#line 1433 "grn_ecmascript.c" break; case 26: /* assignment_expression ::= lefthand_side_expression SHIFTRR_ASSIGN assignment_expression */ -#line 126 "ecmascript.lemon" +#line 126 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTRR_ASSIGN, 2); } -#line 1440 "ecmascript.c" +#line 1440 "grn_ecmascript.c" break; case 27: /* assignment_expression ::= lefthand_side_expression AND_ASSIGN assignment_expression */ -#line 129 "ecmascript.lemon" +#line 129 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_AND_ASSIGN, 2); } -#line 1447 "ecmascript.c" +#line 1447 "grn_ecmascript.c" break; case 28: /* assignment_expression ::= lefthand_side_expression XOR_ASSIGN assignment_expression */ -#line 132 "ecmascript.lemon" +#line 132 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_XOR_ASSIGN, 2); } -#line 1454 "ecmascript.c" +#line 1454 "grn_ecmascript.c" break; case 29: /* assignment_expression ::= lefthand_side_expression OR_ASSIGN assignment_expression */ -#line 135 "ecmascript.lemon" +#line 135 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_OR_ASSIGN, 2); } -#line 1461 "ecmascript.c" +#line 1461 "grn_ecmascript.c" break; case 31: /* conditional_expression ::= logical_or_expression QUESTION assignment_expression COLON assignment_expression */ -#line 140 "ecmascript.lemon" +#line 140 "grn_ecmascript.lemon" { grn_expr *e = (grn_expr *)efsi->e; e->codes[yymsp[-3].minor.yy0].nargs = yymsp[-1].minor.yy0 - yymsp[-3].minor.yy0; e->codes[yymsp[-1].minor.yy0].nargs = e->codes_curr - yymsp[-1].minor.yy0 - 1; } -#line 1470 "ecmascript.c" +#line 1470 "grn_ecmascript.c" break; case 38: /* bitwise_or_expression ::= bitwise_or_expression BITWISE_OR bitwise_xor_expression */ -#line 160 "ecmascript.lemon" +#line 160 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_OR, 2); } -#line 1477 "ecmascript.c" +#line 1477 "grn_ecmascript.c" break; case 40: /* bitwise_xor_expression ::= bitwise_xor_expression BITWISE_XOR bitwise_and_expression */ -#line 165 "ecmascript.lemon" +#line 165 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_XOR, 2); } -#line 1484 "ecmascript.c" +#line 1484 "grn_ecmascript.c" break; case 42: /* bitwise_and_expression ::= bitwise_and_expression BITWISE_AND equality_expression */ -#line 170 "ecmascript.lemon" +#line 170 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_AND, 2); } -#line 1491 "ecmascript.c" +#line 1491 "grn_ecmascript.c" break; case 44: /* equality_expression ::= equality_expression EQUAL relational_expression */ -#line 175 "ecmascript.lemon" +#line 175 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_EQUAL, 2); } -#line 1498 "ecmascript.c" +#line 1498 "grn_ecmascript.c" break; case 45: /* equality_expression ::= equality_expression NOT_EQUAL relational_expression */ -#line 178 "ecmascript.lemon" +#line 178 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NOT_EQUAL, 2); } -#line 1505 "ecmascript.c" +#line 1505 "grn_ecmascript.c" break; case 47: /* relational_expression ::= relational_expression LESS shift_expression */ -#line 183 "ecmascript.lemon" +#line 183 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_LESS, 2); } -#line 1512 "ecmascript.c" +#line 1512 "grn_ecmascript.c" break; case 48: /* relational_expression ::= relational_expression GREATER shift_expression */ -#line 186 "ecmascript.lemon" +#line 186 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_GREATER, 2); } -#line 1519 "ecmascript.c" +#line 1519 "grn_ecmascript.c" break; case 49: /* relational_expression ::= relational_expression LESS_EQUAL shift_expression */ -#line 189 "ecmascript.lemon" +#line 189 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_LESS_EQUAL, 2); } -#line 1526 "ecmascript.c" +#line 1526 "grn_ecmascript.c" break; case 50: /* relational_expression ::= relational_expression GREATER_EQUAL shift_expression */ -#line 192 "ecmascript.lemon" +#line 192 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_GREATER_EQUAL, 2); } -#line 1533 "ecmascript.c" +#line 1533 "grn_ecmascript.c" break; case 51: /* relational_expression ::= relational_expression IN shift_expression */ -#line 195 "ecmascript.lemon" +#line 195 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_IN, 2); } -#line 1540 "ecmascript.c" +#line 1540 "grn_ecmascript.c" break; case 52: /* relational_expression ::= relational_expression MATCH shift_expression */ case 130: /* adjust_match_expression ::= IDENTIFIER MATCH STRING */ yytestcase(yyruleno==130); -#line 198 "ecmascript.lemon" +#line 198 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MATCH, 2); } -#line 1548 "ecmascript.c" +#line 1548 "grn_ecmascript.c" break; case 53: /* relational_expression ::= relational_expression NEAR shift_expression */ -#line 201 "ecmascript.lemon" +#line 201 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NEAR, 2); } -#line 1555 "ecmascript.c" +#line 1555 "grn_ecmascript.c" break; case 54: /* relational_expression ::= relational_expression NEAR2 shift_expression */ -#line 204 "ecmascript.lemon" +#line 204 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NEAR2, 2); } -#line 1562 "ecmascript.c" +#line 1562 "grn_ecmascript.c" break; case 55: /* relational_expression ::= relational_expression SIMILAR shift_expression */ -#line 207 "ecmascript.lemon" +#line 207 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SIMILAR, 2); } -#line 1569 "ecmascript.c" +#line 1569 "grn_ecmascript.c" break; case 56: /* relational_expression ::= relational_expression TERM_EXTRACT shift_expression */ -#line 210 "ecmascript.lemon" +#line 210 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_TERM_EXTRACT, 2); } -#line 1576 "ecmascript.c" +#line 1576 "grn_ecmascript.c" break; case 57: /* relational_expression ::= relational_expression LCP shift_expression */ -#line 213 "ecmascript.lemon" +#line 213 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_LCP, 2); } -#line 1583 "ecmascript.c" +#line 1583 "grn_ecmascript.c" break; case 58: /* relational_expression ::= relational_expression PREFIX shift_expression */ -#line 216 "ecmascript.lemon" +#line 216 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PREFIX, 2); } -#line 1590 "ecmascript.c" +#line 1590 "grn_ecmascript.c" break; case 59: /* relational_expression ::= relational_expression SUFFIX shift_expression */ -#line 219 "ecmascript.lemon" +#line 219 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SUFFIX, 2); } -#line 1597 "ecmascript.c" +#line 1597 "grn_ecmascript.c" break; case 61: /* shift_expression ::= shift_expression SHIFTL additive_expression */ -#line 224 "ecmascript.lemon" +#line 224 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTL, 2); } -#line 1604 "ecmascript.c" +#line 1604 "grn_ecmascript.c" break; case 62: /* shift_expression ::= shift_expression SHIFTR additive_expression */ -#line 227 "ecmascript.lemon" +#line 227 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTR, 2); } -#line 1611 "ecmascript.c" +#line 1611 "grn_ecmascript.c" break; case 63: /* shift_expression ::= shift_expression SHIFTRR additive_expression */ -#line 230 "ecmascript.lemon" +#line 230 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SHIFTRR, 2); } -#line 1618 "ecmascript.c" +#line 1618 "grn_ecmascript.c" break; case 65: /* additive_expression ::= additive_expression PLUS multiplicative_expression */ case 127: /* adjuster ::= adjuster PLUS adjust_expression */ yytestcase(yyruleno==127); -#line 235 "ecmascript.lemon" +#line 235 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PLUS, 2); } -#line 1626 "ecmascript.c" +#line 1626 "grn_ecmascript.c" break; case 66: /* additive_expression ::= additive_expression MINUS multiplicative_expression */ -#line 238 "ecmascript.lemon" +#line 238 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MINUS, 2); } -#line 1633 "ecmascript.c" +#line 1633 "grn_ecmascript.c" break; case 68: /* multiplicative_expression ::= multiplicative_expression STAR unary_expression */ case 129: /* adjust_expression ::= adjust_match_expression STAR DECIMAL */ yytestcase(yyruleno==129); -#line 243 "ecmascript.lemon" +#line 243 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_STAR, 2); } -#line 1641 "ecmascript.c" +#line 1641 "grn_ecmascript.c" break; case 69: /* multiplicative_expression ::= multiplicative_expression SLASH unary_expression */ -#line 246 "ecmascript.lemon" +#line 246 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_SLASH, 2); } -#line 1648 "ecmascript.c" +#line 1648 "grn_ecmascript.c" break; case 70: /* multiplicative_expression ::= multiplicative_expression MOD unary_expression */ -#line 249 "ecmascript.lemon" +#line 249 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MOD, 2); } -#line 1655 "ecmascript.c" +#line 1655 "grn_ecmascript.c" break; case 72: /* unary_expression ::= DELETE unary_expression */ -#line 254 "ecmascript.lemon" +#line 254 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_DELETE, 1); } -#line 1662 "ecmascript.c" +#line 1662 "grn_ecmascript.c" break; case 73: /* unary_expression ::= INCR unary_expression */ -#line 257 "ecmascript.lemon" +#line 257 "grn_ecmascript.lemon" { grn_ctx *ctx = efsi->ctx; grn_expr *e = (grn_expr *)(efsi->e); @@ -1679,10 +1679,10 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_INCR, 1); } } -#line 1683 "ecmascript.c" +#line 1683 "grn_ecmascript.c" break; case 74: /* unary_expression ::= DECR unary_expression */ -#line 274 "ecmascript.lemon" +#line 274 "grn_ecmascript.lemon" { grn_ctx *ctx = efsi->ctx; grn_expr *e = (grn_expr *)(efsi->e); @@ -1700,66 +1700,66 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_DECR, 1); } } -#line 1704 "ecmascript.c" +#line 1704 "grn_ecmascript.c" break; case 75: /* unary_expression ::= PLUS unary_expression */ -#line 291 "ecmascript.lemon" +#line 291 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PLUS, 1); } -#line 1711 "ecmascript.c" +#line 1711 "grn_ecmascript.c" break; case 76: /* unary_expression ::= MINUS unary_expression */ -#line 294 "ecmascript.lemon" +#line 294 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_MINUS, 1); } -#line 1718 "ecmascript.c" +#line 1718 "grn_ecmascript.c" break; case 77: /* unary_expression ::= NOT unary_expression */ -#line 297 "ecmascript.lemon" +#line 297 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_NOT, 1); } -#line 1725 "ecmascript.c" +#line 1725 "grn_ecmascript.c" break; case 78: /* unary_expression ::= BITWISE_NOT unary_expression */ -#line 300 "ecmascript.lemon" +#line 300 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_BITWISE_NOT, 1); } -#line 1732 "ecmascript.c" +#line 1732 "grn_ecmascript.c" break; case 79: /* unary_expression ::= ADJUST unary_expression */ -#line 303 "ecmascript.lemon" +#line 303 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_ADJUST, 1); } -#line 1739 "ecmascript.c" +#line 1739 "grn_ecmascript.c" break; case 80: /* unary_expression ::= EXACT unary_expression */ -#line 306 "ecmascript.lemon" +#line 306 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_EXACT, 1); } -#line 1746 "ecmascript.c" +#line 1746 "grn_ecmascript.c" break; case 81: /* unary_expression ::= PARTIAL unary_expression */ -#line 309 "ecmascript.lemon" +#line 309 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_PARTIAL, 1); } -#line 1753 "ecmascript.c" +#line 1753 "grn_ecmascript.c" break; case 82: /* unary_expression ::= UNSPLIT unary_expression */ -#line 312 "ecmascript.lemon" +#line 312 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_UNSPLIT, 1); } -#line 1760 "ecmascript.c" +#line 1760 "grn_ecmascript.c" break; case 84: /* postfix_expression ::= lefthand_side_expression INCR */ -#line 317 "ecmascript.lemon" +#line 317 "grn_ecmascript.lemon" { grn_ctx *ctx = efsi->ctx; grn_expr *e = (grn_expr *)(efsi->e); @@ -1777,10 +1777,10 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_INCR_POST, 1); } } -#line 1781 "ecmascript.c" +#line 1781 "grn_ecmascript.c" break; case 85: /* postfix_expression ::= lefthand_side_expression DECR */ -#line 334 "ecmascript.lemon" +#line 334 "grn_ecmascript.lemon" { grn_ctx *ctx = efsi->ctx; grn_expr *e = (grn_expr *)(efsi->e); @@ -1798,51 +1798,51 @@ static void yy_reduce( grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_DECR_POST, 1); } } -#line 1802 "ecmascript.c" +#line 1802 "grn_ecmascript.c" break; case 88: /* call_expression ::= member_expression arguments */ -#line 355 "ecmascript.lemon" +#line 355 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_CALL, yymsp[0].minor.yy0); } -#line 1809 "ecmascript.c" +#line 1809 "grn_ecmascript.c" break; case 113: /* member_expression_part ::= BRACKETL expression BRACKETR */ -#line 391 "ecmascript.lemon" +#line 391 "grn_ecmascript.lemon" { grn_expr_append_op(efsi->ctx, efsi->e, GRN_OP_GET_MEMBER, 2); } -#line 1816 "ecmascript.c" +#line 1816 "grn_ecmascript.c" break; case 115: /* arguments ::= PARENL argument_list PARENR */ -#line 396 "ecmascript.lemon" +#line 396 "grn_ecmascript.lemon" { yygotominor.yy0 = yymsp[-1].minor.yy0; } -#line 1821 "ecmascript.c" +#line 1821 "grn_ecmascript.c" break; case 116: /* argument_list ::= */ -#line 397 "ecmascript.lemon" +#line 397 "grn_ecmascript.lemon" { yygotominor.yy0 = 0; } -#line 1826 "ecmascript.c" +#line 1826 "grn_ecmascript.c" break; case 117: /* argument_list ::= assignment_expression */ -#line 398 "ecmascript.lemon" +#line 398 "grn_ecmascript.lemon" { yygotominor.yy0 = 1; } -#line 1831 "ecmascript.c" +#line 1831 "grn_ecmascript.c" break; case 118: /* argument_list ::= argument_list COMMA assignment_expression */ -#line 399 "ecmascript.lemon" +#line 399 "grn_ecmascript.lemon" { yygotominor.yy0 = yymsp[-2].minor.yy0 + 1; } -#line 1836 "ecmascript.c" +#line 1836 "grn_ecmascript.c" break; case 119: /* output_columns ::= */ -#line 401 "ecmascript.lemon" +#line 401 "grn_ecmascript.lemon" { yygotominor.yy0 = 0; } -#line 1843 "ecmascript.c" +#line 1843 "grn_ecmascript.c" break; case 120: /* output_columns ::= output_column */ -#line 404 "ecmascript.lemon" +#line 404 "grn_ecmascript.lemon" { if (yymsp[0].minor.yy0) { yygotominor.yy0 = 0; @@ -1850,10 +1850,10 @@ static void yy_reduce( yygotominor.yy0 = 1; } } -#line 1854 "ecmascript.c" +#line 1854 "grn_ecmascript.c" break; case 121: /* output_columns ::= output_columns COMMA output_column */ -#line 412 "ecmascript.lemon" +#line 412 "grn_ecmascript.lemon" { if (yymsp[0].minor.yy0) { yygotominor.yy0 = yymsp[-2].minor.yy0; @@ -1864,10 +1864,10 @@ static void yy_reduce( yygotominor.yy0 = 1; } } -#line 1868 "ecmascript.c" +#line 1868 "grn_ecmascript.c" break; case 122: /* output_column ::= STAR */ -#line 423 "ecmascript.lemon" +#line 423 "grn_ecmascript.lemon" { grn_ctx *ctx = efsi->ctx; grn_obj *expr = efsi->e; @@ -1905,21 +1905,21 @@ static void yy_reduce( yygotominor.yy0 = GRN_TRUE; } } -#line 1909 "ecmascript.c" +#line 1909 "grn_ecmascript.c" break; case 123: /* output_column ::= NONEXISTENT_COLUMN */ -#line 460 "ecmascript.lemon" +#line 460 "grn_ecmascript.lemon" { yygotominor.yy0 = GRN_TRUE; } -#line 1916 "ecmascript.c" +#line 1916 "grn_ecmascript.c" break; case 124: /* output_column ::= assignment_expression */ -#line 463 "ecmascript.lemon" +#line 463 "grn_ecmascript.lemon" { yygotominor.yy0 = GRN_FALSE; } -#line 1923 "ecmascript.c" +#line 1923 "grn_ecmascript.c" break; default: /* (0) input ::= query */ yytestcase(yyruleno==0); @@ -2033,7 +2033,7 @@ static void yy_syntax_error( ){ grn_expr_parserARG_FETCH; #define TOKEN (yyminor.yy0) -#line 17 "ecmascript.lemon" +#line 17 "grn_ecmascript.lemon" { grn_ctx *ctx = efsi->ctx; @@ -2055,7 +2055,7 @@ static void yy_syntax_error( GRN_OBJ_FIN(ctx, &message); } } -#line 2059 "ecmascript.c" +#line 2059 "grn_ecmascript.c" grn_expr_parserARG_STORE; /* Suppress warning about unused %extra_argument variable */ } Renamed: lib/grn_ecmascript.h (+0 -0) 100% =================================================================== Renamed: lib/grn_ecmascript.lemon (+0 -0) 100% =================================================================== Renamed: lib/grn_error.h (+3 -3) 92% =================================================================== --- lib/error.h 2014-10-30 17:57:25 +0900 (f425e46) +++ lib/grn_error.h 2014-10-30 18:33:03 +0900 (cf348ed) @@ -18,9 +18,9 @@ #ifndef GRN_ERROR_H #define GRN_ERROR_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifdef __cplusplus extern "C" { Renamed: lib/grn_expr.h (+1 -1) 99% =================================================================== --- lib/expr.h 2014-10-30 17:57:25 +0900 (67e134e) +++ lib/grn_expr.h 2014-10-30 18:33:03 +0900 (daf0fc9) @@ -19,7 +19,7 @@ #ifndef GRN_EXPR_H #define GRN_EXPR_H -#include "db.h" +#include "grn_db.h" #ifdef __cplusplus extern "C" { Renamed: lib/grn_geo.h (+5 -5) 98% =================================================================== --- lib/geo.h 2014-10-30 17:57:25 +0900 (b1e0406) +++ lib/grn_geo.h 2014-10-30 18:33:03 +0900 (5becbe4) @@ -17,12 +17,12 @@ #ifndef GRN_GEO_H #define GRN_GEO_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ -#include "ii.h" -#include "db.h" +#include "grn_ii.h" +#include "grn_db.h" #if defined(WIN32) || defined(__sun) # define _USE_MATH_DEFINES Renamed: lib/grn_hash.h (+4 -4) 99% =================================================================== --- lib/hash.h 2014-10-30 17:57:25 +0900 (6f2e68d) +++ lib/grn_hash.h 2014-10-30 18:33:03 +0900 (5ce7d71) @@ -17,12 +17,12 @@ #ifndef GRN_HASH_H #define GRN_HASH_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifdef __cplusplus Renamed: lib/grn_ii.h (+6 -6) 98% =================================================================== --- lib/ii.h 2014-10-30 17:57:25 +0900 (877200f) +++ lib/grn_ii.h 2014-10-30 18:33:03 +0900 (20bafe1) @@ -19,20 +19,20 @@ /* "ii" is for inverted index */ -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_HASH_H -#include "hash.h" +#include "grn_hash.h" #endif /* GRN_HASH_H */ #ifndef GRN_IO_H -#include "io.h" +#include "grn_io.h" #endif /* GRN_IO_H */ #ifndef GRN_STORE_H -#include "store.h" +#include "grn_store.h" #endif /* GRN_STORE_H */ #ifdef __cplusplus Renamed: lib/grn_io.h (+4 -4) 99% =================================================================== --- lib/io.h 2014-10-30 17:57:25 +0900 (833c1ef) +++ lib/grn_io.h 2014-10-30 18:33:03 +0900 (fed0f25) @@ -17,12 +17,12 @@ #ifndef GRN_IO_H #define GRN_IO_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_ERROR_H -#include "error.h" +#include "grn_error.h" #endif /* GRN_ERROR_H */ #ifdef __cplusplus Renamed: lib/grn_mrb.h (+2 -2) 96% =================================================================== --- lib/mrb.h 2014-10-30 17:57:25 +0900 (fe51e5e) +++ lib/grn_mrb.h 2014-10-30 18:33:03 +0900 (b12fd6b) @@ -19,8 +19,8 @@ #ifndef GRN_MRB_H #define GRN_MRB_H -#include "groonga_in.h" -#include "ctx.h" +#include "grn.h" +#include "grn_ctx.h" #ifdef GRN_WITH_MRUBY # include <mruby.h> Renamed: lib/grn_normalizer.h (+8 -8) 86% =================================================================== --- lib/normalizer_in.h 2014-10-30 17:57:25 +0900 (201c789) +++ lib/grn_normalizer.h 2014-10-30 18:33:03 +0900 (1ed12a7) @@ -15,19 +15,19 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_NORMALIZER_IN_H -#define GRN_NORMALIZER_IN_H +#ifndef GRN_NORMALIZER_H +#define GRN_NORMALIZER_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_DB_H -#include "db.h" +#include "grn_db.h" #endif /* GRN_DB_H */ #ifdef __cplusplus @@ -49,4 +49,4 @@ grn_rc grn_db_init_builtin_normalizers(grn_ctx *ctx); } #endif -#endif /* GRN_NORMALIZER_IN_H */ +#endif /* GRN_NORMALIZER_H */ Renamed: lib/grn_output.h (+6 -6) 96% =================================================================== --- lib/output.h 2014-10-30 17:57:25 +0900 (7c8a3f7) +++ lib/grn_output.h 2014-10-30 18:33:03 +0900 (2892b5b) @@ -17,20 +17,20 @@ #ifndef GRN_OUTPUT_H #define GRN_OUTPUT_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_STORE_H -#include "store.h" +#include "grn_store.h" #endif /* GRN_STORE_H */ #ifndef GRN_CTX_IMPL_H -#include "ctx_impl.h" +#include "grn_ctx_impl.h" #endif /* GRN_CTX_IMPL_H */ #ifdef __cplusplus Renamed: lib/grn_pat.h (+5 -5) 96% =================================================================== --- lib/pat.h 2014-10-30 17:57:25 +0900 (d2d1032) +++ lib/grn_pat.h 2014-10-30 18:33:03 +0900 (882d869) @@ -17,12 +17,12 @@ #ifndef GRN_PAT_H #define GRN_PAT_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ -#include "db.h" -#include "hash.h" +#include "grn_db.h" +#include "grn_hash.h" #ifdef __cplusplus extern "C" { Renamed: lib/grn_plugin.h (+8 -8) 89% =================================================================== --- lib/plugin_in.h 2014-10-30 17:57:25 +0900 (6f98308) +++ lib/grn_plugin.h 2014-10-30 18:33:03 +0900 (841ca6d) @@ -14,19 +14,19 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_PLUGIN_IN_H -#define GRN_PLUGIN_IN_H +#ifndef GRN_PLUGIN_H +#define GRN_PLUGIN_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_STORE_H -#include "store.h" +#include "grn_store.h" #endif /* GRN_STORE_H */ #ifdef __cplusplus @@ -65,4 +65,4 @@ char *grn_plugin_find_path(grn_ctx *ctx, const char *name); } #endif -#endif /* GRN_PLUGIN_IN_H */ +#endif /* GRN_PLUGIN_H */ Renamed: lib/grn_proc.h (+3 -3) 93% =================================================================== --- lib/proc.h 2014-10-30 17:57:25 +0900 (1f7f81d) +++ lib/grn_proc.h 2014-10-30 18:33:03 +0900 (340904d) @@ -17,9 +17,9 @@ #ifndef GRN_PROC_H #define GRN_PROC_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifdef __cplusplus extern "C" { Renamed: lib/grn_snip.h (+5 -5) 96% =================================================================== --- lib/snip.h 2014-10-30 17:57:25 +0900 (7a25292) +++ lib/grn_snip.h 2014-10-30 18:33:03 +0900 (7c123e0) @@ -17,15 +17,15 @@ #ifndef GRN_SNIP_H #define GRN_SNIP_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_STR_H -#include "str.h" +#include "grn_str.h" #endif /* GRN_STR_H */ -#include "db.h" +#include "grn_db.h" #define ASIZE 256U #define MAX_SNIP_TAG_COUNT 512U Renamed: lib/grn_store.h (+6 -6) 97% =================================================================== --- lib/store.h 2014-10-30 17:57:25 +0900 (719fe77) +++ lib/grn_store.h 2014-10-30 18:33:03 +0900 (abe2c2c) @@ -17,20 +17,20 @@ #ifndef GRN_STORE_H #define GRN_STORE_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_HASH_H -#include "hash.h" +#include "grn_hash.h" #endif /* GRN_HASH_H */ #ifndef GRN_IO_H -#include "io.h" +#include "grn_io.h" #endif /* GRN_IO_H */ #ifdef __cplusplus Renamed: lib/grn_str.h (+3 -3) 98% =================================================================== --- lib/str.h 2014-10-30 17:57:25 +0900 (069250a) +++ lib/grn_str.h 2014-10-30 18:33:03 +0900 (af7a604) @@ -17,9 +17,9 @@ #ifndef GRN_STR_H #define GRN_STR_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_NFKC_H #include <groonga/nfkc.h> Renamed: lib/grn_string.h (+8 -8) 89% =================================================================== --- lib/string_in.h 2014-10-30 17:57:25 +0900 (55e2cb2) +++ lib/grn_string.h 2014-10-30 18:33:03 +0900 (bb5905c) @@ -20,21 +20,21 @@ #ifndef GRN_STRING_H #define GRN_STRING_H -#ifndef GROONGA_IN_H -# include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +# include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -# include "ctx.h" +# include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_DB_H -# include "db.h" +# include "grn_db.h" #endif /* GRN_DB_H */ #ifndef GRN_STR_H -# include "str.h" -#endif /* GRN_STR_IN_H */ +# include "grn_str.h" +#endif /* GRN_STR_H */ #ifdef __cplusplus extern "C" { @@ -62,4 +62,4 @@ grn_rc grn_string_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *string); } #endif -#endif /* GRN_STRING_IN_H */ +#endif /* GRN_STRING_H */ Renamed: lib/grn_token.h (+6 -6) 95% =================================================================== --- lib/token.h 2014-10-30 17:57:25 +0900 (8689307) +++ lib/grn_token.h 2014-10-30 18:33:03 +0900 (6af68a8) @@ -17,20 +17,20 @@ #ifndef GRN_TOKEN_H #define GRN_TOKEN_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifndef GRN_DB_H -#include "db.h" +#include "grn_db.h" #endif /* GRN_DB_H */ #ifndef GRN_STR_H -#include "str.h" +#include "grn_str.h" #endif /* GRN_STR_H */ #include <groonga/tokenizer.h> Renamed: lib/grn_util.h (+4 -4) 94% =================================================================== --- lib/util.h 2014-10-30 17:57:25 +0900 (b4dbb00) +++ lib/grn_util.h 2014-10-30 18:33:03 +0900 (e9c3f17) @@ -17,12 +17,12 @@ #ifndef GRN_UTIL_H #define GRN_UTIL_H -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #ifndef GRN_CTX_H -#include "ctx.h" +#include "grn_ctx.h" #endif /* GRN_CTX_H */ #ifdef __cplusplus Modified: lib/hash.c (+4 -4) =================================================================== --- lib/hash.c 2014-10-30 17:57:25 +0900 (fa5854a) +++ lib/hash.c 2014-10-30 18:33:03 +0900 (22491c5) @@ -15,13 +15,13 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hash.h" -#include "output.h" +#include "grn_hash.h" +#include "grn_output.h" #include <string.h> #include <limits.h> -#include "store.h" -#include "normalizer_in.h" +#include "grn_store.h" +#include "grn_normalizer.h" /* grn_tiny_array */ Modified: lib/ii.c (+8 -8) =================================================================== --- lib/ii.c 2014-10-30 17:57:25 +0900 (f859627) +++ lib/ii.c 2014-10-30 18:33:03 +0900 (92623a7) @@ -14,19 +14,19 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <stdio.h> #include <fcntl.h> #include <string.h> #include <sys/stat.h> -#include "ii.h" -#include "ctx_impl.h" -#include "token.h" -#include "pat.h" -#include "db.h" -#include "output.h" -#include "util.h" +#include "grn_ii.h" +#include "grn_ctx_impl.h" +#include "grn_token.h" +#include "grn_pat.h" +#include "grn_db.h" +#include "grn_output.h" +#include "grn_util.h" #define MAX_PSEG 0x20000 #define S_CHUNK (1 << GRN_II_W_CHUNK) Modified: lib/io.c (+6 -6) =================================================================== --- lib/io.c 2014-10-30 17:57:25 +0900 (87761da) +++ lib/io.c 2014-10-30 18:33:03 +0900 (166e046) @@ -15,7 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <stdio.h> @@ -26,11 +26,11 @@ #include <string.h> #include <sys/stat.h> -#include "ctx.h" -#include "io.h" -#include "plugin_in.h" -#include "hash.h" -#include "ctx_impl.h" +#include "grn_ctx.h" +#include "grn_io.h" +#include "grn_plugin.h" +#include "grn_hash.h" +#include "grn_ctx_impl.h" #define GRN_IO_IDSTR "GROONGA:IO:00001" Modified: lib/mrb.c (+2 -2) =================================================================== --- lib/mrb.c 2014-10-30 17:57:25 +0900 (f05949c) +++ lib/mrb.c 2014-10-30 18:33:03 +0900 (184e177) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "mrb.h" -#include "ctx_impl.h" +#include "grn_mrb.h" +#include "grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY # include <mruby/proc.h> Modified: lib/mrb/mrb_accessor.c (+2 -2) =================================================================== --- lib/mrb/mrb_accessor.c 2014-10-30 17:57:25 +0900 (a350c6b) +++ lib/mrb/mrb_accessor.c 2014-10-30 18:33:03 +0900 (bd288af) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -24,7 +24,7 @@ #include <mruby/variable.h> #include <mruby/data.h> -#include "../db.h" +#include "../grn_db.h" #include "mrb_accessor.h" static struct mrb_data_type mrb_grn_accessor_type = { Modified: lib/mrb/mrb_accessor.h (+2 -2) =================================================================== --- lib/mrb/mrb_accessor.h 2014-10-30 17:57:25 +0900 (2aaf32f) +++ lib/mrb/mrb_accessor.h 2014-10-30 18:33:03 +0900 (7b27e63) @@ -19,8 +19,8 @@ #ifndef GRN_MRB_ACCESSOR_H #define GRN_MRB_ACCESSOR_H -#include "../ctx.h" -#include "../db.h" +#include "../grn_ctx.h" +#include "../grn_db.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_bulk.c (+2 -2) =================================================================== --- lib/mrb/mrb_bulk.c 2014-10-30 17:57:25 +0900 (ad428ea) +++ lib/mrb/mrb_bulk.c 2014-10-30 18:33:03 +0900 (41647c3) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -25,7 +25,7 @@ #include <mruby/data.h> #include <mruby/numeric.h> -#include "../db.h" +#include "../grn_db.h" #include "mrb_bulk.h" static struct mrb_data_type mrb_grn_bulk_type = { Modified: lib/mrb/mrb_bulk.h (+2 -2) =================================================================== --- lib/mrb/mrb_bulk.h 2014-10-30 17:57:25 +0900 (3be8658) +++ lib/mrb/mrb_bulk.h 2014-10-30 18:33:03 +0900 (26e2c11) @@ -19,8 +19,8 @@ #ifndef GRN_MRB_BULK_H #define GRN_MRB_BULK_H -#include "../ctx.h" -#include "../db.h" +#include "../grn_ctx.h" +#include "../grn_db.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_column.c (+1 -1) =================================================================== --- lib/mrb/mrb_column.c 2014-10-30 17:57:25 +0900 (545f070) +++ lib/mrb/mrb_column.c 2014-10-30 18:33:03 +0900 (9609a18) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_column.h (+1 -1) =================================================================== --- lib/mrb/mrb_column.h 2014-10-30 17:57:25 +0900 (77e0dab) +++ lib/mrb/mrb_column.h 2014-10-30 18:33:03 +0900 (abb9991) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_COLUMN_H #define GRN_MRB_COLUMN_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_converter.c (+1 -1) =================================================================== --- lib/mrb/mrb_converter.c 2014-10-30 17:57:25 +0900 (2e7c41e) +++ lib/mrb/mrb_converter.c 2014-10-30 18:33:03 +0900 (2231c69) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_converter.h (+1 -1) =================================================================== --- lib/mrb/mrb_converter.h 2014-10-30 17:57:25 +0900 (27223a8) +++ lib/mrb/mrb_converter.h 2014-10-30 18:33:03 +0900 (422ecb6) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_CONVERTER_H #define GRN_MRB_CONVERTER_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_ctx.c (+2 -2) =================================================================== --- lib/mrb/mrb_ctx.c 2014-10-30 17:57:25 +0900 (64d6c18) +++ lib/mrb/mrb_ctx.c 2014-10-30 18:33:03 +0900 (00d29cb) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -25,7 +25,7 @@ #include <mruby/variable.h> #include <mruby/string.h> -#include "../mrb.h" +#include "../grn_mrb.h" #include "mrb_ctx.h" #include "mrb_converter.h" Modified: lib/mrb/mrb_ctx.h (+1 -1) =================================================================== --- lib/mrb/mrb_ctx.h 2014-10-30 17:57:25 +0900 (5068d0d) +++ lib/mrb/mrb_ctx.h 2014-10-30 18:33:03 +0900 (95df81d) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_CTX_H #define GRN_MRB_CTX_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_error.c (+2 -2) =================================================================== --- lib/mrb/mrb_error.c 2014-10-30 17:57:25 +0900 (39ce63a) +++ lib/mrb/mrb_error.c 2014-10-30 18:33:03 +0900 (39d34bf) @@ -16,12 +16,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> -#include "../mrb.h" +#include "../grn_mrb.h" #include "mrb_error.h" void Modified: lib/mrb/mrb_error.h (+1 -1) =================================================================== --- lib/mrb/mrb_error.h 2014-10-30 17:57:25 +0900 (c59fabc) +++ lib/mrb/mrb_error.h 2014-10-30 18:33:03 +0900 (c68c58f) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_ERROR_H #define GRN_MRB_ERROR_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_expr.c (+4 -4) =================================================================== --- lib/mrb/mrb_expr.c 2014-10-30 17:57:25 +0900 (3d0499c) +++ lib/mrb/mrb_expr.c 2014-10-30 18:33:03 +0900 (d02d86e) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -26,9 +26,9 @@ #include <mruby/string.h> #include <mruby/array.h> -#include "../expr.h" -#include "../util.h" -#include "../mrb.h" +#include "../grn_expr.h" +#include "../grn_util.h" +#include "../grn_mrb.h" #include "mrb_accessor.h" #include "mrb_ctx.h" #include "mrb_expr.h" Modified: lib/mrb/mrb_expr.h (+2 -2) =================================================================== --- lib/mrb/mrb_expr.h 2014-10-30 17:57:25 +0900 (7fd5c66) +++ lib/mrb/mrb_expr.h 2014-10-30 18:33:03 +0900 (687565d) @@ -19,8 +19,8 @@ #ifndef GRN_MRB_EXPR_H #define GRN_MRB_EXPR_H -#include "../ctx.h" -#include "../expr.h" +#include "../grn_ctx.h" +#include "../grn_expr.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_fixed_size_column.c (+1 -1) =================================================================== --- lib/mrb/mrb_fixed_size_column.c 2014-10-30 17:57:25 +0900 (d8df913) +++ lib/mrb/mrb_fixed_size_column.c 2014-10-30 18:33:03 +0900 (1302250) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_fixed_size_column.h (+1 -1) =================================================================== --- lib/mrb/mrb_fixed_size_column.h 2014-10-30 17:57:25 +0900 (938dcd7) +++ lib/mrb/mrb_fixed_size_column.h 2014-10-30 18:33:03 +0900 (1037716) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_FIXED_SIZE_COLUMN_H #define GRN_MRB_FIXED_SIZE_COLUMN_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_id.c (+1 -1) =================================================================== --- lib/mrb/mrb_id.c 2014-10-30 17:57:25 +0900 (aa907b8) +++ lib/mrb/mrb_id.c 2014-10-30 18:33:03 +0900 (507bb0e) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_id.h (+1 -1) =================================================================== --- lib/mrb/mrb_id.h 2014-10-30 17:57:25 +0900 (f5b4435) +++ lib/mrb/mrb_id.h 2014-10-30 18:33:03 +0900 (fcfd803) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_ID_H #define GRN_MRB_ID_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_index_column.c (+1 -1) =================================================================== --- lib/mrb/mrb_index_column.c 2014-10-30 17:57:25 +0900 (7bdf752) +++ lib/mrb/mrb_index_column.c 2014-10-30 18:33:03 +0900 (d91aa57) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_index_column.h (+1 -1) =================================================================== --- lib/mrb/mrb_index_column.h 2014-10-30 17:57:25 +0900 (10e0589) +++ lib/mrb/mrb_index_column.h 2014-10-30 18:33:03 +0900 (307448f) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_INDEX_COLUMN_H #define GRN_MRB_INDEX_COLUMN_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_logger.c (+2 -2) =================================================================== --- lib/mrb/mrb_logger.c 2014-10-30 17:57:25 +0900 (4917694) +++ lib/mrb/mrb_logger.c 2014-10-30 18:33:03 +0900 (884ca76) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -25,7 +25,7 @@ #include <mruby/variable.h> #include <mruby/string.h> -#include "../mrb.h" +#include "../grn_mrb.h" #include "mrb_logger.h" static mrb_value Modified: lib/mrb/mrb_logger.h (+1 -1) =================================================================== --- lib/mrb/mrb_logger.h 2014-10-30 17:57:25 +0900 (5bfb62e) +++ lib/mrb/mrb_logger.h 2014-10-30 18:33:03 +0900 (358313b) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_LOGGER_H #define GRN_MRB_LOGGER_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_obj.c (+3 -3) =================================================================== --- lib/mrb/mrb_obj.c 2014-10-30 17:57:25 +0900 (142a242) +++ lib/mrb/mrb_obj.c 2014-10-30 18:33:03 +0900 (dc7d045) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" -#include "../util.h" +#include "../grn_ctx_impl.h" +#include "../grn_util.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -25,7 +25,7 @@ #include <mruby/class.h> #include <mruby/data.h> -#include "../mrb.h" +#include "../grn_mrb.h" #include "mrb_obj.h" #include "mrb_converter.h" Modified: lib/mrb/mrb_obj.h (+1 -1) =================================================================== --- lib/mrb/mrb_obj.h 2014-10-30 17:57:25 +0900 (31d5324) +++ lib/mrb/mrb_obj.h 2014-10-30 18:33:03 +0900 (b021d97) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_OBJ_H #define GRN_MRB_OBJ_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_operator.c (+1 -1) =================================================================== --- lib/mrb/mrb_operator.c 2014-10-30 17:57:25 +0900 (5a18d2e) +++ lib/mrb/mrb_operator.c 2014-10-30 18:33:03 +0900 (ca2fc74) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_operator.h (+1 -1) =================================================================== --- lib/mrb/mrb_operator.h 2014-10-30 17:57:25 +0900 (2650cc9) +++ lib/mrb/mrb_operator.h 2014-10-30 18:33:03 +0900 (683b9da) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_OPERATOR_H #define GRN_MRB_OPERATOR_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_procedure.c (+1 -1) =================================================================== --- lib/mrb/mrb_procedure.c 2014-10-30 17:57:25 +0900 (fa9c677) +++ lib/mrb/mrb_procedure.c 2014-10-30 18:33:03 +0900 (4b69573) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_procedure.h (+1 -1) =================================================================== --- lib/mrb/mrb_procedure.h 2014-10-30 17:57:25 +0900 (16a4b32) +++ lib/mrb/mrb_procedure.h 2014-10-30 18:33:03 +0900 (36bd10f) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_PROCEDURE_H #define GRN_MRB_PROCEDURE_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_variable_size_column.c (+1 -1) =================================================================== --- lib/mrb/mrb_variable_size_column.c 2014-10-30 17:57:25 +0900 (9073b32) +++ lib/mrb/mrb_variable_size_column.c 2014-10-30 18:33:03 +0900 (153b280) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> Modified: lib/mrb/mrb_variable_size_column.h (+1 -1) =================================================================== --- lib/mrb/mrb_variable_size_column.h 2014-10-30 17:57:25 +0900 (d120f73) +++ lib/mrb/mrb_variable_size_column.h 2014-10-30 18:33:03 +0900 (c904e70) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_VARIABLE_SIZE_COLUMN_H #define GRN_MRB_VARIABLE_SIZE_COLUMN_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/mrb/mrb_void.c (+2 -2) =================================================================== --- lib/mrb/mrb_void.c 2014-10-30 17:57:25 +0900 (976c472) +++ lib/mrb/mrb_void.c 2014-10-30 18:33:03 +0900 (bdc4519) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../ctx_impl.h" +#include "../grn_ctx_impl.h" #ifdef GRN_WITH_MRUBY #include <mruby.h> @@ -24,7 +24,7 @@ #include <mruby/variable.h> #include <mruby/data.h> -#include "../db.h" +#include "../grn_db.h" #include "mrb_void.h" static struct mrb_data_type mrb_grn_void_type = { Modified: lib/mrb/mrb_void.h (+1 -1) =================================================================== --- lib/mrb/mrb_void.h 2014-10-30 17:57:25 +0900 (a766cec) +++ lib/mrb/mrb_void.h 2014-10-30 18:33:03 +0900 (474d780) @@ -19,7 +19,7 @@ #ifndef GRN_MRB_VOID_H #define GRN_MRB_VOID_H -#include "../ctx.h" +#include "../grn_ctx.h" #ifdef __cplusplus extern "C" { Modified: lib/normalizer.c (+2 -2) =================================================================== --- lib/normalizer.c 2014-10-30 17:57:25 +0900 (04719bd) +++ lib/normalizer.c 2014-10-30 18:33:03 +0900 (27d34a4) @@ -18,8 +18,8 @@ #include <string.h> -#include "normalizer_in.h" -#include "string_in.h" +#include "grn_normalizer.h" +#include "grn_string.h" #include <groonga/normalizer.h> #include <groonga/tokenizer.h> Modified: lib/output.c (+7 -7) =================================================================== --- lib/output.c 2014-10-30 17:57:25 +0900 (9b745c8) +++ lib/output.c 2014-10-30 18:33:03 +0900 (fb6bc02) @@ -15,15 +15,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_IN_H -#include "groonga_in.h" -#endif /* GROONGA_IN_H */ +#ifndef GRN_H +#include "grn.h" +#endif /* GRN_H */ #include <string.h> -#include "str.h" -#include "db.h" -#include "util.h" -#include "output.h" +#include "grn_str.h" +#include "grn_db.h" +#include "grn_util.h" +#include "grn_output.h" #define LEVELS (&ctx->impl->levels) #define DEPTH (GRN_BULK_VSIZE(LEVELS)>>2) Modified: lib/pat.c (+5 -5) =================================================================== --- lib/pat.c 2014-10-30 17:57:25 +0900 (25afb7e) +++ lib/pat.c 2014-10-30 18:33:03 +0900 (add8469) @@ -14,13 +14,13 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <string.h> #include <limits.h> -#include "pat.h" -#include "output.h" -#include "util.h" -#include "normalizer_in.h" +#include "grn_pat.h" +#include "grn_output.h" +#include "grn_util.h" +#include "grn_normalizer.h" #define GRN_PAT_DELETED (GRN_ID_MAX + 1) Modified: lib/plugin.c (+6 -6) =================================================================== --- lib/plugin.c 2014-10-30 17:57:25 +0900 (9d9693f) +++ lib/plugin.c 2014-10-30 18:33:03 +0900 (475c862) @@ -15,17 +15,17 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" -#include "groonga/plugin.h" +#include "grn.h" +#include <groonga/plugin.h> #include <stdarg.h> #include <stdio.h> #include <string.h> -#include "db.h" -#include "plugin_in.h" -#include "ctx_impl.h" -#include "util.h" +#include "grn_db.h" +#include "grn_plugin.h" +#include "grn_ctx_impl.h" +#include "grn_util.h" static grn_hash *grn_plugins = NULL; static grn_critical_section grn_plugins_lock; Modified: lib/proc.c (+9 -9) =================================================================== --- lib/proc.c 2014-10-30 17:57:25 +0900 (3d159ee) +++ lib/proc.c 2014-10-30 18:33:03 +0900 (dd08610) @@ -16,15 +16,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "proc.h" -#include "ii.h" -#include "db.h" -#include "util.h" -#include "output.h" -#include "pat.h" -#include "geo.h" -#include "token.h" -#include "expr.h" +#include "grn_proc.h" +#include "grn_ii.h" +#include "grn_db.h" +#include "grn_util.h" +#include "grn_output.h" +#include "grn_pat.h" +#include "grn_geo.h" +#include "grn_token.h" +#include "grn_expr.h" #include <string.h> #include <float.h> Modified: lib/snip.c (+3 -3) =================================================================== --- lib/snip.c 2014-10-30 17:57:25 +0900 (78c6ef5) +++ lib/snip.c 2014-10-30 18:33:03 +0900 (739ee34) @@ -14,11 +14,11 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <string.h> #include <stddef.h> -#include "snip.h" -#include "ctx.h" +#include "grn_snip.h" +#include "grn_ctx.h" #if !defined MAX #define MAX(a, b) ((a) > (b) ? (a) : (b)) Modified: lib/sources.am (+25 -25) =================================================================== --- lib/sources.am 2014-10-30 17:57:25 +0900 (8b37108) +++ lib/sources.am 2014-10-30 18:33:03 +0900 (2812faf) @@ -1,52 +1,52 @@ libgroonga_la_SOURCES = \ com.c \ - com.h \ + grn_com.h \ ctx.c \ - ctx.h \ - ctx_impl.h \ + grn_ctx.h \ + grn_ctx_impl.h \ ctx_impl_mrb.c \ - ctx_impl_mrb.h \ + grn_ctx_impl_mrb.h \ dat.cpp \ - dat.h \ + grn_dat.h \ db.c \ - db.h \ + grn_db.h \ error.c \ - error.h \ + grn_error.h \ expr.c \ - expr.h \ + grn_expr.h \ geo.c \ - geo.h \ - groonga_in.h \ + grn_geo.h \ + grn.h \ hash.c \ - hash.h \ + grn_hash.h \ ii.c \ - ii.h \ + grn_ii.h \ io.c \ - io.h \ + grn_io.h \ mrb.c \ - mrb.h \ + grn_mrb.h \ nfkc.c \ normalizer.c \ - normalizer_in.h \ + grn_normalizer.h \ output.c \ - output.h \ + grn_output.h \ pat.c \ - pat.h \ + grn_pat.h \ plugin.c \ - plugin_in.h \ + grn_plugin.h \ proc.c \ - proc.h \ + grn_proc.h \ snip.c \ - snip.h \ + grn_snip.h \ store.c \ - store.h \ + grn_store.h \ str.c \ - str.h \ + grn_str.h \ string.c \ - string_in.h \ + grn_string.h \ token.c \ - token.h \ + grn_token.h \ tokenizer.c \ token_filter.c \ util.c \ - util.h + grn_util.h Modified: lib/store.c (+5 -5) =================================================================== --- lib/store.c 2014-10-30 17:57:25 +0900 (21f2957) +++ lib/store.c 2014-10-30 18:33:03 +0900 (a88fbc1) @@ -14,11 +14,11 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" -#include "str.h" -#include "store.h" -#include "ctx_impl.h" -#include "output.h" +#include "grn.h" +#include "grn_str.h" +#include "grn_store.h" +#include "grn_ctx_impl.h" +#include "grn_output.h" #include <string.h> /* rectangular arrays */ Modified: lib/str.c (+3 -3) =================================================================== --- lib/str.c 2014-10-30 17:57:25 +0900 (ea40e25) +++ lib/str.c 2014-10-30 18:33:03 +0900 (f6096cf) @@ -14,13 +14,13 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <limits.h> #include <stdio.h> #include <stdarg.h> #include <string.h> -#include "db.h" -#include "str.h" +#include "grn_db.h" +#include "grn_str.h" #ifndef _ISOC99_SOURCE #define _ISOC99_SOURCE Modified: lib/string.c (+5 -5) =================================================================== --- lib/string.c 2014-10-30 17:57:25 +0900 (f0fcf56) +++ lib/string.c 2014-10-30 18:33:03 +0900 (132d512) @@ -16,12 +16,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <string.h> -#include "string_in.h" -#include "normalizer_in.h" -#include "str.h" -#include "util.h" +#include "grn_string.h" +#include "grn_normalizer.h" +#include "grn_str.h" +#include "grn_util.h" #include <groonga/tokenizer.h> Modified: lib/token.c (+8 -8) =================================================================== --- lib/token.c 2014-10-30 17:57:25 +0900 (00b3de2) +++ lib/token.c 2014-10-30 18:33:03 +0900 (f9bb289) @@ -15,16 +15,16 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" +#include "grn.h" #include <string.h> #include <ctype.h> -#include "ctx_impl.h" -#include "token.h" -#include "pat.h" -#include "dat.h" -#include "hash.h" -#include "string_in.h" -#include "plugin_in.h" +#include "grn_ctx_impl.h" +#include "grn_token.h" +#include "grn_pat.h" +#include "grn_dat.h" +#include "grn_hash.h" +#include "grn_string.h" +#include "grn_plugin.h" #include <groonga/tokenizer.h> grn_obj *grn_token_uvector = NULL; Modified: lib/token_filter.c (+2 -2) =================================================================== --- lib/token_filter.c 2014-10-30 17:57:25 +0900 (910bb9a) +++ lib/token_filter.c 2014-10-30 18:33:03 +0900 (c57650c) @@ -18,8 +18,8 @@ #include <string.h> -#include "groonga_in.h" -#include "db.h" +#include "grn.h" +#include "grn_db.h" #include <groonga/token_filter.h> grn_rc Modified: lib/tokenizer.c (+7 -7) =================================================================== --- lib/tokenizer.c 2014-10-30 17:57:25 +0900 (ac4628b) +++ lib/tokenizer.c 2014-10-30 18:33:03 +0900 (42affce) @@ -15,18 +15,18 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "groonga_in.h" -#include "groonga/tokenizer.h" +#include "grn.h" +#include <groonga/tokenizer.h> #include <stdarg.h> #include <stdio.h> #include <string.h> -#include "ctx.h" -#include "db.h" -#include "str.h" -#include "string_in.h" -#include "token.h" +#include "grn_ctx.h" +#include "grn_db.h" +#include "grn_str.h" +#include "grn_string.h" +#include "grn_token.h" /* Just for backward compatibility. See grn_plugin_charlen() instead. Modified: lib/util.c (+5 -5) =================================================================== --- lib/util.c 2014-10-30 17:57:25 +0900 (7455e10) +++ lib/util.c 2014-10-30 18:33:03 +0900 (e1e28a1) @@ -15,11 +15,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db.h" -#include "pat.h" -#include "ii.h" -#include "util.h" -#include "string_in.h" +#include "grn_db.h" +#include "grn_pat.h" +#include "grn_ii.h" +#include "grn_util.h" +#include "grn_string.h" #include <string.h> #include <stdio.h> Modified: plugins/query_expanders/tsv.c (+1 -1) =================================================================== --- plugins/query_expanders/tsv.c 2014-10-30 17:57:25 +0900 (6b1fc51) +++ plugins/query_expanders/tsv.c 2014-10-30 18:33:03 +0900 (98e62ba) @@ -20,7 +20,7 @@ /* groonga's internal headers */ /* for grn_text_fgets(): We don't want to require stdio.h for groonga.h. What should we do? Should we split header file such as groonga/stdio.h? */ -#include <str.h> +#include <grn_str.h> #include <stdio.h> #include <string.h> Modified: plugins/suggest/suggest.c (+5 -5) =================================================================== --- plugins/suggest/suggest.c 2014-10-30 17:57:25 +0900 (5dc50f7) +++ plugins/suggest/suggest.c 2014-10-30 18:33:03 +0900 (47a1fc0) @@ -15,11 +15,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ctx.h" -#include "db.h" -#include "ii.h" -#include "token.h" -#include "output.h" +#include "grn_ctx.h" +#include "grn_db.h" +#include "grn_ii.h" +#include "grn_token.h" +#include "grn_output.h" #include <groonga/plugin.h> #include <string.h> Modified: plugins/table/table.c (+4 -4) =================================================================== --- plugins/table/table.c 2014-10-30 17:57:25 +0900 (a4fcd17) +++ plugins/table/table.c 2014-10-30 18:33:03 +0900 (3b0c09d) @@ -17,10 +17,10 @@ #include <string.h> -#include "ctx.h" -#include "db.h" -#include "output.h" -#include "util.h" +#include "grn_ctx.h" +#include "grn_db.h" +#include "grn_output.h" +#include "grn_util.h" #include <groonga/plugin.h> #define VAR GRN_PROC_GET_VAR_BY_OFFSET Modified: plugins/token_filters/stem.c (+1 -1) =================================================================== --- plugins/token_filters/stem.c 2014-10-30 17:57:25 +0900 (11465f1) +++ plugins/token_filters/stem.c 2014-10-30 18:33:03 +0900 (c3bb46a) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <str.h> +#include <grn_str.h> #include <groonga.h> #include <groonga/token_filter.h> Modified: plugins/token_filters/stop_word.c (+1 -1) =================================================================== --- plugins/token_filters/stop_word.c 2014-10-30 17:57:25 +0900 (21451f0) +++ plugins/token_filters/stop_word.c 2014-10-30 18:33:03 +0900 (91ae235) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <str.h> +#include <grn_str.h> #include <groonga.h> #include <groonga/token_filter.h> Modified: plugins/tokenizers/mecab.c (+1 -1) =================================================================== --- plugins/tokenizers/mecab.c 2014-10-30 17:57:25 +0900 (4ac99f9) +++ plugins/tokenizers/mecab.c 2014-10-30 18:33:03 +0900 (0edd9ac) @@ -15,7 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <str.h> +#include <grn_str.h> #include <groonga.h> #include <groonga/tokenizer.h> Modified: src/grnslap.c (+2 -2) =================================================================== --- src/grnslap.c 2014-10-30 17:57:25 +0900 (5400fbb) +++ src/grnslap.c 2014-10-30 18:33:03 +0900 (88bf168) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib/com.h" -#include "lib/ctx_impl.h" +#include "lib/grn_com.h" +#include "lib/grn_ctx_impl.h" #include <string.h> #include <stdio.h> #ifdef HAVE_SYS_WAIT_H Modified: src/groonga.c (+6 -6) =================================================================== --- src/groonga.c 2014-10-30 17:57:25 +0900 (49e9821) +++ src/groonga.c 2014-10-30 18:33:03 +0900 (002b914) @@ -19,13 +19,13 @@ #ifdef WIN32 # define GROONGA_MAIN #endif /* WIN32 */ -#include "lib/groonga_in.h" +#include "lib/grn.h" -#include "lib/com.h" -#include "lib/ctx_impl.h" -#include "lib/proc.h" -#include "lib/db.h" -#include "lib/util.h" +#include "lib/grn_com.h" +#include "lib/grn_ctx_impl.h" +#include "lib/grn_proc.h" +#include "lib/grn_db.h" +#include "lib/grn_util.h" #include <string.h> #include <stdio.h> #include <ctype.h> Modified: src/groonga_benchmark.c (+3 -3) =================================================================== --- src/groonga_benchmark.c 2014-10-30 17:57:25 +0900 (6157517) +++ src/groonga_benchmark.c 2014-10-30 18:33:03 +0900 (ec87246) @@ -37,9 +37,9 @@ #include <netinet/in.h> #endif /* HAVE_NETINET_IN_H */ -#include "lib/str.h" -#include "lib/com.h" -#include "lib/db.h" +#include "lib/grn_str.h" +#include "lib/grn_com.h" +#include "lib/grn_db.h" #ifdef WIN32 #include <windows.h> Modified: src/suggest/groonga_suggest_create_dataset.c (+1 -1) =================================================================== --- src/suggest/groonga_suggest_create_dataset.c 2014-10-30 17:57:25 +0900 (35f2cd0) +++ src/suggest/groonga_suggest_create_dataset.c 2014-10-30 18:33:03 +0900 (d566d24) @@ -21,7 +21,7 @@ #include <groonga.h> /* For grn_str_getopt() */ -#include <str.h> +#include <grn_str.h> typedef enum { MODE_NONE, Modified: src/suggest/groonga_suggest_httpd.c (+1 -1) =================================================================== --- src/suggest/groonga_suggest_httpd.c 2014-10-30 17:57:25 +0900 (6d94be8) +++ src/suggest/groonga_suggest_httpd.c 2014-10-30 18:33:03 +0900 (98ae095) @@ -16,7 +16,7 @@ */ /* groonga origin headers */ -#include <str.h> +#include <grn_str.h> #include <stdio.h> #include <signal.h> Modified: src/suggest/groonga_suggest_learner.c (+1 -1) =================================================================== --- src/suggest/groonga_suggest_learner.c 2014-10-30 17:57:25 +0900 (060d238) +++ src/suggest/groonga_suggest_learner.c 2014-10-30 18:33:03 +0900 (18b91d4) @@ -16,7 +16,7 @@ */ /* for grn_str_getopt() */ -#include <str.h> +#include <grn_str.h> #include "zmq_compatible.h" #include <stdio.h> Modified: test/unit/core/dat/test-dat-cursor.cpp (+1 -1) =================================================================== --- test/unit/core/dat/test-dat-cursor.cpp 2014-10-30 17:57:25 +0900 (cc47ca0) +++ test/unit/core/dat/test-dat-cursor.cpp 2014-10-30 18:33:03 +0900 (d59dfa4) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <dat.h> +#include <grn_dat.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/dat/test-dat-pat.cpp (+2 -2) =================================================================== --- test/unit/core/dat/test-dat-pat.cpp 2014-10-30 17:57:25 +0900 (69dec31) +++ test/unit/core/dat/test-dat-pat.cpp 2014-10-30 18:33:03 +0900 (2471fdd) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <dat.h> -#include <pat.h> +#include <grn_dat.h> +#include <grn_pat.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/dat/test-dat.cpp (+1 -1) =================================================================== --- test/unit/core/dat/test-dat.cpp 2014-10-30 17:57:25 +0900 (681b70a) +++ test/unit/core/dat/test-dat.cpp 2014-10-30 18:33:03 +0900 (1423d5f) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <dat.h> +#include <grn_dat.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-cast-basic.c (+1 -1) =================================================================== --- test/unit/core/test-cast-basic.c 2014-10-30 17:57:25 +0900 (6f205d8) +++ test/unit/core/test-cast-basic.c 2014-10-30 18:33:03 +0900 (b35e847) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <db.h> +#include <grn_db.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-cast-table.c (+1 -1) =================================================================== --- test/unit/core/test-cast-table.c 2014-10-30 17:57:25 +0900 (616e853) +++ test/unit/core/test-cast-table.c 2014-10-30 18:33:03 +0900 (ec7b7d3) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <db.h> +#include <grn_db.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-command-column-create.c (+1 -1) =================================================================== --- test/unit/core/test-command-column-create.c 2014-10-30 17:57:25 +0900 (32c4fe2) +++ test/unit/core/test-command-column-create.c 2014-10-30 18:33:03 +0900 (bfd0f0a) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_invalid_name(void); void test_missing_name(void); Modified: test/unit/core/test-command-column-rename.c (+1 -1) =================================================================== --- test/unit/core/test-command-column-rename.c 2014-10-30 17:57:25 +0900 (6365b32) +++ test/unit/core/test-command-column-rename.c 2014-10-30 18:33:03 +0900 (78f174a) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> #define get(name) grn_ctx_get(context, name, strlen(name)) Modified: test/unit/core/test-command-define-selector.c (+1 -1) =================================================================== --- test/unit/core/test-command-define-selector.c 2014-10-30 17:57:25 +0900 (7fc63ef) +++ test/unit/core/test-command-define-selector.c 2014-10-30 18:33:03 +0900 (40d310b) @@ -15,7 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-delete.c (+1 -1) =================================================================== --- test/unit/core/test-command-delete.c 2014-10-30 17:57:25 +0900 (0723125) +++ test/unit/core/test-command-delete.c 2014-10-30 18:33:03 +0900 (2fad6eb) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_id(void); void test_filter(void); Modified: test/unit/core/test-command-dump.c (+1 -1) =================================================================== --- test/unit/core/test-command-dump.c 2014-10-30 17:57:25 +0900 (99aca44) +++ test/unit/core/test-command-dump.c 2014-10-30 18:33:03 +0900 (a299887) @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-load.c (+1 -1) =================================================================== --- test/unit/core/test-command-load.c 2014-10-30 17:57:25 +0900 (cdc8085) +++ test/unit/core/test-command-load.c 2014-10-30 18:33:03 +0900 (9c14563) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_columns(void); void attributes_bool(void); Modified: test/unit/core/test-command-select-filter-invalid.c (+1 -1) =================================================================== --- test/unit/core/test-command-select-filter-invalid.c 2014-10-30 17:57:25 +0900 (271f6f7) +++ test/unit/core/test-command-select-filter-invalid.c 2014-10-30 18:33:03 +0900 (d521213) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-select-filter.c (+1 -1) =================================================================== --- test/unit/core/test-command-select-filter.c 2014-10-30 17:57:25 +0900 (643df59) +++ test/unit/core/test-command-select-filter.c 2014-10-30 18:33:03 +0900 (3f623ed) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-select-prefix-search.c (+1 -1) =================================================================== --- test/unit/core/test-command-select-prefix-search.c 2014-10-30 17:57:25 +0900 (4508287) +++ test/unit/core/test-command-select-prefix-search.c 2014-10-30 18:33:03 +0900 (7bea300) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-select-query.c (+1 -1) =================================================================== --- test/unit/core/test-command-select-query.c 2014-10-30 17:57:25 +0900 (1429aa4) +++ test/unit/core/test-command-select-query.c 2014-10-30 18:33:03 +0900 (dbe530d) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-select-sort.c (+1 -1) =================================================================== --- test/unit/core/test-command-select-sort.c 2014-10-30 17:57:25 +0900 (869acee) +++ test/unit/core/test-command-select-sort.c 2014-10-30 18:33:03 +0900 (316c625) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-select.c (+1 -1) =================================================================== --- test/unit/core/test-command-select.c 2014-10-30 17:57:25 +0900 (6097393) +++ test/unit/core/test-command-select.c 2014-10-30 18:33:03 +0900 (5e3ae8f) @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-command-table-create.c (+1 -1) =================================================================== --- test/unit/core/test-command-table-create.c 2014-10-30 17:57:25 +0900 (6c88ee3) +++ test/unit/core/test-command-table-create.c 2014-10-30 18:33:03 +0900 (10c5820) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_hash_key(void); void test_pat_key(void); Modified: test/unit/core/test-command-table-rename.c (+1 -1) =================================================================== --- test/unit/core/test-command-table-rename.c 2014-10-30 17:57:25 +0900 (3671f95) +++ test/unit/core/test-command-table-rename.c 2014-10-30 18:33:03 +0900 (83eebfd) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> #define get(name) grn_ctx_get(context, name, strlen(name)) Modified: test/unit/core/test-command-truncate.c (+1 -1) =================================================================== --- test/unit/core/test-command-truncate.c 2014-10-30 17:57:25 +0900 (3291050) +++ test/unit/core/test-command-truncate.c 2014-10-30 18:33:03 +0900 (4378ffb) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-context.c (+2 -2) =================================================================== --- test/unit/core/test-context.c 2014-10-30 17:57:25 +0900 (824098f) +++ test/unit/core/test-context.c 2014-10-30 18:33:03 +0900 (df41bc5) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <ctx.h> -#include <db.h> +#include <grn_ctx.h> +#include <grn_db.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-database-create.c (+1 -1) =================================================================== --- test/unit/core/test-database-create.c 2014-10-30 17:57:25 +0900 (8cdaf33) +++ test/unit/core/test-database-create.c 2014-10-30 18:33:03 +0900 (27c4d5d) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <store.h> +#include <grn_store.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-database.c (+1 -1) =================================================================== --- test/unit/core/test-database.c 2014-10-30 17:57:25 +0900 (9218009) +++ test/unit/core/test-database.c 2014-10-30 18:33:03 +0900 (87f6302) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_domain(void); void test_range(void); Modified: test/unit/core/test-expr-parse.c (+1 -1) =================================================================== --- test/unit/core/test-expr-parse.c 2014-10-30 17:57:25 +0900 (1987188) +++ test/unit/core/test-expr-parse.c 2014-10-30 18:33:03 +0900 (e740e55) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db.h" +#include "grn_db.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-expr-query.c (+1 -1) =================================================================== --- test/unit/core/test-expr-query.c 2014-10-30 17:57:25 +0900 (36d7feb) +++ test/unit/core/test-expr-query.c 2014-10-30 18:33:03 +0900 (e770fb1) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db.h" +#include "grn_db.h" #include <stdio.h> #include <time.h> Modified: test/unit/core/test-expr-script.c (+1 -1) =================================================================== --- test/unit/core/test-expr-script.c 2014-10-30 17:57:25 +0900 (18cd97a) +++ test/unit/core/test-expr-script.c 2014-10-30 18:33:03 +0900 (df7e633) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db.h" +#include "grn_db.h" #include <stdio.h> #include <time.h> Modified: test/unit/core/test-expr.c (+1 -1) =================================================================== --- test/unit/core/test-expr.c 2014-10-30 17:57:25 +0900 (b5abcfe) +++ test/unit/core/test-expr.c 2014-10-30 18:33:03 +0900 (ea8d199) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db.h" +#include "grn_db.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-function-edit-distance.c (+1 -1) =================================================================== --- test/unit/core/test-function-edit-distance.c 2014-10-30 17:57:25 +0900 (b918997) +++ test/unit/core/test-function-edit-distance.c 2014-10-30 18:33:03 +0900 (d891c8f) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void data_alphabet(void); void test_alphabet(gconstpointer data); Modified: test/unit/core/test-function.c (+1 -1) =================================================================== --- test/unit/core/test-function.c 2014-10-30 17:57:25 +0900 (dbfa163) +++ test/unit/core/test-function.c 2014-10-30 18:33:03 +0900 (af9bbdc) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_call_as_command(void); Modified: test/unit/core/test-geo-in-rectangle-border.c (+2 -2) =================================================================== --- test/unit/core/test-geo-in-rectangle-border.c 2014-10-30 17:57:25 +0900 (9c2a62b) +++ test/unit/core/test-geo-in-rectangle-border.c 2014-10-30 18:33:03 +0900 (1c77872) @@ -21,8 +21,8 @@ #include "../lib/grn-assertions.h" -#include <str.h> -#include <geo.h> +#include <grn_str.h> +#include <grn_geo.h> #define get(name) grn_ctx_get(context, name, strlen(name)) Modified: test/unit/core/test-geo-in-rectangle.c (+2 -2) =================================================================== --- test/unit/core/test-geo-in-rectangle.c 2014-10-30 17:57:25 +0900 (79151a3) +++ test/unit/core/test-geo-in-rectangle.c 2014-10-30 18:33:03 +0900 (4f8c222) @@ -21,8 +21,8 @@ #include "../lib/grn-assertions.h" -#include <str.h> -#include <geo.h> +#include <grn_str.h> +#include <grn_geo.h> #define get(name) grn_ctx_get(context, name, strlen(name)) Modified: test/unit/core/test-geo.c (+2 -2) =================================================================== --- test/unit/core/test-geo.c 2014-10-30 17:57:25 +0900 (287d56c) +++ test/unit/core/test-geo.c 2014-10-30 18:33:03 +0900 (c0ac4e3) @@ -21,8 +21,8 @@ #include "../lib/grn-assertions.h" -#include <str.h> -#include <geo.h> +#include <grn_str.h> +#include <grn_geo.h> #define get(name) grn_ctx_get(context, name, strlen(name)) Modified: test/unit/core/test-hash-sort.c (+1 -1) =================================================================== --- test/unit/core/test-hash-sort.c 2014-10-30 17:57:25 +0900 (81cc6ab) +++ test/unit/core/test-hash-sort.c 2014-10-30 18:33:03 +0900 (35cb548) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <store.h> +#include <grn_store.h> #include "test-hash.h" void data_sort_by_uint_key(void); Modified: test/unit/core/test-hash.h (+1 -1) =================================================================== --- test/unit/core/test-hash.h 2014-10-30 17:57:25 +0900 (6ce3ece) +++ test/unit/core/test-hash.h 2014-10-30 18:33:03 +0900 (e5f1dde) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <hash.h> +#include <grn_hash.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-inspect.c (+2 -2) =================================================================== --- test/unit/core/test-inspect.c 2014-10-30 17:57:25 +0900 (806e42e) +++ test/unit/core/test-inspect.c 2014-10-30 18:33:03 +0900 (424b4fa) @@ -21,8 +21,8 @@ #include "../lib/grn-assertions.h" -#include <str.h> -#include <util.h> +#include <grn_str.h> +#include <grn_util.h> #define get(name) grn_ctx_get(context, name, strlen(name)) Modified: test/unit/core/test-inverted-index.c (+1 -1) =================================================================== --- test/unit/core/test-inverted-index.c 2014-10-30 17:57:25 +0900 (4261727) +++ test/unit/core/test-inverted-index.c 2014-10-30 18:33:03 +0900 (7abe505) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <ii.h> +#include <grn_ii.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-log.c (+1 -1) =================================================================== --- test/unit/core/test-log.c 2014-10-30 17:57:25 +0900 (3b5315b) +++ test/unit/core/test-log.c 2014-10-30 18:33:03 +0900 (ddce491) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_invalid_char(void); Modified: test/unit/core/test-patricia-trie.h (+1 -1) =================================================================== --- test/unit/core/test-patricia-trie.h 2014-10-30 17:57:25 +0900 (0a69c04) +++ test/unit/core/test-patricia-trie.h 2014-10-30 18:33:03 +0900 (3dea298) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <pat.h> +#include <grn_pat.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-plugin.c (+1 -1) =================================================================== --- test/unit/core/test-plugin.c 2014-10-30 17:57:25 +0900 (60a2747) +++ test/unit/core/test-plugin.c 2014-10-30 18:33:03 +0900 (8b66864) @@ -21,7 +21,7 @@ #include "../lib/grn-assertions.h" -#include <str.h> +#include <grn_str.h> void test_register_function(void); void test_register_with_too_long_name(void); Modified: test/unit/core/test-store-ja.c (+2 -2) =================================================================== --- test/unit/core/test-store-ja.c 2014-10-30 17:57:25 +0900 (fc33292) +++ test/unit/core/test-store-ja.c 2014-10-30 18:33:03 +0900 (2915fcb) @@ -20,9 +20,9 @@ #include <glib/gstdio.h> #include "../lib/grn-assertions.h" -#include "store.h" +#include "grn_store.h" -#include <str.h> +#include <grn_str.h> void test_vector_empty_load(void); Modified: test/unit/core/test-stress.c (+2 -2) =================================================================== --- test/unit/core/test-stress.c 2014-10-30 17:57:25 +0900 (e459073) +++ test/unit/core/test-stress.c 2014-10-30 18:33:03 +0900 (15e74ec) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <hash.h> -#include <pat.h> +#include <grn_hash.h> +#include <grn_pat.h> #include <gcutter.h> Modified: test/unit/core/test-table-hook.c (+1 -1) =================================================================== --- test/unit/core/test-table-hook.c 2014-10-30 17:57:25 +0900 (4eae1ad) +++ test/unit/core/test-table-hook.c 2014-10-30 18:33:03 +0900 (fc6051e) @@ -17,7 +17,7 @@ */ #include <groonga.h> -#include <db.h> +#include <grn_db.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-table-patricia-trie-cursor.c (+1 -1) =================================================================== --- test/unit/core/test-table-patricia-trie-cursor.c 2014-10-30 17:57:25 +0900 (a1f8a03) +++ test/unit/core/test-table-patricia-trie-cursor.c 2014-10-30 18:33:03 +0900 (4145c32) @@ -17,7 +17,7 @@ */ #include <groonga.h> -#include <db.h> +#include <grn_db.h> #include <gcutter.h> #include <glib/gstdio.h> Modified: test/unit/core/test-table-select.c (+1 -1) =================================================================== --- test/unit/core/test-table-select.c 2014-10-30 17:57:25 +0900 (3a2c9ed) +++ test/unit/core/test-table-select.c 2014-10-30 18:33:03 +0900 (45211af) @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db.h" +#include "grn_db.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-text.c (+1 -1) =================================================================== --- test/unit/core/test-text.c 2014-10-30 17:57:25 +0900 (f2b8335) +++ test/unit/core/test-text.c 2014-10-30 18:33:03 +0900 (c67b494) @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "str.h" +#include "grn_str.h" #include <stdio.h> #include <gcutter.h> Modified: test/unit/core/test-tiny-array.c (+1 -1) =================================================================== --- test/unit/core/test-tiny-array.c 2014-10-30 17:57:25 +0900 (3ee5228) +++ test/unit/core/test-tiny-array.c 2014-10-30 18:33:03 +0900 (56f1a99) @@ -23,7 +23,7 @@ #include <string.h> -#include <hash.h> +#include <grn_hash.h> static grn_ctx ctx; Modified: test/unit/fixtures/plugins/string.c (+1 -1) =================================================================== --- test/unit/fixtures/plugins/string.c 2014-10-30 17:57:25 +0900 (30fd00a) +++ test/unit/fixtures/plugins/string.c 2014-10-30 18:33:03 +0900 (277db9e) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <str.h> +#include <grn_str.h> #include <groonga/plugin.h> #include <string.h> Modified: test/unit/fixtures/stress/test-stress-hash.c (+1 -1) =================================================================== --- test/unit/fixtures/stress/test-stress-hash.c 2014-10-30 17:57:25 +0900 (53b8056) +++ test/unit/fixtures/stress/test-stress-hash.c 2014-10-30 18:33:03 +0900 (67262e6) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <hash.h> +#include <grn_hash.h> #include <gcutter.h> #include "../lib/grn-assertions.h" Modified: test/unit/fixtures/stress/test-stress-patricia-trie.c (+1 -1) =================================================================== --- test/unit/fixtures/stress/test-stress-patricia-trie.c 2014-10-30 17:57:25 +0900 (6b4115c) +++ test/unit/fixtures/stress/test-stress-patricia-trie.c 2014-10-30 18:33:03 +0900 (0056bed) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <pat.h> +#include <grn_pat.h> #include <gcutter.h> #include "../lib/grn-assertions.h" Modified: test/unit/lib/grn-assertions.c (+4 -4) =================================================================== --- test/unit/lib/grn-assertions.c 2014-10-30 17:57:25 +0900 (af6e161) +++ test/unit/lib/grn-assertions.c 2014-10-30 18:33:03 +0900 (b2a8106) @@ -19,10 +19,10 @@ #include <cutter/cut-helper.h> #include <gcutter.h> -#include <groonga_in.h> -#include <db.h> -#include <util.h> -#include <str.h> +#include <grn.h> +#include <grn_db.h> +#include <grn_util.h> +#include <grn_str.h> #include "grn-assertions.h" Modified: test/unit/lib/grn-test-hash-assertions.c (+1 -1) =================================================================== --- test/unit/lib/grn-test-hash-assertions.c 2014-10-30 17:57:25 +0900 (a67b8c2) +++ test/unit/lib/grn-test-hash-assertions.c 2014-10-30 18:33:03 +0900 (d60abd9) @@ -18,7 +18,7 @@ #include <gcutter.h> -#include <hash.h> +#include <grn_hash.h> #include "grn-test-hash-assertions.h" Modified: test/unit/lib/grn-test-hash-factory.h (+1 -1) =================================================================== --- test/unit/lib/grn-test-hash-factory.h 2014-10-30 17:57:25 +0900 (ed21e7c) +++ test/unit/lib/grn-test-hash-factory.h 2014-10-30 18:33:03 +0900 (fa2f179) @@ -19,7 +19,7 @@ #ifndef __GRN_TEST_HASH_FACTORY_H__ #define __GRN_TEST_HASH_FACTORY_H__ -#include <hash.h> +#include <grn_hash.h> #include <glib-object.h> Modified: test/unit/lib/grn-test-utils.c (+2 -2) =================================================================== --- test/unit/lib/grn-test-utils.c 2014-10-30 17:57:25 +0900 (7162768) +++ test/unit/lib/grn-test-utils.c 2014-10-30 18:33:03 +0900 (c5b4b6d) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <str.h> -#include <db.h> +#include <grn_str.h> +#include <grn_db.h> #include "grn-assertions.h" Modified: test/unit/util/test-string.c (+2 -2) =================================================================== --- test/unit/util/test-string.c 2014-10-30 17:57:25 +0900 (05fcb67) +++ test/unit/util/test-string.c 2014-10-30 18:33:03 +0900 (b5fe6c2) @@ -16,11 +16,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <groonga_in.h> +#include <grn.h> #include <groonga.h> #include <stdlib.h> -#include <str.h> +#include <grn_str.h> #include <gcutter.h> #include <glib/gstdio.h>
