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 2011/08/05 20:35:46 UTC
[lucy-commits] svn commit: r1154343 - in /incubator/lucy/trunk:
clownfish/lib/Clownfish/Binding/Perl/ clownfish/src/ core/Lucy/Object/
core/Lucy/Store/ perl/lib/Lucy/Analysis/ perl/lib/Lucy/Document/
perl/lib/Lucy/Index/ perl/lib/Lucy/Object/ perl/lib/Lucy/Test/Util/...
Author: marvin
Date: Fri Aug 5 18:35:45 2011
New Revision: 1154343
URL: http://svn.apache.org/viewvc?rev=1154343&view=rev
Log:
Change prefixes for INCREF/DECREF, replacing LUCY_INCREF and LUCY_DECREF with
CFISH_INCREF and CFISH_DECREF.
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm
incubator/lucy/trunk/clownfish/src/CFCBindMethod.c
incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c
incubator/lucy/trunk/clownfish/src/CFCPerlSub.c
incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.c
incubator/lucy/trunk/core/Lucy/Object/Obj.cfh
incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c
incubator/lucy/trunk/perl/lib/Lucy/Analysis/Inversion.pm
incubator/lucy/trunk/perl/lib/Lucy/Analysis/Token.pm
incubator/lucy/trunk/perl/lib/Lucy/Document/Doc.pm
incubator/lucy/trunk/perl/lib/Lucy/Document/HitDoc.pm
incubator/lucy/trunk/perl/lib/Lucy/Index/IndexReader.pm
incubator/lucy/trunk/perl/lib/Lucy/Index/Indexer.pm
incubator/lucy/trunk/perl/lib/Lucy/Index/SortCache.pm
incubator/lucy/trunk/perl/lib/Lucy/Object/Hash.pm
incubator/lucy/trunk/perl/lib/Lucy/Object/Host.pm
incubator/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm
incubator/lucy/trunk/perl/lib/Lucy/Object/Obj.pm
incubator/lucy/trunk/perl/lib/Lucy/Object/VArray.pm
incubator/lucy/trunk/perl/lib/Lucy/Test/Util/BBSortEx.pm
incubator/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm
incubator/lucy/trunk/perl/xs/Lucy/Analysis/CaseFolder.c
incubator/lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c
incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c
incubator/lucy/trunk/perl/xs/XSBind.c
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm Fri Aug 5 18:35:45 2011
@@ -76,7 +76,7 @@ sub xsub_def {
my $type = $var->get_type;
if ( $type->is_object and $type->decremented ) {
my $name = $var->micro_sym;
- $refcount_mods .= "\n LUCY_INCREF($name);";
+ $refcount_mods .= "\n CFISH_INCREF($name);";
}
}
Modified: incubator/lucy/trunk/clownfish/src/CFCBindMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCBindMethod.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCBindMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCBindMethod.c Fri Aug 5 18:35:45 2011
@@ -513,7 +513,7 @@ S_obj_callback_def(CFCMethod *method, co
const char *decrement = CFCType_incremented(return_type)
? ""
- : "\n LUCY_DECREF(retval);";
+ : "\n CFISH_DECREF(retval);";
char pattern[] =
"%s\n"
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c Fri Aug 5 18:35:45 2011
@@ -103,7 +103,7 @@ S_xsub_body(CFCPerlMethod *self) {
CFCVariable *var = arg_vars[i];
CFCType *type = CFCVariable_get_type(var);
if (CFCType_is_object(type) && CFCType_decremented(type)) {
- body = CFCUtil_cat(body, "LUCY_INCREF(",
+ body = CFCUtil_cat(body, "CFISH_INCREF(",
CFCVariable_micro_sym(var), ");\n ", NULL);
}
}
@@ -124,7 +124,7 @@ S_xsub_body(CFCPerlMethod *self) {
if (CFCType_is_object(return_type)
&& CFCType_incremented(return_type)
) {
- body = CFCUtil_cat(body, "\n LUCY_DECREF(retval);", NULL);
+ body = CFCUtil_cat(body, "\n CFISH_DECREF(retval);", NULL);
}
body = CFCUtil_cat(body, "\n sv_2mortal( ST(0) );\n XSRETURN(1);",
NULL);
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlSub.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlSub.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlSub.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlSub.c Fri Aug 5 18:35:45 2011
@@ -248,7 +248,7 @@ CFCPerlSub_build_allot_params(CFCPerlSub
allot_params
= CFCUtil_cat(allot_params, " NULL);\n",
" if (!args_ok) {\n"
- " CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));\n"
+ " CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));\n"
" }", NULL);
return allot_params;
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.c Fri Aug 5 18:35:45 2011
@@ -293,7 +293,7 @@ CFCPerlTypeMap_write_xs_typemap(CFCHiera
output = CFCUtil_cat(output, vtable_var, "_\n"
" $arg = (SV*)Cfish_Obj_To_Host((cfish_Obj*)$var);\n"
- " LUCY_DECREF($var);\n"
+ " CFISH_DECREF($var);\n"
"\n", NULL);
}
Modified: incubator/lucy/trunk/core/Lucy/Object/Obj.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Obj.cfh?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Obj.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Obj.cfh Fri Aug 5 18:35:45 2011
@@ -208,7 +208,7 @@ lucy_Obj_incref(lucy_Obj *self) {
else { return NULL; }
}
-#define LUCY_INCREF(_self) lucy_Obj_incref((lucy_Obj*)_self)
+#define CFISH_INCREF(_self) lucy_Obj_incref((lucy_Obj*)_self)
static CHY_INLINE uint32_t
lucy_Obj_decref(lucy_Obj *self) {
@@ -216,12 +216,12 @@ lucy_Obj_decref(lucy_Obj *self) {
else { return 0; }
}
-#define LUCY_DECREF(_self) lucy_Obj_decref((lucy_Obj*)_self)
+#define CFISH_DECREF(_self) lucy_Obj_decref((lucy_Obj*)_self)
#ifdef LUCY_USE_SHORT_NAMES
#define SUPER_DESTROY(_self, _vtable) LUCY_SUPER_DESTROY(_self, _vtable)
- #define INCREF(_self) LUCY_INCREF(_self)
- #define DECREF(_self) LUCY_DECREF(_self)
+ #define INCREF(_self) CFISH_INCREF(_self)
+ #define DECREF(_self) CFISH_DECREF(_self)
#endif
__END_C__
Modified: incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c Fri Aug 5 18:35:45 2011
@@ -79,7 +79,7 @@ FSDH_do_open(FSDirHandle *self, const Ch
// Deal with Windows ceiling on file path lengths.
Err_set_error(Err_new(CB_newf("Directory path is too long: %o",
dir)));
- LUCY_DECREF(self);
+ CFISH_DECREF(self);
return NULL;
}
@@ -93,7 +93,7 @@ FSDH_do_open(FSDirHandle *self, const Ch
if (INVALID_HANDLE_VALUE == self->sys_dirhandle) {
// Directory inaccessible or doesn't exist.
Err_set_error(Err_new(CB_newf("Failed to open dir '%o'", dir)));
- LUCY_DECREF(self);
+ CFISH_DECREF(self);
return NULL;
}
else {
@@ -150,7 +150,7 @@ FSDH_close(FSDirHandle *self) {
// If we encountered an error condition previously, report it now.
if (self->saved_error) {
- Err_set_error((Err*)LUCY_INCREF(self->saved_error));
+ Err_set_error((Err*)CFISH_INCREF(self->saved_error));
return false;
}
else {
Modified: incubator/lucy/trunk/perl/lib/Lucy/Analysis/Inversion.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Analysis/Inversion.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Analysis/Inversion.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Analysis/Inversion.pm Fri Aug 5 18:35:45 2011
@@ -39,7 +39,7 @@ CODE:
ALLOT_SV(&text_sv, "text", 4, false),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
if (XSBind_sv_defined(text_sv)) {
STRLEN len;
@@ -49,7 +49,7 @@ CODE:
}
RETVAL = CFISH_OBJ_TO_SV_NOINC(lucy_Inversion_new(starter_token));
- LUCY_DECREF(starter_token);
+ CFISH_DECREF(starter_token);
}
OUTPUT: RETVAL
END_XS
Modified: incubator/lucy/trunk/perl/lib/Lucy/Analysis/Token.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Analysis/Token.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Analysis/Token.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Analysis/Token.pm Fri Aug 5 18:35:45 2011
@@ -46,7 +46,7 @@ CODE:
ALLOT_F32(&boost, "boost", 5, false),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
STRLEN len;
Modified: incubator/lucy/trunk/perl/lib/Lucy/Document/Doc.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Document/Doc.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Document/Doc.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Document/Doc.pm Fri Aug 5 18:35:45 2011
@@ -39,7 +39,7 @@ CODE:
ALLOT_I32(&doc_id, "doc_id", 6, false),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
HV *fields = NULL;
Modified: incubator/lucy/trunk/perl/lib/Lucy/Document/HitDoc.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Document/HitDoc.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Document/HitDoc.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Document/HitDoc.pm Fri Aug 5 18:35:45 2011
@@ -41,7 +41,7 @@ CODE:
ALLOT_F32(&score, "score", 5, false),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
HV *fields = NULL;
Modified: incubator/lucy/trunk/perl/lib/Lucy/Index/IndexReader.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Index/IndexReader.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Index/IndexReader.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Index/IndexReader.pm Fri Aug 5 18:35:45 2011
@@ -29,11 +29,11 @@ void
set_race_condition_debug1(val_sv)
SV *val_sv;
PPCODE:
- LUCY_DECREF(lucy_PolyReader_race_condition_debug1);
+ CFISH_DECREF(lucy_PolyReader_race_condition_debug1);
lucy_PolyReader_race_condition_debug1 = (lucy_CharBuf*)
XSBind_maybe_sv_to_cfish_obj(val_sv, LUCY_CHARBUF, NULL);
if (lucy_PolyReader_race_condition_debug1) {
- (void)LUCY_INCREF(lucy_PolyReader_race_condition_debug1);
+ (void)CFISH_INCREF(lucy_PolyReader_race_condition_debug1);
}
int32_t
Modified: incubator/lucy/trunk/perl/lib/Lucy/Index/Indexer.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Index/Indexer.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Index/Indexer.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Index/Indexer.pm Fri Aug 5 18:35:45 2011
@@ -59,7 +59,7 @@ PPCODE:
ALLOT_F32(&boost, "boost", 5, false),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
}
else if (items == 1) {
Modified: incubator/lucy/trunk/perl/lib/Lucy/Index/SortCache.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Index/SortCache.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Index/SortCache.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Index/SortCache.pm Fri Aug 5 18:35:45 2011
@@ -37,13 +37,13 @@ CODE:
ALLOT_I32(&ord, "ord", 3, false),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
{
lucy_Obj *blank = Lucy_SortCache_Make_Blank(self);
lucy_Obj *value = Lucy_SortCache_Value(self, ord, blank);
RETVAL = XSBind_cfish_to_perl(value);
- LUCY_DECREF(blank);
+ CFISH_DECREF(blank);
}
}
OUTPUT: RETVAL
Modified: incubator/lucy/trunk/perl/lib/Lucy/Object/Hash.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Object/Hash.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Object/Hash.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Object/Hash.pm Fri Aug 5 18:35:45 2011
@@ -49,7 +49,7 @@ store(self, key, value);
lucy_Obj *value;
PPCODE:
{
- if (value) { LUCY_INCREF(value); }
+ if (value) { CFISH_INCREF(value); }
lucy_Hash_store(self, (lucy_Obj*)key, value);
}
Modified: incubator/lucy/trunk/perl/lib/Lucy/Object/Host.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Object/Host.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Object/Host.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Object/Host.pm Fri Aug 5 18:35:45 2011
@@ -45,7 +45,7 @@ CODE:
SV *pack_var = get_sv("Lucy::Object::Host::testobj", 1);
RETVAL = (SV*)Lucy_BB_To_Host(test_obj);
SvSetSV_nosteal(pack_var, RETVAL);
- LUCY_DECREF(test_obj);
+ CFISH_DECREF(test_obj);
CHY_UNUSED_VAR(items);
}
OUTPUT: RETVAL
@@ -94,7 +94,7 @@ CODE:
{
lucy_Obj *other = lucy_Host_callback_obj(obj, "_test_obj", 0);
RETVAL = (SV*)Lucy_Obj_To_Host(other);
- LUCY_DECREF(other);
+ CFISH_DECREF(other);
}
OUTPUT: RETVAL
END_XS_CODE
Modified: incubator/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm Fri Aug 5 18:35:45 2011
@@ -39,7 +39,7 @@ CODE:
ALLOT_SV(&ints_sv, "ints", 4, true),
NULL);
if (!args_ok) {
- CFISH_RETHROW(LUCY_INCREF(cfish_Err_get_error()));
+ CFISH_RETHROW(CFISH_INCREF(cfish_Err_get_error()));
}
AV *ints_av = NULL;
Modified: incubator/lucy/trunk/perl/lib/Lucy/Object/Obj.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Object/Obj.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Object/Obj.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Object/Obj.pm Fri Aug 5 18:35:45 2011
@@ -55,8 +55,8 @@ PPCODE:
serialized_bb
= Lucy_RAMFile_Get_Contents(Lucy_RAMFH_Get_File(file_handle));
retval = XSBind_bb_to_sv(serialized_bb);
- LUCY_DECREF(file_handle);
- LUCY_DECREF(target);
+ CFISH_DECREF(file_handle);
+ CFISH_DECREF(target);
if (SvCUR(retval) == 0) { // Thwart Storable bug
THROW(LUCY_ERR, "Calling serialize produced an empty string");
@@ -97,10 +97,10 @@ PPCODE:
lucy_Obj *deserialized = Lucy_Obj_Deserialize(self, instream);
CHY_UNUSED_VAR(cloning);
- LUCY_DECREF(contents);
- LUCY_DECREF(ram_file);
- LUCY_DECREF(file_handle);
- LUCY_DECREF(instream);
+ CFISH_DECREF(contents);
+ CFISH_DECREF(ram_file);
+ CFISH_DECREF(file_handle);
+ CFISH_DECREF(instream);
// Catch bad deserialize() override.
if (deserialized != self) {
Modified: incubator/lucy/trunk/perl/lib/Lucy/Object/VArray.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Object/VArray.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Object/VArray.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Object/VArray.pm Fri Aug 5 18:35:45 2011
@@ -77,7 +77,7 @@ store(self, tick, value);
lucy_Obj *value;
PPCODE:
{
- if (value) { LUCY_INCREF(value); }
+ if (value) { CFISH_INCREF(value); }
lucy_VA_store(self, tick, value);
}
Modified: incubator/lucy/trunk/perl/lib/Lucy/Test/Util/BBSortEx.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Test/Util/BBSortEx.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Test/Util/BBSortEx.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Test/Util/BBSortEx.pm Fri Aug 5 18:35:45 2011
@@ -33,7 +33,7 @@ CODE:
void *address = Lucy_BBSortEx_Fetch(self);
if (address) {
RETVAL = XSBind_cfish_to_perl(*(lucy_Obj**)address);
- LUCY_DECREF(*(lucy_Obj**)address);
+ CFISH_DECREF(*(lucy_Obj**)address);
}
else {
RETVAL = newSV(0);
@@ -61,7 +61,7 @@ feed(self, bb)
lucy_BBSortEx *self;
lucy_ByteBuf *bb;
CODE:
- LUCY_INCREF(bb);
+ CFISH_INCREF(bb);
Lucy_BBSortEx_Feed(self, &bb);
END_XS_CODE
Modified: incubator/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm (original)
+++ incubator/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm Fri Aug 5 18:35:45 2011
@@ -39,7 +39,7 @@ CODE:
{
lucy_CharBuf *latest = lucy_IxFileNames_latest_snapshot(folder);
RETVAL = XSBind_cb_to_sv(latest);
- LUCY_DECREF(latest);
+ CFISH_DECREF(latest);
}
OUTPUT: RETVAL
END_XS_CODE
Modified: incubator/lucy/trunk/perl/xs/Lucy/Analysis/CaseFolder.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/Lucy/Analysis/CaseFolder.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/Lucy/Analysis/CaseFolder.c (original)
+++ incubator/lucy/trunk/perl/xs/Lucy/Analysis/CaseFolder.c Fri Aug 5 18:35:45 2011
@@ -79,7 +79,7 @@ lucy_CaseFolder_transform(lucy_CaseFolde
token->len = size;
}
Lucy_Inversion_Reset(inversion);
- return (lucy_Inversion*)LUCY_INCREF(inversion);
+ return (lucy_Inversion*)CFISH_INCREF(inversion);
}
lucy_Inversion*
@@ -92,7 +92,7 @@ lucy_CaseFolder_transform_text(lucy_Case
Lucy_CB_Get_Size(text), &buf, &limit);
token = lucy_Token_new((char*)buf, size, 0, size, 1.0f, 1);
retval = lucy_Inversion_new(token);
- LUCY_DECREF(token);
+ CFISH_DECREF(token);
return retval;
}
Modified: incubator/lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c (original)
+++ incubator/lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c Fri Aug 5 18:35:45 2011
@@ -42,7 +42,7 @@ lucy_RegexTokenizer_init(lucy_RegexToken
if (Lucy_CB_Find_Str(pattern, "\\p", 2) != -1
|| Lucy_CB_Find_Str(pattern, "\\P", 2) != -1
) {
- LUCY_DECREF(self);
+ CFISH_DECREF(self);
THROW(LUCY_ERR, "\\p and \\P constructs forbidden");
}
self->pattern = Lucy_CB_Clone(pattern);
@@ -103,7 +103,7 @@ lucy_RegexTokenizer_set_token_re(lucy_Re
void
lucy_RegexTokenizer_destroy(lucy_RegexTokenizer *self) {
- LUCY_DECREF(self->pattern);
+ CFISH_DECREF(self->pattern);
ReREFCNT_dec(((REGEXP*)self->token_re));
LUCY_SUPER_DESTROY(self, LUCY_REGEXTOKENIZER);
}
Modified: incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c (original)
+++ incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c Fri Aug 5 18:35:45 2011
@@ -21,7 +21,7 @@ lucy_Err*
lucy_Err_get_error() {
lucy_Err *error
= (lucy_Err*)lucy_Host_callback_obj(LUCY_ERR, "get_error", 0);
- LUCY_DECREF(error); // Cancel out incref from callback.
+ CFISH_DECREF(error); // Cancel out incref from callback.
return error;
}
@@ -29,14 +29,14 @@ void
lucy_Err_set_error(lucy_Err *error) {
lucy_Host_callback(LUCY_ERR, "set_error", 1,
CFISH_ARG_OBJ("error", error));
- LUCY_DECREF(error);
+ CFISH_DECREF(error);
}
void
lucy_Err_do_throw(lucy_Err *err) {
dSP;
SV *error_sv = (SV*)Lucy_Err_To_Host(err);
- LUCY_DECREF(err);
+ CFISH_DECREF(err);
ENTER;
SAVETMPS;
PUSHMARK(SP);
@@ -62,14 +62,14 @@ lucy_Err_throw_mess(lucy_VTable *vtable,
CFISH_CERTIFY(vtable, LUCY_VTABLE), Err, Make);
lucy_Err *err = (lucy_Err*)CFISH_CERTIFY(make(NULL), LUCY_ERR);
Lucy_Err_Cat_Mess(err, message);
- LUCY_DECREF(message);
+ CFISH_DECREF(message);
lucy_Err_do_throw(err);
}
void
lucy_Err_warn_mess(lucy_CharBuf *message) {
SV *error_sv = XSBind_cb_to_sv(message);
- LUCY_DECREF(message);
+ CFISH_DECREF(message);
warn("%s", SvPV_nolen(error_sv));
SvREFCNT_dec(error_sv);
}
Modified: incubator/lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/XSBind.c?rev=1154343&r1=1154342&r2=1154343&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/XSBind.c (original)
+++ incubator/lucy/trunk/perl/xs/XSBind.c Fri Aug 5 18:35:45 2011
@@ -111,7 +111,7 @@ XSBind_maybe_sv_to_cfish_obj(SV *sv, cfi
// dangerous, but is the only way to avoid requiring that the
// caller take responsibility for a refcount.
SV *mortal = (SV*)Cfish_Obj_To_Host(retval);
- LUCY_DECREF(retval);
+ CFISH_DECREF(retval);
sv_2mortal(mortal);
}
}
@@ -182,7 +182,7 @@ XSBind_perl_to_cfish(SV *sv) {
) {
IV tmp = SvIV(inner);
retval = INT2PTR(cfish_Obj*, tmp);
- (void)LUCY_INCREF(retval);
+ (void)CFISH_INCREF(retval);
}
}