Adjust for XSBind_perl_to_cfish changes
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3f3318eb Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3f3318eb Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3f3318eb Branch: refs/heads/master Commit: 3f3318eb86d28eb2deec99f9b6aa8c5b85358120 Parents: 45eac39 Author: Nick Wellnhofer <[email protected]> Authored: Wed Aug 5 20:44:51 2015 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Thu Aug 20 19:16:44 2015 +0200 ---------------------------------------------------------------------- perl/buildlib/Lucy/Build/Binding/Index.pm | 5 +---- perl/buildlib/Lucy/Build/Binding/Misc.pm | 2 +- perl/buildlib/Lucy/Build/Binding/Search.pm | 9 +++------ perl/xs/Lucy/Document/Doc.c | 6 ++++-- 4 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/3f3318eb/perl/buildlib/Lucy/Build/Binding/Index.pm ---------------------------------------------------------------------- diff --git a/perl/buildlib/Lucy/Build/Binding/Index.pm b/perl/buildlib/Lucy/Build/Binding/Index.pm index 781e0da..7e0e535 100644 --- a/perl/buildlib/Lucy/Build/Binding/Index.pm +++ b/perl/buildlib/Lucy/Build/Binding/Index.pm @@ -304,10 +304,7 @@ set_race_condition_debug1(val_sv) PPCODE: CFISH_DECREF(lucy_PolyReader_race_condition_debug1); lucy_PolyReader_race_condition_debug1 = (cfish_String*) - XSBind_maybe_sv_to_cfish_obj(aTHX_ val_sv, CFISH_STRING, NULL); - if (lucy_PolyReader_race_condition_debug1) { - (void)CFISH_INCREF(lucy_PolyReader_race_condition_debug1); - } + XSBind_perl_to_cfish_nullable(aTHX_ val_sv, CFISH_STRING); int32_t debug1_num_passes() http://git-wip-us.apache.org/repos/asf/lucy/blob/3f3318eb/perl/buildlib/Lucy/Build/Binding/Misc.pm ---------------------------------------------------------------------- diff --git a/perl/buildlib/Lucy/Build/Binding/Misc.pm b/perl/buildlib/Lucy/Build/Binding/Misc.pm index 92c8b95..76e20ac 100644 --- a/perl/buildlib/Lucy/Build/Binding/Misc.pm +++ b/perl/buildlib/Lucy/Build/Binding/Misc.pm @@ -46,7 +46,7 @@ to_clownfish(sv) SV *sv; CODE: { - cfish_Obj *obj = XSBind_perl_to_cfish(aTHX_ sv); + cfish_Obj *obj = XSBind_perl_to_cfish_nullable(aTHX_ sv, CFISH_OBJ); RETVAL = CFISH_OBJ_TO_SV_NOINC(obj); } OUTPUT: RETVAL http://git-wip-us.apache.org/repos/asf/lucy/blob/3f3318eb/perl/buildlib/Lucy/Build/Binding/Search.pm ---------------------------------------------------------------------- diff --git a/perl/buildlib/Lucy/Build/Binding/Search.pm b/perl/buildlib/Lucy/Build/Binding/Search.pm index 1602945..1abd9e9 100644 --- a/perl/buildlib/Lucy/Build/Binding/Search.pm +++ b/perl/buildlib/Lucy/Build/Binding/Search.pm @@ -467,18 +467,15 @@ CODE: } else if (strcmp(type_str, "FIELD") == 0) { type = LUCY_QPARSER_TOKEN_FIELD; - value = CFISH_CERTIFY(XSBind_perl_to_cfish(aTHX_ value_sv), - CFISH_STRING); + value = XSBind_perl_to_cfish(aTHX_ value_sv, CFISH_STRING); } else if (strcmp(type_str, "STRING") == 0) { type = LUCY_QPARSER_TOKEN_STRING; - value = CFISH_CERTIFY(XSBind_perl_to_cfish(aTHX_ value_sv), - CFISH_STRING); + value = XSBind_perl_to_cfish(aTHX_ value_sv, CFISH_STRING); } else if (strcmp(type_str, "QUERY") == 0) { type = LUCY_QPARSER_TOKEN_QUERY; - value = CFISH_CERTIFY(XSBind_perl_to_cfish(aTHX_ value_sv), - LUCY_QUERY); + value = XSBind_perl_to_cfish(aTHX_ value_sv, LUCY_QUERY); } else { CFISH_THROW(CFISH_ERR, "Bad type: '%s'", type_str); http://git-wip-us.apache.org/repos/asf/lucy/blob/3f3318eb/perl/xs/Lucy/Document/Doc.c ---------------------------------------------------------------------- diff --git a/perl/xs/Lucy/Document/Doc.c b/perl/xs/Lucy/Document/Doc.c index c352f4e..a45f758 100644 --- a/perl/xs/Lucy/Document/Doc.c +++ b/perl/xs/Lucy/Document/Doc.c @@ -153,7 +153,7 @@ LUCY_Doc_Extract_IMP(lucy_Doc *self, cfish_String *field) { -CFISH_Str_Get_Size(field), 0); if (sv_ptr) { - retval = XSBind_perl_to_cfish(aTHX_ *sv_ptr); + retval = XSBind_perl_to_cfish_nullable(aTHX_ *sv_ptr, CFISH_OBJ); } return retval; @@ -188,8 +188,10 @@ LUCY_Doc_Dump_IMP(lucy_Doc *self) { (cfish_Obj*)CFISH_Str_Clone(lucy_Doc_get_class_name(self))); CFISH_Hash_Store_Utf8(dump, "doc_id", 7, (cfish_Obj*)cfish_Str_newf("%i32", ivars->doc_id)); + SV *fields_sv = newRV_inc((SV*)ivars->fields); CFISH_Hash_Store_Utf8(dump, "fields", 6, - XSBind_perl_to_cfish(aTHX_ (SV*)ivars->fields)); + XSBind_perl_to_cfish(aTHX_ fields_sv, CFISH_HASH)); + SvREFCNT_dec(fields_sv); return dump; }
