From 8ff50bf0fc454a6ec76711273c6eef70dd232a1d Mon Sep 17 00:00:00 2001 From: taca Date: Fri, 12 Aug 2011 17:19:26 +0000 Subject: Fix build problem adding paches from http://cvs.pld-linux.org/. --- textproc/ruby-ferret/distinfo | 8 +-- .../ruby-ferret/patches/patch-ext_r__analysis.c | 42 ++++++------- textproc/ruby-ferret/patches/patch-ext_r__index.c | 41 +++++++------ textproc/ruby-ferret/patches/patch-ext_r__search.c | 69 +++++++++++++++------- 4 files changed, 95 insertions(+), 65 deletions(-) (limited to 'textproc/ruby-ferret') diff --git a/textproc/ruby-ferret/distinfo b/textproc/ruby-ferret/distinfo index d51382d2110..b69da06a982 100644 --- a/textproc/ruby-ferret/distinfo +++ b/textproc/ruby-ferret/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.3 2011/06/19 16:01:52 taca Exp $ +$NetBSD: distinfo,v 1.4 2011/08/12 17:19:26 taca Exp $ SHA1 (ferret-0.11.6.gem) = 83e0fada54e20445fe4ed7cd1dcdf9ffe74bb953 RMD160 (ferret-0.11.6.gem) = 8f3fb148dafea297468fdc277c94f13fd4c4e164 Size (ferret-0.11.6.gem) = 473600 bytes SHA1 (patch-ext_ferret.c) = 97e5ee20b63f9940a897cb7e98775e39798fd67b SHA1 (patch-ext_lang.h) = 1c1b04b8420a9d0e610e725ca9237d9924076c4e -SHA1 (patch-ext_r__analysis.c) = 9e072327eddedb7f97a9f0b112246c97ac76c3ad -SHA1 (patch-ext_r__index.c) = 9f695ab78e3e7fdb0f0c29f72e11632ab77ad69d +SHA1 (patch-ext_r__analysis.c) = e7f4df5ec5623fae5e954884fcf4e8c8777ea179 +SHA1 (patch-ext_r__index.c) = b40ab0b956f84ac29d1c67814bb2b95468575db8 SHA1 (patch-ext_r__qparser.c) = 1dfd71b0e690af23d31f6e8d2d0d77622e85200a -SHA1 (patch-ext_r__search.c) = 88bb96400a8c9fce888c8caddb7ae07741c47c38 +SHA1 (patch-ext_r__search.c) = 1a1bad97173a8e569a47b8d01b6cd14681d7cc70 diff --git a/textproc/ruby-ferret/patches/patch-ext_r__analysis.c b/textproc/ruby-ferret/patches/patch-ext_r__analysis.c index 3a7bcc08b17..4f57dbe37b7 100644 --- a/textproc/ruby-ferret/patches/patch-ext_r__analysis.c +++ b/textproc/ruby-ferret/patches/patch-ext_r__analysis.c @@ -1,23 +1,24 @@ -$NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ +$NetBSD: patch-ext_r__analysis.c,v 1.2 2011/08/12 17:19:27 taca Exp $ * Switch to modern Ruby's API: http://cvs.pld-linux.org/ ---- ext/r_analysis.c.orig 2011-06-10 06:23:08.000000000 +0000 +--- ext/r_analysis.c.orig 2011-08-08 00:44:55.000000000 +0000 +++ ext/r_analysis.c -@@ -1,6 +1,11 @@ +@@ -1,6 +1,12 @@ +#include "lang.h" +#ifdef RUBY18 #include +-#include + #include +#else +#include -+#endif - #include --#include +#include ++#endif ++#include #include "ferret.h" #include "analysis.h" -@@ -47,13 +52,15 @@ static ID id_token_stream; +@@ -47,13 +53,15 @@ static ID id_token_stream; static VALUE object_space; @@ -34,7 +35,7 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } /**************************************************************************** -@@ -69,11 +76,11 @@ get_stopwords(VALUE rstop_words) +@@ -69,11 +77,11 @@ get_stopwords(VALUE rstop_words) int i, len; VALUE rstr; Check_Type(rstop_words, T_ARRAY); @@ -49,7 +50,7 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ stop_words[i] = rs2s(rstr); } return stop_words; -@@ -132,7 +139,7 @@ frt_set_token(Token *tk, VALUE rt) +@@ -132,7 +140,7 @@ frt_set_token(Token *tk, VALUE rt) if (rt == Qnil) return NULL; Data_Get_Struct(rt, RToken, rtk); @@ -58,7 +59,7 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ rtk->start, rtk->end, rtk->pos_inc); return tk; } -@@ -372,7 +379,7 @@ frt_token_to_s(VALUE self) +@@ -372,7 +380,7 @@ frt_token_to_s(VALUE self) RToken *token; char *buf; GET_TK(token, self); @@ -67,7 +68,7 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ sprintf(buf, "token[\"%s\":%d:%d:%d]", rs2s(token->text), token->start, token->end, token->pos_inc); return rb_str_new2(buf); -@@ -621,7 +628,7 @@ typedef struct RegExpTokenStream { +@@ -621,7 +629,7 @@ typedef struct RegExpTokenStream { VALUE rtext; VALUE regex; VALUE proc; @@ -76,7 +77,7 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } RegExpTokenStream; static void -@@ -689,16 +696,20 @@ frt_rets_get_text(VALUE self) +@@ -689,16 +697,20 @@ frt_rets_get_text(VALUE self) return RETS(ts)->rtext; } @@ -100,7 +101,7 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ ®s); if (ret == -2) rb_raise(rb_eStandardError, "regexp buffer overflow"); -@@ -707,15 +718,78 @@ rets_next(TokenStream *ts) +@@ -707,16 +719,79 @@ rets_next(TokenStream *ts) beg = regs.beg[0]; RETS(ts)->curr_ind = end = regs.end[0]; if (NIL_P(RETS(ts)->proc)) { @@ -142,14 +143,14 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ + RSTRING_END(str), enc); + else + *start = END(0)+1; -+ } + } + else { + *start = END(0); - } ++ } + return rb_reg_nth_match(0, match); + } + return Qnil; - } ++} +// + +static Token * @@ -176,13 +177,14 @@ $NetBSD: patch-ext_r__analysis.c,v 1.1 2011/06/19 16:01:52 taca Exp $ + return tk_set(&(CachedTS(ts)->token), rs2s(rtok), + RSTRING_LEN(rtok), beg, end, 1); + } -+} -+ -+#endif + } ++#endif ++ static TokenStream * rets_reset(TokenStream *ts, char *text) -@@ -1029,8 +1103,8 @@ static int frt_add_mappings_i(VALUE key, + { +@@ -1029,8 +1104,8 @@ static int frt_add_mappings_i(VALUE key, } if (TYPE(key) == T_ARRAY) { int i; diff --git a/textproc/ruby-ferret/patches/patch-ext_r__index.c b/textproc/ruby-ferret/patches/patch-ext_r__index.c index d8afb28b95d..9fa5c025572 100644 --- a/textproc/ruby-ferret/patches/patch-ext_r__index.c +++ b/textproc/ruby-ferret/patches/patch-ext_r__index.c @@ -1,18 +1,21 @@ -$NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ +$NetBSD: patch-ext_r__index.c,v 1.2 2011/08/12 17:19:27 taca Exp $ * Switch to modern Ruby's API: http://cvs.pld-linux.org/ ---- ext/r_index.c.orig 2011-06-10 06:23:08.000000000 +0000 +--- ext/r_index.c.orig 2011-08-08 00:44:55.000000000 +0000 +++ ext/r_index.c -@@ -1,6 +1,6 @@ +@@ -1,6 +1,10 @@ #include "ferret.h" #include "index.h" --#include ++#ifdef RUBY18 + #include ++#else +#include ++#endif VALUE mIndex; -@@ -765,8 +765,8 @@ frt_te_each(VALUE self) +@@ -765,8 +769,8 @@ frt_te_each(VALUE self) char *term; int term_cnt = 0; VALUE vals = rb_ary_new2(2); @@ -23,7 +26,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ /* each is being called so there will be no current term */ -@@ -775,8 +775,8 @@ frt_te_each(VALUE self) +@@ -775,8 +779,8 @@ frt_te_each(VALUE self) while (NULL != (term = te->next(te))) { term_cnt++; @@ -34,7 +37,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ rb_yield(vals); } return INT2FIX(term_cnt); -@@ -1040,13 +1040,13 @@ frt_tde_each(VALUE self) +@@ -1040,13 +1044,13 @@ frt_tde_each(VALUE self) int doc_cnt = 0; TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self); VALUE vals = rb_ary_new2(2); @@ -52,7 +55,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ rb_yield(vals); } -@@ -1212,14 +1212,11 @@ frt_get_tv_term(TVTerm *tv_term) +@@ -1212,14 +1216,11 @@ frt_get_tv_term(TVTerm *tv_term) VALUE rpositions = Qnil; rtext = rb_str_new2(tv_term->text); if (tv_term->positions) { @@ -68,7 +71,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } return rb_struct_new(cTVTerm, rtext, rpositions, NULL); } -@@ -1237,25 +1234,20 @@ frt_get_tv(TermVector *tv) +@@ -1237,25 +1238,20 @@ frt_get_tv(TermVector *tv) TVTerm *terms = tv->terms; const int t_cnt = tv->term_cnt; const int o_cnt = tv->offset_cnt; @@ -97,7 +100,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } } -@@ -1458,19 +1450,19 @@ frt_hash_to_doc_i(VALUE key, VALUE value +@@ -1458,19 +1454,19 @@ frt_hash_to_doc_i(VALUE key, VALUE value { int i; df->destroy_data = true; @@ -122,7 +125,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ break; } doc_add_field(doc, df); -@@ -1498,9 +1490,9 @@ frt_get_doc(VALUE rdoc) +@@ -1498,9 +1494,9 @@ frt_get_doc(VALUE rdoc) int i; df = df_new("content"); df->destroy_data = true; @@ -135,7 +138,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } doc_add_field(doc, df); } -@@ -1511,13 +1503,13 @@ frt_get_doc(VALUE rdoc) +@@ -1511,13 +1507,13 @@ frt_get_doc(VALUE rdoc) break; case T_STRING: df = df_add_data_len(df_new("content"), rs2s(rdoc), @@ -151,7 +154,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ df->destroy_data = true; doc_add_field(doc, df); break; -@@ -1597,14 +1589,14 @@ frt_iw_add_readers(VALUE self, VALUE rre +@@ -1597,14 +1593,14 @@ frt_iw_add_readers(VALUE self, VALUE rre IndexReader **irs; Check_Type(rreaders, T_ARRAY); @@ -170,7 +173,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ free(irs); return self; } -@@ -1953,9 +1945,7 @@ frt_lazy_df_load(VALUE self, VALUE rkey, +@@ -1953,9 +1949,7 @@ frt_lazy_df_load(VALUE self, VALUE rkey, rdata = rb_ary_new2(lazy_df->size); for (i = 0; i < lazy_df->size; i++) { char *data = lazy_df_get_data(lazy_df, i); @@ -181,7 +184,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } } rb_hash_aset(self, rkey, rdata); -@@ -2038,8 +2028,7 @@ frt_get_lazy_doc(LazyDoc *lazy_doc) +@@ -2038,8 +2032,7 @@ frt_get_lazy_doc(LazyDoc *lazy_doc) rb_ivar_set(self, id_data, rdata); for (i = 0; i < lazy_doc->size; i++) { @@ -191,7 +194,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } rb_ivar_set(self, id_fields, rfields); -@@ -2115,11 +2104,11 @@ frt_ir_init(VALUE self, VALUE rdir) +@@ -2115,11 +2108,11 @@ frt_ir_init(VALUE self, VALUE rdir) if (TYPE(rdir) == T_ARRAY) { VALUE rdirs = rdir; @@ -205,7 +208,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ switch (TYPE(rdir)) { case T_DATA: if (CLASS_OF(rdir) == cIndexReader) { -@@ -2235,11 +2224,11 @@ frt_ir_get_norms_into(VALUE self, VALUE +@@ -2235,11 +2228,11 @@ frt_ir_get_norms_into(VALUE self, VALUE int offset; offset = FIX2INT(roffset); Check_Type(rnorms, T_STRING); @@ -220,7 +223,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } ir_get_norms_into(ir, frt_field(rfield), -@@ -2382,8 +2371,7 @@ frt_get_doc_range(IndexReader *ir, int p +@@ -2382,8 +2375,7 @@ frt_get_doc_range(IndexReader *ir, int p len = max - pos; ary = rb_ary_new2(len); for (i = 0; i < len; i++) { @@ -230,7 +233,7 @@ $NetBSD: patch-ext_r__index.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } return ary; } -@@ -2410,9 +2398,8 @@ frt_ir_get_doc(int argc, VALUE *argv, VA +@@ -2410,9 +2402,8 @@ frt_ir_get_doc(int argc, VALUE *argv, VA pos = FIX2INT(arg1); pos = (pos < 0) ? (max + pos) : pos; if (pos < 0 || pos >= max) { diff --git a/textproc/ruby-ferret/patches/patch-ext_r__search.c b/textproc/ruby-ferret/patches/patch-ext_r__search.c index ddf1f35ca80..c7c42151ef9 100644 --- a/textproc/ruby-ferret/patches/patch-ext_r__search.c +++ b/textproc/ruby-ferret/patches/patch-ext_r__search.c @@ -1,8 +1,9 @@ -$NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ +$NetBSD: patch-ext_r__search.c,v 1.2 2011/08/12 17:19:27 taca Exp $ * Switch to modern Ruby's API: http://cvs.pld-linux.org/ +* Care for incompatible rb_cvar_set() between ruby18 and ruby19. ---- ext/r_search.c.orig 2011-06-10 05:02:24.000000000 +0000 +--- ext/r_search.c.orig 2011-08-08 00:48:52.000000000 +0000 +++ ext/r_search.c @@ -161,8 +161,7 @@ frt_get_td(TopDocs *td, VALUE rsearcher) VALUE hit_ary = rb_ary_new2(td->size); @@ -57,16 +58,20 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ doc_id = FIX2INT(rb_funcall(rhit, id_doc, 0)); lzd = sea->get_lazy_doc(sea, doc_id); s = frt_lzd_load_to_json(lzd, &str, s, &len); -@@ -623,7 +622,7 @@ frt_mtq_set_dmt(VALUE self, VALUE rnum_t +@@ -623,7 +622,11 @@ frt_mtq_set_dmt(VALUE self, VALUE rnum_t rb_raise(rb_eArgError, "%d <= 0. @@max_terms must be > 0", max_terms); } - rb_cvar_set(cMultiTermQuery, id_default_max_terms, rnum_terms, Qfalse); -+ rb_cvar_set(cMultiTermQuery, id_default_max_terms, rnum_terms); ++ rb_cvar_set(cMultiTermQuery, id_default_max_terms, rnum_terms ++#ifdef RUBY18 ++ , RTEST(ruby_verbose) ++#endif ++ ); return rnum_terms; } -@@ -1165,15 +1164,15 @@ frt_phq_add(int argc, VALUE *argv, VALUE +@@ -1165,15 +1168,15 @@ frt_phq_add(int argc, VALUE *argv, VALUE { int i; char *t; @@ -86,25 +91,33 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ phq_append_multi_term(q, t); } break; -@@ -1426,7 +1425,7 @@ frt_fq_set_dms(VALUE self, VALUE val) +@@ -1426,7 +1429,11 @@ frt_fq_set_dms(VALUE self, VALUE val) "%f < 0.0. :min_similarity must be > 0.0", min_sim); } qp_default_fuzzy_min_sim = (float)min_sim; - rb_cvar_set(cFuzzyQuery, id_default_min_similarity, val, Qfalse); -+ rb_cvar_set(cFuzzyQuery, id_default_min_similarity, val); ++ rb_cvar_set(cFuzzyQuery, id_default_min_similarity, val ++#ifdef RUBY18 ++ , RTEST(ruby_verbose) ++#endif ++ ); return val; } -@@ -1458,7 +1457,7 @@ frt_fq_set_dpl(VALUE self, VALUE val) +@@ -1458,7 +1465,11 @@ frt_fq_set_dpl(VALUE self, VALUE val) "%d < 0. :prefix_length must be >= 0", pre_len); } qp_default_fuzzy_pre_len = pre_len; - rb_cvar_set(cFuzzyQuery, id_default_prefix_length, val, Qfalse); -+ rb_cvar_set(cFuzzyQuery, id_default_prefix_length, val); ++ rb_cvar_set(cFuzzyQuery, id_default_prefix_length, val ++#ifdef RUBY18 ++ , RTEST(ruby_verbose) ++#endif ++ ); return val; } -@@ -1591,8 +1590,8 @@ frt_spanmtq_init(VALUE self, VALUE rfiel +@@ -1591,8 +1602,8 @@ frt_spanmtq_init(VALUE self, VALUE rfiel { Query *q = spanmtq_new(frt_field(rfield)); int i; @@ -115,7 +128,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } Frt_Wrap_Struct(self, NULL, &frt_q_free, q); object_add(q, self); -@@ -1716,8 +1715,8 @@ frt_spannq_init(int argc, VALUE *argv, V +@@ -1716,8 +1727,8 @@ frt_spannq_init(int argc, VALUE *argv, V int i; Query *clause; Check_Type(v, T_ARRAY); @@ -126,7 +139,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ spannq_add_clause(q, clause); } } -@@ -1782,8 +1781,8 @@ frt_spanoq_init(int argc, VALUE *argv, V +@@ -1782,8 +1793,8 @@ frt_spanoq_init(int argc, VALUE *argv, V int i; Query *clause; Check_Type(rclauses, T_ARRAY); @@ -137,7 +150,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ spanoq_add_clause(q, clause); } } -@@ -2277,8 +2276,8 @@ frt_sort_init(int argc, VALUE *argv, VAL +@@ -2277,8 +2288,8 @@ frt_sort_init(int argc, VALUE *argv, VAL case 1: if (TYPE(rfields) == T_ARRAY) { int i; @@ -148,7 +161,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } } else { frt_sort_add(sort, rfields, reverse); -@@ -2632,8 +2631,6 @@ frt_sea_search_each(int argc, VALUE *arg +@@ -2632,8 +2643,6 @@ frt_sea_search_each(int argc, VALUE *arg rb_scan_args(argc, argv, "11", &rquery, &roptions); @@ -157,7 +170,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ Data_Get_Struct(rquery, Query, q); td = frt_sea_search_internal(q, roptions, sea); -@@ -2648,8 +2645,6 @@ frt_sea_search_each(int argc, VALUE *arg +@@ -2648,8 +2657,6 @@ frt_sea_search_each(int argc, VALUE *arg rtotal_hits = INT2FIX(td->total_hits); td_destroy(td); @@ -166,7 +179,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ return rtotal_hits; } -@@ -2753,8 +2748,7 @@ frt_sea_highlight(int argc, VALUE *argv, +@@ -2753,8 +2760,7 @@ frt_sea_highlight(int argc, VALUE *argv, VALUE rexcerpts = rb_ary_new2(size); for (i = 0; i < size; i++) { @@ -176,7 +189,7 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ } ary_destroy(excerpts, &free); return rexcerpts; -@@ -2870,10 +2864,10 @@ frt_ms_init(int argc, VALUE *argv, VALUE +@@ -2870,10 +2876,10 @@ frt_ms_init(int argc, VALUE *argv, VALUE rsearcher = argv[i]; switch (TYPE(rsearcher)) { case T_ARRAY: @@ -190,16 +203,20 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ Data_Get_Struct(rs, Searcher, s); searchers[top++] = s; } -@@ -3107,7 +3101,7 @@ Init_MultiTermQuery(void) +@@ -3107,7 +3113,11 @@ Init_MultiTermQuery(void) cMultiTermQuery = rb_define_class_under(mSearch, "MultiTermQuery", cQuery); rb_define_alloc_func(cMultiTermQuery, frt_data_alloc); - rb_cvar_set(cMultiTermQuery, id_default_max_terms, INT2FIX(512), Qfalse); -+ rb_cvar_set(cMultiTermQuery, id_default_max_terms, INT2FIX(512)); ++ rb_cvar_set(cMultiTermQuery, id_default_max_terms, INT2FIX(512) ++#ifdef RUBY18 ++ , RTEST(ruby_verbose) ++#endif ++ ); rb_define_singleton_method(cMultiTermQuery, "default_max_terms", frt_mtq_get_dmt, 0); rb_define_singleton_method(cMultiTermQuery, "default_max_terms=", -@@ -3415,10 +3409,8 @@ Init_FuzzyQuery(void) +@@ -3415,10 +3425,16 @@ Init_FuzzyQuery(void) cFuzzyQuery = rb_define_class_under(mSearch, "FuzzyQuery", cQuery); rb_define_alloc_func(cFuzzyQuery, frt_data_alloc); @@ -207,8 +224,16 @@ $NetBSD: patch-ext_r__search.c,v 1.1 2011/06/19 16:01:52 taca Exp $ - rb_float_new(0.5), Qfalse); - rb_cvar_set(cFuzzyQuery, id_default_prefix_length, - INT2FIX(0), Qfalse); -+ rb_cvar_set(cFuzzyQuery, id_default_min_similarity, rb_float_new(0.5)); -+ rb_cvar_set(cFuzzyQuery, id_default_prefix_length, INT2FIX(0)); ++ rb_cvar_set(cFuzzyQuery, id_default_min_similarity, rb_float_new(0.5) ++#ifdef RUBY18 ++ , RTEST(ruby_verbose) ++#endif ++ ); ++ rb_cvar_set(cFuzzyQuery, id_default_prefix_length, INT2FIX(0) ++#ifdef RUBY18 ++ , RTEST(ruby_verbose) ++#endif ++ ); rb_define_singleton_method(cFuzzyQuery, "default_min_similarity", frt_fq_get_dms, 0); -- cgit v1.2.3