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/03 18:17:34 UTC
[lucy-commits] svn commit: r1030546 - in /incubator/lucy/trunk:
clownfish/lib/Clownfish/Binding/Core/ core/KinoSearch/Object/
perl/lib/KinoSearch/Object/ perl/xs/ perl/xs/KinoSearch/Index/
Author: marvin
Date: Wed Nov 3 17:17:33 2010
New Revision: 1030546
URL: http://svn.apache.org/viewvc?rev=1030546&view=rev
Log:
Migrate some manually namespaced ZombieCharBuf symbols to CFISH prefix.
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm
incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh
incubator/lucy/trunk/perl/lib/KinoSearch/Object/Host.pm
incubator/lucy/trunk/perl/lib/KinoSearch/Object/Obj.pm
incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c
incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c
incubator/lucy/trunk/perl/xs/XSBind.c
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm Wed Nov 3 17:17:33 2010
@@ -41,7 +41,6 @@ our %aliases = (
cfish_ZombieCharBuf => 'kino_ZombieCharBuf',
CFISH_ZOMBIECHARBUF => 'KINO_ZOMBIECHARBUF',
cfish_ZCB_size => 'kino_ZCB_size',
- CFISH_ZCB_WRAP_STR => 'KINO_ZCB_WRAP_STR',
CFISH_ERR => 'KINO_ERR',
Modified: incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh Wed Nov 3 17:17:33 2010
@@ -379,25 +379,25 @@ class KinoSearch::Object::ZombieCharBuf
__C__
-#define KINO_ZCB_BLANK() kino_ZCB_new(alloca(kino_ZCB_size()))
+#define CFISH_ZCB_BLANK() kino_ZCB_new(alloca(kino_ZCB_size()))
-#define KINO_ZCB_LITERAL(string) \
+#define CFISH_ZCB_LITERAL(string) \
{ KINO_ZOMBIECHARBUF, {1}, string "", sizeof(string) -1, sizeof(string) }
-#define KINO_ZCB_WRAP(source) \
+#define CFISH_ZCB_WRAP(source) \
kino_ZCB_wrap(alloca(kino_ZCB_size()), source)
-#define KINO_ZCB_WRAP_STR(ptr, size) \
+#define CFISH_ZCB_WRAP_STR(ptr, size) \
kino_ZCB_wrap_str(alloca(kino_ZCB_size()), ptr, size)
-extern kino_ZombieCharBuf KINO_ZCB_EMPTY;
+extern kino_ZombieCharBuf CFISH_ZCB_EMPTY;
#ifdef LUCY_USE_SHORT_NAMES
- #define ZCB_BLANK KINO_ZCB_BLANK
- #define ZCB_LITERAL(_string) KINO_ZCB_LITERAL(_string)
- #define EMPTY KINO_ZCB_EMPTY
- #define ZCB_WRAP KINO_ZCB_WRAP
- #define ZCB_WRAP_STR KINO_ZCB_WRAP_STR
+ #define ZCB_BLANK CFISH_ZCB_BLANK
+ #define ZCB_LITERAL(_string) CFISH_ZCB_LITERAL(_string)
+ #define EMPTY CFISH_ZCB_EMPTY
+ #define ZCB_WRAP CFISH_ZCB_WRAP
+ #define ZCB_WRAP_STR CFISH_ZCB_WRAP_STR
#endif
__END_C__
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/Host.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/Host.pm?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/Host.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/Host.pm Wed Nov 3 17:17:33 2010
@@ -55,7 +55,7 @@ _callback(obj)
kino_Obj *obj;
PPCODE:
{
- kino_ZombieCharBuf *blank = KINO_ZCB_BLANK();
+ kino_ZombieCharBuf *blank = CFISH_ZCB_BLANK();
kino_Host_callback(obj, "_test", 2,
CFISH_ARG_OBJ("nothing", (kino_CharBuf*)blank),
CFISH_ARG_I32("foo", 3));
@@ -66,7 +66,7 @@ _callback_i64(obj)
kino_Obj *obj;
CODE:
{
- kino_ZombieCharBuf *blank = KINO_ZCB_BLANK();
+ kino_ZombieCharBuf *blank = CFISH_ZCB_BLANK();
RETVAL = kino_Host_callback_i64(obj, "_test", 2,
CFISH_ARG_OBJ("nothing", (kino_CharBuf*)blank),
CFISH_ARG_I32("foo", 3));
@@ -78,7 +78,7 @@ _callback_f64(obj)
kino_Obj *obj;
CODE:
{
- kino_ZombieCharBuf *blank = KINO_ZCB_BLANK();
+ kino_ZombieCharBuf *blank = CFISH_ZCB_BLANK();
RETVAL = kino_Host_callback_f64(obj, "_test", 2,
CFISH_ARG_OBJ("nothing", (kino_CharBuf*)blank),
CFISH_ARG_I32("foo", 3));
Modified: incubator/lucy/trunk/perl/lib/KinoSearch/Object/Obj.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch/Object/Obj.pm?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch/Object/Obj.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch/Object/Obj.pm Wed Nov 3 17:17:33 2010
@@ -83,7 +83,7 @@ PPCODE:
{
char *class_name = HvNAME(SvSTASH(SvRV(blank_obj)));
kino_ZombieCharBuf *klass
- = KINO_ZCB_WRAP_STR(class_name, strlen(class_name));
+ = CFISH_ZCB_WRAP_STR(class_name, strlen(class_name));
kino_VTable *vtable = (kino_VTable*)kino_VTable_singleton(
(kino_CharBuf*)klass, NULL);
STRLEN len;
Modified: incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c (original)
+++ incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c Wed Nov 3 17:17:33 2010
@@ -64,7 +64,7 @@ kino_DefDocReader_fetch_doc(kino_Default
// Find the Field's FieldType.
kino_ZombieCharBuf *field_name_zcb
- = KINO_ZCB_WRAP_STR(field_name_ptr, field_name_len);
+ = CFISH_ZCB_WRAP_STR(field_name_ptr, field_name_len);
Kino_ZCB_Assign_Str(field_name_zcb, field_name_ptr, field_name_len);
type = Kino_Schema_Fetch_Type(schema, (kino_CharBuf*)field_name_zcb);
Modified: incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c (original)
+++ incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c Wed Nov 3 17:17:33 2010
@@ -51,7 +51,7 @@ S_fetch_entry(kino_Inverter *self, HE *h
}
}
- kino_ZombieCharBuf *field = KINO_ZCB_WRAP_STR(key, key_len);
+ kino_ZombieCharBuf *field = CFISH_ZCB_WRAP_STR(key, key_len);
int32_t field_num
= Kino_Seg_Field_Num(self->segment, (kino_CharBuf*)field);
if (!field_num) {
Modified: incubator/lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/XSBind.c?rev=1030546&r1=1030545&r2=1030546&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/XSBind.c (original)
+++ incubator/lucy/trunk/perl/xs/XSBind.c Wed Nov 3 17:17:33 2010
@@ -56,7 +56,7 @@ XSBind_new_blank_obj(SV *either_sv)
// Use the supplied class name string to find a VTable.
STRLEN len;
char *ptr = SvPVutf8(either_sv, len);
- kino_ZombieCharBuf *klass = KINO_ZCB_WRAP_STR(ptr, len);
+ kino_ZombieCharBuf *klass = CFISH_ZCB_WRAP_STR(ptr, len);
vtable = kino_VTable_singleton((kino_CharBuf*)klass, NULL);
}