You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2010/11/01 18:32:11 UTC
[lucy-commits] svn commit: r1029757 - in /incubator/lucy/trunk:
clownfish/lib/Clownfish/Binding/Perl/ perl/lib/ perl/lib/KinoSearch/
perl/lib/KinoSearch/Analysis/ perl/lib/KinoSearch/Index/
perl/lib/KinoSearch/Object/ perl/lib/KinoSearch/Test/Util/ perl/xs/
perl/xs/K...
Author: marvin
Date: Mon Nov 1 17:32:11 2010
New Revision: 1029757
URL: http://svn.apache.org/viewvc?rev=1029757&view=rev
Log:
Replace "kino" with "cfish" in some symbols from XSBind.[ch].
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Method.pm
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm
incubator/lucy/trunk/perl/lib/KinoSearch.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Inversion.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Token.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Index/IndexReader.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Index/SortCache.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/ByteBuf.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/CharBuf.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/Hash.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/I32Array.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/Num.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/VArray.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Test.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm
incubator/lucy/trunk/perl/xs/KinoSearch/Document/Doc.c
incubator/lucy/trunk/perl/xs/KinoSearch/Object/Host.c
incubator/lucy/trunk/perl/xs/XSBind.c
incubator/lucy/trunk/perl/xs/XSBind.h
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Method.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Method.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Method.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Method.pm Mon Nov 1 17:32:11 2010
@@ -280,8 +280,8 @@ sub _self_assign_statement {
# a class method.
my $binding_func
= $method_name eq 'deserialize'
- ? 'XSBind_maybe_sv_to_kino_obj'
- : 'XSBind_sv_to_kino_obj';
+ ? 'XSBind_maybe_sv_to_cfish_obj'
+ : 'XSBind_sv_to_cfish_obj';
return "self = ($type_c)$binding_func(ST(0), $vtable, NULL);";
}
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm Mon Nov 1 17:32:11 2010
@@ -88,11 +88,11 @@ sub _sv_to_cf_obj {
# Share buffers rather than copy between Perl scalars and Clownfish
# string types. Assume that the appropriate ZombieCharBuf has been
# declared on the stack.
- return "$cf_var = ($struct_sym*)XSBind_sv_to_kino_obj($xs_var, "
+ return "$cf_var = ($struct_sym*)XSBind_sv_to_cfish_obj($xs_var, "
. "$vtable, alloca(kino_ZCB_size()));";
}
else {
- return "$cf_var = ($struct_sym*)XSBind_sv_to_kino_obj($xs_var, "
+ return "$cf_var = ($struct_sym*)XSBind_sv_to_cfish_obj($xs_var, "
. "$vtable, NULL);";
}
}
@@ -139,7 +139,7 @@ sub to_perl {
if ( $type->is_object ) {
return "$xs_var = $cf_var == NULL ? newSV(0) : "
- . "XSBind_kino_to_perl((kino_Obj*)$cf_var);";
+ . "XSBind_cfish_to_perl((kino_Obj*)$cf_var);";
}
elsif ( $type->is_primitive ) {
if ( my $sub = $primitives_to_perl{$type_str} ) {
@@ -172,7 +172,7 @@ sub write_xs_typemap {
$typemap_start .= "$full_struct_sym*\t$label\n";
$typemap_input .= <<END_INPUT;
$label
- \$var = ($full_struct_sym*)XSBind_sv_to_kino_obj(\$arg, $vtable, NULL);
+ \$var = ($full_struct_sym*)XSBind_sv_to_cfish_obj(\$arg, $vtable, NULL);
END_INPUT
Modified: incubator/lucy/trunk/perl/lib/KinoSearch.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch.pm Mon Nov 1 17:32:11 2010
@@ -633,8 +633,8 @@ to_kino(sv)
SV *sv;
CODE:
{
- kino_Obj *obj = XSBind_perl_to_kino(sv);
- RETVAL = KINO_OBJ_TO_SV_NOINC(obj);
+ kino_Obj *obj = XSBind_perl_to_cfish(sv);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(obj);
}
OUTPUT: RETVAL
@@ -646,7 +646,7 @@ CODE:
if (sv_isobject(sv) && sv_derived_from(sv, "KinoSearch::Object::Obj")) {
IV tmp = SvIV(SvRV(sv));
kino_Obj* obj = INT2PTR(kino_Obj*, tmp);
- RETVAL = XSBind_kino_to_perl(obj);
+ RETVAL = XSBind_cfish_to_perl(obj);
}
else {
RETVAL = newSVsv(sv);
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Inversion.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Inversion.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Inversion.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Inversion.pm Mon Nov 1 17:32:11 2010
@@ -44,7 +44,7 @@ CODE:
}
}
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_Inversion_new(starter_token));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_Inversion_new(starter_token));
LUCY_DECREF(starter_token);
}
OUTPUT: RETVAL
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Token.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Token.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Token.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Analysis/Token.pm Mon Nov 1 17:32:11 2010
@@ -64,7 +64,7 @@ CODE:
kino_Token *self = (kino_Token*)XSBind_new_blank_obj(either_sv);
kino_Token_init(self, text, len, start_off, end_off, boost,
pos_inc);
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Index/IndexReader.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Index/IndexReader.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Index/IndexReader.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Index/IndexReader.pm Mon Nov 1 17:32:11 2010
@@ -31,7 +31,7 @@ set_race_condition_debug1(val_sv)
PPCODE:
LUCY_DECREF(kino_PolyReader_race_condition_debug1);
kino_PolyReader_race_condition_debug1 = (kino_CharBuf*)
- XSBind_maybe_sv_to_kino_obj(val_sv, KINO_CHARBUF, NULL);
+ XSBind_maybe_sv_to_cfish_obj(val_sv, KINO_CHARBUF, NULL);
if (kino_PolyReader_race_condition_debug1)
(void)LUCY_INCREF(kino_PolyReader_race_condition_debug1);
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Index/SortCache.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Index/SortCache.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Index/SortCache.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Index/SortCache.pm Mon Nov 1 17:32:11 2010
@@ -43,7 +43,7 @@ CODE:
{
kino_Obj *blank = Kino_SortCache_Make_Blank(self);
kino_Obj *value = Kino_SortCache_Value(self, ord, blank);
- RETVAL = XSBind_kino_to_perl(value);
+ RETVAL = XSBind_cfish_to_perl(value);
LUCY_DECREF(blank);
}
}
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/ByteBuf.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/ByteBuf.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/ByteBuf.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/ByteBuf.pm Mon Nov 1 17:32:11 2010
@@ -36,7 +36,7 @@ CODE:
kino_ByteBuf *self = (kino_ByteBuf*)XSBind_new_blank_obj(either_sv);
kino_BB_init(self, size);
Kino_BB_Mimic_Bytes(self, ptr, size);
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
@@ -46,7 +46,7 @@ _deserialize(either_sv, instream)
kino_InStream *instream;
CODE:
CHY_UNUSED_VAR(either_sv);
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_BB_deserialize(NULL, instream));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_BB_deserialize(NULL, instream));
OUTPUT: RETVAL
END_XS_CODE
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/CharBuf.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/CharBuf.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/CharBuf.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/CharBuf.pm Mon Nov 1 17:32:11 2010
@@ -36,7 +36,7 @@ CODE:
kino_CharBuf *self = (kino_CharBuf*)XSBind_new_blank_obj(either_sv);
kino_CB_init(self, size);
Kino_CB_Cat_Trusted_Str(self, ptr, size);
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
@@ -44,7 +44,7 @@ SV*
_clone(self)
kino_CharBuf *self;
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_CB_clone(self));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_CB_clone(self));
OUTPUT: RETVAL
SV*
@@ -53,7 +53,7 @@ _deserialize(either_sv, instream)
kino_InStream *instream;
CODE:
CHY_UNUSED_VAR(either_sv);
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_CB_deserialize(NULL, instream));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_CB_deserialize(NULL, instream));
OUTPUT: RETVAL
SV*
@@ -76,7 +76,7 @@ CODE:
kino_ViewCharBuf *self
= kino_ViewCB_new_from_trusted_utf8(ptr, size);
CHY_UNUSED_VAR(unused);
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
END_XS_CODE
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/Hash.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/Hash.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/Hash.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/Hash.pm Mon Nov 1 17:32:11 2010
@@ -31,7 +31,7 @@ _deserialize(either_sv, instream)
kino_InStream *instream;
CODE:
CHY_UNUSED_VAR(either_sv);
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_Hash_deserialize(NULL, instream));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_Hash_deserialize(NULL, instream));
OUTPUT: RETVAL
SV*
@@ -39,7 +39,7 @@ _fetch(self, key)
kino_Hash *self;
const kino_CharBuf *key;
CODE:
- RETVAL = KINO_OBJ_TO_SV(kino_Hash_fetch(self, (kino_Obj*)key));
+ RETVAL = CFISH_OBJ_TO_SV(kino_Hash_fetch(self, (kino_Obj*)key));
OUTPUT: RETVAL
void
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/I32Array.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/I32Array.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/I32Array.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/I32Array.pm Mon Nov 1 17:32:11 2010
@@ -60,7 +60,7 @@ CODE:
THROW(KINO_ERR, "Required param 'ints' isn't an arrayref");
}
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/Num.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/Num.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/Num.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/Num.pm Mon Nov 1 17:32:11 2010
@@ -33,7 +33,7 @@ CODE:
{
kino_Float32 *self = (kino_Float32*)XSBind_new_blank_obj(either_sv);
kino_Float32_init(self, value);
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
END_XS_CODE
@@ -49,7 +49,7 @@ CODE:
{
kino_Float64 *self = (kino_Float64*)XSBind_new_blank_obj(either_sv);
kino_Float64_init(self, value);
- RETVAL = KINO_OBJ_TO_SV_NOINC(self);
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(self);
}
OUTPUT: RETVAL
END_XS_CODE
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/VArray.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/VArray.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/VArray.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/VArray.pm Mon Nov 1 17:32:11 2010
@@ -29,7 +29,7 @@ SV*
shallow_copy(self)
kino_VArray *self;
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(Kino_VA_Shallow_Copy(self));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(Kino_VA_Shallow_Copy(self));
OUTPUT: RETVAL
SV*
@@ -38,28 +38,28 @@ _deserialize(either_sv, instream)
kino_InStream *instream;
CODE:
CHY_UNUSED_VAR(either_sv);
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_VA_deserialize(NULL, instream));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_VA_deserialize(NULL, instream));
OUTPUT: RETVAL
SV*
_clone(self)
kino_VArray *self;
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(Kino_VA_Clone(self));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(Kino_VA_Clone(self));
OUTPUT: RETVAL
SV*
shift(self)
kino_VArray *self;
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(Kino_VA_Shift(self));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(Kino_VA_Shift(self));
OUTPUT: RETVAL
SV*
pop(self)
kino_VArray *self;
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(Kino_VA_Pop(self));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(Kino_VA_Pop(self));
OUTPUT: RETVAL
SV*
@@ -67,7 +67,7 @@ delete(self, tick)
kino_VArray *self;
uint32_t tick;
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(Kino_VA_Delete(self, tick));
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(Kino_VA_Delete(self, tick));
OUTPUT: RETVAL
void
@@ -86,7 +86,7 @@ fetch(self, tick)
kino_VArray *self;
uint32_t tick;
CODE:
- RETVAL = KINO_OBJ_TO_SV(Kino_VA_Fetch(self, tick));
+ RETVAL = CFISH_OBJ_TO_SV(Kino_VA_Fetch(self, tick));
OUTPUT: RETVAL
END_XS_CODE
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Test.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Test.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Test.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Test.pm Mon Nov 1 17:32:11 2010
@@ -32,7 +32,7 @@ MODULE = KinoSearch PACKAGE = KinoSear
SV*
doc_set()
CODE:
- RETVAL = KINO_OBJ_TO_SV_NOINC(kino_TestUtils_doc_set());
+ RETVAL = CFISH_OBJ_TO_SV_NOINC(kino_TestUtils_doc_set());
OUTPUT: RETVAL
MODULE = KinoSearch PACKAGE = KinoSearch::Test
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm Mon Nov 1 17:32:11 2010
@@ -32,7 +32,7 @@ CODE:
{
void *address = Kino_BBSortEx_Fetch(self);
if (address) {
- RETVAL = XSBind_kino_to_perl(*(kino_Obj**)address);
+ RETVAL = XSBind_cfish_to_perl(*(kino_Obj**)address);
LUCY_DECREF(*(kino_Obj**)address);
}
else {
@@ -48,7 +48,7 @@ CODE:
{
void *address = Kino_BBSortEx_Peek(self);
if (address) {
- RETVAL = XSBind_kino_to_perl(*(kino_Obj**)address);
+ RETVAL = XSBind_cfish_to_perl(*(kino_Obj**)address);
}
else {
RETVAL = newSV(0);
Modified: incubator/lucy/trunk/perl/xs/KinoSearch/Document/Doc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/KinoSearch/Document/Doc.c?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/KinoSearch/Document/Doc.c (original)
+++ incubator/lucy/trunk/perl/xs/KinoSearch/Document/Doc.c Mon Nov 1 17:32:11 2010
@@ -133,7 +133,7 @@ kino_Doc_dump(kino_Doc *self)
Kino_Hash_Store_Str(dump, "doc_id", 7,
(kino_Obj*)kino_CB_newf("%i32", self->doc_id));
Kino_Hash_Store_Str(dump, "fields", 6,
- XSBind_perl_to_kino((SV*)self->fields));
+ XSBind_perl_to_cfish((SV*)self->fields));
return dump;
}
@@ -149,7 +149,7 @@ kino_Doc_load(kino_Doc *self, kino_Obj *
Kino_Hash_Fetch_Str(source, "doc_id", 7), KINO_OBJ);
kino_Hash *fields = (kino_Hash*)CFISH_CERTIFY(
Kino_Hash_Fetch_Str(source, "fields", 6), KINO_HASH);
- SV *fields_sv = XSBind_kino_to_perl((kino_Obj*)fields);
+ SV *fields_sv = XSBind_cfish_to_perl((kino_Obj*)fields);
CHY_UNUSED_VAR(self);
loaded->doc_id = (int32_t)Kino_Obj_To_I64(doc_id);
Modified: incubator/lucy/trunk/perl/xs/KinoSearch/Object/Host.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/KinoSearch/Object/Host.c?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/KinoSearch/Object/Host.c (original)
+++ incubator/lucy/trunk/perl/xs/KinoSearch/Object/Host.c Mon Nov 1 17:32:11 2010
@@ -94,7 +94,7 @@ SI_push_args(void *vobj, va_list args, u
kino_Obj* anObj = va_arg(args, kino_Obj*);
SV *arg_sv = anObj == NULL
? newSV(0)
- : XSBind_kino_to_perl(anObj);
+ : XSBind_cfish_to_perl(anObj);
PUSHs( sv_2mortal(arg_sv) );
}
break;
@@ -187,7 +187,7 @@ kino_Host_callback_obj(void *vobj, char
temp_retval = S_do_callback_sv(vobj, method, num_args, args);
va_end(args);
- retval = XSBind_perl_to_kino(temp_retval);
+ retval = XSBind_perl_to_cfish(temp_retval);
FREETMPS;
LEAVE;
Modified: incubator/lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/XSBind.c?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/XSBind.c (original)
+++ incubator/lucy/trunk/perl/xs/XSBind.c Mon Nov 1 17:32:11 2010
@@ -19,24 +19,24 @@
#include "XSBind.h"
#include "KinoSearch/Util/StringHelper.h"
-// Convert a Perl hash into a KS Hash. Caller takes responsibility for a
-// refcount.
+// Convert a Perl hash into a Clownfish Hash. Caller takes responsibility for
+// a refcount.
static kino_Hash*
-S_perl_hash_to_kino_hash(HV *phash);
+S_perl_hash_to_cfish_hash(HV *phash);
-// Convert a Perl array into a KS VArray. Caller takes responsibility for a
-// refcount.
+// Convert a Perl array into a Clownfish VArray. Caller takes responsibility
+// for a refcount.
static kino_VArray*
-S_perl_array_to_kino_array(AV *parray);
+S_perl_array_to_cfish_array(AV *parray);
// Convert a VArray to a Perl array. Caller takes responsibility for a
// refcount.
static SV*
-S_kino_array_to_perl_array(kino_VArray *varray);
+S_cfish_array_to_perl_array(kino_VArray *varray);
// Convert a Hash to a Perl hash. Caller takes responsibility for a refcount.
static SV*
-S_kino_hash_to_perl_hash(kino_Hash *hash);
+S_cfish_hash_to_perl_hash(kino_Hash *hash);
kino_Obj*
XSBind_new_blank_obj(SV *either_sv)
@@ -65,9 +65,9 @@ XSBind_new_blank_obj(SV *either_sv)
}
kino_Obj*
-XSBind_sv_to_kino_obj(SV *sv, kino_VTable *vtable, void *allocation)
+XSBind_sv_to_cfish_obj(SV *sv, kino_VTable *vtable, void *allocation)
{
- kino_Obj *retval = XSBind_maybe_sv_to_kino_obj(sv, vtable, allocation);
+ kino_Obj *retval = XSBind_maybe_sv_to_cfish_obj(sv, vtable, allocation);
if (!retval) {
THROW(KINO_ERR, "Not a %o", Kino_VTable_Get_Name(vtable));
}
@@ -75,7 +75,7 @@ XSBind_sv_to_kino_obj(SV *sv, kino_VTabl
}
kino_Obj*
-XSBind_maybe_sv_to_kino_obj(SV *sv, kino_VTable *vtable, void *allocation)
+XSBind_maybe_sv_to_cfish_obj(SV *sv, kino_VTable *vtable, void *allocation)
{
kino_Obj *retval = NULL;
if (XSBind_sv_defined(sv)) {
@@ -104,10 +104,10 @@ XSBind_maybe_sv_to_kino_obj(SV *sv, kino
// analogues.
SV *inner = SvRV(sv);
if (SvTYPE(inner) == SVt_PVAV && vtable == KINO_VARRAY) {
- retval = (kino_Obj*)S_perl_array_to_kino_array((AV*)inner);
+ retval = (kino_Obj*)S_perl_array_to_cfish_array((AV*)inner);
}
else if (SvTYPE(inner) == SVt_PVHV && vtable == KINO_HASH) {
- retval = (kino_Obj*)S_perl_hash_to_kino_hash((HV*)inner);
+ retval = (kino_Obj*)S_perl_hash_to_cfish_hash((HV*)inner);
}
if(retval) {
@@ -125,7 +125,7 @@ XSBind_maybe_sv_to_kino_obj(SV *sv, kino
}
SV*
-XSBind_kino_to_perl(kino_Obj *obj)
+XSBind_cfish_to_perl(kino_Obj *obj)
{
if (obj == NULL) {
return newSV(0);
@@ -137,10 +137,10 @@ XSBind_kino_to_perl(kino_Obj *obj)
return XSBind_bb_to_sv((kino_ByteBuf*)obj);
}
else if (Kino_Obj_Is_A(obj, KINO_VARRAY)) {
- return S_kino_array_to_perl_array((kino_VArray*)obj);
+ return S_cfish_array_to_perl_array((kino_VArray*)obj);
}
else if (Kino_Obj_Is_A(obj, KINO_HASH)) {
- return S_kino_hash_to_perl_hash((kino_Hash*)obj);
+ return S_cfish_hash_to_perl_hash((kino_Hash*)obj);
}
else if (Kino_Obj_Is_A(obj, KINO_FLOATNUM)) {
return newSVnv(Kino_Obj_To_F64(obj));
@@ -163,7 +163,7 @@ XSBind_kino_to_perl(kino_Obj *obj)
}
kino_Obj*
-XSBind_perl_to_kino(SV *sv)
+XSBind_perl_to_cfish(SV *sv)
{
kino_Obj *retval = NULL;
@@ -172,10 +172,10 @@ XSBind_perl_to_kino(SV *sv)
// Deep conversion of references.
SV *inner = SvRV(sv);
if (SvTYPE(inner) == SVt_PVAV) {
- retval = (kino_Obj*)S_perl_array_to_kino_array((AV*)inner);
+ retval = (kino_Obj*)S_perl_array_to_cfish_array((AV*)inner);
}
else if (SvTYPE(inner) == SVt_PVHV) {
- retval = (kino_Obj*)S_perl_hash_to_kino_hash((HV*)inner);
+ retval = (kino_Obj*)S_perl_hash_to_cfish_hash((HV*)inner);
}
else if ( sv_isobject(sv)
&& sv_derived_from(sv, "KinoSearch::Object::Obj")
@@ -197,10 +197,10 @@ XSBind_perl_to_kino(SV *sv)
else if (sv) {
// Deep conversion of raw AVs and HVs.
if (SvTYPE(sv) == SVt_PVAV) {
- retval = (kino_Obj*)S_perl_array_to_kino_array((AV*)sv);
+ retval = (kino_Obj*)S_perl_array_to_cfish_array((AV*)sv);
}
else if (SvTYPE(sv) == SVt_PVHV) {
- retval = (kino_Obj*)S_perl_hash_to_kino_hash((HV*)sv);
+ retval = (kino_Obj*)S_perl_hash_to_cfish_hash((HV*)sv);
}
}
@@ -229,7 +229,7 @@ XSBind_cb_to_sv(const kino_CharBuf *cb)
}
static kino_Hash*
-S_perl_hash_to_kino_hash(HV *phash)
+S_perl_hash_to_cfish_hash(HV *phash)
{
uint32_t num_keys = hv_iterinit(phash);
kino_Hash *retval = kino_Hash_new(num_keys);
@@ -257,14 +257,14 @@ S_perl_hash_to_kino_hash(HV *phash)
// Recurse for each value.
Kino_Hash_Store_Str(retval, key, key_len,
- XSBind_perl_to_kino(value_sv));
+ XSBind_perl_to_cfish(value_sv));
}
return retval;
}
static kino_VArray*
-S_perl_array_to_kino_array(AV *parray)
+S_perl_array_to_cfish_array(AV *parray)
{
const uint32_t size = av_len(parray) + 1;
kino_VArray *retval = kino_VA_new(size);
@@ -274,7 +274,7 @@ S_perl_array_to_kino_array(AV *parray)
for (i = 0; i < size; i++) {
SV **elem_sv = av_fetch(parray, i, false);
if (elem_sv) {
- kino_Obj *elem = XSBind_perl_to_kino(*elem_sv);
+ kino_Obj *elem = XSBind_perl_to_cfish(*elem_sv);
if (elem) { Kino_VA_Store(retval, i, elem); }
}
}
@@ -284,7 +284,7 @@ S_perl_array_to_kino_array(AV *parray)
}
static SV*
-S_kino_array_to_perl_array(kino_VArray *varray)
+S_cfish_array_to_perl_array(kino_VArray *varray)
{
AV *perl_array = newAV();
uint32_t num_elems = Kino_VA_Get_Size(varray);
@@ -300,7 +300,7 @@ S_kino_array_to_perl_array(kino_VArray *
}
else {
// Recurse for each value.
- SV *const val_sv = XSBind_kino_to_perl(val);
+ SV *const val_sv = XSBind_cfish_to_perl(val);
av_store(perl_array, i, val_sv);
}
}
@@ -310,7 +310,7 @@ S_kino_array_to_perl_array(kino_VArray *
}
static SV*
-S_kino_hash_to_perl_hash(kino_Hash *hash)
+S_cfish_hash_to_perl_hash(kino_Hash *hash)
{
HV *perl_hash = newHV();
SV *key_sv = newSV(1);
@@ -325,7 +325,7 @@ S_kino_hash_to_perl_hash(kino_Hash *hash
Kino_Hash_Iterate(hash);
while (Kino_Hash_Next(hash, (kino_Obj**)&key, &val)) {
// Recurse for each value.
- SV *val_sv = XSBind_kino_to_perl(val);
+ SV *val_sv = XSBind_cfish_to_perl(val);
if (!Kino_Obj_Is_A((kino_Obj*)key, KINO_CHARBUF)) {
CFISH_THROW(KINO_ERR,
"Can't convert a key of class %o to a Perl hash key",
Modified: incubator/lucy/trunk/perl/xs/XSBind.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/XSBind.h?rev=1029757&r1=1029756&r2=1029757&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/XSBind.h (original)
+++ incubator/lucy/trunk/perl/xs/XSBind.h Mon Nov 1 17:32:11 2010
@@ -66,14 +66,14 @@ kino_XSBind_sv_defined(SV *sv)
* instead. If all else fails, throw an exception.
*/
kino_Obj*
-kino_XSBind_sv_to_kino_obj(SV *sv, kino_VTable *vtable, void *allocation);
+kino_XSBind_sv_to_cfish_obj(SV *sv, kino_VTable *vtable, void *allocation);
-/** As XSBind_sv_to_kino_obj above, but returns NULL instead of throwing an
+/** As XSBind_sv_to_cfish_obj above, but returns NULL instead of throwing an
* exception.
*/
kino_Obj*
-kino_XSBind_maybe_sv_to_kino_obj(SV *sv, kino_VTable *vtable,
- void *allocation);
+kino_XSBind_maybe_sv_to_cfish_obj(SV *sv, kino_VTable *vtable,
+ void *allocation);
/** Derive an SV from a KinoSearch object. If the KS object is NULL, the SV
@@ -83,21 +83,21 @@ kino_XSBind_maybe_sv_to_kino_obj(SV *sv,
* responsibility.
*/
static CHY_INLINE SV*
-kino_XSBind_kino_obj_to_sv(kino_Obj *obj)
+kino_XSBind_cfish_obj_to_sv(kino_Obj *obj)
{
return obj ? (SV*)Kino_Obj_To_Host(obj) : newSV(0);
}
-/** XSBind_kino_obj_to_sv, with a cast.
+/** XSBind_cfish_obj_to_sv, with a cast.
*/
-#define KINO_OBJ_TO_SV(_obj) kino_XSBind_kino_obj_to_sv((kino_Obj*)_obj)
+#define CFISH_OBJ_TO_SV(_obj) kino_XSBind_cfish_obj_to_sv((kino_Obj*)_obj)
-/** As XSBind_kino_obj_to_sv above, except decrements the object's refcount
+/** As XSBind_cfish_obj_to_sv above, except decrements the object's refcount
* after creating the SV. This is useful when the KS expression creates a new
* refcount, e.g. a call to a constructor.
*/
static CHY_INLINE SV*
-kino_XSBind_kino_obj_to_sv_noinc(kino_Obj *obj)
+kino_XSBind_cfish_obj_to_sv_noinc(kino_Obj *obj)
{
SV *retval;
if (obj) {
@@ -110,24 +110,24 @@ kino_XSBind_kino_obj_to_sv_noinc(kino_Ob
return retval;
}
-/** XSBind_kino_obj_to_sv_noinc, with a cast.
+/** XSBind_cfish_obj_to_sv_noinc, with a cast.
*/
-#define KINO_OBJ_TO_SV_NOINC(_obj) \
- kino_XSBind_kino_obj_to_sv_noinc((kino_Obj*)_obj)
+#define CFISH_OBJ_TO_SV_NOINC(_obj) \
+ kino_XSBind_cfish_obj_to_sv_noinc((kino_Obj*)_obj)
-/** Deep conversion of KS objects to Perl objects -- CharBufs to UTF-8 SVs,
- * ByteBufs to SVs, VArrays to Perl array refs, Hashes to Perl hashrefs, and
- * any other object to a Perl object wrapping the KS Obj.
+/** Deep conversion of Clownfish objects to Perl objects -- CharBufs to UTF-8
+ * SVs, ByteBufs to SVs, VArrays to Perl array refs, Hashes to Perl hashrefs,
+ * and any other object to a Perl object wrapping the Clownfish Obj.
*/
SV*
-kino_XSBind_kino_to_perl(kino_Obj *obj);
+kino_XSBind_cfish_to_perl(kino_Obj *obj);
-/** Deep conversion of Perl data structures to KS objects -- Perl hash to
- * Hash*, Perl array to VArray*, KinoSearch objects stripped of their
+/** Deep conversion of Perl data structures to Clownfish objects -- Perl hash
+ * to Hash, Perl array to VArray, Clownfish objects stripped of their
* wrappers, and everything else stringified and turned to a CharBuf.
*/
kino_Obj*
-kino_XSBind_perl_to_kino(SV *sv);
+kino_XSBind_perl_to_cfish(SV *sv);
/** Convert a ByteBuf into a new string SV.
*/
@@ -176,21 +176,21 @@ kino_XSBind_allot_params(SV** stack, int
* full symbols nevertheless in case someone else defines e.g. a function
* named "XSBind_sv_defined".)
*/
-#define XSBind_new_blank_obj kino_XSBind_new_blank_obj
-#define XSBind_sv_defined kino_XSBind_sv_defined
-#define XSBind_sv_to_kino_obj kino_XSBind_sv_to_kino_obj
-#define XSBind_maybe_sv_to_kino_obj kino_XSBind_maybe_sv_to_kino_obj
-#define XSBind_kino_obj_to_sv kino_XSBind_kino_obj_to_sv
-#define XSBind_kino_obj_to_sv_noinc kino_XSBind_kino_obj_to_sv_noinc
-#define XSBind_kino_to_perl kino_XSBind_kino_to_perl
-#define XSBind_perl_to_kino kino_XSBind_perl_to_kino
-#define XSBind_bb_to_sv kino_XSBind_bb_to_sv
-#define XSBind_cb_to_sv kino_XSBind_cb_to_sv
-#define XSBind_enable_overload kino_XSBind_enable_overload
-#define XSBind_allot_params kino_XSBind_allot_params
+#define XSBind_new_blank_obj kino_XSBind_new_blank_obj
+#define XSBind_sv_defined kino_XSBind_sv_defined
+#define XSBind_sv_to_cfish_obj kino_XSBind_sv_to_cfish_obj
+#define XSBind_maybe_sv_to_cfish_obj kino_XSBind_maybe_sv_to_cfish_obj
+#define XSBind_cfish_obj_to_sv kino_XSBind_cfish_obj_to_sv
+#define XSBind_cfish_obj_to_sv_noinc kino_XSBind_cfish_obj_to_sv_noinc
+#define XSBind_cfish_to_perl kino_XSBind_cfish_to_perl
+#define XSBind_perl_to_cfish kino_XSBind_perl_to_cfish
+#define XSBind_bb_to_sv kino_XSBind_bb_to_sv
+#define XSBind_cb_to_sv kino_XSBind_cb_to_sv
+#define XSBind_enable_overload kino_XSBind_enable_overload
+#define XSBind_allot_params kino_XSBind_allot_params
-/* Strip the prefix from some common kino_ symbols where we know there's no
- * conflict with Perl. It's a little inconsistent to do this rather than
+/* Strip the prefix from some common ClownFish symbols where we know there's
+ * no conflict with Perl. It's a little inconsistent to do this rather than
* leave all symbols at full size, but the succinctness is worth it.
*/
#define THROW CFISH_THROW