Kouhei Sutou
null+****@clear*****
Thu Oct 3 17:20:05 JST 2013
Kouhei Sutou 2013-10-03 17:20:05 +0900 (Thu, 03 Oct 2013) New Revision: 1b122e1fc8c774d5a7448731cd69ec21ebb6c224 https://github.com/groonga/groonga/commit/1b122e1fc8c774d5a7448731cd69ec21ebb6c224 Message: Move grn_ctx_impl related mruby code to ctx_impl_mrb.c Copied files: lib/ctx_impl_mrb.c (from lib/mrb.h) lib/ctx_impl_mrb.h (from lib/mrb.h) Modified files: lib/ctx.c lib/mrb.c lib/mrb.h lib/sources.am Modified: lib/ctx.c (+1 -1) =================================================================== --- lib/ctx.c 2013-10-03 17:11:12 +0900 (5780b21) +++ lib/ctx.c 2013-10-03 17:20:05 +0900 (a171162) @@ -25,7 +25,7 @@ #include "snip.h" #include "output.h" #include "normalizer_in.h" -#include "mrb.h" +#include "ctx_impl_mrb.h" #include <stdio.h> #include <stdarg.h> #include <time.h> Copied: lib/ctx_impl_mrb.c (+29 -21) 58% =================================================================== --- lib/mrb.h 2013-10-03 17:11:12 +0900 (e79944b) +++ lib/ctx_impl_mrb.c 2013-10-03 17:20:05 +0900 (0970b17) @@ -16,30 +16,38 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_H -#define GRN_MRB_H - -#include "groonga_in.h" -#include "ctx.h" +#include "ctx_impl_mrb.h" +#include "ctx_impl.h" #ifdef GRN_WITH_MRUBY -# include <mruby.h> -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -void grn_ctx_impl_mrb_init(grn_ctx *ctx); -void grn_ctx_impl_mrb_fin(grn_ctx *ctx); +void +grn_ctx_impl_mrb_init(grn_ctx *ctx) +{ + const char *grn_mruby_enabled; + grn_mruby_enabled = getenv("GRN_MRUBY_ENABLED"); + if (grn_mruby_enabled && strcmp(grn_mruby_enabled, "no") == 0) { + ctx->impl->mrb = NULL; + } else { + ctx->impl->mrb = mrb_open(); + } +} -#ifdef GRN_WITH_MRUBY -mrb_value grn_mrb_eval(grn_ctx *ctx, const char *script, int script_length); -grn_rc grn_mrb_to_grn(grn_ctx *ctx, mrb_value mrb_object, grn_obj *grn_object); -#endif +void +grn_ctx_impl_mrb_fin(grn_ctx *ctx) +{ + if (ctx->impl->mrb) { + mrb_close(ctx->impl->mrb); + ctx->impl->mrb = NULL; + } +} +#else +void +grn_ctx_impl_mrb_init(grn_ctx *ctx) +{ +} -#ifdef __cplusplus +void +grn_ctx_impl_mrb_fin(grn_ctx *ctx) +{ } #endif - -#endif /* GRN_MRB_H */ Copied: lib/ctx_impl_mrb.h (+3 -12) 75% =================================================================== --- lib/mrb.h 2013-10-03 17:11:12 +0900 (e79944b) +++ lib/ctx_impl_mrb.h 2013-10-03 17:20:05 +0900 (6810d1f) @@ -16,16 +16,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_H -#define GRN_MRB_H +#ifndef GRN_CTX_IMPL_MRB_H +#define GRN_CTX_IMPL_MRB_H #include "groonga_in.h" #include "ctx.h" -#ifdef GRN_WITH_MRUBY -# include <mruby.h> -#endif - #ifdef __cplusplus extern "C" { #endif @@ -33,13 +29,8 @@ extern "C" { void grn_ctx_impl_mrb_init(grn_ctx *ctx); void grn_ctx_impl_mrb_fin(grn_ctx *ctx); -#ifdef GRN_WITH_MRUBY -mrb_value grn_mrb_eval(grn_ctx *ctx, const char *script, int script_length); -grn_rc grn_mrb_to_grn(grn_ctx *ctx, mrb_value mrb_object, grn_obj *grn_object); -#endif - #ifdef __cplusplus } #endif -#endif /* GRN_MRB_H */ +#endif /* GRN_CTX_IMPL_MRB_H */ Modified: lib/mrb.c (+0 -31) =================================================================== --- lib/mrb.c 2013-10-03 17:11:12 +0900 (f089a36) +++ lib/mrb.c 2013-10-03 17:20:05 +0900 (47af811) @@ -25,27 +25,6 @@ #endif #ifdef GRN_WITH_MRUBY -void -grn_ctx_impl_mrb_init(grn_ctx *ctx) -{ - const char *grn_mruby_enabled; - grn_mruby_enabled = getenv("GRN_MRUBY_ENABLED"); - if (grn_mruby_enabled && strcmp(grn_mruby_enabled, "no") == 0) { - ctx->impl->mrb = NULL; - } else { - ctx->impl->mrb = mrb_open(); - } -} - -void -grn_ctx_impl_mrb_fin(grn_ctx *ctx) -{ - if (ctx->impl->mrb) { - mrb_close(ctx->impl->mrb); - ctx->impl->mrb = NULL; - } -} - mrb_value grn_mrb_eval(grn_ctx *ctx, const char *script, int script_length) { @@ -88,14 +67,4 @@ grn_mrb_to_grn(grn_ctx *ctx, mrb_value mrb_object, grn_obj *grn_object) return rc; } -#else -void -grn_ctx_impl_mrb_init(grn_ctx *ctx) -{ -} - -void -grn_ctx_impl_mrb_fin(grn_ctx *ctx) -{ -} #endif Modified: lib/mrb.h (+0 -3) =================================================================== --- lib/mrb.h 2013-10-03 17:11:12 +0900 (e79944b) +++ lib/mrb.h 2013-10-03 17:20:05 +0900 (8733df0) @@ -30,9 +30,6 @@ extern "C" { #endif -void grn_ctx_impl_mrb_init(grn_ctx *ctx); -void grn_ctx_impl_mrb_fin(grn_ctx *ctx); - #ifdef GRN_WITH_MRUBY mrb_value grn_mrb_eval(grn_ctx *ctx, const char *script, int script_length); grn_rc grn_mrb_to_grn(grn_ctx *ctx, mrb_value mrb_object, grn_obj *grn_object); Modified: lib/sources.am (+2 -0) =================================================================== --- lib/sources.am 2013-10-03 17:11:12 +0900 (0bca90e) +++ lib/sources.am 2013-10-03 17:20:05 +0900 (7d1e656) @@ -4,6 +4,8 @@ libgroonga_la_SOURCES = \ ctx.c \ ctx.h \ ctx_impl.h \ + ctx_impl_mrb.c \ + ctx_impl_mrb.h \ dat.cpp \ dat.h \ db.c \ -------------- next part -------------- HTML����������������������������...Download