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 2015/05/29 12:27:09 UTC
[1/3] lucy git commit: Adjust for CLOWNFISH-50 changes
Repository: lucy
Updated Branches:
refs/heads/master 64c58184d -> b2f0e09f3
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Store/TestFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolder.c b/core/Lucy/Test/Store/TestFolder.c
index f5b0464..b2fa213 100644
--- a/core/Lucy/Test/Store/TestFolder.c
+++ b/core/Lucy/Test/Store/TestFolder.c
@@ -185,12 +185,12 @@ test_Enclosing_Folder_and_Find_Folder(TestBatchRunner *runner) {
Folder *found = Folder_Find_Folder(folder, foo_bar);
TEST_TRUE(runner,
encloser
- && Folder_Is_A(encloser, FOLDER)
+ && Folder_is_a(encloser, FOLDER)
&& Str_Ends_With(Folder_Get_Path(encloser), foo),
"Enclosing_Folder() - find one directory down");
TEST_TRUE(runner,
found
- && Folder_Is_A(found, FOLDER)
+ && Folder_is_a(found, FOLDER)
&& Str_Ends_With(Folder_Get_Path(found), bar),
"Find_Folder() - 'foo/bar'");
}
@@ -200,12 +200,12 @@ test_Enclosing_Folder_and_Find_Folder(TestBatchRunner *runner) {
Folder *found = Folder_Find_Folder(folder, foo_bar_baz);
TEST_TRUE(runner,
encloser
- && Folder_Is_A(encloser, FOLDER)
+ && Folder_is_a(encloser, FOLDER)
&& Str_Ends_With(Folder_Get_Path(encloser), bar),
"Find two directories down");
TEST_TRUE(runner,
found
- && Folder_Is_A(found, FOLDER)
+ && Folder_is_a(found, FOLDER)
&& Str_Ends_With(Folder_Get_Path(found), baz),
"Find_Folder() - 'foo/bar/baz'");
}
@@ -216,7 +216,7 @@ test_Enclosing_Folder_and_Find_Folder(TestBatchRunner *runner) {
Folder *found = Folder_Find_Folder(folder, foo_bar_baz_boffo);
TEST_TRUE(runner,
encloser
- && Folder_Is_A(encloser, FOLDER)
+ && Folder_is_a(encloser, FOLDER)
&& Str_Ends_With(Folder_Get_Path(encloser), baz),
"Recurse to find a directory containing a real file");
TEST_TRUE(runner, found == NULL,
@@ -274,10 +274,10 @@ test_Open_Dir(TestBatchRunner *runner) {
Folder_MkDir(folder, foo_bar);
dh = Folder_Open_Dir(folder, foo);
- TEST_TRUE(runner, dh && DH_Is_A(dh, DIRHANDLE), "Open_Dir");
+ TEST_TRUE(runner, dh && DH_is_a(dh, DIRHANDLE), "Open_Dir");
DECREF(dh);
dh = Folder_Open_Dir(folder, foo_bar);
- TEST_TRUE(runner, dh && DH_Is_A(dh, DIRHANDLE), "Open_Dir nested dir");
+ TEST_TRUE(runner, dh && DH_is_a(dh, DIRHANDLE), "Open_Dir nested dir");
DECREF(dh);
Err_set_error(NULL);
@@ -305,12 +305,12 @@ test_Open_FileHandle(TestBatchRunner *runner) {
Folder_MkDir(folder, foo);
fh = Folder_Open_FileHandle(folder, boffo, FH_CREATE | FH_WRITE_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, FILEHANDLE), "Open_FileHandle");
+ TEST_TRUE(runner, fh && FH_is_a(fh, FILEHANDLE), "Open_FileHandle");
DECREF(fh);
fh = Folder_Open_FileHandle(folder, foo_boffo,
FH_CREATE | FH_WRITE_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, FILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, FILEHANDLE),
"Open_FileHandle for nested file");
DECREF(fh);
@@ -340,12 +340,12 @@ test_Open_Out(TestBatchRunner *runner) {
Folder_MkDir(folder, foo);
outstream = Folder_Open_Out(folder, boffo);
- TEST_TRUE(runner, outstream && OutStream_Is_A(outstream, OUTSTREAM),
+ TEST_TRUE(runner, outstream && OutStream_is_a(outstream, OUTSTREAM),
"Open_Out");
DECREF(outstream);
outstream = Folder_Open_Out(folder, foo_boffo);
- TEST_TRUE(runner, outstream && OutStream_Is_A(outstream, OUTSTREAM),
+ TEST_TRUE(runner, outstream && OutStream_is_a(outstream, OUTSTREAM),
"Open_Out for nested file");
DECREF(outstream);
@@ -387,12 +387,12 @@ test_Open_In(TestBatchRunner *runner) {
DECREF(fh);
instream = Folder_Open_In(folder, boffo);
- TEST_TRUE(runner, instream && InStream_Is_A(instream, INSTREAM),
+ TEST_TRUE(runner, instream && InStream_is_a(instream, INSTREAM),
"Open_In");
DECREF(instream);
instream = Folder_Open_In(folder, foo_boffo);
- TEST_TRUE(runner, instream && InStream_Is_A(instream, INSTREAM),
+ TEST_TRUE(runner, instream && InStream_is_a(instream, INSTREAM),
"Open_In for nested file");
DECREF(instream);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Store/TestFolderCommon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolderCommon.c b/core/Lucy/Test/Store/TestFolderCommon.c
index 346d078..d5f3a9d 100644
--- a/core/Lucy/Test/Store/TestFolderCommon.c
+++ b/core/Lucy/Test/Store/TestFolderCommon.c
@@ -156,7 +156,7 @@ test_Local_Find_Folder(TestBatchRunner *runner, set_up_t set_up,
local = Folder_Local_Find_Folder(folder, foo);
TEST_TRUE(runner,
local
- && Folder_Is_A(local, FOLDER)
+ && Folder_is_a(local, FOLDER)
&& Str_Ends_With(Folder_Get_Path(local), foo),
"Find local directory");
@@ -207,7 +207,7 @@ static void
test_Local_Open_Dir(TestBatchRunner *runner, set_up_t set_up, tear_down_t tear_down) {
Folder *folder = set_up();
DirHandle *dh = Folder_Local_Open_Dir(folder);
- TEST_TRUE(runner, dh && DH_Is_A(dh, DIRHANDLE),
+ TEST_TRUE(runner, dh && DH_is_a(dh, DIRHANDLE),
"Local_Open_Dir returns an DirHandle");
DECREF(dh);
DECREF(folder);
@@ -222,13 +222,13 @@ test_Local_Open_FileHandle(TestBatchRunner *runner, set_up_t set_up,
fh = Folder_Local_Open_FileHandle(folder, boffo,
FH_CREATE | FH_WRITE_ONLY | FH_EXCLUSIVE);
- TEST_TRUE(runner, fh && FH_Is_A(fh, FILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, FILEHANDLE),
"opened FileHandle");
DECREF(fh);
fh = Folder_Local_Open_FileHandle(folder, boffo,
FH_CREATE | FH_WRITE_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, FILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, FILEHANDLE),
"opened FileHandle for append");
DECREF(fh);
@@ -240,7 +240,7 @@ test_Local_Open_FileHandle(TestBatchRunner *runner, set_up_t set_up,
"failure due to FH_EXLUSIVE flag sets global error");
fh = Folder_Local_Open_FileHandle(folder, boffo, FH_READ_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, FILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, FILEHANDLE),
"opened FileHandle for reading");
DECREF(fh);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Store/TestRAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.c b/core/Lucy/Test/Store/TestRAMFolder.c
index 97cc8b4..c148fe3 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.c
+++ b/core/Lucy/Test/Store/TestRAMFolder.c
@@ -158,7 +158,7 @@ test_Local_Find_Folder(TestBatchRunner *runner) {
local = (RAMFolder*)RAMFolder_Local_Find_Folder(folder, foo);
TEST_TRUE(runner,
local
- && RAMFolder_Is_A(local, RAMFOLDER)
+ && RAMFolder_is_a(local, RAMFOLDER)
&& Str_Equals_Utf8(RAMFolder_Get_Path(local), "foo", 3),
"Find local directory");
@@ -202,7 +202,7 @@ static void
test_Local_Open_Dir(TestBatchRunner *runner) {
RAMFolder *folder = RAMFolder_new(NULL);
DirHandle *dh = RAMFolder_Local_Open_Dir(folder);
- TEST_TRUE(runner, dh && DH_Is_A(dh, RAMDIRHANDLE),
+ TEST_TRUE(runner, dh && DH_is_a(dh, RAMDIRHANDLE),
"Local_Open_Dir returns a RAMDirHandle");
DECREF(dh);
DECREF(folder);
@@ -215,13 +215,13 @@ test_Local_Open_FileHandle(TestBatchRunner *runner) {
fh = RAMFolder_Local_Open_FileHandle(folder, boffo,
FH_CREATE | FH_WRITE_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, RAMFILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, RAMFILEHANDLE),
"opened FileHandle");
DECREF(fh);
fh = RAMFolder_Local_Open_FileHandle(folder, boffo,
FH_CREATE | FH_WRITE_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, RAMFILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, RAMFILEHANDLE),
"opened FileHandle for append");
DECREF(fh);
@@ -233,7 +233,7 @@ test_Local_Open_FileHandle(TestBatchRunner *runner) {
"failure due to FH_EXLUSIVE flag sets global error");
fh = RAMFolder_Local_Open_FileHandle(folder, boffo, FH_READ_ONLY);
- TEST_TRUE(runner, fh && FH_Is_A(fh, RAMFILEHANDLE),
+ TEST_TRUE(runner, fh && FH_is_a(fh, RAMFILEHANDLE),
"opened FileHandle for reading");
DECREF(fh);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Util/Freezer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Freezer.c b/core/Lucy/Util/Freezer.c
index 9cc9410..ed6e38c 100644
--- a/core/Lucy/Util/Freezer.c
+++ b/core/Lucy/Util/Freezer.c
@@ -37,7 +37,7 @@
void
Freezer_freeze(Obj *obj, OutStream *outstream) {
- Freezer_serialize_string(Obj_Get_Class_Name(obj), outstream);
+ Freezer_serialize_string(Obj_get_class_name(obj), outstream);
Freezer_serialize(obj, outstream);
}
@@ -52,94 +52,94 @@ Freezer_thaw(InStream *instream) {
void
Freezer_serialize(Obj *obj, OutStream *outstream) {
- if (Obj_Is_A(obj, STRING)) {
+ if (Obj_is_a(obj, STRING)) {
Freezer_serialize_string((String*)obj, outstream);
}
- else if (Obj_Is_A(obj, BLOB)) {
+ else if (Obj_is_a(obj, BLOB)) {
Freezer_serialize_blob((Blob*)obj, outstream);
}
- else if (Obj_Is_A(obj, VECTOR)) {
+ else if (Obj_is_a(obj, VECTOR)) {
Freezer_serialize_varray((Vector*)obj, outstream);
}
- else if (Obj_Is_A(obj, HASH)) {
+ else if (Obj_is_a(obj, HASH)) {
Freezer_serialize_hash((Hash*)obj, outstream);
}
- else if (Obj_Is_A(obj, NUM)) {
- if (Obj_Is_A(obj, INTNUM)) {
- if (Obj_Is_A(obj, BOOLNUM)) {
+ else if (Obj_is_a(obj, NUM)) {
+ if (Obj_is_a(obj, INTNUM)) {
+ if (Obj_is_a(obj, BOOLNUM)) {
bool val = Bool_Get_Value((BoolNum*)obj);
OutStream_Write_U8(outstream, (uint8_t)val);
}
- else if (Obj_Is_A(obj, INTEGER32)) {
+ else if (Obj_is_a(obj, INTEGER32)) {
int32_t val = Int32_Get_Value((Integer32*)obj);
OutStream_Write_C32(outstream, (uint32_t)val);
}
- else if (Obj_Is_A(obj, INTEGER64)) {
+ else if (Obj_is_a(obj, INTEGER64)) {
int64_t val = Int64_Get_Value((Integer64*)obj);
OutStream_Write_C64(outstream, (uint64_t)val);
}
}
- else if (Obj_Is_A(obj, FLOATNUM)) {
- if (Obj_Is_A(obj, FLOAT32)) {
+ else if (Obj_is_a(obj, FLOATNUM)) {
+ if (Obj_is_a(obj, FLOAT32)) {
float val = Float32_Get_Value((Float32*)obj);
OutStream_Write_F32(outstream, val);
}
- else if (Obj_Is_A(obj, FLOAT64)) {
+ else if (Obj_is_a(obj, FLOAT64)) {
double val = Float64_Get_Value((Float64*)obj);
OutStream_Write_F64(outstream, val);
}
}
}
- else if (Obj_Is_A(obj, QUERY)) {
+ else if (Obj_is_a(obj, QUERY)) {
Query_Serialize((Query*)obj, outstream);
}
- else if (Obj_Is_A(obj, DOC)) {
+ else if (Obj_is_a(obj, DOC)) {
Doc_Serialize((Doc*)obj, outstream);
}
- else if (Obj_Is_A(obj, DOCVECTOR)) {
+ else if (Obj_is_a(obj, DOCVECTOR)) {
DocVec_Serialize((DocVector*)obj, outstream);
}
- else if (Obj_Is_A(obj, TERMVECTOR)) {
+ else if (Obj_is_a(obj, TERMVECTOR)) {
TV_Serialize((TermVector*)obj, outstream);
}
- else if (Obj_Is_A(obj, SIMILARITY)) {
+ else if (Obj_is_a(obj, SIMILARITY)) {
Sim_Serialize((Similarity*)obj, outstream);
}
- else if (Obj_Is_A(obj, MATCHDOC)) {
+ else if (Obj_is_a(obj, MATCHDOC)) {
MatchDoc_Serialize((MatchDoc*)obj, outstream);
}
- else if (Obj_Is_A(obj, TOPDOCS)) {
+ else if (Obj_is_a(obj, TOPDOCS)) {
TopDocs_Serialize((TopDocs*)obj, outstream);
}
- else if (Obj_Is_A(obj, SORTSPEC)) {
+ else if (Obj_is_a(obj, SORTSPEC)) {
SortSpec_Serialize((SortSpec*)obj, outstream);
}
- else if (Obj_Is_A(obj, SORTRULE)) {
+ else if (Obj_is_a(obj, SORTRULE)) {
SortRule_Serialize((SortRule*)obj, outstream);
}
else {
THROW(ERR, "Don't know how to serialize a %o",
- Obj_Get_Class_Name(obj));
+ Obj_get_class_name(obj));
}
}
Obj*
Freezer_deserialize(Obj *obj, InStream *instream) {
- if (Obj_Is_A(obj, STRING)) {
+ if (Obj_is_a(obj, STRING)) {
obj = (Obj*)Freezer_deserialize_string((String*)obj, instream);
}
- else if (Obj_Is_A(obj, BLOB)) {
+ else if (Obj_is_a(obj, BLOB)) {
obj = (Obj*)Freezer_deserialize_blob((Blob*)obj, instream);
}
- else if (Obj_Is_A(obj, VECTOR)) {
+ else if (Obj_is_a(obj, VECTOR)) {
obj = (Obj*)Freezer_deserialize_varray((Vector*)obj, instream);
}
- else if (Obj_Is_A(obj, HASH)) {
+ else if (Obj_is_a(obj, HASH)) {
obj = (Obj*)Freezer_deserialize_hash((Hash*)obj, instream);
}
- else if (Obj_Is_A(obj, NUM)) {
- if (Obj_Is_A(obj, INTNUM)) {
- if (Obj_Is_A(obj, BOOLNUM)) {
+ else if (Obj_is_a(obj, NUM)) {
+ if (Obj_is_a(obj, INTNUM)) {
+ if (Obj_is_a(obj, BOOLNUM)) {
bool value = !!InStream_Read_U8(instream);
Obj *result = value ? INCREF(CFISH_TRUE) : INCREF(CFISH_FALSE);
// FIXME: This DECREF is essentially a no-op causing a
@@ -147,56 +147,56 @@ Freezer_deserialize(Obj *obj, InStream *instream) {
DECREF(obj);
obj = result;
}
- else if (Obj_Is_A(obj, INTEGER32)) {
+ else if (Obj_is_a(obj, INTEGER32)) {
int32_t value = (int32_t)InStream_Read_C32(instream);
obj = (Obj*)Int32_init((Integer32*)obj, value);
}
- else if (Obj_Is_A(obj, INTEGER64)) {
+ else if (Obj_is_a(obj, INTEGER64)) {
int64_t value = (int64_t)InStream_Read_C64(instream);
obj = (Obj*)Int64_init((Integer64*)obj, value);
}
}
- else if (Obj_Is_A(obj, FLOATNUM)) {
- if (Obj_Is_A(obj, FLOAT32)) {
+ else if (Obj_is_a(obj, FLOATNUM)) {
+ if (Obj_is_a(obj, FLOAT32)) {
float value = InStream_Read_F32(instream);
obj = (Obj*)Float32_init((Float32*)obj, value);
}
- else if (Obj_Is_A(obj, FLOAT64)) {
+ else if (Obj_is_a(obj, FLOAT64)) {
double value = InStream_Read_F64(instream);
obj = (Obj*)Float64_init((Float64*)obj, value);
}
}
}
- else if (Obj_Is_A(obj, QUERY)) {
+ else if (Obj_is_a(obj, QUERY)) {
obj = (Obj*)Query_Deserialize((Query*)obj, instream);
}
- else if (Obj_Is_A(obj, DOC)) {
+ else if (Obj_is_a(obj, DOC)) {
obj = (Obj*)Doc_Deserialize((Doc*)obj, instream);
}
- else if (Obj_Is_A(obj, DOCVECTOR)) {
+ else if (Obj_is_a(obj, DOCVECTOR)) {
obj = (Obj*)DocVec_Deserialize((DocVector*)obj, instream);
}
- else if (Obj_Is_A(obj, TERMVECTOR)) {
+ else if (Obj_is_a(obj, TERMVECTOR)) {
obj = (Obj*)TV_Deserialize((TermVector*)obj, instream);
}
- else if (Obj_Is_A(obj, SIMILARITY)) {
+ else if (Obj_is_a(obj, SIMILARITY)) {
obj = (Obj*)Sim_Deserialize((Similarity*)obj, instream);
}
- else if (Obj_Is_A(obj, MATCHDOC)) {
+ else if (Obj_is_a(obj, MATCHDOC)) {
obj = (Obj*)MatchDoc_Deserialize((MatchDoc*)obj, instream);
}
- else if (Obj_Is_A(obj, TOPDOCS)) {
+ else if (Obj_is_a(obj, TOPDOCS)) {
obj = (Obj*)TopDocs_Deserialize((TopDocs*)obj, instream);
}
- else if (Obj_Is_A(obj, SORTSPEC)) {
+ else if (Obj_is_a(obj, SORTSPEC)) {
obj = (Obj*)SortSpec_Deserialize((SortSpec*)obj, instream);
}
- else if (Obj_Is_A(obj, SORTRULE)) {
+ else if (Obj_is_a(obj, SORTRULE)) {
obj = (Obj*)SortRule_Deserialize((SortRule*)obj, instream);
}
else {
THROW(ERR, "Don't know how to deserialize a %o",
- Obj_Get_Class_Name(obj));
+ Obj_get_class_name(obj));
}
return obj;
@@ -359,34 +359,34 @@ S_dump_hash(Hash *hash) {
Obj*
Freezer_dump(Obj *obj) {
- if (Obj_Is_A(obj, STRING)) {
+ if (Obj_is_a(obj, STRING)) {
return (Obj*)Obj_To_String(obj);
}
- else if (Obj_Is_A(obj, VECTOR)) {
+ else if (Obj_is_a(obj, VECTOR)) {
return S_dump_array((Vector*)obj);
}
- else if (Obj_Is_A(obj, HASH)) {
+ else if (Obj_is_a(obj, HASH)) {
return S_dump_hash((Hash*)obj);
}
- else if (Obj_Is_A(obj, ANALYZER)) {
+ else if (Obj_is_a(obj, ANALYZER)) {
return Analyzer_Dump((Analyzer*)obj);
}
- else if (Obj_Is_A(obj, DOC)) {
+ else if (Obj_is_a(obj, DOC)) {
return (Obj*)Doc_Dump((Doc*)obj);
}
- else if (Obj_Is_A(obj, SIMILARITY)) {
+ else if (Obj_is_a(obj, SIMILARITY)) {
return Sim_Dump((Similarity*)obj);
}
- else if (Obj_Is_A(obj, FIELDTYPE)) {
+ else if (Obj_is_a(obj, FIELDTYPE)) {
return FType_Dump((FieldType*)obj);
}
- else if (Obj_Is_A(obj, SCHEMA)) {
+ else if (Obj_is_a(obj, SCHEMA)) {
return (Obj*)Schema_Dump((Schema*)obj);
}
- else if (Obj_Is_A(obj, QUERY)) {
+ else if (Obj_is_a(obj, QUERY)) {
return Query_Dump((Query*)obj);
}
- else if (Obj_Is_A(obj, NUM)) {
+ else if (Obj_is_a(obj, NUM)) {
return Obj_Clone(obj);
}
else {
@@ -398,22 +398,22 @@ static Obj*
S_load_via_load_method(Class *klass, Obj *dump) {
Obj *dummy = Class_Make_Obj(klass);
Obj *loaded = NULL;
- if (Obj_Is_A(dummy, ANALYZER)) {
+ if (Obj_is_a(dummy, ANALYZER)) {
loaded = Analyzer_Load((Analyzer*)dummy, dump);
}
- else if (Obj_Is_A(dummy, DOC)) {
+ else if (Obj_is_a(dummy, DOC)) {
loaded = (Obj*)Doc_Load((Doc*)dummy, dump);
}
- else if (Obj_Is_A(dummy, SIMILARITY)) {
+ else if (Obj_is_a(dummy, SIMILARITY)) {
loaded = (Obj*)Sim_Load((Similarity*)dummy, dump);
}
- else if (Obj_Is_A(dummy, FIELDTYPE)) {
+ else if (Obj_is_a(dummy, FIELDTYPE)) {
loaded = FType_Load((FieldType*)dummy, dump);
}
- else if (Obj_Is_A(dummy, SCHEMA)) {
+ else if (Obj_is_a(dummy, SCHEMA)) {
loaded = (Obj*)Schema_Load((Schema*)dummy, dump);
}
- else if (Obj_Is_A(dummy, QUERY)) {
+ else if (Obj_is_a(dummy, QUERY)) {
loaded = Query_Load((Query*)dummy, dump);
}
else {
@@ -431,7 +431,7 @@ S_load_from_hash(Hash *dump) {
// Assume that the presence of the "_class" key paired with a valid class
// name indicates the output of a dump() rather than an ordinary Hash.
- if (class_name && Str_Is_A(class_name, STRING)) {
+ if (class_name && Str_is_a(class_name, STRING)) {
Class *klass = Class_fetch_class(class_name);
if (!klass) {
@@ -487,10 +487,10 @@ S_load_from_array(Vector *dump) {
Obj*
Freezer_load(Obj *obj) {
- if (Obj_Is_A(obj, HASH)) {
+ if (Obj_is_a(obj, HASH)) {
return S_load_from_hash((Hash*)obj);
}
- else if (Obj_Is_A(obj, VECTOR)) {
+ else if (Obj_is_a(obj, VECTOR)) {
return S_load_from_array((Vector*)obj);
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Util/Json.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Json.c b/core/Lucy/Util/Json.c
index 4b589ea..740595c 100644
--- a/core/Lucy/Util/Json.c
+++ b/core/Lucy/Util/Json.c
@@ -143,9 +143,9 @@ Json_spew_json(Obj *dump, Folder *folder, String *path) {
String*
Json_to_json(Obj *dump) {
// Validate object type, only allowing hashes and arrays per JSON spec.
- if (!dump || !(Obj_Is_A(dump, HASH) || Obj_Is_A(dump, VECTOR))) {
+ if (!dump || !(Obj_is_a(dump, HASH) || Obj_is_a(dump, VECTOR))) {
if (!tolerant) {
- String *class_name = dump ? Obj_Get_Class_Name(dump) : NULL;
+ String *class_name = dump ? Obj_get_class_name(dump) : NULL;
String *mess = MAKE_MESS("Illegal top-level object type: %o",
class_name);
Err_set_error(Err_new(mess));
@@ -278,16 +278,16 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) {
else if (dump == (Obj*)CFISH_FALSE) {
CB_Cat_Trusted_Utf8(buf, "false", 5);
}
- else if (Obj_Is_A(dump, STRING)) {
+ else if (Obj_is_a(dump, STRING)) {
S_append_json_string((String*)dump, buf);
}
- else if (Obj_Is_A(dump, INTNUM)) {
+ else if (Obj_is_a(dump, INTNUM)) {
CB_catf(buf, "%i64", IntNum_To_I64((IntNum*)dump));
}
- else if (Obj_Is_A(dump, FLOATNUM)) {
+ else if (Obj_is_a(dump, FLOATNUM)) {
CB_catf(buf, "%f64", FloatNum_To_F64((FloatNum*)dump));
}
- else if (Obj_Is_A(dump, VECTOR)) {
+ else if (Obj_is_a(dump, VECTOR)) {
Vector *array = (Vector*)dump;
size_t size = Vec_Get_Size(array);
if (size == 0) {
@@ -297,7 +297,7 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) {
}
else if (size == 1) {
Obj *elem = Vec_Fetch(array, 0);
- if (!(Obj_Is_A(elem, HASH) || Obj_Is_A(elem, VECTOR))) {
+ if (!(Obj_is_a(elem, HASH) || Obj_is_a(elem, VECTOR))) {
// Put array containing single scalar element on one line.
CB_Cat_Trusted_Utf8(buf, "[", 1);
if (!S_to_json(elem, buf, depth + 1)) {
@@ -323,7 +323,7 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) {
S_cat_whitespace(buf, depth);
CB_Cat_Trusted_Utf8(buf, "]", 1);
}
- else if (Obj_Is_A(dump, HASH)) {
+ else if (Obj_is_a(dump, HASH)) {
Hash *hash = (Hash*)dump;
size_t size = Hash_Get_Size(hash);
@@ -337,9 +337,9 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) {
Vector *keys = Hash_Keys(hash);
for (size_t i = 0; i < size; i++) {
Obj *key = Vec_Fetch(keys, i);
- if (!key || !Obj_Is_A(key, STRING)) {
+ if (!key || !Obj_is_a(key, STRING)) {
DECREF(keys);
- String *key_class = key ? Obj_Get_Class_Name(key) : NULL;
+ String *key_class = key ? Obj_get_class_name(key) : NULL;
String *mess = MAKE_MESS("Illegal key type: %o", key_class);
Err_set_error(Err_new(mess));
return false;
@@ -708,15 +708,15 @@ Json_obj_to_i64(Obj *obj) {
if (!obj) {
THROW(ERR, "Can't extract integer from NULL");
}
- else if (Obj_Is_A(obj, STRING)) {
+ else if (Obj_is_a(obj, STRING)) {
retval = Str_To_I64((String*)obj);
}
- else if (Obj_Is_A(obj, NUM)) {
+ else if (Obj_is_a(obj, NUM)) {
retval = Num_To_I64((Num*)obj);
}
else {
THROW(ERR, "Can't extract integer from object of type %o",
- Obj_Get_Class_Name(obj));
+ Obj_get_class_name(obj));
}
return retval;
@@ -729,15 +729,15 @@ Json_obj_to_f64(Obj *obj) {
if (!obj) {
THROW(ERR, "Can't extract float from NULL");
}
- else if (Obj_Is_A(obj, STRING)) {
+ else if (Obj_is_a(obj, STRING)) {
retval = Str_To_F64((String*)obj);
}
- else if (Obj_Is_A(obj, NUM)) {
+ else if (Obj_is_a(obj, NUM)) {
retval = Num_To_F64((Num*)obj);
}
else {
THROW(ERR, "Can't extract float from object of type %o",
- Obj_Get_Class_Name(obj));
+ Obj_get_class_name(obj));
}
return retval;
@@ -750,15 +750,15 @@ Json_obj_to_bool(Obj *obj) {
if (!obj) {
THROW(ERR, "Can't extract bool from NULL");
}
- else if (Obj_Is_A(obj, STRING)) {
+ else if (Obj_is_a(obj, STRING)) {
retval = (Str_To_I64((String*)obj) != 0);
}
- else if (Obj_Is_A(obj, NUM)) {
+ else if (Obj_is_a(obj, NUM)) {
retval = Num_To_Bool((Num*)obj);
}
else {
THROW(ERR, "Can't extract bool from object of type %o",
- Obj_Get_Class_Name(obj));
+ Obj_get_class_name(obj));
}
return retval;
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Util/SortExternal.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/SortExternal.c b/core/Lucy/Util/SortExternal.c
index 37e7c4b..4d75839 100644
--- a/core/Lucy/Util/SortExternal.c
+++ b/core/Lucy/Util/SortExternal.c
@@ -134,7 +134,7 @@ SortEx_Sort_Buffer_IMP(SortExternal *self) {
THROW(ERR, "Cant Sort_Buffer() after fetching %u32 items", ivars->buf_tick);
}
if (ivars->buf_max != 0) {
- Class *klass = SortEx_Get_Class(self);
+ Class *klass = SortEx_get_class(self);
CFISH_Sort_Compare_t compare
= (CFISH_Sort_Compare_t)METHOD_PTR(klass, LUCY_SortEx_Compare);
if (ivars->scratch_cap < ivars->buf_cap) {
@@ -260,7 +260,7 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars,
uint32_t num_runs = Vec_Get_Size(ivars->runs);
Obj ***slice_starts = ivars->slice_starts;
uint32_t *slice_sizes = ivars->slice_sizes;
- Class *klass = SortEx_Get_Class(self);
+ Class *klass = SortEx_get_class(self);
CFISH_Sort_Compare_t compare
= (CFISH_Sort_Compare_t)METHOD_PTR(klass, LUCY_SortEx_Compare);
@@ -354,7 +354,7 @@ S_find_slice_size(SortExternal *self, SortExternalIVARS *ivars,
int32_t hi = ivars->buf_max;
Obj **buffer = ivars->buffer;
SortEx_Compare_t compare
- = METHOD_PTR(SortEx_Get_Class(self), LUCY_SortEx_Compare);
+ = METHOD_PTR(SortEx_get_class(self), LUCY_SortEx_Compare);
// Binary search.
while (hi - lo > 1) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/LucyX/Search/ProximityQuery.c
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityQuery.c b/core/LucyX/Search/ProximityQuery.c
index 6173acc..5ee0519 100644
--- a/core/LucyX/Search/ProximityQuery.c
+++ b/core/LucyX/Search/ProximityQuery.c
@@ -131,7 +131,7 @@ ProximityQuery_Load_IMP(ProximityQuery *self, Obj *dump) {
bool
ProximityQuery_Equals_IMP(ProximityQuery *self, Obj *other) {
if ((ProximityQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, PROXIMITYQUERY)) { return false; }
+ if (!Obj_is_a(other, PROXIMITYQUERY)) { return false; }
ProximityQueryIVARS *const ivars = ProximityQuery_IVARS(self);
ProximityQueryIVARS *const ovars
= ProximityQuery_IVARS((ProximityQuery*)other);
@@ -284,7 +284,7 @@ ProximityCompiler_Deserialize_IMP(ProximityCompiler *self,
bool
ProximityCompiler_Equals_IMP(ProximityCompiler *self, Obj *other) {
if ((ProximityCompiler*)other == self) { return true; }
- if (!Obj_Is_A(other, PROXIMITYCOMPILER)) { return false; }
+ if (!Obj_is_a(other, PROXIMITYCOMPILER)) { return false; }
ProximityCompiler_Equals_t super_equals
= (ProximityCompiler_Equals_t)SUPER_METHOD_PTR(PROXIMITYCOMPILER,
LUCY_ProximityCompiler_Equals);
@@ -335,7 +335,7 @@ ProximityCompiler_Make_Matcher_IMP(ProximityCompiler *self, SegReader *reader,
// Bail unless field is valid and posting type supports positions.
Similarity *sim = ProximityCompiler_Get_Similarity(self);
Posting *posting = Sim_Make_Posting(sim);
- if (posting == NULL || !Obj_Is_A((Obj*)posting, SCOREPOSTING)) {
+ if (posting == NULL || !Obj_is_a((Obj*)posting, SCOREPOSTING)) {
DECREF(posting);
return NULL;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/perl/xs/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Document/Doc.c b/perl/xs/Lucy/Document/Doc.c
index 651e140..2f54da7 100644
--- a/perl/xs/Lucy/Document/Doc.c
+++ b/perl/xs/Lucy/Document/Doc.c
@@ -165,7 +165,7 @@ LUCY_Doc_Dump_IMP(lucy_Doc *self) {
lucy_DocIVARS *const ivars = lucy_Doc_IVARS(self);
cfish_Hash *dump = cfish_Hash_new(0);
CFISH_Hash_Store_Utf8(dump, "_class", 6,
- (cfish_Obj*)CFISH_Str_Clone(LUCY_Doc_Get_Class_Name(self)));
+ (cfish_Obj*)CFISH_Str_Clone(lucy_Doc_get_class_name(self)));
CFISH_Hash_Store_Utf8(dump, "doc_id", 7,
(cfish_Obj*)cfish_Str_newf("%i32", ivars->doc_id));
CFISH_Hash_Store_Utf8(dump, "fields", 6,
@@ -202,7 +202,7 @@ LUCY_Doc_Load_IMP(lucy_Doc *self, cfish_Obj *dump) {
bool
LUCY_Doc_Equals_IMP(lucy_Doc *self, cfish_Obj *other) {
if ((lucy_Doc*)other == self) { return true; }
- if (!CFISH_Obj_Is_A(other, LUCY_DOC)) { return false; }
+ if (!cfish_Obj_is_a(other, LUCY_DOC)) { return false; }
lucy_DocIVARS *const ivars = lucy_Doc_IVARS(self);
lucy_DocIVARS *const ovars = lucy_Doc_IVARS((lucy_Doc*)other);
[2/3] lucy git commit: Adjust for CLOWNFISH-50 changes
Posted by nw...@apache.org.
Adjust for CLOWNFISH-50 changes
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/00d34f93
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/00d34f93
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/00d34f93
Branch: refs/heads/master
Commit: 00d34f93ebf994447b91eb51e2ebe456ab6d5280
Parents: 64c5818
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Fri May 29 12:20:12 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Fri May 29 12:20:12 2015 +0200
----------------------------------------------------------------------
c/src/Lucy/Document/Doc.c | 2 +-
core/Lucy/Analysis/Analyzer.c | 2 +-
core/Lucy/Analysis/CaseFolder.c | 2 +-
core/Lucy/Analysis/EasyAnalyzer.c | 2 +-
core/Lucy/Analysis/Normalizer.c | 2 +-
core/Lucy/Analysis/PolyAnalyzer.c | 2 +-
core/Lucy/Analysis/RegexTokenizer.c | 2 +-
core/Lucy/Analysis/SnowballStemmer.c | 2 +-
core/Lucy/Analysis/SnowballStopFilter.c | 2 +-
core/Lucy/Analysis/StandardTokenizer.c | 2 +-
core/Lucy/Document/HitDoc.c | 2 +-
core/Lucy/Highlight/Highlighter.c | 6 +-
core/Lucy/Index/BackgroundMerger.c | 6 +-
core/Lucy/Index/HighlightWriter.c | 4 +-
core/Lucy/Index/IndexReader.c | 2 +-
core/Lucy/Index/Indexer.c | 14 +-
core/Lucy/Index/Inverter.c | 4 +-
core/Lucy/Index/LexIndex.c | 8 +-
core/Lucy/Index/PolyReader.c | 6 +-
core/Lucy/Index/PostingPool.c | 2 +-
core/Lucy/Index/SegPostingList.c | 2 +-
core/Lucy/Index/Similarity.c | 10 +-
core/Lucy/Index/SortCache/NumericSortCache.c | 2 +-
core/Lucy/Object/BitVector.c | 4 +-
core/Lucy/Plan/Architecture.c | 2 +-
core/Lucy/Plan/BlobType.c | 6 +-
core/Lucy/Plan/FieldType.c | 2 +-
core/Lucy/Plan/FullTextType.c | 10 +-
core/Lucy/Plan/NumericType.c | 14 +-
core/Lucy/Plan/Schema.c | 22 ++--
core/Lucy/Plan/StringType.c | 4 +-
core/Lucy/Plan/TextType.c | 4 +-
core/Lucy/Search/ANDQuery.c | 2 +-
core/Lucy/Search/Compiler.c | 2 +-
core/Lucy/Search/IndexSearcher.c | 4 +-
core/Lucy/Search/LeafQuery.c | 2 +-
core/Lucy/Search/MatchAllQuery.c | 2 +-
core/Lucy/Search/NOTQuery.c | 4 +-
core/Lucy/Search/NoMatchQuery.c | 2 +-
core/Lucy/Search/ORQuery.c | 2 +-
core/Lucy/Search/PhraseQuery.c | 6 +-
core/Lucy/Search/PolyQuery.c | 4 +-
core/Lucy/Search/PolySearcher.c | 10 +-
core/Lucy/Search/Query.c | 2 +-
core/Lucy/Search/QueryParser.c | 36 +++---
core/Lucy/Search/QueryParser/ParserElem.c | 2 +-
core/Lucy/Search/RangeQuery.c | 2 +-
core/Lucy/Search/RequiredOptionalQuery.c | 2 +-
core/Lucy/Search/Searcher.c | 6 +-
core/Lucy/Search/Span.c | 2 +-
core/Lucy/Search/TermQuery.c | 4 +-
core/Lucy/Store/CompoundFileReader.c | 2 +-
core/Lucy/Store/FSFolder.c | 4 +-
core/Lucy/Store/Folder.c | 2 +-
core/Lucy/Store/InStream.c | 12 +-
core/Lucy/Store/Lock.c | 8 +-
core/Lucy/Store/OutStream.c | 8 +-
core/Lucy/Store/RAMFolder.c | 44 +++----
core/Lucy/Test/Analysis/TestNormalizer.c | 2 +-
core/Lucy/Test/Analysis/TestSnowballStemmer.c | 2 +-
core/Lucy/Test/Analysis/TestStandardTokenizer.c | 10 +-
core/Lucy/Test/Index/TestSegment.c | 4 +-
core/Lucy/Test/Search/TestSortSpec.c | 4 +-
core/Lucy/Test/Store/TestFSFileHandle.c | 6 +-
core/Lucy/Test/Store/TestFolder.c | 26 ++--
core/Lucy/Test/Store/TestFolderCommon.c | 10 +-
core/Lucy/Test/Store/TestRAMFolder.c | 10 +-
core/Lucy/Util/Freezer.c | 128 +++++++++----------
core/Lucy/Util/Json.c | 38 +++---
core/Lucy/Util/SortExternal.c | 6 +-
core/LucyX/Search/ProximityQuery.c | 6 +-
perl/xs/Lucy/Document/Doc.c | 4 +-
72 files changed, 294 insertions(+), 294 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/c/src/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Document/Doc.c b/c/src/Lucy/Document/Doc.c
index adcd316..717059f 100644
--- a/c/src/Lucy/Document/Doc.c
+++ b/c/src/Lucy/Document/Doc.c
@@ -103,7 +103,7 @@ Doc_Load_IMP(Doc *self, Obj *dump) {
bool
Doc_Equals_IMP(Doc *self, Obj *other) {
if ((Doc*)other == self) { return true; }
- if (!Obj_Is_A(other, DOC)) { return false; }
+ if (!Obj_is_a(other, DOC)) { return false; }
DocIVARS *const ivars = Doc_IVARS(self);
DocIVARS *const ovars = Doc_IVARS((Doc*)other);
return Hash_Equals((Hash*)ivars->fields, (Obj*)ovars->fields);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/Analyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Analyzer.c b/core/Lucy/Analysis/Analyzer.c
index 5ffccc7..5560531 100644
--- a/core/Lucy/Analysis/Analyzer.c
+++ b/core/Lucy/Analysis/Analyzer.c
@@ -62,7 +62,7 @@ Obj*
Analyzer_Dump_IMP(Analyzer *self) {
Hash *dump = Hash_new(0);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(Obj_Get_Class_Name((Obj*)self)));
+ (Obj*)Str_Clone(Obj_get_class_name((Obj*)self)));
return (Obj*)dump;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/CaseFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/CaseFolder.c b/core/Lucy/Analysis/CaseFolder.c
index ca2e293..5e9e07b 100644
--- a/core/Lucy/Analysis/CaseFolder.c
+++ b/core/Lucy/Analysis/CaseFolder.c
@@ -57,7 +57,7 @@ CaseFolder_Transform_Text_IMP(CaseFolder *self, String *text) {
bool
CaseFolder_Equals_IMP(CaseFolder *self, Obj *other) {
if ((CaseFolder*)other == self) { return true; }
- if (!Obj_Is_A(other, CASEFOLDER)) { return false; }
+ if (!Obj_is_a(other, CASEFOLDER)) { return false; }
return true;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/EasyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/EasyAnalyzer.c b/core/Lucy/Analysis/EasyAnalyzer.c
index 365ea13..a370566 100644
--- a/core/Lucy/Analysis/EasyAnalyzer.c
+++ b/core/Lucy/Analysis/EasyAnalyzer.c
@@ -96,7 +96,7 @@ EasyAnalyzer_Load_IMP(EasyAnalyzer *self, Obj *dump) {
bool
EasyAnalyzer_Equals_IMP(EasyAnalyzer *self, Obj *other) {
if ((EasyAnalyzer*)other == self) { return true; }
- if (!Obj_Is_A(other, EASYANALYZER)) { return false; }
+ if (!Obj_is_a(other, EASYANALYZER)) { return false; }
EasyAnalyzerIVARS *const ivars = EasyAnalyzer_IVARS(self);
EasyAnalyzerIVARS *const ovars = EasyAnalyzer_IVARS((EasyAnalyzer*)other);
if (!Str_Equals(ovars->language, (Obj*)ivars->language)) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/Normalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.c b/core/Lucy/Analysis/Normalizer.c
index 7f2382e..eea503e 100644
--- a/core/Lucy/Analysis/Normalizer.c
+++ b/core/Lucy/Analysis/Normalizer.c
@@ -165,7 +165,7 @@ Normalizer_Load_IMP(Normalizer *self, Obj *dump) {
bool
Normalizer_Equals_IMP(Normalizer *self, Obj *other) {
if ((Normalizer*)other == self) { return true; }
- if (!Obj_Is_A(other, NORMALIZER)) { return false; }
+ if (!Obj_is_a(other, NORMALIZER)) { return false; }
NormalizerIVARS *const ivars = Normalizer_IVARS(self);
NormalizerIVARS *const ovars = Normalizer_IVARS((Normalizer*)other);
if (ovars->options != ivars->options) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/PolyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/PolyAnalyzer.c b/core/Lucy/Analysis/PolyAnalyzer.c
index 8013937..ac9960f 100644
--- a/core/Lucy/Analysis/PolyAnalyzer.c
+++ b/core/Lucy/Analysis/PolyAnalyzer.c
@@ -114,7 +114,7 @@ PolyAnalyzer_Transform_Text_IMP(PolyAnalyzer *self, String *text) {
bool
PolyAnalyzer_Equals_IMP(PolyAnalyzer *self, Obj *other) {
if ((PolyAnalyzer*)other == self) { return true; }
- if (!Obj_Is_A(other, POLYANALYZER)) { return false; }
+ if (!Obj_is_a(other, POLYANALYZER)) { return false; }
PolyAnalyzerIVARS *const ivars = PolyAnalyzer_IVARS(self);
PolyAnalyzerIVARS *const ovars = PolyAnalyzer_IVARS((PolyAnalyzer*)other);
if (!Vec_Equals(ovars->analyzers, (Obj*)ivars->analyzers)) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.c b/core/Lucy/Analysis/RegexTokenizer.c
index 40a0177..3286501 100644
--- a/core/Lucy/Analysis/RegexTokenizer.c
+++ b/core/Lucy/Analysis/RegexTokenizer.c
@@ -74,7 +74,7 @@ RegexTokenizer_Load_IMP(RegexTokenizer *self, Obj *dump) {
bool
RegexTokenizer_Equals_IMP(RegexTokenizer *self, Obj *other) {
if ((RegexTokenizer*)other == self) { return true; }
- if (!Obj_Is_A(other, REGEXTOKENIZER)) { return false; }
+ if (!Obj_is_a(other, REGEXTOKENIZER)) { return false; }
RegexTokenizerIVARS *ivars = RegexTokenizer_IVARS(self);
RegexTokenizerIVARS *ovars = RegexTokenizer_IVARS((RegexTokenizer*)other);
if (!Str_Equals(ivars->pattern, (Obj*)ovars->pattern)) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/SnowballStemmer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.c b/core/Lucy/Analysis/SnowballStemmer.c
index b2df057..dc5fe91 100644
--- a/core/Lucy/Analysis/SnowballStemmer.c
+++ b/core/Lucy/Analysis/SnowballStemmer.c
@@ -108,7 +108,7 @@ SnowStemmer_Load_IMP(SnowballStemmer *self, Obj *dump) {
bool
SnowStemmer_Equals_IMP(SnowballStemmer *self, Obj *other) {
if ((SnowballStemmer*)other == self) { return true; }
- if (!Obj_Is_A(other, SNOWBALLSTEMMER)) { return false; }
+ if (!Obj_is_a(other, SNOWBALLSTEMMER)) { return false; }
SnowballStemmerIVARS *ivars = SnowStemmer_IVARS(self);
SnowballStemmerIVARS *ovars = SnowStemmer_IVARS((SnowballStemmer*)other);
if (!Str_Equals(ovars->language, (Obj*)ivars->language)) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/SnowballStopFilter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.c b/core/Lucy/Analysis/SnowballStopFilter.c
index c1fb1c5..f7c16fd 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.c
+++ b/core/Lucy/Analysis/SnowballStopFilter.c
@@ -80,7 +80,7 @@ SnowStop_Transform_IMP(SnowballStopFilter *self, Inversion *inversion) {
bool
SnowStop_Equals_IMP(SnowballStopFilter *self, Obj *other) {
if ((SnowballStopFilter*)other == self) { return true; }
- if (!Obj_Is_A(other, SNOWBALLSTOPFILTER)) { return false; }
+ if (!Obj_is_a(other, SNOWBALLSTOPFILTER)) { return false; }
SnowballStopFilterIVARS *const ivars = SnowStop_IVARS(self);
SnowballStopFilterIVARS *const ovars
= SnowStop_IVARS((SnowballStopFilter*)other);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Analysis/StandardTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/StandardTokenizer.c b/core/Lucy/Analysis/StandardTokenizer.c
index 23b25e3..429eff9 100644
--- a/core/Lucy/Analysis/StandardTokenizer.c
+++ b/core/Lucy/Analysis/StandardTokenizer.c
@@ -341,7 +341,7 @@ S_skip_extend_format(const char *text, size_t len, lucy_StringIter *iter) {
bool
StandardTokenizer_Equals_IMP(StandardTokenizer *self, Obj *other) {
if ((StandardTokenizer*)other == self) { return true; }
- if (!Obj_Is_A(other, STANDARDTOKENIZER)) { return false; }
+ if (!Obj_is_a(other, STANDARDTOKENIZER)) { return false; }
return true;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Document/HitDoc.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Document/HitDoc.c b/core/Lucy/Document/HitDoc.c
index 98d3123..b223b23 100644
--- a/core/Lucy/Document/HitDoc.c
+++ b/core/Lucy/Document/HitDoc.c
@@ -90,7 +90,7 @@ HitDoc_Load_IMP(HitDoc *self, Obj *dump) {
bool
HitDoc_Equals_IMP(HitDoc *self, Obj *other) {
if ((HitDoc*)other == self) { return true; }
- if (!Obj_Is_A(other, HITDOC)) { return false; }
+ if (!Obj_is_a(other, HITDOC)) { return false; }
HitDoc_Equals_t super_equals
= (HitDoc_Equals_t)SUPER_METHOD_PTR(HITDOC, LUCY_HitDoc_Equals);
if (!super_equals(self, other)) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Highlight/Highlighter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/Highlighter.c b/core/Lucy/Highlight/Highlighter.c
index f090264..9aeece0 100644
--- a/core/Lucy/Highlight/Highlighter.c
+++ b/core/Lucy/Highlight/Highlighter.c
@@ -62,7 +62,7 @@ Highlighter_init(Highlighter *self, Searcher *searcher, Obj *query,
ivars->slop = excerpt_length / 3;
ivars->pre_tag = Str_new_from_trusted_utf8("<strong>", 8);
ivars->post_tag = Str_new_from_trusted_utf8("</strong>", 9);
- if (Query_Is_A(ivars->query, COMPILER)) {
+ if (Query_is_a(ivars->query, COMPILER)) {
ivars->compiler = (Compiler*)INCREF(ivars->query);
}
else {
@@ -155,7 +155,7 @@ Highlighter_Create_Excerpt_IMP(Highlighter *self, HitDoc *hit_doc) {
String *field_val = (String*)HitDoc_Extract(hit_doc, ivars->field);
String *retval;
- if (!field_val || !Obj_Is_A((Obj*)field_val, STRING)) {
+ if (!field_val || !Obj_is_a((Obj*)field_val, STRING)) {
retval = NULL;
}
else if (!Str_Get_Size(field_val)) {
@@ -565,7 +565,7 @@ Highlighter_Encode_IMP(Highlighter *self, String *text) {
static String*
S_do_encode(Highlighter *self, String *text, CharBuf **encode_buf) {
- Class *klass = Highlighter_Get_Class(self);
+ Class *klass = Highlighter_get_class(self);
Highlighter_Encode_t my_meth
= (Highlighter_Encode_t)METHOD_PTR(klass, LUCY_Highlighter_Encode);
Highlighter_Encode_t orig_meth
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/BackgroundMerger.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BackgroundMerger.c b/core/Lucy/Index/BackgroundMerger.c
index d4a0bed..5e17007 100644
--- a/core/Lucy/Index/BackgroundMerger.c
+++ b/core/Lucy/Index/BackgroundMerger.c
@@ -180,14 +180,14 @@ S_init_folder(Obj *index) {
Folder *folder = NULL;
// Validate or acquire a Folder.
- if (Obj_Is_A(index, FOLDER)) {
+ if (Obj_is_a(index, FOLDER)) {
folder = (Folder*)INCREF(index);
}
- else if (Obj_Is_A(index, STRING)) {
+ else if (Obj_is_a(index, STRING)) {
folder = (Folder*)FSFolder_new((String*)index);
}
else {
- THROW(ERR, "Invalid type for 'index': %o", Obj_Get_Class_Name(index));
+ THROW(ERR, "Invalid type for 'index': %o", Obj_get_class_name(index));
}
// Validate index directory.
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/HighlightWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/HighlightWriter.c b/core/Lucy/Index/HighlightWriter.c
index a8115ae..518750c 100644
--- a/core/Lucy/Index/HighlightWriter.c
+++ b/core/Lucy/Index/HighlightWriter.c
@@ -115,7 +115,7 @@ HLWriter_Add_Inverted_Doc_IMP(HighlightWriter *self, Inverter *inverter,
Inverter_Iterate(inverter);
while (Inverter_Next(inverter)) {
FieldType *type = Inverter_Get_Type(inverter);
- if (FType_Is_A(type, FULLTEXTTYPE)
+ if (FType_is_a(type, FULLTEXTTYPE)
&& FullTextType_Highlightable((FullTextType*)type)
) {
num_highlightable++;
@@ -126,7 +126,7 @@ HLWriter_Add_Inverted_Doc_IMP(HighlightWriter *self, Inverter *inverter,
Inverter_Iterate(inverter);
while (Inverter_Next(inverter)) {
FieldType *type = Inverter_Get_Type(inverter);
- if (FType_Is_A(type, FULLTEXTTYPE)
+ if (FType_is_a(type, FULLTEXTTYPE)
&& FullTextType_Highlightable((FullTextType*)type)
) {
String *field = Inverter_Get_Field_Name(inverter);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/IndexReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexReader.c b/core/Lucy/Index/IndexReader.c
index b8f2725..98ef4dc 100644
--- a/core/Lucy/Index/IndexReader.c
+++ b/core/Lucy/Index/IndexReader.c
@@ -74,7 +74,7 @@ IxReader_Close_IMP(IndexReader *self) {
HashIterator *iter = HashIter_new(ivars->components);
while (HashIter_Next(iter)) {
DataReader *component = (DataReader*)HashIter_Get_Value(iter);
- if (Obj_Is_A((Obj*)component, DATAREADER)) {
+ if (Obj_is_a((Obj*)component, DATAREADER)) {
DataReader_Close(component);
}
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/Indexer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Indexer.c b/core/Lucy/Index/Indexer.c
index 2226b84..60b7564 100644
--- a/core/Lucy/Index/Indexer.c
+++ b/core/Lucy/Index/Indexer.c
@@ -244,14 +244,14 @@ S_init_folder(Obj *index, bool create) {
Folder *folder = NULL;
// Validate or acquire a Folder.
- if (Obj_Is_A(index, FOLDER)) {
+ if (Obj_is_a(index, FOLDER)) {
folder = (Folder*)INCREF(index);
}
- else if (Obj_Is_A(index, STRING)) {
+ else if (Obj_is_a(index, STRING)) {
folder = (Folder*)FSFolder_new((String*)index);
}
else {
- THROW(ERR, "Invalid type for 'index': %o", Obj_Get_Class_Name(index));
+ THROW(ERR, "Invalid type for 'index': %o", Obj_get_class_name(index));
}
// Validate or create the index directory.
@@ -285,7 +285,7 @@ Indexer_Delete_By_Term_IMP(Indexer *self, String *field, Obj *term) {
}
// Analyze term if appropriate, then zap.
- if (FType_Is_A(type, FULLTEXTTYPE)) {
+ if (FType_is_a(type, FULLTEXTTYPE)) {
CERTIFY(term, STRING);
Analyzer *analyzer = Schema_Fetch_Analyzer(schema, field);
Vector *terms = Analyzer_Split(analyzer, (String*)term);
@@ -319,14 +319,14 @@ Indexer_Add_Index_IMP(Indexer *self, Obj *index) {
Folder *other_folder = NULL;
IndexReader *reader = NULL;
- if (Obj_Is_A(index, FOLDER)) {
+ if (Obj_is_a(index, FOLDER)) {
other_folder = (Folder*)INCREF(index);
}
- else if (Obj_Is_A(index, STRING)) {
+ else if (Obj_is_a(index, STRING)) {
other_folder = (Folder*)FSFolder_new((String*)index);
}
else {
- THROW(ERR, "Invalid type for 'index': %o", Obj_Get_Class_Name(index));
+ THROW(ERR, "Invalid type for 'index': %o", Obj_get_class_name(index));
}
reader = IxReader_open((Obj*)other_folder, NULL, NULL);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/Inverter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Inverter.c b/core/Lucy/Index/Inverter.c
index 23dd0f6..09000f0 100644
--- a/core/Lucy/Index/Inverter.c
+++ b/core/Lucy/Index/Inverter.c
@@ -237,11 +237,11 @@ InvEntry_init(InverterEntry *self, Schema *schema, String *field,
}
ivars->indexed = FType_Indexed(ivars->type);
- if (ivars->indexed && FType_Is_A(ivars->type, NUMERICTYPE)) {
+ if (ivars->indexed && FType_is_a(ivars->type, NUMERICTYPE)) {
THROW(ERR, "Field '%o' spec'd as indexed, but numerical types cannot "
"be indexed yet", field);
}
- if (FType_Is_A(ivars->type, FULLTEXTTYPE)) {
+ if (FType_is_a(ivars->type, FULLTEXTTYPE)) {
ivars->highlightable
= FullTextType_Highlightable((FullTextType*)ivars->type);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/LexIndex.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexIndex.c b/core/Lucy/Index/LexIndex.c
index f9f6064..162933f 100644
--- a/core/Lucy/Index/LexIndex.c
+++ b/core/Lucy/Index/LexIndex.c
@@ -154,15 +154,15 @@ LexIndex_Seek_IMP(LexIndex *self, Obj *target) {
return;
}
else {
- if (!Obj_Is_A(target, STRING)) {
+ if (!Obj_is_a(target, STRING)) {
THROW(ERR, "Target is a %o, and not comparable to a %o",
- Obj_Get_Class_Name(target), Class_Get_Name(STRING));
+ Obj_get_class_name(target), Class_Get_Name(STRING));
}
/* TODO:
Obj *first_obj = Vec_Fetch(terms, 0);
- if (!Obj_Is_A(target, Obj_Get_Class(first_obj))) {
+ if (!Obj_is_a(target, Obj_get_class(first_obj))) {
THROW(ERR, "Target is a %o, and not comparable to a %o",
- Obj_Get_Class_Name(target), Obj_Get_Class_Name(first_obj));
+ Obj_get_class_name(target), Obj_get_class_name(first_obj));
}
*/
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/PolyReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyReader.c b/core/Lucy/Index/PolyReader.c
index 4133569..02d3ff8 100644
--- a/core/Lucy/Index/PolyReader.c
+++ b/core/Lucy/Index/PolyReader.c
@@ -455,14 +455,14 @@ PolyReader_do_open(PolyReader *self, Obj *index, Snapshot *snapshot,
static Folder*
S_derive_folder(Obj *index) {
Folder *folder = NULL;
- if (Obj_Is_A(index, FOLDER)) {
+ if (Obj_is_a(index, FOLDER)) {
folder = (Folder*)INCREF(index);
}
- else if (Obj_Is_A(index, STRING)) {
+ else if (Obj_is_a(index, STRING)) {
folder = (Folder*)FSFolder_new((String*)index);
}
else {
- THROW(ERR, "Invalid type for 'index': %o", Obj_Get_Class_Name(index));
+ THROW(ERR, "Invalid type for 'index': %o", Obj_get_class_name(index));
}
return folder;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/PostingPool.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingPool.c b/core/Lucy/Index/PostingPool.c
index 5f6341d..357755a 100644
--- a/core/Lucy/Index/PostingPool.c
+++ b/core/Lucy/Index/PostingPool.c
@@ -485,7 +485,7 @@ PostPool_Refill_IMP(PostingPool *self) {
if (Lex_Next(lexicon)) {
ivars->post_count = Lex_Doc_Freq(lexicon);
term_text = (String*)Lex_Get_Term(lexicon);
- if (term_text && !Obj_Is_A((Obj*)term_text, STRING)) {
+ if (term_text && !Obj_is_a((Obj*)term_text, STRING)) {
THROW(ERR, "Only String terms are supported for now");
}
Posting *posting = PList_Get_Posting(plist);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/SegPostingList.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegPostingList.c b/core/Lucy/Index/SegPostingList.c
index 304d3d0..78a8d11 100644
--- a/core/Lucy/Index/SegPostingList.c
+++ b/core/Lucy/Index/SegPostingList.c
@@ -260,7 +260,7 @@ SegPList_Seek_Lex_IMP(SegPostingList *self, Lexicon *lexicon) {
SegLexicon *const seg_lexicon = (SegLexicon*)lexicon;
// Optimized case.
- if (Obj_Is_A((Obj*)lexicon, SEGLEXICON)
+ if (Obj_is_a((Obj*)lexicon, SEGLEXICON)
&& (SegLex_Get_Segment(seg_lexicon)
== PListReader_Get_Segment(ivars->plist_reader)) // i.e. same segment
) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/Similarity.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Similarity.c b/core/Lucy/Index/Similarity.c
index 8696a79..636f7de 100644
--- a/core/Lucy/Index/Similarity.c
+++ b/core/Lucy/Index/Similarity.c
@@ -90,7 +90,7 @@ Obj*
Sim_Dump_IMP(Similarity *self) {
Hash *dump = Hash_new(0);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(Sim_Get_Class_Name(self)));
+ (Obj*)Str_Clone(Sim_get_class_name(self)));
return (Obj*)dump;
}
@@ -108,14 +108,14 @@ Sim_Load_IMP(Similarity *self, Obj *dump) {
void
Sim_Serialize_IMP(Similarity *self, OutStream *target) {
// Only the class name.
- Freezer_serialize_string(Sim_Get_Class_Name(self), target);
+ Freezer_serialize_string(Sim_get_class_name(self), target);
}
Similarity*
Sim_Deserialize_IMP(Similarity *self, InStream *instream) {
String *class_name = Freezer_read_string(instream);
- if (!Str_Equals(class_name, (Obj*)Sim_Get_Class_Name(self))) {
- THROW(ERR, "Class name mismatch: '%o' '%o'", Sim_Get_Class_Name(self),
+ if (!Str_Equals(class_name, (Obj*)Sim_get_class_name(self))) {
+ THROW(ERR, "Class name mismatch: '%o' '%o'", Sim_get_class_name(self),
class_name);
}
DECREF(class_name);
@@ -125,7 +125,7 @@ Sim_Deserialize_IMP(Similarity *self, InStream *instream) {
bool
Sim_Equals_IMP(Similarity *self, Obj *other) {
- if (Sim_Get_Class(self) != Obj_Get_Class(other)) { return false; }
+ if (Sim_get_class(self) != Obj_get_class(other)) { return false; }
return true;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Index/SortCache/NumericSortCache.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache/NumericSortCache.c b/core/Lucy/Index/SortCache/NumericSortCache.c
index e801dff..ba4d6fc 100644
--- a/core/Lucy/Index/SortCache/NumericSortCache.c
+++ b/core/Lucy/Index/SortCache/NumericSortCache.c
@@ -35,7 +35,7 @@ NumSortCache_init(NumericSortCache *self, String *field,
int32_t null_ord, int32_t ord_width, InStream *ord_in,
InStream *dat_in) {
// Validate.
- if (!type || !FType_Sortable(type) || !FType_Is_A(type, NUMERICTYPE)) {
+ if (!type || !FType_Sortable(type) || !FType_is_a(type, NUMERICTYPE)) {
DECREF(self);
THROW(ERR, "'%o' isn't a sortable NumericType field", field);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Object/BitVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Object/BitVector.c b/core/Lucy/Object/BitVector.c
index 8b7dd9e..b73e762 100644
--- a/core/Lucy/Object/BitVector.c
+++ b/core/Lucy/Object/BitVector.c
@@ -86,9 +86,9 @@ BitVec_Clone_IMP(BitVector *self) {
BitVectorIVARS *const ovars = BitVec_IVARS(other);
// Forbid inheritance.
- if (BitVec_Get_Class(self) != BITVECTOR) {
+ if (BitVec_get_class(self) != BITVECTOR) {
THROW(ERR, "Attempt by %o to inherit BitVec_Clone",
- BitVec_Get_Class_Name(self));
+ BitVec_get_class_name(self));
}
memcpy(ovars->bits, ivars->bits, byte_size * sizeof(uint8_t));
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/Architecture.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Architecture.c b/core/Lucy/Plan/Architecture.c
index 36bebb0..f56b9fc 100644
--- a/core/Lucy/Plan/Architecture.c
+++ b/core/Lucy/Plan/Architecture.c
@@ -54,7 +54,7 @@ bool
Arch_Equals_IMP(Architecture *self, Obj *other) {
Architecture *twin = (Architecture*)other;
if (twin == self) { return true; }
- if (!Obj_Is_A(other, ARCHITECTURE)) { return false; }
+ if (!Obj_is_a(other, ARCHITECTURE)) { return false; }
return true;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/BlobType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/BlobType.c b/core/Lucy/Plan/BlobType.c
index ab0048c..608b0a0 100644
--- a/core/Lucy/Plan/BlobType.c
+++ b/core/Lucy/Plan/BlobType.c
@@ -55,7 +55,7 @@ BlobType_Primitive_ID_IMP(BlobType *self) {
bool
BlobType_Equals_IMP(BlobType *self, Obj *other) {
if ((BlobType*)other == self) { return true; }
- if (!Obj_Is_A(other, BLOBTYPE)) { return false; }
+ if (!Obj_is_a(other, BLOBTYPE)) { return false; }
BlobType_Equals_t super_equals
= (BlobType_Equals_t)SUPER_METHOD_PTR(BLOBTYPE, LUCY_BlobType_Equals);
return super_equals(self, other);
@@ -86,7 +86,7 @@ Hash*
BlobType_Dump_IMP(BlobType *self) {
Hash *dump = BlobType_Dump_For_Schema(self);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(BlobType_Get_Class_Name(self)));
+ (Obj*)Str_Clone(BlobType_get_class_name(self)));
DECREF(Hash_Delete_Utf8(dump, "type", 4));
return dump;
}
@@ -96,7 +96,7 @@ BlobType_Load_IMP(BlobType *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
String *class_name = (String*)Hash_Fetch_Utf8(source, "_class", 6);
Class *klass
- = (class_name != NULL && Obj_Is_A((Obj*)class_name, STRING))
+ = (class_name != NULL && Obj_is_a((Obj*)class_name, STRING))
? Class_singleton(class_name, NULL)
: BLOBTYPE;
BlobType *loaded = (BlobType*)Class_Make_Obj(klass);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/FieldType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FieldType.c b/core/Lucy/Plan/FieldType.c
index a3b2ffc..5faf188 100644
--- a/core/Lucy/Plan/FieldType.c
+++ b/core/Lucy/Plan/FieldType.c
@@ -100,7 +100,7 @@ FType_Compare_Values_IMP(FieldType *self, Obj *a, Obj *b) {
bool
FType_Equals_IMP(FieldType *self, Obj *other) {
if ((FieldType*)other == self) { return true; }
- if (FType_Get_Class(self) != Obj_Get_Class(other)) { return false; }
+ if (FType_get_class(self) != Obj_get_class(other)) { return false; }
FieldTypeIVARS *const ivars = FType_IVARS(self);
FieldTypeIVARS *const ovars = FType_IVARS((FieldType*)other);
if (ivars->boost != ovars->boost) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/FullTextType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FullTextType.c b/core/Lucy/Plan/FullTextType.c
index 00cc578..ead988b 100644
--- a/core/Lucy/Plan/FullTextType.c
+++ b/core/Lucy/Plan/FullTextType.c
@@ -63,7 +63,7 @@ FullTextType_Destroy_IMP(FullTextType *self) {
bool
FullTextType_Equals_IMP(FullTextType *self, Obj *other) {
if ((FullTextType*)other == self) { return true; }
- if (!Obj_Is_A(other, FULLTEXTTYPE)) { return false; }
+ if (!Obj_is_a(other, FULLTEXTTYPE)) { return false; }
FullTextTypeIVARS *const ivars = FullTextType_IVARS(self);
FullTextTypeIVARS *const ovars = FullTextType_IVARS((FullTextType*)other);
FullTextType_Equals_t super_equals
@@ -109,7 +109,7 @@ FullTextType_Dump_IMP(FullTextType *self) {
FullTextTypeIVARS *const ivars = FullTextType_IVARS(self);
Hash *dump = FullTextType_Dump_For_Schema(self);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(FullTextType_Get_Class_Name(self)));
+ (Obj*)Str_Clone(FullTextType_get_class_name(self)));
Hash_Store_Utf8(dump, "analyzer", 8,
(Obj*)Analyzer_Dump(ivars->analyzer));
DECREF(Hash_Delete_Utf8(dump, "type", 4));
@@ -123,7 +123,7 @@ FullTextType_Load_IMP(FullTextType *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
String *class_name = (String*)Hash_Fetch_Utf8(source, "_class", 6);
Class *klass
- = (class_name != NULL && Obj_Is_A((Obj*)class_name, STRING))
+ = (class_name != NULL && Obj_is_a((Obj*)class_name, STRING))
? Class_singleton(class_name, NULL)
: FULLTEXTTYPE;
FullTextType *loaded = (FullTextType*)Class_Make_Obj(klass);
@@ -146,11 +146,11 @@ FullTextType_Load_IMP(FullTextType *self, Obj *dump) {
Obj *analyzer_dump = Hash_Fetch_Utf8(source, "analyzer", 8);
Analyzer *analyzer = NULL;
if (analyzer_dump) {
- if (Obj_Is_A(analyzer_dump, ANALYZER)) {
+ if (Obj_is_a(analyzer_dump, ANALYZER)) {
// Schema munged the dump and installed a shared analyzer.
analyzer = (Analyzer*)INCREF(analyzer_dump);
}
- else if (Obj_Is_A((Obj*)analyzer_dump, HASH)) {
+ else if (Obj_is_a((Obj*)analyzer_dump, HASH)) {
analyzer = (Analyzer*)Freezer_load(analyzer_dump);
}
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/NumericType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/NumericType.c b/core/Lucy/Plan/NumericType.c
index 217ea49..4927709 100644
--- a/core/Lucy/Plan/NumericType.c
+++ b/core/Lucy/Plan/NumericType.c
@@ -70,7 +70,7 @@ Hash*
NumType_Dump_IMP(NumericType *self) {
Hash *dump = NumType_Dump_For_Schema(self);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(NumType_Get_Class_Name(self)));
+ (Obj*)Str_Clone(NumType_get_class_name(self)));
DECREF(Hash_Delete_Utf8(dump, "type", 4));
return dump;
}
@@ -84,10 +84,10 @@ NumType_Load_IMP(NumericType *self, Obj *dump) {
String *class_name = (String*)Hash_Fetch_Utf8(source, "_class", 6);
String *type_spec = (String*)Hash_Fetch_Utf8(source, "type", 4);
Class *klass = NULL;
- if (class_name != NULL && Obj_Is_A((Obj*)class_name, STRING)) {
+ if (class_name != NULL && Obj_is_a((Obj*)class_name, STRING)) {
klass = Class_singleton(class_name, NULL);
}
- else if (type_spec != NULL && Obj_Is_A((Obj*)type_spec, STRING)) {
+ else if (type_spec != NULL && Obj_is_a((Obj*)type_spec, STRING)) {
if (Str_Equals_Utf8(type_spec, "i32_t", 5)) {
klass = INT32TYPE;
}
@@ -158,7 +158,7 @@ bool
Float64Type_Equals_IMP(Float64Type *self, Obj *other) {
if (self == (Float64Type*)other) { return true; }
if (!other) { return false; }
- if (!Obj_Is_A(other, FLOAT64TYPE)) { return false; }
+ if (!Obj_is_a(other, FLOAT64TYPE)) { return false; }
Float64Type_Equals_t super_equals
= SUPER_METHOD_PTR(FLOAT64TYPE, LUCY_Float64Type_Equals);
return super_equals(self, other);
@@ -200,7 +200,7 @@ bool
Float32Type_Equals_IMP(Float32Type *self, Obj *other) {
if (self == (Float32Type*)other) { return true; }
if (!other) { return false; }
- if (!Obj_Is_A(other, FLOAT32TYPE)) { return false; }
+ if (!Obj_is_a(other, FLOAT32TYPE)) { return false; }
Float32Type_Equals_t super_equals
= SUPER_METHOD_PTR(FLOAT32TYPE, LUCY_Float32Type_Equals);
return super_equals(self, other);
@@ -242,7 +242,7 @@ bool
Int32Type_Equals_IMP(Int32Type *self, Obj *other) {
if (self == (Int32Type*)other) { return true; }
if (!other) { return false; }
- if (!Obj_Is_A(other, INT32TYPE)) { return false; }
+ if (!Obj_is_a(other, INT32TYPE)) { return false; }
Int32Type_Equals_t super_equals
= SUPER_METHOD_PTR(INT32TYPE, LUCY_Int32Type_Equals);
return super_equals(self, other);
@@ -284,7 +284,7 @@ bool
Int64Type_Equals_IMP(Int64Type *self, Obj *other) {
if (self == (Int64Type*)other) { return true; }
if (!other) { return false; }
- if (!Obj_Is_A(other, INT64TYPE)) { return false; }
+ if (!Obj_is_a(other, INT64TYPE)) { return false; }
Int64Type_Equals_t super_equals
= SUPER_METHOD_PTR(INT64TYPE, LUCY_Int64Type_Equals);
return super_equals(self, other);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/Schema.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Schema.c b/core/Lucy/Plan/Schema.c
index 77d9680..1682c50 100644
--- a/core/Lucy/Plan/Schema.c
+++ b/core/Lucy/Plan/Schema.c
@@ -89,7 +89,7 @@ S_add_unique(Vector *array, Obj *elem) {
Obj *candidate = Vec_Fetch(array, i);
if (!candidate) { continue; }
if (elem == candidate) { return; }
- if (Obj_Get_Class(elem) == Obj_Get_Class(candidate)) {
+ if (Obj_get_class(elem) == Obj_get_class(candidate)) {
if (Obj_Equals(elem, candidate)) { return; }
}
}
@@ -99,7 +99,7 @@ S_add_unique(Vector *array, Obj *elem) {
bool
Schema_Equals_IMP(Schema *self, Obj *other) {
if ((Schema*)other == self) { return true; }
- if (!Obj_Is_A(other, SCHEMA)) { return false; }
+ if (!Obj_is_a(other, SCHEMA)) { return false; }
SchemaIVARS *const ivars = Schema_IVARS(self);
SchemaIVARS *const ovars = Schema_IVARS((Schema*)other);
if (!Arch_Equals(ivars->arch, (Obj*)ovars->arch)) { return false; }
@@ -124,16 +124,16 @@ Schema_Spec_Field_IMP(Schema *self, String *field, FieldType *type) {
else { THROW(ERR, "'%o' assigned conflicting FieldType", field); }
}
- if (FType_Is_A(type, FULLTEXTTYPE)) {
+ if (FType_is_a(type, FULLTEXTTYPE)) {
S_add_text_field(self, field, type);
}
- else if (FType_Is_A(type, STRINGTYPE)) {
+ else if (FType_is_a(type, STRINGTYPE)) {
S_add_string_field(self, field, type);
}
- else if (FType_Is_A(type, BLOBTYPE)) {
+ else if (FType_is_a(type, BLOBTYPE)) {
S_add_blob_field(self, field, type);
}
- else if (FType_Is_A(type, NUMERICTYPE)) {
+ else if (FType_is_a(type, NUMERICTYPE)) {
S_add_numeric_field(self, field, type);
}
else {
@@ -237,7 +237,7 @@ S_find_in_array(Vector *array, Obj *obj) {
return i;
}
else if (obj != NULL && candidate != NULL) {
- if (Obj_Get_Class(obj) == Obj_Get_Class(candidate)) {
+ if (Obj_get_class(obj) == Obj_get_class(candidate)) {
if (Obj_Equals(obj, candidate)) {
return i;
}
@@ -256,7 +256,7 @@ Schema_Dump_IMP(Schema *self) {
// Record class name, store dumps of unique Analyzers.
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(Schema_Get_Class_Name(self)));
+ (Obj*)Str_Clone(Schema_get_class_name(self)));
Hash_Store_Utf8(dump, "analyzers", 9,
Freezer_dump((Obj*)ivars->uniq_analyzers));
@@ -266,7 +266,7 @@ Schema_Dump_IMP(Schema *self) {
while (HashIter_Next(iter)) {
String *field = HashIter_Get_Key(iter);
FieldType *type = (FieldType*)HashIter_Get_Value(iter);
- Class *type_class = FType_Get_Class(type);
+ Class *type_class = FType_get_class(type);
// Dump known types to simplified format.
if (type_class == FULLTEXTTYPE) {
@@ -404,9 +404,9 @@ Schema_Load_IMP(Schema *self, Obj *dump) {
void
Schema_Eat_IMP(Schema *self, Schema *other) {
- if (!Schema_Is_A(self, Schema_Get_Class(other))) {
+ if (!Schema_is_a(self, Schema_get_class(other))) {
THROW(ERR, "%o not a descendent of %o",
- Schema_Get_Class_Name(self), Schema_Get_Class_Name(other));
+ Schema_get_class_name(self), Schema_get_class_name(other));
}
SchemaIVARS *const ovars = Schema_IVARS(other);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/StringType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/StringType.c b/core/Lucy/Plan/StringType.c
index d6262a3..2a00d12 100644
--- a/core/Lucy/Plan/StringType.c
+++ b/core/Lucy/Plan/StringType.c
@@ -82,7 +82,7 @@ Hash*
StringType_Dump_IMP(StringType *self) {
Hash *dump = StringType_Dump_For_Schema(self);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(StringType_Get_Class_Name(self)));
+ (Obj*)Str_Clone(StringType_get_class_name(self)));
DECREF(Hash_Delete_Utf8(dump, "type", 4));
return dump;
}
@@ -92,7 +92,7 @@ StringType_Load_IMP(StringType *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
String *class_name = (String*)Hash_Fetch_Utf8(source, "_class", 6);
Class *klass
- = (class_name != NULL && Obj_Is_A((Obj*)class_name, STRING))
+ = (class_name != NULL && Obj_is_a((Obj*)class_name, STRING))
? Class_singleton(class_name, NULL)
: STRINGTYPE;
StringType *loaded = (StringType*)Class_Make_Obj(klass);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Plan/TextType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/TextType.c b/core/Lucy/Plan/TextType.c
index 3553641..a27020a 100644
--- a/core/Lucy/Plan/TextType.c
+++ b/core/Lucy/Plan/TextType.c
@@ -114,12 +114,12 @@ TextTermStepper_Write_Delta_IMP(TextTermStepper *self, OutStream *outstream,
const char *new_text = NULL;
size_t new_size = 0;
- if (Obj_Is_A(value, STRING)) {
+ if (Obj_is_a(value, STRING)) {
String *new_string = (String*)value;
new_text = Str_Get_Ptr8(new_string);
new_size = Str_Get_Size(new_string);
}
- else if (Obj_Is_A(value, CHARBUF)) {
+ else if (Obj_is_a(value, CHARBUF)) {
CharBuf *new_charbuf = (CharBuf*)value;
new_text = CB_Get_Ptr8(new_charbuf);
new_size = CB_Get_Size(new_charbuf);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/ANDQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/ANDQuery.c b/core/Lucy/Search/ANDQuery.c
index fa1067f..3e2f2d5 100644
--- a/core/Lucy/Search/ANDQuery.c
+++ b/core/Lucy/Search/ANDQuery.c
@@ -71,7 +71,7 @@ ANDQuery_To_String_IMP(ANDQuery *self) {
bool
ANDQuery_Equals_IMP(ANDQuery *self, Obj *other) {
if ((ANDQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, ANDQUERY)) { return false; }
+ if (!Obj_is_a(other, ANDQUERY)) { return false; }
ANDQuery_Equals_t super_equals
= (ANDQuery_Equals_t)SUPER_METHOD_PTR(ANDQUERY, LUCY_ANDQuery_Equals);
return super_equals(self, other);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/Compiler.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Compiler.c b/core/Lucy/Search/Compiler.c
index 346b8a9..6dc920e 100644
--- a/core/Lucy/Search/Compiler.c
+++ b/core/Lucy/Search/Compiler.c
@@ -121,7 +121,7 @@ Compiler_To_String_IMP(Compiler *self) {
bool
Compiler_Equals_IMP(Compiler *self, Obj *other) {
if ((Compiler*)other == self) { return true; }
- if (!Obj_Is_A(other, COMPILER)) { return false; }
+ if (!Obj_is_a(other, COMPILER)) { return false; }
CompilerIVARS *const ivars = Compiler_IVARS(self);
CompilerIVARS *const ovars = Compiler_IVARS((Compiler*)other);
if (ivars->boost != ovars->boost) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/IndexSearcher.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/IndexSearcher.c b/core/Lucy/Search/IndexSearcher.c
index 4d2bd8f..78faca2 100644
--- a/core/Lucy/Search/IndexSearcher.c
+++ b/core/Lucy/Search/IndexSearcher.c
@@ -52,7 +52,7 @@ IxSearcher_new(Obj *index) {
IndexSearcher*
IxSearcher_init(IndexSearcher *self, Obj *index) {
IndexSearcherIVARS *const ivars = IxSearcher_IVARS(self);
- if (Obj_Is_A(index, INDEXREADER)) {
+ if (Obj_is_a(index, INDEXREADER)) {
ivars->reader = (IndexReader*)INCREF(index);
}
else {
@@ -133,7 +133,7 @@ IxSearcher_Collect_IMP(IndexSearcher *self, Query *query, Collector *collector)
Vector *const seg_readers = ivars->seg_readers;
I32Array *const seg_starts = ivars->seg_starts;
bool need_score = Coll_Need_Score(collector);
- Compiler *compiler = Query_Is_A(query, COMPILER)
+ Compiler *compiler = Query_is_a(query, COMPILER)
? (Compiler*)INCREF(query)
: Query_Make_Compiler(query, (Searcher*)self,
Query_Get_Boost(query), false);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/LeafQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/LeafQuery.c b/core/Lucy/Search/LeafQuery.c
index fe9f41a..32c56d6 100644
--- a/core/Lucy/Search/LeafQuery.c
+++ b/core/Lucy/Search/LeafQuery.c
@@ -60,7 +60,7 @@ LeafQuery_Get_Text_IMP(LeafQuery *self) {
bool
LeafQuery_Equals_IMP(LeafQuery *self, Obj *other) {
if ((LeafQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, LEAFQUERY)) { return false; }
+ if (!Obj_is_a(other, LEAFQUERY)) { return false; }
LeafQueryIVARS *const ivars = LeafQuery_IVARS(self);
LeafQueryIVARS *const ovars = LeafQuery_IVARS((LeafQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/MatchAllQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/MatchAllQuery.c b/core/Lucy/Search/MatchAllQuery.c
index 484f7c0..97c72b8 100644
--- a/core/Lucy/Search/MatchAllQuery.c
+++ b/core/Lucy/Search/MatchAllQuery.c
@@ -42,7 +42,7 @@ MatchAllQuery_init(MatchAllQuery *self) {
bool
MatchAllQuery_Equals_IMP(MatchAllQuery *self, Obj *other) {
- if (!Obj_Is_A(other, MATCHALLQUERY)) { return false; }
+ if (!Obj_is_a(other, MATCHALLQUERY)) { return false; }
MatchAllQueryIVARS *const ivars = MatchAllQuery_IVARS(self);
MatchAllQueryIVARS *const ovars = MatchAllQuery_IVARS((MatchAllQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/NOTQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/NOTQuery.c b/core/Lucy/Search/NOTQuery.c
index 84c6d80..51a46fa 100644
--- a/core/Lucy/Search/NOTQuery.c
+++ b/core/Lucy/Search/NOTQuery.c
@@ -65,7 +65,7 @@ NOTQuery_To_String_IMP(NOTQuery *self) {
bool
NOTQuery_Equals_IMP(NOTQuery *self, Obj *other) {
if ((NOTQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, NOTQUERY)) { return false; }
+ if (!Obj_is_a(other, NOTQUERY)) { return false; }
NOTQuery_Equals_t super_equals
= (NOTQuery_Equals_t)SUPER_METHOD_PTR(NOTQUERY, LUCY_NOTQuery_Equals);
return super_equals(self, other);
@@ -128,7 +128,7 @@ NOTCompiler_Make_Matcher_IMP(NOTCompiler *self, SegReader *reader,
int32_t doc_max = SegReader_Doc_Max(reader);
return (Matcher*)MatchAllMatcher_new(weight, doc_max);
}
- else if (Obj_Is_A((Obj*)negated_matcher, MATCHALLMATCHER)) {
+ else if (Obj_is_a((Obj*)negated_matcher, MATCHALLMATCHER)) {
DECREF(negated_matcher);
return NULL;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/NoMatchQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/NoMatchQuery.c b/core/Lucy/Search/NoMatchQuery.c
index 408358d..6d698d2 100644
--- a/core/Lucy/Search/NoMatchQuery.c
+++ b/core/Lucy/Search/NoMatchQuery.c
@@ -44,7 +44,7 @@ NoMatchQuery_init(NoMatchQuery *self) {
bool
NoMatchQuery_Equals_IMP(NoMatchQuery *self, Obj *other) {
- if (!Obj_Is_A(other, NOMATCHQUERY)) { return false; }
+ if (!Obj_is_a(other, NOMATCHQUERY)) { return false; }
NoMatchQueryIVARS *const ivars = NoMatchQuery_IVARS(self);
NoMatchQueryIVARS *const ovars = NoMatchQuery_IVARS((NoMatchQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/ORQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/ORQuery.c b/core/Lucy/Search/ORQuery.c
index 54b9791..e6264ba 100644
--- a/core/Lucy/Search/ORQuery.c
+++ b/core/Lucy/Search/ORQuery.c
@@ -52,7 +52,7 @@ ORQuery_Make_Compiler_IMP(ORQuery *self, Searcher *searcher, float boost,
bool
ORQuery_Equals_IMP(ORQuery *self, Obj *other) {
if ((ORQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, ORQUERY)) { return false; }
+ if (!Obj_is_a(other, ORQUERY)) { return false; }
ORQuery_Equals_t super_equals
= (ORQuery_Equals_t)SUPER_METHOD_PTR(ORQUERY, LUCY_ORQuery_Equals);
return super_equals(self, other);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/PhraseQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PhraseQuery.c b/core/Lucy/Search/PhraseQuery.c
index 0884532..bcaad8d 100644
--- a/core/Lucy/Search/PhraseQuery.c
+++ b/core/Lucy/Search/PhraseQuery.c
@@ -122,7 +122,7 @@ PhraseQuery_Load_IMP(PhraseQuery *self, Obj *dump) {
bool
PhraseQuery_Equals_IMP(PhraseQuery *self, Obj *other) {
if ((PhraseQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, PHRASEQUERY)) { return false; }
+ if (!Obj_is_a(other, PHRASEQUERY)) { return false; }
PhraseQueryIVARS *const ivars = PhraseQuery_IVARS(self);
PhraseQueryIVARS *const ovars = PhraseQuery_IVARS((PhraseQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
@@ -258,7 +258,7 @@ PhraseCompiler_Deserialize_IMP(PhraseCompiler *self, InStream *instream) {
bool
PhraseCompiler_Equals_IMP(PhraseCompiler *self, Obj *other) {
- if (!Obj_Is_A(other, PHRASECOMPILER)) { return false; }
+ if (!Obj_is_a(other, PHRASECOMPILER)) { return false; }
PhraseCompiler_Equals_t super_equals
= (PhraseCompiler_Equals_t)SUPER_METHOD_PTR(PHRASECOMPILER,
LUCY_PhraseCompiler_Equals);
@@ -307,7 +307,7 @@ PhraseCompiler_Make_Matcher_IMP(PhraseCompiler *self, SegReader *reader,
// Bail unless field is valid and posting type supports positions.
Similarity *sim = PhraseCompiler_Get_Similarity(self);
Posting *posting = Sim_Make_Posting(sim);
- if (posting == NULL || !Obj_Is_A((Obj*)posting, SCOREPOSTING)) {
+ if (posting == NULL || !Obj_is_a((Obj*)posting, SCOREPOSTING)) {
DECREF(posting);
return NULL;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/PolyQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PolyQuery.c b/core/Lucy/Search/PolyQuery.c
index 2372f44..aee253b 100644
--- a/core/Lucy/Search/PolyQuery.c
+++ b/core/Lucy/Search/PolyQuery.c
@@ -117,7 +117,7 @@ PolyQuery_Load_IMP(PolyQuery *self, Obj *dump) {
bool
PolyQuery_Equals_IMP(PolyQuery *self, Obj *other) {
if ((PolyQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, POLYQUERY)) { return false; }
+ if (!Obj_is_a(other, POLYQUERY)) { return false; }
PolyQueryIVARS *const ivars = PolyQuery_IVARS(self);
PolyQueryIVARS *const ovars = PolyQuery_IVARS((PolyQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
@@ -203,7 +203,7 @@ PolyCompiler_Highlight_Spans_IMP(PolyCompiler *self, Searcher *searcher,
void
PolyCompiler_Serialize_IMP(PolyCompiler *self, OutStream *outstream) {
PolyCompilerIVARS *const ivars = PolyCompiler_IVARS(self);
- Freezer_serialize_string(PolyCompiler_Get_Class_Name(self), outstream);
+ Freezer_serialize_string(PolyCompiler_get_class_name(self), outstream);
Freezer_serialize_varray(ivars->children, outstream);
PolyCompiler_Serialize_t super_serialize
= SUPER_METHOD_PTR(POLYCOMPILER, LUCY_PolyCompiler_Serialize);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/PolySearcher.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PolySearcher.c b/core/Lucy/Search/PolySearcher.c
index d0af055..69a1f99 100644
--- a/core/Lucy/Search/PolySearcher.c
+++ b/core/Lucy/Search/PolySearcher.c
@@ -48,14 +48,14 @@ PolySearcher_init(PolySearcher *self, Schema *schema, Vector *searchers) {
Searcher *searcher
= (Searcher*)CERTIFY(Vec_Fetch(searchers, i), SEARCHER);
Schema *candidate = Searcher_Get_Schema(searcher);
- Class *orig_class = Schema_Get_Class(schema);
- Class *candidate_class = Schema_Get_Class(candidate);
+ Class *orig_class = Schema_get_class(schema);
+ Class *candidate_class = Schema_get_class(candidate);
// Confirm that searchers all use the same schema.
if (orig_class != candidate_class) {
THROW(ERR, "Conflicting schemas: '%o', '%o'",
- Schema_Get_Class_Name(schema),
- Schema_Get_Class_Name(candidate));
+ Schema_get_class_name(schema),
+ Schema_get_class_name(candidate));
}
// Derive doc_max and relative start offsets.
@@ -135,7 +135,7 @@ PolySearcher_Top_Docs_IMP(PolySearcher *self, Query *query,
? HitQ_new(schema, sort_spec, num_wanted)
: HitQ_new(NULL, NULL, num_wanted);
uint32_t total_hits = 0;
- Compiler *compiler = Query_Is_A(query, COMPILER)
+ Compiler *compiler = Query_is_a(query, COMPILER)
? ((Compiler*)INCREF(query))
: Query_Make_Compiler(query, (Searcher*)self,
Query_Get_Boost(query),
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/Query.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Query.c b/core/Lucy/Search/Query.c
index b82776e..85fa672 100644
--- a/core/Lucy/Search/Query.c
+++ b/core/Lucy/Search/Query.c
@@ -57,7 +57,7 @@ Query_Dump_IMP(Query *self) {
QueryIVARS *ivars = Query_IVARS(self);
Hash *dump = Hash_new(0);
Hash_Store_Utf8(dump, "_class", 6,
- (Obj*)Str_Clone(Obj_Get_Class_Name((Obj*)self)));
+ (Obj*)Str_Clone(Obj_get_class_name((Obj*)self)));
Hash_Store_Utf8(dump, "boost", 5,
(Obj*)Str_newf("%f64", (double)ivars->boost));
return (Obj*)dump;
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/QueryParser.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.c b/core/Lucy/Search/QueryParser.c
index 4dc496d..dce7fb6 100644
--- a/core/Lucy/Search/QueryParser.c
+++ b/core/Lucy/Search/QueryParser.c
@@ -659,13 +659,13 @@ S_compose_subquery(QueryParser *self, Vector *elems, bool enclosed) {
static bool
S_has_valid_clauses(Query *query) {
- if (Query_Is_A(query, NOTQUERY)) {
+ if (Query_is_a(query, NOTQUERY)) {
return false;
}
- else if (Query_Is_A(query, MATCHALLQUERY)) {
+ else if (Query_is_a(query, MATCHALLQUERY)) {
return false;
}
- else if (Query_Is_A(query, ORQUERY) || Query_Is_A(query, ANDQUERY)) {
+ else if (Query_is_a(query, ORQUERY) || Query_is_a(query, ANDQUERY)) {
PolyQuery *polyquery = (PolyQuery*)query;
Vector *children = PolyQuery_Get_Children(polyquery);
for (uint32_t i = 0, max = Vec_Get_Size(children); i < max; i++) {
@@ -681,11 +681,11 @@ S_has_valid_clauses(Query *query) {
static void
S_do_prune(QueryParser *self, Query *query) {
- if (Query_Is_A(query, NOTQUERY)) {
+ if (Query_is_a(query, NOTQUERY)) {
// Don't allow double negatives.
NOTQuery *not_query = (NOTQuery*)query;
Query *neg_query = NOTQuery_Get_Negated_Query(not_query);
- if (!Query_Is_A(neg_query, MATCHALLQUERY)
+ if (!Query_is_a(neg_query, MATCHALLQUERY)
&& !S_has_valid_clauses(neg_query)
) {
MatchAllQuery *matchall = MatchAllQuery_new();
@@ -693,7 +693,7 @@ S_do_prune(QueryParser *self, Query *query) {
DECREF(matchall);
}
}
- else if (Query_Is_A(query, POLYQUERY)) {
+ else if (Query_is_a(query, POLYQUERY)) {
PolyQuery *polyquery = (PolyQuery*)query;
Vector *children = PolyQuery_Get_Children(polyquery);
@@ -703,8 +703,8 @@ S_do_prune(QueryParser *self, Query *query) {
S_do_prune(self, child);
}
- if (PolyQuery_Is_A(polyquery, REQUIREDOPTIONALQUERY)
- || PolyQuery_Is_A(polyquery, ORQUERY)
+ if (PolyQuery_is_a(polyquery, REQUIREDOPTIONALQUERY)
+ || PolyQuery_is_a(polyquery, ORQUERY)
) {
// Don't allow 'foo OR (-bar)'.
Vector *children = PolyQuery_Get_Children(polyquery);
@@ -715,7 +715,7 @@ S_do_prune(QueryParser *self, Query *query) {
}
}
}
- else if (PolyQuery_Is_A(polyquery, ANDQUERY)) {
+ else if (PolyQuery_is_a(polyquery, ANDQUERY)) {
// Don't allow '(-bar AND -baz)'.
if (!S_has_valid_clauses((Query*)polyquery)) {
Vector *children = PolyQuery_Get_Children(polyquery);
@@ -728,12 +728,12 @@ S_do_prune(QueryParser *self, Query *query) {
Query*
QParser_Prune_IMP(QueryParser *self, Query *query) {
if (!query
- || Query_Is_A(query, NOTQUERY)
- || Query_Is_A(query, MATCHALLQUERY)
+ || Query_is_a(query, NOTQUERY)
+ || Query_is_a(query, MATCHALLQUERY)
) {
return (Query*)NoMatchQuery_new();
}
- else if (Query_Is_A(query, POLYQUERY)) {
+ else if (Query_is_a(query, POLYQUERY)) {
S_do_prune(self, query);
}
return (Query*)INCREF(query);
@@ -743,10 +743,10 @@ Query*
QParser_Expand_IMP(QueryParser *self, Query *query) {
Query *retval = NULL;
- if (Query_Is_A(query, LEAFQUERY)) {
+ if (Query_is_a(query, LEAFQUERY)) {
retval = QParser_Expand_Leaf(self, query);
}
- else if (Query_Is_A(query, ORQUERY) || Query_Is_A(query, ANDQUERY)) {
+ else if (Query_is_a(query, ORQUERY) || Query_is_a(query, ANDQUERY)) {
PolyQuery *polyquery = (PolyQuery*)query;
Vector *children = PolyQuery_Get_Children(polyquery);
Vector *new_kids = Vec_new(Vec_Get_Size(children));
@@ -755,7 +755,7 @@ QParser_Expand_IMP(QueryParser *self, Query *query) {
Query *child = (Query*)Vec_Fetch(children, i);
Query *new_child = QParser_Expand(self, child); // recurse
if (new_child) {
- if (Query_Is_A(new_child, NOMATCHQUERY)) {
+ if (Query_is_a(new_child, NOMATCHQUERY)) {
bool fails = NoMatchQuery_Get_Fails_To_Match(
(NoMatchQuery*)new_child);
if (fails) {
@@ -784,7 +784,7 @@ QParser_Expand_IMP(QueryParser *self, Query *query) {
DECREF(new_kids);
}
- else if (Query_Is_A(query, NOTQUERY)) {
+ else if (Query_is_a(query, NOTQUERY)) {
NOTQuery *not_query = (NOTQuery*)query;
Query *negated_query = NOTQuery_Get_Negated_Query(not_query);
negated_query = QParser_Expand(self, negated_query);
@@ -797,7 +797,7 @@ QParser_Expand_IMP(QueryParser *self, Query *query) {
retval = (Query*)MatchAllQuery_new();
}
}
- else if (Query_Is_A(query, REQUIREDOPTIONALQUERY)) {
+ else if (Query_is_a(query, REQUIREDOPTIONALQUERY)) {
RequiredOptionalQuery *req_opt_query = (RequiredOptionalQuery*)query;
Query *req_query = ReqOptQuery_Get_Required_Query(req_opt_query);
Query *opt_query = ReqOptQuery_Get_Optional_Query(req_opt_query);
@@ -867,7 +867,7 @@ QParser_Expand_Leaf_IMP(QueryParser *self, Query *query) {
bool ambiguous = false;
// Determine whether we can actually process the input.
- if (!Query_Is_A(query, LEAFQUERY)) { return NULL; }
+ if (!Query_is_a(query, LEAFQUERY)) { return NULL; }
String *full_text = LeafQuery_Get_Text(leaf_query);
if (!Str_Get_Size(full_text)) { return NULL; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/QueryParser/ParserElem.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser/ParserElem.c b/core/Lucy/Search/QueryParser/ParserElem.c
index 147d2cb..7c461a1 100644
--- a/core/Lucy/Search/QueryParser/ParserElem.c
+++ b/core/Lucy/Search/QueryParser/ParserElem.c
@@ -52,7 +52,7 @@ ParserElem_Set_Value_IMP(ParserElem *self, Obj *value) {
Obj*
ParserElem_As_IMP(ParserElem *self, Class *klass) {
ParserElemIVARS *const ivars = ParserElem_IVARS(self);
- if (ivars->value && Obj_Is_A(ivars->value, klass)) {
+ if (ivars->value && Obj_is_a(ivars->value, klass)) {
return ivars->value;
}
return NULL;
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/RangeQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RangeQuery.c b/core/Lucy/Search/RangeQuery.c
index 63cc997..ed340e5 100644
--- a/core/Lucy/Search/RangeQuery.c
+++ b/core/Lucy/Search/RangeQuery.c
@@ -79,7 +79,7 @@ RangeQuery_Destroy_IMP(RangeQuery *self) {
bool
RangeQuery_Equals_IMP(RangeQuery *self, Obj *other) {
if ((RangeQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, RANGEQUERY)) { return false; }
+ if (!Obj_is_a(other, RANGEQUERY)) { return false; }
RangeQueryIVARS *const ivars = RangeQuery_IVARS(self);
RangeQueryIVARS *const ovars = RangeQuery_IVARS((RangeQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/RequiredOptionalQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RequiredOptionalQuery.c b/core/Lucy/Search/RequiredOptionalQuery.c
index a90f841..0f76a1a 100644
--- a/core/Lucy/Search/RequiredOptionalQuery.c
+++ b/core/Lucy/Search/RequiredOptionalQuery.c
@@ -82,7 +82,7 @@ ReqOptQuery_To_String_IMP(RequiredOptionalQuery *self) {
bool
ReqOptQuery_Equals_IMP(RequiredOptionalQuery *self, Obj *other) {
if ((RequiredOptionalQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, REQUIREDOPTIONALQUERY)) { return false; }
+ if (!Obj_is_a(other, REQUIREDOPTIONALQUERY)) { return false; }
ReqOptQuery_Equals_t super_equals
= (ReqOptQuery_Equals_t)SUPER_METHOD_PTR(REQUIREDOPTIONALQUERY,
LUCY_ReqOptQuery_Equals);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/Searcher.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Searcher.c b/core/Lucy/Search/Searcher.c
index 7b6cd25..5d65a7d 100644
--- a/core/Lucy/Search/Searcher.c
+++ b/core/Lucy/Search/Searcher.c
@@ -71,10 +71,10 @@ Searcher_Glean_Query_IMP(Searcher *self, Obj *query) {
if (!query) {
real_query = (Query*)NoMatchQuery_new();
}
- else if (Obj_Is_A(query, QUERY)) {
+ else if (Obj_is_a(query, QUERY)) {
real_query = (Query*)INCREF(query);
}
- else if (Obj_Is_A(query, STRING)) {
+ else if (Obj_is_a(query, STRING)) {
if (!ivars->qparser) {
ivars->qparser = QParser_new(ivars->schema, NULL, NULL, NULL);
}
@@ -82,7 +82,7 @@ Searcher_Glean_Query_IMP(Searcher *self, Obj *query) {
}
else {
THROW(ERR, "Invalid type for 'query' param: %o",
- Obj_Get_Class_Name(query));
+ Obj_get_class_name(query));
}
return real_query;
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/Span.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Span.c b/core/Lucy/Search/Span.c
index 87c283d..c1748ea 100644
--- a/core/Lucy/Search/Span.c
+++ b/core/Lucy/Search/Span.c
@@ -68,7 +68,7 @@ Span_Set_Weight_IMP(Span *self, float weight) {
bool
Span_Equals_IMP(Span *self, Obj *other) {
if (self == (Span*)other) { return true; }
- if (!Obj_Is_A(other, SPAN)) { return false; }
+ if (!Obj_is_a(other, SPAN)) { return false; }
SpanIVARS *const ivars = Span_IVARS(self);
SpanIVARS *const ovars = Span_IVARS((Span*)other);
if (ivars->offset != ovars->offset) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Search/TermQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/TermQuery.c b/core/Lucy/Search/TermQuery.c
index 8207384..9003036 100644
--- a/core/Lucy/Search/TermQuery.c
+++ b/core/Lucy/Search/TermQuery.c
@@ -112,7 +112,7 @@ TermQuery_Get_Term_IMP(TermQuery *self) {
bool
TermQuery_Equals_IMP(TermQuery *self, Obj *other) {
if ((TermQuery*)other == self) { return true; }
- if (!Obj_Is_A(other, TERMQUERY)) { return false; }
+ if (!Obj_is_a(other, TERMQUERY)) { return false; }
TermQueryIVARS *const ivars = TermQuery_IVARS(self);
TermQueryIVARS *const ovars = TermQuery_IVARS((TermQuery*)other);
if (ivars->boost != ovars->boost) { return false; }
@@ -193,7 +193,7 @@ TermCompiler_Equals_IMP(TermCompiler *self, Obj *other) {
= (TermCompiler_Equals_t)SUPER_METHOD_PTR(TERMCOMPILER,
LUCY_TermCompiler_Equals);
if (!super_equals(self, other)) { return false; }
- if (!Obj_Is_A(other, TERMCOMPILER)) { return false; }
+ if (!Obj_is_a(other, TERMCOMPILER)) { return false; }
TermCompilerIVARS *const ivars = TermCompiler_IVARS(self);
TermCompilerIVARS *const ovars = TermCompiler_IVARS((TermCompiler*)other);
if (ivars->idf != ovars->idf) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/CompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/CompoundFileReader.c b/core/Lucy/Store/CompoundFileReader.c
index 396eabe..7a530b9 100644
--- a/core/Lucy/Store/CompoundFileReader.c
+++ b/core/Lucy/Store/CompoundFileReader.c
@@ -45,7 +45,7 @@ CFReader_do_open(CompoundFileReader *self, Folder *folder) {
Folder_init((Folder*)self, Folder_Get_Path(folder));
// Parse metadata file.
- if (!metadata || !Hash_Is_A(metadata, HASH)) {
+ if (!metadata || !Hash_is_a(metadata, HASH)) {
error = Err_new(Str_newf("Can't read '%o' in '%o'", cfmeta_file,
Folder_Get_Path(folder)));
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/FSFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSFolder.c b/core/Lucy/Store/FSFolder.c
index a02979d..40c17b8 100644
--- a/core/Lucy/Store/FSFolder.c
+++ b/core/Lucy/Store/FSFolder.c
@@ -164,7 +164,7 @@ FSFolder_Local_Is_Directory_IMP(FSFolder *self, String *name) {
// Check for a cached object, then fall back to a system call.
Obj *elem = Hash_Fetch(ivars->entries, name);
- if (elem && Obj_Is_A(elem, FOLDER)) {
+ if (elem && Obj_is_a(elem, FOLDER)) {
return true;
}
else {
@@ -238,7 +238,7 @@ FSFolder_Local_Find_Folder_IMP(FSFolder *self, String *name) {
return NULL;
}
else if (NULL != (subfolder = (Folder*)Hash_Fetch(ivars->entries, name))) {
- if (Folder_Is_A(subfolder, FOLDER)) {
+ if (Folder_is_a(subfolder, FOLDER)) {
return subfolder;
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/Folder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Folder.c b/core/Lucy/Store/Folder.c
index ccdde5a..b75e73e 100644
--- a/core/Lucy/Store/Folder.c
+++ b/core/Lucy/Store/Folder.c
@@ -414,7 +414,7 @@ Folder_Consolidate_IMP(Folder *self, String *path) {
if (!folder) {
THROW(ERR, "Can't consolidate %o", path);
}
- else if (Folder_Is_A(folder, COMPOUNDFILEREADER)) {
+ else if (Folder_is_a(folder, COMPOUNDFILEREADER)) {
THROW(ERR, "Can't consolidate %o twice", path);
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/InStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/InStream.c b/core/Lucy/Store/InStream.c
index fd5b36f..b3aeffa 100644
--- a/core/Lucy/Store/InStream.c
+++ b/core/Lucy/Store/InStream.c
@@ -66,20 +66,20 @@ InStream_do_open(InStream *self, Obj *file) {
ivars->window = FileWindow_new();
// Obtain a FileHandle.
- if (Obj_Is_A(file, FILEHANDLE)) {
+ if (Obj_is_a(file, FILEHANDLE)) {
ivars->file_handle = (FileHandle*)INCREF(file);
}
- else if (Obj_Is_A(file, RAMFILE)) {
+ else if (Obj_is_a(file, RAMFILE)) {
ivars->file_handle
= (FileHandle*)RAMFH_open(NULL, FH_READ_ONLY, (RAMFile*)file);
}
- else if (Obj_Is_A(file, STRING)) {
+ else if (Obj_is_a(file, STRING)) {
ivars->file_handle
= (FileHandle*)FSFH_open((String*)file, FH_READ_ONLY);
}
else {
Err_set_error(Err_new(Str_newf("Invalid type for param 'file': '%o'",
- Obj_Get_Class_Name(file))));
+ Obj_get_class_name(file))));
DECREF(self);
return NULL;
}
@@ -136,7 +136,7 @@ InStream_Reopen_IMP(InStream *self, String *filename, int64_t offset,
offset, len, FH_Length(ivars->file_handle));
}
- Class *klass = InStream_Get_Class(self);
+ Class *klass = InStream_get_class(self);
InStream *other = (InStream*)Class_Make_Obj(klass);
InStreamIVARS *const ovars = InStream_IVARS(other);
InStream_do_open(other, (Obj*)ivars->file_handle);
@@ -154,7 +154,7 @@ InStream_Reopen_IMP(InStream *self, String *filename, int64_t offset,
InStream*
InStream_Clone_IMP(InStream *self) {
InStreamIVARS *const ivars = InStream_IVARS(self);
- Class *klass = InStream_Get_Class(self);
+ Class *klass = InStream_get_class(self);
InStream *twin = (InStream*)Class_Make_Obj(klass);
InStream_do_open(twin, (Obj*)ivars->file_handle);
InStream_Seek(twin, SI_tell(self));
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/Lock.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Lock.c b/core/Lucy/Store/Lock.c
index e4d868a..8ea0aee 100644
--- a/core/Lucy/Store/Lock.c
+++ b/core/Lucy/Store/Lock.c
@@ -272,20 +272,20 @@ LFLock_Maybe_Delete_File_IMP(LockFileLock *self, String *path,
// Attempt to delete dead lock file.
if (Folder_Exists(folder, path)) {
Hash *hash = (Hash*)Json_slurp_json(folder, path);
- if (hash != NULL && Obj_Is_A((Obj*)hash, HASH)) {
+ if (hash != NULL && Obj_is_a((Obj*)hash, HASH)) {
String *pid_buf = (String*)Hash_Fetch_Utf8(hash, "pid", 3);
String *host = (String*)Hash_Fetch_Utf8(hash, "host", 4);
String *name = (String*)Hash_Fetch_Utf8(hash, "name", 4);
// Match hostname and lock name.
if (host != NULL
- && Str_Is_A(host, STRING)
+ && Str_is_a(host, STRING)
&& Str_Equals(host, (Obj*)ivars->host)
&& name != NULL
- && Str_Is_A(name, STRING)
+ && Str_is_a(name, STRING)
&& Str_Equals(name, (Obj*)ivars->name)
&& pid_buf != NULL
- && Str_Is_A(pid_buf, STRING)
+ && Str_is_a(pid_buf, STRING)
) {
// Verify that pid is either mine or dead.
int pid = (int)Str_To_I64(pid_buf);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/OutStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/OutStream.c b/core/Lucy/Store/OutStream.c
index ca4e676..d0fadd4 100644
--- a/core/Lucy/Store/OutStream.c
+++ b/core/Lucy/Store/OutStream.c
@@ -57,20 +57,20 @@ OutStream_do_open(OutStream *self, Obj *file) {
ivars->buf_pos = 0;
// Obtain a FileHandle.
- if (Obj_Is_A(file, FILEHANDLE)) {
+ if (Obj_is_a(file, FILEHANDLE)) {
ivars->file_handle = (FileHandle*)INCREF(file);
}
- else if (Obj_Is_A(file, RAMFILE)) {
+ else if (Obj_is_a(file, RAMFILE)) {
ivars->file_handle
= (FileHandle*)RAMFH_open(NULL, FH_WRITE_ONLY, (RAMFile*)file);
}
- else if (Obj_Is_A(file, STRING)) {
+ else if (Obj_is_a(file, STRING)) {
ivars->file_handle = (FileHandle*)FSFH_open((String*)file,
FH_WRITE_ONLY | FH_CREATE | FH_EXCLUSIVE);
}
else {
Err_set_error(Err_new(Str_newf("Invalid type for param 'file': '%o'",
- Obj_Get_Class_Name(file))));
+ Obj_get_class_name(file))));
DECREF(self);
return NULL;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Store/RAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFolder.c b/core/Lucy/Store/RAMFolder.c
index c6ca285..e4e832c 100644
--- a/core/Lucy/Store/RAMFolder.c
+++ b/core/Lucy/Store/RAMFolder.c
@@ -83,7 +83,7 @@ RAMFolder_Local_Open_FileHandle_IMP(RAMFolder *self, String *name,
// Make sure the filepath isn't a directory, and that it either exists
// or we have permission to create it.
if (file) {
- if (!RAMFile_Is_A(file, RAMFILE)) {
+ if (!RAMFile_is_a(file, RAMFILE)) {
Err_set_error(Err_new(Str_newf("Not a file: '%o'", fullpath)));
DECREF(fullpath);
return NULL;
@@ -130,7 +130,7 @@ bool
RAMFolder_Local_Is_Directory_IMP(RAMFolder *self, String *name) {
RAMFolderIVARS *const ivars = RAMFolder_IVARS(self);
Obj *entry = Hash_Fetch(ivars->entries, name);
- if (entry && Obj_Is_A(entry, FOLDER)) { return true; }
+ if (entry && Obj_is_a(entry, FOLDER)) { return true; }
return false;
}
@@ -159,35 +159,35 @@ S_rename_or_hard_link(RAMFolder *self, String* from, String *to,
}
// Extract RAMFolders from compound reader wrappers, if necessary.
- if (Folder_Is_A(from_folder, COMPOUNDFILEREADER)) {
+ if (Folder_is_a(from_folder, COMPOUNDFILEREADER)) {
inner_from_folder = (RAMFolder*)CFReader_Get_Real_Folder(
(CompoundFileReader*)from_folder);
}
else {
inner_from_folder = (RAMFolder*)from_folder;
}
- if (Folder_Is_A(to_folder, COMPOUNDFILEREADER)) {
+ if (Folder_is_a(to_folder, COMPOUNDFILEREADER)) {
inner_to_folder = (RAMFolder*)CFReader_Get_Real_Folder(
(CompoundFileReader*)to_folder);
}
else {
inner_to_folder = (RAMFolder*)to_folder;
}
- if (!RAMFolder_Is_A(inner_from_folder, RAMFOLDER)) {
+ if (!RAMFolder_is_a(inner_from_folder, RAMFOLDER)) {
Err_set_error(Err_new(Str_newf("Not a RAMFolder, but a '%o'",
- Obj_Get_Class_Name((Obj*)inner_from_folder))));
+ Obj_get_class_name((Obj*)inner_from_folder))));
return false;
}
- if (!RAMFolder_Is_A(inner_to_folder, RAMFOLDER)) {
+ if (!RAMFolder_is_a(inner_to_folder, RAMFOLDER)) {
Err_set_error(Err_new(Str_newf("Not a RAMFolder, but a '%o'",
- Obj_Get_Class_Name((Obj*)inner_to_folder))));
+ Obj_get_class_name((Obj*)inner_to_folder))));
return false;
}
// Find the original element.
elem = Hash_Fetch(RAMFolder_IVARS(inner_from_folder)->entries, from_name);
if (!elem) {
- if (Folder_Is_A(from_folder, COMPOUNDFILEREADER)
+ if (Folder_is_a(from_folder, COMPOUNDFILEREADER)
&& Folder_Local_Exists(from_folder, from_name)
) {
Err_set_error(Err_new(Str_newf("Source file '%o' is virtual",
@@ -214,20 +214,20 @@ S_rename_or_hard_link(RAMFolder *self, String* from, String *to,
}
// Don't allow clobbering of different entry type.
- if (Obj_Is_A(elem, RAMFILE)) {
- if (!Obj_Is_A(existing, RAMFILE)) {
+ if (Obj_is_a(elem, RAMFILE)) {
+ if (!Obj_is_a(existing, RAMFILE)) {
conflict = true;
}
}
- else if (Obj_Is_A(elem, FOLDER)) {
- if (!Obj_Is_A(existing, FOLDER)) {
+ else if (Obj_is_a(elem, FOLDER)) {
+ if (!Obj_is_a(existing, FOLDER)) {
conflict = true;
}
}
if (conflict) {
Err_set_error(Err_new(Str_newf("Can't clobber a %o with a %o",
- Obj_Get_Class_Name(existing),
- Obj_Get_Class_Name(elem))));
+ Obj_get_class_name(existing),
+ Obj_get_class_name(elem))));
return false;
}
}
@@ -238,16 +238,16 @@ S_rename_or_hard_link(RAMFolder *self, String* from, String *to,
to_name, INCREF(elem));
DECREF(Hash_Delete(RAMFolder_IVARS(inner_from_folder)->entries,
from_name));
- if (Obj_Is_A(elem, FOLDER)) {
+ if (Obj_is_a(elem, FOLDER)) {
String *newpath = S_fullpath(inner_to_folder, to_name);
Folder_Set_Path((Folder*)elem, newpath);
DECREF(newpath);
}
}
else if (op == OP_HARD_LINK) {
- if (!Obj_Is_A(elem, RAMFILE)) {
+ if (!Obj_is_a(elem, RAMFILE)) {
Err_set_error(Err_new(Str_newf("'%o' isn't a file, it's a %o",
- from, Obj_Get_Class_Name(elem))));
+ from, Obj_get_class_name(elem))));
return false;
}
else {
@@ -306,12 +306,12 @@ RAMFolder_Local_Delete_IMP(RAMFolder *self, String *name) {
RAMFolderIVARS *const ivars = RAMFolder_IVARS(self);
Obj *entry = Hash_Fetch(ivars->entries, name);
if (entry) {
- if (Obj_Is_A(entry, RAMFILE)) {
+ if (Obj_is_a(entry, RAMFILE)) {
;
}
- else if (Obj_Is_A(entry, FOLDER)) {
+ else if (Obj_is_a(entry, FOLDER)) {
RAMFolder *inner_folder;
- if (Obj_Is_A(entry, COMPOUNDFILEREADER)) {
+ if (Obj_is_a(entry, COMPOUNDFILEREADER)) {
inner_folder = (RAMFolder*)CERTIFY(
CFReader_Get_Real_Folder((CompoundFileReader*)entry),
RAMFOLDER);
@@ -339,7 +339,7 @@ Folder*
RAMFolder_Local_Find_Folder_IMP(RAMFolder *self, String *path) {
RAMFolderIVARS *const ivars = RAMFolder_IVARS(self);
Folder *local_folder = (Folder*)Hash_Fetch(ivars->entries, path);
- if (local_folder && Folder_Is_A(local_folder, FOLDER)) {
+ if (local_folder && Folder_is_a(local_folder, FOLDER)) {
return local_folder;
}
return NULL;
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Analysis/TestNormalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestNormalizer.c b/core/Lucy/Test/Analysis/TestNormalizer.c
index 3b69ce8..0b8f85c 100644
--- a/core/Lucy/Test/Analysis/TestNormalizer.c
+++ b/core/Lucy/Test/Analysis/TestNormalizer.c
@@ -94,7 +94,7 @@ test_normalization(TestBatchRunner *runner) {
String *norm = (String*)Vec_Fetch(got, 0);
TEST_TRUE(runner,
norm
- && Str_Is_A(norm, STRING)
+ && Str_is_a(norm, STRING)
&& Str_Equals(norm, Vec_Fetch(norms, j)),
"Normalize %s %d %d: %s", Str_Get_Ptr8(form),
case_fold, strip_accents, Str_Get_Ptr8(word)
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Analysis/TestSnowballStemmer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStemmer.c b/core/Lucy/Test/Analysis/TestSnowballStemmer.c
index d1157b6..87b88c9 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStemmer.c
+++ b/core/Lucy/Test/Analysis/TestSnowballStemmer.c
@@ -81,7 +81,7 @@ test_stemming(TestBatchRunner *runner) {
String *stem = (String*)Vec_Fetch(got, 0);
TEST_TRUE(runner,
stem
- && Str_Is_A(stem, STRING)
+ && Str_is_a(stem, STRING)
&& Str_Equals(stem, Vec_Fetch(stems, i)),
"Stem %s: %s", Str_Get_Ptr8(iso), Str_Get_Ptr8(word)
);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Analysis/TestStandardTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestStandardTokenizer.c b/core/Lucy/Test/Analysis/TestStandardTokenizer.c
index 54e0b0e..2676549 100644
--- a/core/Lucy/Test/Analysis/TestStandardTokenizer.c
+++ b/core/Lucy/Test/Analysis/TestStandardTokenizer.c
@@ -65,31 +65,31 @@ test_tokenizer(TestBatchRunner *runner) {
String *token = (String*)Vec_Fetch(got, 0);
TEST_TRUE(runner,
token
- && Str_Is_A(token, STRING)
+ && Str_is_a(token, STRING)
&& Str_Equals_Utf8(token, "tha\xcc\x82t's", 8),
"Token: %s", Str_Get_Ptr8(token));
token = (String*)Vec_Fetch(got, 1);
TEST_TRUE(runner,
token
- && Str_Is_A(token, STRING)
+ && Str_is_a(token, STRING)
&& Str_Equals_Utf8(token, "1,02\xC2\xADZ4.38", 11),
"Token: %s", Str_Get_Ptr8(token));
token = (String*)Vec_Fetch(got, 2);
TEST_TRUE(runner,
token
- && Str_Is_A(token, STRING)
+ && Str_is_a(token, STRING)
&& Str_Equals_Utf8(token, "\xE0\xB8\x81\xC2\xAD\xC2\xAD", 7),
"Token: %s", Str_Get_Ptr8(token));
token = (String*)Vec_Fetch(got, 3);
TEST_TRUE(runner,
token
- && Str_Is_A(token, STRING)
+ && Str_is_a(token, STRING)
&& Str_Equals_Utf8(token, "\xF0\xA0\x80\x80", 4),
"Token: %s", Str_Get_Ptr8(token));
token = (String*)Vec_Fetch(got, 4);
TEST_TRUE(runner,
token
- && Str_Is_A(token, STRING)
+ && Str_is_a(token, STRING)
&& Str_Equals_Utf8(token, "a", 1),
"Token: %s", Str_Get_Ptr8(token));
DECREF(got);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Index/TestSegment.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSegment.c b/core/Lucy/Test/Index/TestSegment.c
index aafeef9..1d8bbb2 100644
--- a/core/Lucy/Test/Index/TestSegment.c
+++ b/core/Lucy/Test/Index/TestSegment.c
@@ -67,7 +67,7 @@ test_metadata_storage(TestBatchRunner *runner) {
got = (String*)Seg_Fetch_Metadata_Utf8(segment, "foo", 3);
TEST_TRUE(runner,
got
- && Str_Is_A(got, STRING)
+ && Str_is_a(got, STRING)
&& Str_Equals_Utf8(got, "bar", 3),
"metadata round trip"
);
@@ -146,7 +146,7 @@ test_Write_File_and_Read_File(TestBatchRunner *runner) {
meta = (String*)Seg_Fetch_Metadata_Utf8(got, "foo", 3);
TEST_TRUE(runner,
meta
- && Str_Is_A(meta, STRING)
+ && Str_is_a(meta, STRING)
&& Str_Equals_Utf8(meta, "bar", 3),
"Round trip metadata through file");
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Search/TestSortSpec.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.c b/core/Lucy/Test/Search/TestSortSpec.c
index dde3f32..f7a2f1e 100644
--- a/core/Lucy/Test/Search/TestSortSpec.c
+++ b/core/Lucy/Test/Search/TestSortSpec.c
@@ -465,7 +465,7 @@ test_sort_spec(TestBatchRunner *runner) {
sort_ctx.sort_field = nope_str;
error = Err_trap(S_attempt_sorted_search, &sort_ctx);
TEST_TRUE(runner, error != NULL
- && Err_Is_A(error, ERR)
+ && Err_is_a(error, ERR)
&& Str_Find_Utf8(Err_Get_Mess(error), "sortable", 8) != -1,
"sorting on a non-sortable field throws an error");
DECREF(error);
@@ -473,7 +473,7 @@ test_sort_spec(TestBatchRunner *runner) {
sort_ctx.sort_field = unknown_str;
error = Err_trap(S_attempt_sorted_search, &sort_ctx);
TEST_TRUE(runner, error != NULL
- && Err_Is_A(error, ERR)
+ && Err_is_a(error, ERR)
&& Str_Find_Utf8(Err_Get_Mess(error), "sortable", 8) != -1,
"sorting on an unknown field throws an error");
DECREF(error);
http://git-wip-us.apache.org/repos/asf/lucy/blob/00d34f93/core/Lucy/Test/Store/TestFSFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.c b/core/Lucy/Test/Store/TestFSFileHandle.c
index 0b54d04..f1b4d30 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.c
+++ b/core/Lucy/Test/Store/TestFSFileHandle.c
@@ -69,7 +69,7 @@ test_open(TestBatchRunner *runner) {
Err_set_error(NULL);
fh = FSFH_open(test_filename, FH_CREATE | FH_WRITE_ONLY | FH_EXCLUSIVE);
- TEST_TRUE(runner, fh && FSFH_Is_A(fh, FSFILEHANDLE), "open() succeeds");
+ TEST_TRUE(runner, fh && FSFH_is_a(fh, FSFILEHANDLE), "open() succeeds");
TEST_TRUE(runner, Err_get_error() == NULL, "open() no errors");
FSFH_Write(fh, "foo", 3);
if (!FSFH_Close(fh)) { RETHROW(INCREF(Err_get_error())); }
@@ -83,7 +83,7 @@ test_open(TestBatchRunner *runner) {
Err_set_error(NULL);
fh = FSFH_open(test_filename, FH_CREATE | FH_WRITE_ONLY);
- TEST_TRUE(runner, fh && FSFH_Is_A(fh, FSFILEHANDLE),
+ TEST_TRUE(runner, fh && FSFH_is_a(fh, FSFILEHANDLE),
"open() for append");
TEST_TRUE(runner, Err_get_error() == NULL,
"open() for append -- no errors");
@@ -93,7 +93,7 @@ test_open(TestBatchRunner *runner) {
Err_set_error(NULL);
fh = FSFH_open(test_filename, FH_READ_ONLY);
- TEST_TRUE(runner, fh && FSFH_Is_A(fh, FSFILEHANDLE), "open() read only");
+ TEST_TRUE(runner, fh && FSFH_is_a(fh, FSFILEHANDLE), "open() read only");
TEST_TRUE(runner, Err_get_error() == NULL,
"open() read only -- no errors");
DECREF(fh);
[3/3] lucy git commit: Add missing cast
Posted by nw...@apache.org.
Add missing cast
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/b2f0e09f
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/b2f0e09f
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/b2f0e09f
Branch: refs/heads/master
Commit: b2f0e09f3a5555090fbc0af8d004393f2153a402
Parents: 00d34f9
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Fri May 29 12:25:00 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Fri May 29 12:25:00 2015 +0200
----------------------------------------------------------------------
core/Lucy/Index/Inverter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/b2f0e09f/core/Lucy/Index/Inverter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Inverter.c b/core/Lucy/Index/Inverter.c
index 09000f0..8c9fd6d 100644
--- a/core/Lucy/Index/Inverter.c
+++ b/core/Lucy/Index/Inverter.c
@@ -183,7 +183,7 @@ void
Inverter_Clear_IMP(Inverter *self) {
InverterIVARS *const ivars = Inverter_IVARS(self);
for (uint32_t i = 0, max = Vec_Get_Size(ivars->entries); i < max; i++) {
- InvEntry_Clear(Vec_Fetch(ivars->entries, i));
+ InvEntry_Clear((InverterEntry*)Vec_Fetch(ivars->entries, i));
}
Vec_Clear(ivars->entries);
ivars->tick = -1;