You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2012/07/14 15:48:01 UTC
[lucy-commits] svn commit: r1361542 - in /lucy/trunk: clownfish/perl/lib/ clownfish/src/
core/Lucy/Analysis/ core/Lucy/Document/ core/Lucy/Index/ core/Lucy/Object/
core/Lucy/Plan/ core/Lucy/Search/ core/Lucy/Store/ core/Lucy/Test/Util/
core/Lucy/Util/ core/LucyX/Sear...
Author: nwellnhof
Date: Sat Jul 14 13:48:00 2012
New Revision: 1361542
URL: http://svn.apache.org/viewvc?rev=1361542&view=rev
Log:
LUCY-233 Rename METHOD macro to METHOD_PTR
Modified:
lucy/trunk/clownfish/perl/lib/Clownfish.pod
lucy/trunk/clownfish/src/CFCBindCore.c
lucy/trunk/clownfish/src/CFCDumpable.c
lucy/trunk/clownfish/src/CFCPerlMethod.c
lucy/trunk/core/Lucy/Analysis/CaseFolder.c
lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c
lucy/trunk/core/Lucy/Analysis/Normalizer.c
lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c
lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c
lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c
lucy/trunk/core/Lucy/Document/HitDoc.c
lucy/trunk/core/Lucy/Index/PolyReader.c
lucy/trunk/core/Lucy/Index/SortFieldWriter.c
lucy/trunk/core/Lucy/Object/CharBuf.c
lucy/trunk/core/Lucy/Object/Err.c
lucy/trunk/core/Lucy/Object/Hash.c
lucy/trunk/core/Lucy/Object/Num.c
lucy/trunk/core/Lucy/Object/Obj.cfh
lucy/trunk/core/Lucy/Object/VTable.c
lucy/trunk/core/Lucy/Plan/NumericType.c
lucy/trunk/core/Lucy/Search/HitQueue.c
lucy/trunk/core/Lucy/Search/NoMatchQuery.c
lucy/trunk/core/Lucy/Search/PhraseQuery.c
lucy/trunk/core/Lucy/Search/PolyQuery.c
lucy/trunk/core/Lucy/Search/TermQuery.c
lucy/trunk/core/Lucy/Store/SharedLock.c
lucy/trunk/core/Lucy/Test/Util/BBSortEx.c
lucy/trunk/core/Lucy/Util/SortExternal.c
lucy/trunk/core/LucyX/Search/ProximityQuery.c
lucy/trunk/perl/xs/Lucy/Document/Doc.c
lucy/trunk/perl/xs/Lucy/Object/Err.c
lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c
lucy/trunk/perl/xs/Lucy/Object/VTable.c
Modified: lucy/trunk/clownfish/perl/lib/Clownfish.pod
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/perl/lib/Clownfish.pod?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/clownfish/perl/lib/Clownfish.pod (original)
+++ lucy/trunk/clownfish/perl/lib/Clownfish.pod Sat Jul 14 13:48:00 2012
@@ -80,7 +80,7 @@ Boat_capsize() is a function, Boat_Capsi
Battleship_capsize(Battleship *self)
{
// Superclass method invocation.
- Boat_capsize_t capsize = SUPER_METHOD(BATTLESHIP, Battleship_Capsize);
+ Boat_capsize_t capsize = SUPER_METHOD_PTR(BATTLESHIP, Battleship_Capsize);
capsize((Boat*)self);
// Subclass-specific behavior.
@@ -92,7 +92,7 @@ Boat_capsize() is a function, Boat_Capsi
RubDing_capsize(RubberDinghy *self)
{
// Superclass method invocation.
- Boat_capsize_t capsize = SUPER_METHOD(RUBBERDINGHY, RubDing_Capsize);
+ Boat_capsize_t capsize = SUPER_METHOD_PTR(RUBBERDINGHY, RubDing_Capsize);
capsize((Boat*)self);
// Subclass-specific behavior.
Modified: lucy/trunk/clownfish/src/CFCBindCore.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCBindCore.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCBindCore.c (original)
+++ lucy/trunk/clownfish/src/CFCBindCore.c Sat Jul 14 13:48:00 2012
@@ -175,7 +175,7 @@ S_write_parcel_h(CFCBindCore *self) {
"\n"
"/* Access the function pointer for a given method from the vtable.\n"
" */\n"
- "#define CFISH_METHOD(_vtable, _full_meth) \\\n"
+ "#define CFISH_METHOD_PTR(_vtable, _full_meth) \\\n"
" ((_full_meth ## _t)cfish_method(_vtable, _full_meth ## _OFFSET))\n"
"\n"
"static CHY_INLINE cfish_method_t\n"
@@ -187,7 +187,7 @@ S_write_parcel_h(CFCBindCore *self) {
"\n"
"/* Access the function pointer for the given method in the superclass's\n"
" * vtable. */\n"
- "#define CFISH_SUPER_METHOD(_vtable, _full_meth) \\\n"
+ "#define CFISH_SUPER_METHOD_PTR(_vtable, _full_meth) \\\n"
" ((_full_meth ## _t)cfish_super_method(_vtable, \\\n"
" _full_meth ## _OFFSET))\n"
"\n"
@@ -207,8 +207,8 @@ S_write_parcel_h(CFCBindCore *self) {
" != (cfish_method_t)_full_func)\n"
"\n"
"#ifdef CFISH_USE_SHORT_NAMES\n"
- " #define METHOD CFISH_METHOD\n"
- " #define SUPER_METHOD CFISH_SUPER_METHOD\n"
+ " #define METHOD_PTR CFISH_METHOD_PTR\n"
+ " #define SUPER_METHOD_PTR CFISH_SUPER_METHOD_PTR\n"
" #define OVERRIDDEN CFISH_OVERRIDDEN\n"
"#endif\n"
"\n"
Modified: lucy/trunk/clownfish/src/CFCDumpable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCDumpable.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCDumpable.c (original)
+++ lucy/trunk/clownfish/src/CFCDumpable.c Sat Jul 14 13:48:00 2012
@@ -178,7 +178,7 @@ S_add_dump_method(CFCClass *klass) {
"cfish_Obj*\n"
"%s(%s *self)\n"
"{\n"
- " %s super_dump = SUPER_METHOD(%s, %s);\n"
+ " %s super_dump = SUPER_METHOD_PTR(%s, %s);\n"
" cfish_Hash *dump = (cfish_Hash*)super_dump(self);\n";
size_t amount = sizeof(pattern)
+ strlen(full_func_sym)
@@ -252,7 +252,7 @@ S_add_load_method(CFCClass *klass) {
"%s(%s *self, cfish_Obj *dump)\n"
"{\n"
" cfish_Hash *source = (cfish_Hash*)CFISH_CERTIFY(dump, CFISH_HASH);\n"
- " %s super_load = SUPER_METHOD(%s, %s);\n"
+ " %s super_load = SUPER_METHOD_PTR(%s, %s);\n"
" %s *loaded = (%s*)super_load(self, dump);\n";
size_t amount = sizeof(pattern)
+ strlen(full_func_sym)
Modified: lucy/trunk/clownfish/src/CFCPerlMethod.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCPerlMethod.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCPerlMethod.c (original)
+++ lucy/trunk/clownfish/src/CFCPerlMethod.c Sat Jul 14 13:48:00 2012
@@ -128,7 +128,7 @@ S_xsub_body(CFCPerlMethod *self) {
= CFCMethod_full_method_sym(method, klass, NULL, 0);
char *full_meth = (char*)MALLOCATE(meth_size);
CFCMethod_full_method_sym(method, klass, full_meth, meth_size);
- body = CFCUtil_cat(body, full_typedef, " method = CFISH_METHOD(",
+ body = CFCUtil_cat(body, full_typedef, " method = CFISH_METHOD_PTR(",
CFCClass_full_vtable_var(klass), ", ",
full_meth, ");\n ", NULL);
FREEMEM(full_typedef);
Modified: lucy/trunk/core/Lucy/Analysis/CaseFolder.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/CaseFolder.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/CaseFolder.c (original)
+++ lucy/trunk/core/Lucy/Analysis/CaseFolder.c Sat Jul 14 13:48:00 2012
@@ -62,14 +62,14 @@ CaseFolder_equals(CaseFolder *self, Obj
Hash*
CaseFolder_dump(CaseFolder *self) {
CaseFolder_Dump_t super_dump
- = SUPER_METHOD(CASEFOLDER, Lucy_CaseFolder_Dump);
+ = SUPER_METHOD_PTR(CASEFOLDER, Lucy_CaseFolder_Dump);
return super_dump(self);
}
CaseFolder*
CaseFolder_load(CaseFolder *self, Obj *dump) {
CaseFolder_Load_t super_load
- = SUPER_METHOD(CASEFOLDER, Lucy_CaseFolder_Load);
+ = SUPER_METHOD_PTR(CASEFOLDER, Lucy_CaseFolder_Load);
CaseFolder *loaded = super_load(self, dump);
return CaseFolder_init(loaded);
}
Modified: lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c Sat Jul 14 13:48:00 2012
@@ -71,7 +71,7 @@ EasyAnalyzer_transform_text(EasyAnalyzer
Hash*
EasyAnalyzer_dump(EasyAnalyzer *self) {
EasyAnalyzer_Dump_t super_dump
- = SUPER_METHOD(EASYANALYZER, Lucy_EasyAnalyzer_Dump);
+ = SUPER_METHOD_PTR(EASYANALYZER, Lucy_EasyAnalyzer_Dump);
Hash *dump = super_dump(self);
Hash_Store_Str(dump, "language", 8, (Obj*)CB_Clone(self->language));
return dump;
@@ -80,7 +80,7 @@ EasyAnalyzer_dump(EasyAnalyzer *self) {
EasyAnalyzer*
EasyAnalyzer_load(EasyAnalyzer *self, Obj *dump) {
EasyAnalyzer_Load_t super_load
- = SUPER_METHOD(EASYANALYZER, Lucy_EasyAnalyzer_Load);
+ = SUPER_METHOD_PTR(EASYANALYZER, Lucy_EasyAnalyzer_Load);
EasyAnalyzer *loaded = super_load(self, dump);
Hash *source = (Hash*)CERTIFY(dump, HASH);
CharBuf *language
Modified: lucy/trunk/core/Lucy/Analysis/Normalizer.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/Normalizer.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Normalizer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/Normalizer.c Sat Jul 14 13:48:00 2012
@@ -115,7 +115,7 @@ Normalizer_transform(Normalizer *self, I
Hash*
Normalizer_dump(Normalizer *self) {
Normalizer_Dump_t super_dump
- = SUPER_METHOD(NORMALIZER, Lucy_Normalizer_Dump);
+ = SUPER_METHOD_PTR(NORMALIZER, Lucy_Normalizer_Dump);
Hash *dump = super_dump(self);
int options = self->options;
@@ -141,7 +141,7 @@ Normalizer_dump(Normalizer *self) {
Normalizer*
Normalizer_load(Normalizer *self, Obj *dump) {
Normalizer_Load_t super_load
- = SUPER_METHOD(NORMALIZER, Lucy_Normalizer_Load);
+ = SUPER_METHOD_PTR(NORMALIZER, Lucy_Normalizer_Load);
Normalizer *loaded = super_load(self, dump);
Hash *source = (Hash*)CERTIFY(dump, HASH);
Modified: lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c Sat Jul 14 13:48:00 2012
@@ -120,7 +120,7 @@ PolyAnalyzer*
PolyAnalyzer_load(PolyAnalyzer *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
PolyAnalyzer_Load_t super_load
- = SUPER_METHOD(POLYANALYZER, Lucy_PolyAnalyzer_Load);
+ = SUPER_METHOD_PTR(POLYANALYZER, Lucy_PolyAnalyzer_Load);
PolyAnalyzer *loaded = super_load(self, dump);
VArray *analyzer_dumps = (VArray*)CERTIFY(
Hash_Fetch_Str(source, "analyzers", 9),
Modified: lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c Sat Jul 14 13:48:00 2012
@@ -52,7 +52,7 @@ RegexTokenizer_transform_text(RegexToken
Obj*
RegexTokenizer_dump(RegexTokenizer *self) {
RegexTokenizer_Dump_t super_dump
- = SUPER_METHOD(REGEXTOKENIZER, Lucy_RegexTokenizer_Dump);
+ = SUPER_METHOD_PTR(REGEXTOKENIZER, Lucy_RegexTokenizer_Dump);
Hash *dump = (Hash*)CERTIFY(super_dump(self), HASH);
Hash_Store_Str(dump, "pattern", 7, CB_Dump(self->pattern));
return (Obj*)dump;
@@ -62,7 +62,7 @@ RegexTokenizer*
RegexTokenizer_load(RegexTokenizer *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
RegexTokenizer_Load_t super_load
- = SUPER_METHOD(REGEXTOKENIZER, Lucy_RegexTokenizer_Load);
+ = SUPER_METHOD_PTR(REGEXTOKENIZER, Lucy_RegexTokenizer_Load);
RegexTokenizer *loaded = super_load(self, dump);
CharBuf *pattern
= (CharBuf*)CERTIFY(Hash_Fetch_Str(source, "pattern", 7), CHARBUF);
Modified: lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c Sat Jul 14 13:48:00 2012
@@ -82,7 +82,7 @@ SnowStemmer_transform(SnowballStemmer *s
Hash*
SnowStemmer_dump(SnowballStemmer *self) {
SnowStemmer_Dump_t super_dump
- = SUPER_METHOD(SNOWBALLSTEMMER, Lucy_SnowStemmer_Dump);
+ = SUPER_METHOD_PTR(SNOWBALLSTEMMER, Lucy_SnowStemmer_Dump);
Hash *dump = super_dump(self);
Hash_Store_Str(dump, "language", 8, (Obj*)CB_Clone(self->language));
return dump;
@@ -91,7 +91,7 @@ SnowStemmer_dump(SnowballStemmer *self)
SnowballStemmer*
SnowStemmer_load(SnowballStemmer *self, Obj *dump) {
SnowStemmer_Load_t super_load
- = SUPER_METHOD(SNOWBALLSTEMMER, Lucy_SnowStemmer_Load);
+ = SUPER_METHOD_PTR(SNOWBALLSTEMMER, Lucy_SnowStemmer_Load);
SnowballStemmer *loaded = super_load(self, dump);
Hash *source = (Hash*)CERTIFY(dump, HASH);
CharBuf *language
Modified: lucy/trunk/core/Lucy/Document/HitDoc.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Document/HitDoc.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Document/HitDoc.c (original)
+++ lucy/trunk/core/Lucy/Document/HitDoc.c Sat Jul 14 13:48:00 2012
@@ -47,7 +47,7 @@ HitDoc_get_score(HitDoc *self) {
void
HitDoc_serialize(HitDoc *self, OutStream *outstream) {
HitDoc_Serialize_t super_serialize
- = SUPER_METHOD(HITDOC, Lucy_HitDoc_Serialize);
+ = SUPER_METHOD_PTR(HITDOC, Lucy_HitDoc_Serialize);
super_serialize(self, outstream);
OutStream_Write_F32(outstream, self->score);
}
@@ -55,7 +55,7 @@ HitDoc_serialize(HitDoc *self, OutStream
HitDoc*
HitDoc_deserialize(HitDoc *self, InStream *instream) {
HitDoc_Deserialize_t super_deserialize
- = SUPER_METHOD(HITDOC, Lucy_HitDoc_Deserialize);
+ = SUPER_METHOD_PTR(HITDOC, Lucy_HitDoc_Deserialize);
self = super_deserialize(self, instream);
self->score = InStream_Read_F32(instream);
return self;
@@ -64,7 +64,7 @@ HitDoc_deserialize(HitDoc *self, InStrea
Hash*
HitDoc_dump(HitDoc *self) {
HitDoc_Dump_t super_dump
- = SUPER_METHOD(HITDOC, Lucy_HitDoc_Dump);
+ = SUPER_METHOD_PTR(HITDOC, Lucy_HitDoc_Dump);
Hash *dump = super_dump(self);
Hash_Store_Str(dump, "score", 5, (Obj*)CB_newf("%f64", self->score));
return dump;
@@ -74,7 +74,7 @@ HitDoc*
HitDoc_load(HitDoc *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
HitDoc_Load_t super_load
- = SUPER_METHOD(HITDOC, Lucy_HitDoc_Load);
+ = SUPER_METHOD_PTR(HITDOC, Lucy_HitDoc_Load);
HitDoc *loaded = super_load(self, dump);
Obj *score = CERTIFY(Hash_Fetch_Str(source, "score", 5), OBJ);
loaded->score = (float)Obj_To_F64(score);
Modified: lucy/trunk/core/Lucy/Index/PolyReader.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/PolyReader.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/PolyReader.c (original)
+++ lucy/trunk/core/Lucy/Index/PolyReader.c Sat Jul 14 13:48:00 2012
@@ -183,7 +183,7 @@ PolyReader_init(PolyReader *self, Schema
void
PolyReader_close(PolyReader *self) {
PolyReader_Close_t super_close
- = SUPER_METHOD(POLYREADER, Lucy_PolyReader_Close);
+ = SUPER_METHOD_PTR(POLYREADER, Lucy_PolyReader_Close);
for (uint32_t i = 0, max = VA_Get_Size(self->sub_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)VA_Fetch(self->sub_readers, i);
SegReader_Close(seg_reader);
Modified: lucy/trunk/core/Lucy/Index/SortFieldWriter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/SortFieldWriter.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/SortFieldWriter.c (original)
+++ lucy/trunk/core/Lucy/Index/SortFieldWriter.c Sat Jul 14 13:48:00 2012
@@ -129,7 +129,7 @@ SortFieldWriter_clear_cache(SortFieldWri
Hash_Clear(self->uniq_vals);
}
SortFieldWriter_Clear_Cache_t super_clear_cache
- = SUPER_METHOD(self->vtable, Lucy_SortFieldWriter_Clear_Cache);
+ = SUPER_METHOD_PTR(self->vtable, Lucy_SortFieldWriter_Clear_Cache);
super_clear_cache(self);
}
Modified: lucy/trunk/core/Lucy/Object/CharBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/CharBuf.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/CharBuf.c (original)
+++ lucy/trunk/core/Lucy/Object/CharBuf.c Sat Jul 14 13:48:00 2012
@@ -133,7 +133,7 @@ CB_hash_sum(CharBuf *self) {
uint32_t hashvalue = 5381;
ZombieCharBuf *iterator = ZCB_WRAP(self);
- const CB_Nip_One_t nip_one = METHOD(iterator->vtable, Lucy_CB_Nip_One);
+ const CB_Nip_One_t nip_one = METHOD_PTR(iterator->vtable, Lucy_CB_Nip_One);
while (iterator->size) {
uint32_t code_point = (uint32_t)nip_one((CharBuf*)iterator);
hashvalue = ((hashvalue << 5) + hashvalue) ^ code_point;
Modified: lucy/trunk/core/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Err.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Err.c (original)
+++ lucy/trunk/core/Lucy/Object/Err.c Sat Jul 14 13:48:00 2012
@@ -68,7 +68,7 @@ Err_cat_mess(Err *self, const CharBuf *m
void
THROW(VTable *vtable, char *pattern, ...) {
va_list args;
- Err_Make_t make = METHOD(CERTIFY(vtable, VTABLE), Lucy_Err_Make);
+ Err_Make_t make = METHOD_PTR(CERTIFY(vtable, VTABLE), Lucy_Err_Make);
Err *err = (Err*)CERTIFY(make(NULL), ERR);
CharBuf *mess = Err_Get_Mess(err);
@@ -171,7 +171,7 @@ void
Err_throw_at(VTable *vtable, const char *file, int line,
const char *func, const char *pattern, ...) {
va_list args;
- Err_Make_t make = METHOD(CERTIFY(vtable, VTABLE), Lucy_Err_Make);
+ Err_Make_t make = METHOD_PTR(CERTIFY(vtable, VTABLE), Lucy_Err_Make);
Err *err = (Err*)CERTIFY(make(NULL), ERR);
CharBuf *mess = Err_Get_Mess(err);
Modified: lucy/trunk/core/Lucy/Object/Hash.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Hash.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Hash.c (original)
+++ lucy/trunk/core/Lucy/Object/Hash.c Sat Jul 14 13:48:00 2012
@@ -144,7 +144,7 @@ Hash_load(Hash *self, Obj *dump) {
// Dispatch to an alternate Load() method.
if (vtable) {
- Obj_Load_t load = METHOD(vtable, Lucy_Obj_Load);
+ Obj_Load_t load = METHOD_PTR(vtable, Lucy_Obj_Load);
if (load == Obj_load) {
THROW(ERR, "Abstract method Load() not defined for %o",
VTable_Get_Name(vtable));
Modified: lucy/trunk/core/Lucy/Object/Num.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Num.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Num.c (original)
+++ lucy/trunk/core/Lucy/Object/Num.c Sat Jul 14 13:48:00 2012
@@ -438,7 +438,7 @@ Bool_deserialize(BoolNum *self, InStream
bool_t value = (bool_t)InStream_Read_U8(instream);
if (self && self != CFISH_TRUE && self != CFISH_FALSE) {
Bool_Dec_RefCount_t super_decref
- = SUPER_METHOD(BOOLNUM, Lucy_Bool_Dec_RefCount);
+ = SUPER_METHOD_PTR(BOOLNUM, Lucy_Bool_Dec_RefCount);
super_decref(self);
}
return value ? CFISH_TRUE : CFISH_FALSE;
Modified: lucy/trunk/core/Lucy/Object/Obj.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Obj.cfh?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Obj.cfh (original)
+++ lucy/trunk/core/Lucy/Object/Obj.cfh Sat Jul 14 13:48:00 2012
@@ -191,7 +191,7 @@ __C__
static CHY_INLINE void
lucy_Obj_super_destroy(lucy_Obj *self, lucy_VTable *vtable) {
Lucy_Obj_Destroy_t super_destroy
- = CFISH_SUPER_METHOD(vtable, Lucy_Obj_Destroy);
+ = CFISH_SUPER_METHOD_PTR(vtable, Lucy_Obj_Destroy);
super_destroy(self);
}
Modified: lucy/trunk/core/Lucy/Object/VTable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/VTable.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/VTable.c (original)
+++ lucy/trunk/core/Lucy/Object/VTable.c Sat Jul 14 13:48:00 2012
@@ -268,7 +268,7 @@ VTable_init_obj(VTable *self, void *allo
Obj*
VTable_load_obj(VTable *self, Obj *dump) {
- Obj_Load_t load = METHOD(self, Lucy_Obj_Load);
+ Obj_Load_t load = METHOD_PTR(self, Lucy_Obj_Load);
if (load == Obj_load) {
THROW(ERR, "Abstract method Load() not defined for %o", self->name);
}
Modified: lucy/trunk/core/Lucy/Plan/NumericType.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Plan/NumericType.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Plan/NumericType.c (original)
+++ lucy/trunk/core/Lucy/Plan/NumericType.c Sat Jul 14 13:48:00 2012
@@ -157,7 +157,7 @@ Float64Type_equals(Float64Type *self, Ob
if (!other) { return false; }
if (!Obj_Is_A(other, FLOAT64TYPE)) { return false; }
Float64Type_Equals_t super_equals
- = SUPER_METHOD(FLOAT64TYPE, Lucy_Float64Type_Equals);
+ = SUPER_METHOD_PTR(FLOAT64TYPE, Lucy_Float64Type_Equals);
return super_equals(self, other);
}
@@ -199,7 +199,7 @@ Float32Type_equals(Float32Type *self, Ob
if (!other) { return false; }
if (!Obj_Is_A(other, FLOAT32TYPE)) { return false; }
Float32Type_Equals_t super_equals
- = SUPER_METHOD(FLOAT32TYPE, Lucy_Float32Type_Equals);
+ = SUPER_METHOD_PTR(FLOAT32TYPE, Lucy_Float32Type_Equals);
return super_equals(self, other);
}
@@ -241,7 +241,7 @@ Int32Type_equals(Int32Type *self, Obj *o
if (!other) { return false; }
if (!Obj_Is_A(other, INT32TYPE)) { return false; }
Int32Type_Equals_t super_equals
- = SUPER_METHOD(INT32TYPE, Lucy_Int32Type_Equals);
+ = SUPER_METHOD_PTR(INT32TYPE, Lucy_Int32Type_Equals);
return super_equals(self, other);
}
@@ -283,7 +283,7 @@ Int64Type_equals(Int64Type *self, Obj *o
if (!other) { return false; }
if (!Obj_Is_A(other, INT64TYPE)) { return false; }
Int64Type_Equals_t super_equals
- = SUPER_METHOD(INT64TYPE, Lucy_Int64Type_Equals);
+ = SUPER_METHOD_PTR(INT64TYPE, Lucy_Int64Type_Equals);
return super_equals(self, other);
}
Modified: lucy/trunk/core/Lucy/Search/HitQueue.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/HitQueue.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/HitQueue.c (original)
+++ lucy/trunk/core/Lucy/Search/HitQueue.c Sat Jul 14 13:48:00 2012
@@ -120,7 +120,7 @@ Obj*
HitQ_jostle(HitQueue *self, Obj *element) {
MatchDoc *match_doc = (MatchDoc*)CERTIFY(element, MATCHDOC);
HitQ_Jostle_t super_jostle
- = SUPER_METHOD(HITQUEUE, Lucy_HitQ_Jostle);
+ = SUPER_METHOD_PTR(HITQUEUE, Lucy_HitQ_Jostle);
if (self->need_values) {
CERTIFY(match_doc->values, VARRAY);
}
Modified: lucy/trunk/core/Lucy/Search/NoMatchQuery.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/NoMatchQuery.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/NoMatchQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/NoMatchQuery.c Sat Jul 14 13:48:00 2012
@@ -78,7 +78,7 @@ NoMatchQuery_get_fails_to_match(NoMatchQ
Obj*
NoMatchQuery_dump(NoMatchQuery *self) {
NoMatchQuery_Dump_t super_dump
- = SUPER_METHOD(NOMATCHQUERY, Lucy_NoMatchQuery_Dump);
+ = SUPER_METHOD_PTR(NOMATCHQUERY, Lucy_NoMatchQuery_Dump);
Hash *dump = (Hash*)CERTIFY(super_dump(self), HASH);
Hash_Store_Str(dump, "fails_to_match", 14,
(Obj*)Bool_singleton(self->fails_to_match));
@@ -89,7 +89,7 @@ NoMatchQuery*
NoMatchQuery_load(NoMatchQuery *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
NoMatchQuery_Load_t super_load
- = SUPER_METHOD(NOMATCHQUERY, Lucy_NoMatchQuery_Load);
+ = SUPER_METHOD_PTR(NOMATCHQUERY, Lucy_NoMatchQuery_Load);
NoMatchQuery *loaded = super_load(self, dump);
Obj *fails = Cfish_Hash_Fetch_Str(source, "fails_to_match", 14);
loaded->fails_to_match = fails ? Obj_To_Bool(fails) : true;
Modified: lucy/trunk/core/Lucy/Search/PhraseQuery.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/PhraseQuery.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/PhraseQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/PhraseQuery.c Sat Jul 14 13:48:00 2012
@@ -205,7 +205,7 @@ PhraseCompiler_serialize(PhraseCompiler
PhraseCompiler*
PhraseCompiler_deserialize(PhraseCompiler *self, InStream *instream) {
PhraseCompiler_Deserialize_t super_deserialize
- = SUPER_METHOD(PHRASECOMPILER, Lucy_PhraseCompiler_Deserialize);
+ = SUPER_METHOD_PTR(PHRASECOMPILER, Lucy_PhraseCompiler_Deserialize);
self = super_deserialize(self, instream);
self->idf = InStream_Read_F32(instream);
self->raw_weight = InStream_Read_F32(instream);
Modified: lucy/trunk/core/Lucy/Search/PolyQuery.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/PolyQuery.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/PolyQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/PolyQuery.c Sat Jul 14 13:48:00 2012
@@ -170,7 +170,7 @@ PolyCompiler_serialize(PolyCompiler *sel
CB_Serialize(PolyCompiler_Get_Class_Name(self), outstream);
VA_Serialize(self->children, outstream);
PolyCompiler_Serialize_t super_serialize
- = SUPER_METHOD(POLYCOMPILER, Lucy_PolyCompiler_Serialize);
+ = SUPER_METHOD_PTR(POLYCOMPILER, Lucy_PolyCompiler_Serialize);
super_serialize(self, outstream);
}
@@ -182,7 +182,7 @@ PolyCompiler_deserialize(PolyCompiler *s
self->children
= VA_Deserialize((VArray*)VTable_Make_Obj(VARRAY), instream);
PolyCompiler_Deserialize_t super_deserialize
- = SUPER_METHOD(POLYCOMPILER, Lucy_PolyCompiler_Deserialize);
+ = SUPER_METHOD_PTR(POLYCOMPILER, Lucy_PolyCompiler_Deserialize);
return super_deserialize(self, instream);
}
Modified: lucy/trunk/core/Lucy/Search/TermQuery.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/TermQuery.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/TermQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/TermQuery.c Sat Jul 14 13:48:00 2012
@@ -171,7 +171,7 @@ TermCompiler_equals(TermCompiler *self,
void
TermCompiler_serialize(TermCompiler *self, OutStream *outstream) {
TermCompiler_Serialize_t super_serialize
- = SUPER_METHOD(TERMCOMPILER, Lucy_TermCompiler_Serialize);
+ = SUPER_METHOD_PTR(TERMCOMPILER, Lucy_TermCompiler_Serialize);
super_serialize(self, outstream);
OutStream_Write_F32(outstream, self->idf);
OutStream_Write_F32(outstream, self->raw_weight);
@@ -182,7 +182,7 @@ TermCompiler_serialize(TermCompiler *sel
TermCompiler*
TermCompiler_deserialize(TermCompiler *self, InStream *instream) {
TermCompiler_Deserialize_t super_deserialize
- = SUPER_METHOD(TERMCOMPILER, Lucy_TermCompiler_Deserialize);
+ = SUPER_METHOD_PTR(TERMCOMPILER, Lucy_TermCompiler_Deserialize);
self = super_deserialize(self, instream);
self->idf = InStream_Read_F32(instream);
self->raw_weight = InStream_Read_F32(instream);
Modified: lucy/trunk/core/Lucy/Store/SharedLock.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/SharedLock.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/SharedLock.c (original)
+++ lucy/trunk/core/Lucy/Store/SharedLock.c Sat Jul 14 13:48:00 2012
@@ -55,7 +55,7 @@ bool_t
ShLock_request(SharedLock *self) {
uint32_t i = 0;
ShLock_Request_t super_request
- = SUPER_METHOD(SHAREDLOCK, Lucy_ShLock_Request);
+ = SUPER_METHOD_PTR(SHAREDLOCK, Lucy_ShLock_Request);
// Empty lock_path indicates whether this particular instance is locked.
if (self->lock_path
@@ -83,7 +83,7 @@ void
ShLock_release(SharedLock *self) {
if (self->lock_path && !CB_Equals_Str(self->lock_path, "", 0)) {
ShLock_Release_t super_release
- = SUPER_METHOD(SHAREDLOCK, Lucy_ShLock_Release);
+ = SUPER_METHOD_PTR(SHAREDLOCK, Lucy_ShLock_Release);
super_release(self);
// Empty out lock_path.
Modified: lucy/trunk/core/Lucy/Test/Util/BBSortEx.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Util/BBSortEx.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Util/BBSortEx.c (original)
+++ lucy/trunk/core/Lucy/Test/Util/BBSortEx.c Sat Jul 14 13:48:00 2012
@@ -54,7 +54,7 @@ BBSortEx_clear_cache(BBSortEx *self) {
}
self->mem_consumed = 0;
BBSortEx_Clear_Cache_t super_clear_cache
- = SUPER_METHOD(self->vtable, Lucy_BBSortEx_Clear_Cache);
+ = SUPER_METHOD_PTR(self->vtable, Lucy_BBSortEx_Clear_Cache);
super_clear_cache(self);
}
Modified: lucy/trunk/core/Lucy/Util/SortExternal.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/SortExternal.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/SortExternal.c (original)
+++ lucy/trunk/core/Lucy/Util/SortExternal.c Sat Jul 14 13:48:00 2012
@@ -126,7 +126,7 @@ SortEx_sort_cache(SortExternal *self) {
if (self->cache_max != 0) {
VTable *vtable = SortEx_Get_VTable(self);
Lucy_Sort_Compare_t compare
- = (Lucy_Sort_Compare_t)METHOD(vtable, Lucy_SortEx_Compare);
+ = (Lucy_Sort_Compare_t)METHOD_PTR(vtable, Lucy_SortEx_Compare);
if (self->scratch_cap < self->cache_cap) {
self->scratch_cap = self->cache_cap;
self->scratch = (uint8_t*)REALLOCATE(
@@ -220,7 +220,7 @@ S_absorb_slices(SortExternal *self, uint
uint32_t *slice_sizes = self->slice_sizes;
VTable *vtable = SortEx_Get_VTable(self);
Lucy_Sort_Compare_t compare
- = (Lucy_Sort_Compare_t)METHOD(vtable, Lucy_SortEx_Compare);
+ = (Lucy_Sort_Compare_t)METHOD_PTR(vtable, Lucy_SortEx_Compare);
if (self->cache_max != 0) { THROW(ERR, "Can't refill unless empty"); }
@@ -310,7 +310,7 @@ S_find_slice_size(SortExternal *self, ui
uint8_t *const cache = self->cache;
const size_t width = self->width;
SortEx_Compare_t compare
- = METHOD(SortEx_Get_VTable(self), Lucy_SortEx_Compare);
+ = METHOD_PTR(SortEx_Get_VTable(self), Lucy_SortEx_Compare);
// Binary search.
while (hi - lo > 1) {
Modified: lucy/trunk/core/LucyX/Search/ProximityQuery.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/LucyX/Search/ProximityQuery.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/core/LucyX/Search/ProximityQuery.c (original)
+++ lucy/trunk/core/LucyX/Search/ProximityQuery.c Sat Jul 14 13:48:00 2012
@@ -212,7 +212,7 @@ ProximityCompiler_init(ProximityCompiler
void
ProximityCompiler_serialize(ProximityCompiler *self, OutStream *outstream) {
ProximityCompiler_Serialize_t super_serialize
- = SUPER_METHOD(PROXIMITYCOMPILER, Lucy_ProximityCompiler_Serialize);
+ = SUPER_METHOD_PTR(PROXIMITYCOMPILER, Lucy_ProximityCompiler_Serialize);
super_serialize(self, outstream);
OutStream_Write_F32(outstream, self->idf);
OutStream_Write_F32(outstream, self->raw_weight);
@@ -224,7 +224,7 @@ ProximityCompiler_serialize(ProximityCom
ProximityCompiler*
ProximityCompiler_deserialize(ProximityCompiler *self, InStream *instream) {
ProximityCompiler_Deserialize_t super_deserialize
- = SUPER_METHOD(PROXIMITYCOMPILER, Lucy_ProximityCompiler_Deserialize);
+ = SUPER_METHOD_PTR(PROXIMITYCOMPILER, Lucy_ProximityCompiler_Deserialize);
self = super_deserialize(self, instream);
self->idf = InStream_Read_F32(instream);
self->raw_weight = InStream_Read_F32(instream);
Modified: lucy/trunk/perl/xs/Lucy/Document/Doc.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Document/Doc.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Document/Doc.c (original)
+++ lucy/trunk/perl/xs/Lucy/Document/Doc.c Sat Jul 14 13:48:00 2012
@@ -107,7 +107,7 @@ lucy_Doc_extract(lucy_Doc *self, lucy_Ch
void*
lucy_Doc_to_host(lucy_Doc *self) {
Lucy_Doc_To_Host_t super_to_host
- = CFISH_SUPER_METHOD(LUCY_DOC, Lucy_Doc_To_Host);
+ = CFISH_SUPER_METHOD_PTR(LUCY_DOC, Lucy_Doc_To_Host);
SV *perl_obj = (SV*)super_to_host(self);
XSBind_enable_overload(perl_obj);
return perl_obj;
Modified: lucy/trunk/perl/xs/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/Err.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Err.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Err.c Sat Jul 14 13:48:00 2012
@@ -75,7 +75,7 @@ lucy_Err_do_throw(lucy_Err *err) {
void*
lucy_Err_to_host(lucy_Err *self) {
Lucy_Err_To_Host_t super_to_host
- = CFISH_SUPER_METHOD(LUCY_ERR, Lucy_Err_To_Host);
+ = CFISH_SUPER_METHOD_PTR(LUCY_ERR, Lucy_Err_To_Host);
SV *perl_obj = (SV*)super_to_host(self);
XSBind_enable_overload(perl_obj);
return perl_obj;
@@ -84,7 +84,7 @@ lucy_Err_to_host(lucy_Err *self) {
void
lucy_Err_throw_mess(lucy_VTable *vtable, lucy_CharBuf *message) {
Lucy_Err_Make_t make
- = CFISH_METHOD(CFISH_CERTIFY(vtable, LUCY_VTABLE), Lucy_Err_Make);
+ = CFISH_METHOD_PTR(CFISH_CERTIFY(vtable, LUCY_VTABLE), Lucy_Err_Make);
lucy_Err *err = (lucy_Err*)CFISH_CERTIFY(make(NULL), LUCY_ERR);
Lucy_Err_Cat_Mess(err, message);
CFISH_DECREF(message);
Modified: lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c Sat Jul 14 13:48:00 2012
@@ -25,7 +25,7 @@ void*
lucy_LFReg_to_host(lucy_LockFreeRegistry *self) {
chy_bool_t first_time = self->ref.count < 4 ? true : false;
Lucy_LFReg_To_Host_t to_host
- = CFISH_SUPER_METHOD(LUCY_LOCKFREEREGISTRY, Lucy_LFReg_To_Host);
+ = CFISH_SUPER_METHOD_PTR(LUCY_LOCKFREEREGISTRY, Lucy_LFReg_To_Host);
SV *host_obj = (SV*)to_host(self);
if (first_time) {
SvSHARE((SV*)self->ref.host_obj);
Modified: lucy/trunk/perl/xs/Lucy/Object/VTable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/VTable.c?rev=1361542&r1=1361541&r2=1361542&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/VTable.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/VTable.c Sat Jul 14 13:48:00 2012
@@ -59,7 +59,7 @@ void*
lucy_VTable_to_host(lucy_VTable *self) {
chy_bool_t first_time = self->ref.count < 4 ? true : false;
Lucy_VTable_To_Host_t to_host
- = CFISH_SUPER_METHOD(LUCY_VTABLE, Lucy_VTable_To_Host);
+ = CFISH_SUPER_METHOD_PTR(LUCY_VTABLE, Lucy_VTable_To_Host);
SV *host_obj = (SV*)to_host(self);
if (first_time) {
SvSHARE((SV*)self->ref.host_obj);