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 2012/04/20 03:41:31 UTC
[lucy-commits] svn commit: r1328171 - 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/LucyX/Search/ perl/xs/Lucy...
Author: marvin
Date: Fri Apr 20 01:41:30 2012
New Revision: 1328171
URL: http://svn.apache.org/viewvc?rev=1328171&view=rev
Log:
Make SUPER_METHOD more compact.
Have the SUPER_METHOD macro cast its return value and take more sensible
arguments. Only define one SUPER_METHOD macro globally rather than defining
one for each parcel.
Modified:
lucy/trunk/clownfish/perl/lib/Clownfish.pod
lucy/trunk/clownfish/src/CFCBindCore.c
lucy/trunk/clownfish/src/CFCDumpable.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/Num.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/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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/clownfish/perl/lib/Clownfish.pod (original)
+++ lucy/trunk/clownfish/perl/lib/Clownfish.pod Fri Apr 20 01:41:30 2012
@@ -80,8 +80,7 @@ Boat_capsize() is a function, Boat_Capsi
Battleship_capsize(Battleship *self)
{
// Superclass method invocation.
- Boat_capsize_t capsize = (Boat_capsize_t)SUPER_METHOD(
- BATTLESHIP, Battleship, Capsize);
+ Boat_capsize_t capsize = SUPER_METHOD(BATTLESHIP, Battleship_Capsize);
capsize((Boat*)self);
// Subclass-specific behavior.
@@ -93,8 +92,7 @@ Boat_capsize() is a function, Boat_Capsi
RubDing_capsize(RubberDinghy *self)
{
// Superclass method invocation.
- Boat_capsize_t capsize = (Boat_capsize_t)SUPER_METHOD(
- RUBBERDINGHY, RubDing, Capsize);
+ Boat_capsize_t capsize = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCBindCore.c (original)
+++ lucy/trunk/clownfish/src/CFCBindCore.c Fri Apr 20 01:41:30 2012
@@ -187,9 +187,9 @@ S_write_parcel_h(CFCBindCore *self) {
"\n"
"/* Access the function pointer for the given method in the superclass's\n"
" * vtable. */\n"
- "#define %sSUPER_METHOD(_vtable, _class_nick, _meth_name) \\\n"
- " cfish_super_method(_vtable, \\\n"
- " %s ## _class_nick ## _ ## _meth_name ## _OFFSET)\n"
+ "#define CFISH_SUPER_METHOD(_vtable, _full_meth) \\\n"
+ " ((_full_meth ## _t)cfish_super_method(_vtable, \\\n"
+ " _full_meth ## _OFFSET))\n"
"\n"
"extern size_t cfish_VTable_offset_of_parent;\n"
"static CHY_INLINE cfish_method_t\n"
@@ -209,7 +209,7 @@ S_write_parcel_h(CFCBindCore *self) {
"\n"
"#ifdef CFISH_USE_SHORT_NAMES\n"
" #define METHOD %sMETHOD\n"
- " #define SUPER_METHOD %sSUPER_METHOD\n"
+ " #define SUPER_METHOD CFISH_SUPER_METHOD\n"
" #define OVERRIDDEN %sOVERRIDDEN\n"
"#endif\n"
"\n"
@@ -239,9 +239,8 @@ S_write_parcel_h(CFCBindCore *self) {
+ strlen(aliases)
+ strlen(typedefs)
+ strlen(PREFIX) + strlen(Prefix)
- + strlen(PREFIX) + strlen(Prefix)
+ strlen(PREFIX) + strlen(Prefix) + strlen(prefix)
- + 3 * strlen(PREFIX)
+ + 2 * strlen(PREFIX)
+ 2 * strlen(prefix)
+ strlen(self->footer)
+ 100;
@@ -249,9 +248,8 @@ S_write_parcel_h(CFCBindCore *self) {
sprintf(file_content, pattern,
self->header, aliases, typedefs,
PREFIX, Prefix,
- PREFIX, Prefix,
PREFIX, Prefix, prefix,
- PREFIX, PREFIX, PREFIX,
+ PREFIX, PREFIX,
prefix, prefix,
self->footer);
Modified: lucy/trunk/clownfish/src/CFCDumpable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCDumpable.c?rev=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCDumpable.c (original)
+++ lucy/trunk/clownfish/src/CFCDumpable.c Fri Apr 20 01:41:30 2012
@@ -170,26 +170,32 @@ S_add_dump_method(CFCClass *klass) {
char *full_typedef = (char*)MALLOCATE(full_typedef_size);
CFCMethod_full_typedef(method, cnick, full_typedef, full_typedef_size);
+ size_t full_meth_size = CFCMethod_full_method_sym(method, cnick, NULL, 0);
+ char *full_meth = (char*)MALLOCATE(full_meth_size);
+ CFCMethod_full_method_sym(method, cnick, full_meth, full_meth_size);
+
if (parent && CFCClass_has_attribute(parent, "dumpable")) {
const char pattern[] =
"cfish_Obj*\n"
"%s(%s *self)\n"
"{\n"
- " %s super_dump = (%s)SUPER_METHOD(%s, %s, Dump);\n"
+ " %s super_dump = SUPER_METHOD(%s, %s);\n"
" cfish_Hash *dump = (cfish_Hash*)super_dump(self);\n";
size_t amount = sizeof(pattern)
+ strlen(full_func_sym)
+ strlen(full_struct)
- + strlen(full_typedef) * 2
+ + strlen(full_typedef)
+ strlen(vtable_var)
- + strlen(cnick)
+ + strlen(full_meth)
+ 50;
char *autocode = (char*)MALLOCATE(amount);
sprintf(autocode, pattern, full_func_sym, full_struct, full_typedef,
- full_typedef, vtable_var, cnick);
- FREEMEM(full_typedef);
+ vtable_var, full_meth);
CFCClass_append_autocode(klass, autocode);
+ FREEMEM(full_meth);
+ FREEMEM(full_typedef);
FREEMEM(autocode);
+
CFCVariable **fresh = CFCClass_fresh_member_vars(klass);
for (size_t i = 0; fresh[i] != NULL; i++) {
S_process_dump_member(klass, fresh[i], buf, BUF_SIZE);
@@ -238,27 +244,33 @@ S_add_load_method(CFCClass *klass) {
char *full_typedef = (char*)MALLOCATE(full_typedef_size);
CFCMethod_full_typedef(method, cnick, full_typedef, full_typedef_size);
+ size_t full_meth_size = CFCMethod_full_method_sym(method, cnick, NULL, 0);
+ char *full_meth = (char*)MALLOCATE(full_meth_size);
+ CFCMethod_full_method_sym(method, cnick, full_meth, full_meth_size);
+
if (parent && CFCClass_has_attribute(parent, "dumpable")) {
const char pattern[] =
"cfish_Obj*\n"
"%s(%s *self, cfish_Obj *dump)\n"
"{\n"
" cfish_Hash *source = (cfish_Hash*)CFISH_CERTIFY(dump, CFISH_HASH);\n"
- " %s super_load = (%s)SUPER_METHOD(%s, %s, Load);\n"
+ " %s super_load = SUPER_METHOD(%s, %s);\n"
" %s *loaded = (%s*)super_load(self, dump);\n";
size_t amount = sizeof(pattern)
+ strlen(full_func_sym)
+ strlen(full_struct) * 3
- + strlen(full_typedef) * 2
+ + strlen(full_typedef)
+ strlen(vtable_var)
- + strlen(cnick)
+ + strlen(full_meth)
+ 50;
char *autocode = (char*)MALLOCATE(amount);
sprintf(autocode, pattern, full_func_sym, full_struct, full_typedef,
- full_typedef, vtable_var, cnick, full_struct, full_struct);
- FREEMEM(full_typedef);
+ vtable_var, full_meth, full_struct, full_struct);
CFCClass_append_autocode(klass, autocode);
+ FREEMEM(full_meth);
+ FREEMEM(full_typedef);
FREEMEM(autocode);
+
CFCVariable **fresh = CFCClass_fresh_member_vars(klass);
for (size_t i = 0; fresh[i] != NULL; i++) {
S_process_load_member(klass, fresh[i], buf, BUF_SIZE);
Modified: lucy/trunk/core/Lucy/Analysis/CaseFolder.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/CaseFolder.c?rev=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/CaseFolder.c (original)
+++ lucy/trunk/core/Lucy/Analysis/CaseFolder.c Fri Apr 20 01:41:30 2012
@@ -62,14 +62,14 @@ CaseFolder_equals(CaseFolder *self, Obj
Hash*
CaseFolder_dump(CaseFolder *self) {
CaseFolder_Dump_t super_dump
- = (CaseFolder_Dump_t)SUPER_METHOD(CASEFOLDER, CaseFolder, Dump);
+ = SUPER_METHOD(CASEFOLDER, Lucy_CaseFolder_Dump);
return super_dump(self);
}
CaseFolder*
CaseFolder_load(CaseFolder *self, Obj *dump) {
CaseFolder_Load_t super_load
- = (CaseFolder_Load_t)SUPER_METHOD(CASEFOLDER, CaseFolder, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/EasyAnalyzer.c Fri Apr 20 01:41:30 2012
@@ -71,7 +71,7 @@ EasyAnalyzer_transform_text(EasyAnalyzer
Hash*
EasyAnalyzer_dump(EasyAnalyzer *self) {
EasyAnalyzer_Dump_t super_dump
- = (EasyAnalyzer_Dump_t)SUPER_METHOD(EASYANALYZER, EasyAnalyzer, Dump);
+ = SUPER_METHOD(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
- = (EasyAnalyzer_Load_t)SUPER_METHOD(EASYANALYZER, EasyAnalyzer, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Normalizer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/Normalizer.c Fri Apr 20 01:41:30 2012
@@ -115,7 +115,7 @@ Normalizer_transform(Normalizer *self, I
Hash*
Normalizer_dump(Normalizer *self) {
Normalizer_Dump_t super_dump
- = (Normalizer_Dump_t)SUPER_METHOD(NORMALIZER, Normalizer, Dump);
+ = SUPER_METHOD(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
- = (Normalizer_Load_t)SUPER_METHOD(NORMALIZER, Normalizer, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c Fri Apr 20 01:41:30 2012
@@ -119,8 +119,8 @@ PolyAnalyzer_equals(PolyAnalyzer *self,
PolyAnalyzer*
PolyAnalyzer_load(PolyAnalyzer *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
- PolyAnalyzer_Load_t super_load = (PolyAnalyzer_Load_t)SUPER_METHOD(
- POLYANALYZER, PolyAnalyzer, Load);
+ PolyAnalyzer_Load_t super_load
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c Fri Apr 20 01:41:30 2012
@@ -52,7 +52,7 @@ RegexTokenizer_transform_text(RegexToken
Obj*
RegexTokenizer_dump(RegexTokenizer *self) {
RegexTokenizer_Dump_t super_dump
- = (RegexTokenizer_Dump_t)SUPER_METHOD(REGEXTOKENIZER, RegexTokenizer, Dump);
+ = SUPER_METHOD(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
- = (RegexTokenizer_Load_t)SUPER_METHOD(REGEXTOKENIZER, RegexTokenizer, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c Fri Apr 20 01:41:30 2012
@@ -82,7 +82,7 @@ SnowStemmer_transform(SnowballStemmer *s
Hash*
SnowStemmer_dump(SnowballStemmer *self) {
SnowStemmer_Dump_t super_dump
- = (SnowStemmer_Dump_t)SUPER_METHOD(SNOWBALLSTEMMER, SnowStemmer, Dump);
+ = SUPER_METHOD(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
- = (SnowStemmer_Load_t)SUPER_METHOD(SNOWBALLSTEMMER, SnowStemmer, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Document/HitDoc.c (original)
+++ lucy/trunk/core/Lucy/Document/HitDoc.c Fri Apr 20 01:41:30 2012
@@ -47,7 +47,7 @@ HitDoc_get_score(HitDoc *self) {
void
HitDoc_serialize(HitDoc *self, OutStream *outstream) {
HitDoc_Serialize_t super_serialize
- = (HitDoc_Serialize_t)SUPER_METHOD(HITDOC, HitDoc, Serialize);
+ = SUPER_METHOD(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
- = (HitDoc_Deserialize_t)SUPER_METHOD(HITDOC, HitDoc, Deserialize);
+ = SUPER_METHOD(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
- = (HitDoc_Dump_t)SUPER_METHOD(HITDOC, HitDoc, Dump);
+ = SUPER_METHOD(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
- = (HitDoc_Load_t)SUPER_METHOD(HITDOC, HitDoc, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/PolyReader.c (original)
+++ lucy/trunk/core/Lucy/Index/PolyReader.c Fri Apr 20 01:41:30 2012
@@ -183,7 +183,7 @@ PolyReader_init(PolyReader *self, Schema
void
PolyReader_close(PolyReader *self) {
PolyReader_Close_t super_close
- = (PolyReader_Close_t)SUPER_METHOD(POLYREADER, PolyReader, Close);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/SortFieldWriter.c (original)
+++ lucy/trunk/core/Lucy/Index/SortFieldWriter.c Fri Apr 20 01:41:30 2012
@@ -129,8 +129,7 @@ SortFieldWriter_clear_cache(SortFieldWri
Hash_Clear(self->uniq_vals);
}
SortFieldWriter_Clear_Cache_t super_clear_cache
- = (SortFieldWriter_Clear_Cache_t)SUPER_METHOD(
- self->vtable, SortFieldWriter, Clear_Cache);
+ = SUPER_METHOD(self->vtable, Lucy_SortFieldWriter_Clear_Cache);
super_clear_cache(self);
}
Modified: lucy/trunk/core/Lucy/Object/Num.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Num.c?rev=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Num.c (original)
+++ lucy/trunk/core/Lucy/Object/Num.c Fri Apr 20 01:41:30 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
- = (Bool_Dec_RefCount_t)SUPER_METHOD(BOOLNUM, Bool, Dec_RefCount);
+ = SUPER_METHOD(BOOLNUM, Lucy_Bool_Dec_RefCount);
super_decref(self);
}
return value ? CFISH_TRUE : CFISH_FALSE;
Modified: lucy/trunk/core/Lucy/Plan/NumericType.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Plan/NumericType.c?rev=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Plan/NumericType.c (original)
+++ lucy/trunk/core/Lucy/Plan/NumericType.c Fri Apr 20 01:41:30 2012
@@ -156,8 +156,8 @@ Float64Type_equals(Float64Type *self, Ob
if (self == (Float64Type*)other) { return true; }
if (!other) { return false; }
if (!Obj_Is_A(other, FLOAT64TYPE)) { return false; }
- Float64Type_Equals_t super_equals = (Float64Type_Equals_t)SUPER_METHOD(
- FLOAT64TYPE, Float64Type, Equals);
+ Float64Type_Equals_t super_equals
+ = SUPER_METHOD(FLOAT64TYPE, Lucy_Float64Type_Equals);
return super_equals(self, other);
}
@@ -198,8 +198,8 @@ Float32Type_equals(Float32Type *self, Ob
if (self == (Float32Type*)other) { return true; }
if (!other) { return false; }
if (!Obj_Is_A(other, FLOAT32TYPE)) { return false; }
- Float32Type_Equals_t super_equals = (Float32Type_Equals_t)SUPER_METHOD(
- FLOAT32TYPE, Float32Type, Equals);
+ Float32Type_Equals_t super_equals
+ = SUPER_METHOD(FLOAT32TYPE, Lucy_Float32Type_Equals);
return super_equals(self, other);
}
@@ -240,8 +240,8 @@ Int32Type_equals(Int32Type *self, Obj *o
if (self == (Int32Type*)other) { return true; }
if (!other) { return false; }
if (!Obj_Is_A(other, INT32TYPE)) { return false; }
- Int32Type_Equals_t super_equals = (Int32Type_Equals_t)SUPER_METHOD(
- INT32TYPE, Int32Type, Equals);
+ Int32Type_Equals_t super_equals
+ = SUPER_METHOD(INT32TYPE, Lucy_Int32Type_Equals);
return super_equals(self, other);
}
@@ -282,8 +282,8 @@ Int64Type_equals(Int64Type *self, Obj *o
if (self == (Int64Type*)other) { return true; }
if (!other) { return false; }
if (!Obj_Is_A(other, INT64TYPE)) { return false; }
- Int64Type_Equals_t super_equals = (Int64Type_Equals_t)SUPER_METHOD(
- INT64TYPE, Int64Type, Equals);
+ Int64Type_Equals_t super_equals
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/HitQueue.c (original)
+++ lucy/trunk/core/Lucy/Search/HitQueue.c Fri Apr 20 01:41:30 2012
@@ -120,7 +120,7 @@ Obj*
HitQ_jostle(HitQueue *self, Obj *element) {
MatchDoc *match_doc = (MatchDoc*)CERTIFY(element, MATCHDOC);
HitQ_Jostle_t super_jostle
- = (HitQ_Jostle_t)SUPER_METHOD(HITQUEUE, HitQ, Jostle);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/NoMatchQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/NoMatchQuery.c Fri Apr 20 01:41:30 2012
@@ -78,7 +78,7 @@ NoMatchQuery_get_fails_to_match(NoMatchQ
Obj*
NoMatchQuery_dump(NoMatchQuery *self) {
NoMatchQuery_Dump_t super_dump
- = (NoMatchQuery_Dump_t)SUPER_METHOD(NOMATCHQUERY, NoMatchQuery, Dump);
+ = SUPER_METHOD(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
- = (NoMatchQuery_Load_t)SUPER_METHOD(NOMATCHQUERY, NoMatchQuery, Load);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/PhraseQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/PhraseQuery.c Fri Apr 20 01:41:30 2012
@@ -205,9 +205,7 @@ PhraseCompiler_serialize(PhraseCompiler
PhraseCompiler*
PhraseCompiler_deserialize(PhraseCompiler *self, InStream *instream) {
PhraseCompiler_Deserialize_t super_deserialize
- = (PhraseCompiler_Deserialize_t)SUPER_METHOD(PHRASECOMPILER,
- PhraseCompiler,
- Deserialize);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/PolyQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/PolyQuery.c Fri Apr 20 01:41:30 2012
@@ -170,8 +170,7 @@ PolyCompiler_serialize(PolyCompiler *sel
CB_Serialize(PolyCompiler_Get_Class_Name(self), outstream);
VA_Serialize(self->children, outstream);
PolyCompiler_Serialize_t super_serialize
- = (PolyCompiler_Serialize_t)SUPER_METHOD(POLYCOMPILER, PolyCompiler,
- Serialize);
+ = SUPER_METHOD(POLYCOMPILER, Lucy_PolyCompiler_Serialize);
super_serialize(self, outstream);
}
@@ -183,8 +182,7 @@ PolyCompiler_deserialize(PolyCompiler *s
self->children
= VA_Deserialize((VArray*)VTable_Make_Obj(VARRAY), instream);
PolyCompiler_Deserialize_t super_deserialize
- = (PolyCompiler_Deserialize_t)SUPER_METHOD(POLYCOMPILER, PolyCompiler,
- Deserialize);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/TermQuery.c (original)
+++ lucy/trunk/core/Lucy/Search/TermQuery.c Fri Apr 20 01:41:30 2012
@@ -171,8 +171,7 @@ TermCompiler_equals(TermCompiler *self,
void
TermCompiler_serialize(TermCompiler *self, OutStream *outstream) {
TermCompiler_Serialize_t super_serialize
- = (TermCompiler_Serialize_t)SUPER_METHOD(TERMCOMPILER, TermCompiler,
- Serialize);
+ = SUPER_METHOD(TERMCOMPILER, Lucy_TermCompiler_Serialize);
super_serialize(self, outstream);
OutStream_Write_F32(outstream, self->idf);
OutStream_Write_F32(outstream, self->raw_weight);
@@ -183,8 +182,7 @@ TermCompiler_serialize(TermCompiler *sel
TermCompiler*
TermCompiler_deserialize(TermCompiler *self, InStream *instream) {
TermCompiler_Deserialize_t super_deserialize
- = (TermCompiler_Deserialize_t)SUPER_METHOD(TERMCOMPILER, TermCompiler,
- Deserialize);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/SharedLock.c (original)
+++ lucy/trunk/core/Lucy/Store/SharedLock.c Fri Apr 20 01:41:30 2012
@@ -55,7 +55,7 @@ bool_t
ShLock_request(SharedLock *self) {
uint32_t i = 0;
ShLock_Request_t super_request
- = (ShLock_Request_t)SUPER_METHOD(SHAREDLOCK, ShLock, Request);
+ = SUPER_METHOD(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
- = (ShLock_Release_t)SUPER_METHOD(SHAREDLOCK, ShLock, Release);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Util/BBSortEx.c (original)
+++ lucy/trunk/core/Lucy/Test/Util/BBSortEx.c Fri Apr 20 01:41:30 2012
@@ -54,8 +54,7 @@ BBSortEx_clear_cache(BBSortEx *self) {
}
self->mem_consumed = 0;
BBSortEx_Clear_Cache_t super_clear_cache
- = (BBSortEx_Clear_Cache_t)SUPER_METHOD(
- self->vtable, SortEx, Clear_Cache);
+ = SUPER_METHOD(self->vtable, Lucy_BBSortEx_Clear_Cache);
super_clear_cache(self);
}
Modified: lucy/trunk/core/LucyX/Search/ProximityQuery.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/LucyX/Search/ProximityQuery.c?rev=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/core/LucyX/Search/ProximityQuery.c (original)
+++ lucy/trunk/core/LucyX/Search/ProximityQuery.c Fri Apr 20 01:41:30 2012
@@ -212,9 +212,7 @@ ProximityCompiler_init(ProximityCompiler
void
ProximityCompiler_serialize(ProximityCompiler *self, OutStream *outstream) {
ProximityCompiler_Serialize_t super_serialize
- = (ProximityCompiler_Serialize_t)SUPER_METHOD(PROXIMITYCOMPILER,
- ProximityCompiler,
- Serialize);
+ = SUPER_METHOD(PROXIMITYCOMPILER, Lucy_ProximityCompiler_Serialize);
super_serialize(self, outstream);
OutStream_Write_F32(outstream, self->idf);
OutStream_Write_F32(outstream, self->raw_weight);
@@ -226,9 +224,7 @@ ProximityCompiler_serialize(ProximityCom
ProximityCompiler*
ProximityCompiler_deserialize(ProximityCompiler *self, InStream *instream) {
ProximityCompiler_Deserialize_t super_deserialize
- = (ProximityCompiler_Deserialize_t)SUPER_METHOD(PROXIMITYCOMPILER,
- ProximityCompiler,
- Deserialize);
+ = SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Document/Doc.c (original)
+++ lucy/trunk/perl/xs/Lucy/Document/Doc.c Fri Apr 20 01:41:30 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
- = (Lucy_Doc_To_Host_t)LUCY_SUPER_METHOD(LUCY_DOC, Doc, To_Host);
+ = CFISH_SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Err.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Err.c Fri Apr 20 01:41:30 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
- = (Lucy_Err_To_Host_t)LUCY_SUPER_METHOD(LUCY_ERR, Err, To_Host);
+ = CFISH_SUPER_METHOD(LUCY_ERR, Lucy_Err_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/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c?rev=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c Fri Apr 20 01:41:30 2012
@@ -24,8 +24,8 @@
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 = (Lucy_LFReg_To_Host_t)LUCY_SUPER_METHOD(
- LUCY_LOCKFREEREGISTRY, LFReg, To_Host);
+ Lucy_LFReg_To_Host_t to_host
+ = CFISH_SUPER_METHOD(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=1328171&r1=1328170&r2=1328171&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/VTable.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/VTable.c Fri Apr 20 01:41:30 2012
@@ -58,8 +58,8 @@ lucy_VTable_find_parent_class(const lucy
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 = (Lucy_VTable_To_Host_t)LUCY_SUPER_METHOD(
- LUCY_VTABLE, VTable, To_Host);
+ Lucy_VTable_To_Host_t to_host
+ = CFISH_SUPER_METHOD(LUCY_VTABLE, Lucy_VTable_To_Host);
SV *host_obj = (SV*)to_host(self);
if (first_time) {
SvSHARE((SV*)self->ref.host_obj);