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);
