You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2009/12/27 03:25:02 UTC
svn commit: r894044 - in /lucene/lucy/trunk: clownfish/lib/Clownfish/
clownfish/lib/Clownfish/Binding/Perl/ core/Lucy/Object/ core/Lucy/Store/
core/Lucy/Test/Index/ core/Lucy/Test/Object/ core/Lucy/Test/Store/
core/Lucy/Test/Util/ perl/lib/Lucy/Object/...
Author: marvin
Date: Sun Dec 27 02:25:02 2009
New Revision: 894044
URL: http://svn.apache.org/viewvc?rev=894044&view=rev
Log:
Change method invocations to deal with the fallout of tightening type checking
in Clownfish. (fallout.diff from LUCY-89)
Modified:
lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm
lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm
lucene/lucy/trunk/clownfish/lib/Clownfish/Dumpable.pm
lucene/lucy/trunk/core/Lucy/Object/BitVector.c
lucene/lucy/trunk/core/Lucy/Object/ByteBuf.c
lucene/lucy/trunk/core/Lucy/Object/CharBuf.c
lucene/lucy/trunk/core/Lucy/Object/Hash.c
lucene/lucy/trunk/core/Lucy/Object/Num.c
lucene/lucy/trunk/core/Lucy/Object/Obj.c
lucene/lucy/trunk/core/Lucy/Object/VArray.c
lucene/lucy/trunk/core/Lucy/Object/VTable.c
lucene/lucy/trunk/core/Lucy/Store/CompoundFileReader.c
lucene/lucy/trunk/core/Lucy/Store/FSFolder.c
lucene/lucy/trunk/core/Lucy/Store/Folder.c
lucene/lucy/trunk/core/Lucy/Store/RAMDirHandle.c
lucene/lucy/trunk/core/Lucy/Store/RAMFolder.c
lucene/lucy/trunk/core/Lucy/Test/Index/TestSegment.c
lucene/lucy/trunk/core/Lucy/Test/Object/TestHash.c
lucene/lucy/trunk/core/Lucy/Test/Object/TestObj.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestCompoundFileReader.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestFSDirHandle.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestFSFolder.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestFolder.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestFolderCommon.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c
lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c
lucene/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c
lucene/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c
lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm
lucene/lucy/trunk/perl/xs/XSBind.c
Modified: lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm (original)
+++ lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/Constructor.pm Sun Dec 27 02:25:02 2009
@@ -123,8 +123,8 @@
$refcount_mods
retval = $func_sym($name_list);
if (retval) {
- ST(0) = (SV*)Lucy_Obj_To_Host(retval);
- Lucy_Obj_Dec_RefCount(retval);
+ ST(0) = (SV*)Lucy_Obj_To_Host((lucy_Obj*)retval);
+ Lucy_Obj_Dec_RefCount((lucy_Obj*)retval);
}
else {
ST(0) = newSV(0);
Modified: lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm (original)
+++ lucene/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm Sun Dec 27 02:25:02 2009
@@ -188,7 +188,7 @@
$typemap_output .= <<END_OUTPUT;
$label
- \$arg = (SV*)Lucy_Obj_To_Host(\$var);
+ \$arg = (SV*)Lucy_Obj_To_Host((lucy_Obj*)\$var);
LUCY_DECREF(\$var);
END_OUTPUT
Modified: lucene/lucy/trunk/clownfish/lib/Clownfish/Dumpable.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/clownfish/lib/Clownfish/Dumpable.pm?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/clownfish/lib/Clownfish/Dumpable.pm (original)
+++ lucene/lucy/trunk/clownfish/lib/Clownfish/Dumpable.pm Sun Dec 27 02:25:02 2009
@@ -111,7 +111,7 @@
{
lucy_Hash *dump = lucy_Hash_new(0);
Lucy_Hash_Store_Str(dump, "_class", 6,
- (lucy_Obj*)Lucy_CB_Clone(Lucy_Obj_Get_Class_Name(self)));
+ (lucy_Obj*)Lucy_CB_Clone(Lucy_Obj_Get_Class_Name((lucy_Obj*)self)));
END_STUFF
@members = $class->member_vars;
shift @members; # skip self->vtable
@@ -141,7 +141,7 @@
elsif ( $type->is_object ) {
return <<END_STUFF;
if (self->$name) {
- Lucy_Hash_Store_Str(dump, "$name", $len, Lucy_Obj_Dump(self->$name));
+ Lucy_Hash_Store_Str(dump, "$name", $len, Lucy_Obj_Dump((lucy_Obj*)self->$name));
}
END_STUFF
}
Modified: lucene/lucy/trunk/core/Lucy/Object/BitVector.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/BitVector.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/BitVector.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/BitVector.c Sun Dec 27 02:25:02 2009
@@ -83,9 +83,9 @@
u32_t byte_size = (u32_t)ceil(self->cap / 8.0);
/* Forbid inheritance. */
- if (Obj_Get_VTable(self) != BITVECTOR) {
+ if (BitVec_Get_VTable(self) != BITVECTOR) {
THROW(ERR, "Attempt by %o to inherit BitVec_Clone",
- Obj_Get_Class_Name(self));
+ BitVec_Get_Class_Name(self));
}
memcpy(evil_twin->bits, self->bits, byte_size * sizeof(u8_t));
Modified: lucene/lucy/trunk/core/Lucy/Object/ByteBuf.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/ByteBuf.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/ByteBuf.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/ByteBuf.c Sun Dec 27 02:25:02 2009
@@ -99,7 +99,7 @@
{
ByteBuf *const evil_twin = (ByteBuf*)other;
if (evil_twin == self) return true;
- if (!Obj_Is_A(evil_twin, BYTEBUF)) return false;
+ if (!Obj_Is_A(other, BYTEBUF)) return false;
return SI_equals_bytes(self, evil_twin->buf, evil_twin->size);
}
Modified: lucene/lucy/trunk/core/Lucy/Object/CharBuf.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/CharBuf.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/CharBuf.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/CharBuf.c Sun Dec 27 02:25:02 2009
@@ -552,7 +552,7 @@
{
CharBuf *const evil_twin = (CharBuf*)other;
if (evil_twin == self) return true;
- if (!Obj_Is_A(evil_twin, CHARBUF)) return false;
+ if (!Obj_Is_A(other, CHARBUF)) return false;
return CB_equals_str(self, evil_twin->ptr, evil_twin->size);
}
Modified: lucene/lucy/trunk/core/Lucy/Object/Hash.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/Hash.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/Hash.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/Hash.c Sun Dec 27 02:25:02 2009
@@ -115,7 +115,7 @@
/* 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 && Obj_Is_A(class_name, CHARBUF)) {
+ if (class_name && CB_Is_A(class_name, CHARBUF)) {
VTable *vtable = VTable_fetch_vtable(class_name);
if (!vtable) {
@@ -444,7 +444,7 @@
Obj *val;
if (evil_twin == self) return true;
- if (!Obj_Is_A(evil_twin, HASH)) return false;
+ if (!Obj_Is_A(other, HASH)) return false;
if (self->size != evil_twin->size) return false;
Hash_Iter_Init(self);
Modified: lucene/lucy/trunk/core/Lucy/Object/Num.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/Num.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/Num.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/Num.c Sun Dec 27 02:25:02 2009
@@ -27,7 +27,7 @@
{
Num *evil_twin = (Num*)other;
if (evil_twin == self) { return true; }
- if (!Obj_Is_A(evil_twin, NUM)) { return false; }
+ if (!Obj_Is_A(other, NUM)) { return false; }
if (Num_To_F64(self) != Num_To_F64(evil_twin)) { return false; }
if (Num_To_I64(self) != Num_To_I64(evil_twin)) { return false; }
return true;
@@ -308,8 +308,8 @@
{
Num *evil_twin = (Num*)other;
if (evil_twin == (Num*)self) { return true; }
- if (!Obj_Is_A(evil_twin, NUM)) { return false; }
- if (Obj_Is_A(evil_twin, FLOATNUM)) {
+ if (!Obj_Is_A(other, NUM)) { return false; }
+ if (Num_Is_A(evil_twin, FLOATNUM)) {
double floating_val = Num_To_F64(evil_twin);
i64_t int_val = (i64_t)floating_val;
if ((double)int_val != floating_val) { return false; }
Modified: lucene/lucy/trunk/core/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/Obj.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/Obj.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/Obj.c Sun Dec 27 02:25:02 2009
@@ -26,7 +26,7 @@
void
Obj_destroy(Obj *self)
{
- Obj_Dec_RefCount(self->vtable);
+ VTable_Dec_RefCount(self->vtable);
FREEMEM(self);
}
Modified: lucene/lucy/trunk/core/Lucy/Object/VArray.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/VArray.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/VArray.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/VArray.c Sun Dec 27 02:25:02 2009
@@ -334,7 +334,7 @@
{
VArray *evil_twin = (VArray*)other;
if (evil_twin == self) return true;
- if (!Obj_Is_A(evil_twin, VARRAY)) return false;
+ if (!Obj_Is_A(other, VARRAY)) return false;
if (evil_twin->size != self->size) {
return false;
}
Modified: lucene/lucy/trunk/core/Lucy/Object/VTable.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Object/VTable.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Object/VTable.c (original)
+++ lucene/lucy/trunk/core/Lucy/Object/VTable.c Sun Dec 27 02:25:02 2009
@@ -34,7 +34,7 @@
if (self->flags & VTABLE_F_IMMORTAL) {
THROW(ERR, "Attempt to destroy immortal VTable for class %o", self->name);
}
- if (self->parent && (Obj_Get_RefCount(self->parent) == 2)) {
+ if (self->parent && (VTable_Get_RefCount(self->parent) == 2)) {
S_remove_from_registry(self->parent->name);
}
DECREF(self->name);
@@ -240,7 +240,7 @@
else {
VTable *vtable = (VTable*)Hash_Delete(VTable_registry, (Obj*)name);
if (vtable) {
- Obj_Dec_RefCount(vtable);
+ VTable_Dec_RefCount(vtable);
}
}
}
Modified: lucene/lucy/trunk/core/Lucy/Store/CompoundFileReader.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Store/CompoundFileReader.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Store/CompoundFileReader.c (original)
+++ lucene/lucy/trunk/core/Lucy/Store/CompoundFileReader.c Sun Dec 27 02:25:02 2009
@@ -30,7 +30,7 @@
Folder_init((Folder*)self, Folder_Get_Path(folder));
/* Parse metadata file. */
- if (!metadata || !Obj_Is_A(metadata, HASH)) {
+ if (!metadata || !Hash_Is_A(metadata, HASH)) {
error = Err_new(CB_newf("Can't read '%o' in '%o'", &cfmeta_file,
Folder_Get_Path(folder)));
}
@@ -275,11 +275,11 @@
CFReaderDH_close(CFReaderDirHandle *self)
{
if (self->elems) {
- Obj_Dec_RefCount(self->elems);
+ VA_Dec_RefCount(self->elems);
self->elems = NULL;
}
if (self->cf_reader) {
- Obj_Dec_RefCount(self->cf_reader);
+ CFReader_Dec_RefCount(self->cf_reader);
self->cf_reader = NULL;
}
return true;
Modified: lucene/lucy/trunk/core/Lucy/Store/FSFolder.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Store/FSFolder.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Store/FSFolder.c (original)
+++ lucene/lucy/trunk/core/Lucy/Store/FSFolder.c Sun Dec 27 02:25:02 2009
@@ -234,7 +234,7 @@
return NULL;
}
else if (NULL != (subfolder = (Folder*)Hash_Fetch(self->entries, (Obj*)name))) {
- if (Obj_Is_A(subfolder, FOLDER)) {
+ if (Folder_Is_A(subfolder, FOLDER)) {
return subfolder;
}
else {
Modified: lucene/lucy/trunk/core/Lucy/Store/Folder.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Store/Folder.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Store/Folder.c (original)
+++ lucene/lucy/trunk/core/Lucy/Store/Folder.c Sun Dec 27 02:25:02 2009
@@ -377,7 +377,7 @@
if (!folder) {
THROW(ERR, "Can't consolidate %o", path);
}
- else if (Obj_Is_A(folder, COMPOUNDFILEREADER)) {
+ else if (Folder_Is_A(folder, COMPOUNDFILEREADER)) {
THROW(ERR, "Can't consolidate %o twice", path);
}
else {
Modified: lucene/lucy/trunk/core/Lucy/Store/RAMDirHandle.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Store/RAMDirHandle.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Store/RAMDirHandle.c (original)
+++ lucene/lucy/trunk/core/Lucy/Store/RAMDirHandle.c Sun Dec 27 02:25:02 2009
@@ -27,11 +27,11 @@
RAMDH_close(RAMDirHandle *self)
{
if (self->elems) {
- Obj_Dec_RefCount(self->elems);
+ VA_Dec_RefCount(self->elems);
self->elems = NULL;
}
if (self->folder) {
- Obj_Dec_RefCount(self->folder);
+ RAMFolder_Dec_RefCount(self->folder);
self->folder = NULL;
}
return true;
@@ -62,7 +62,7 @@
if (self->elems) {
CharBuf *name = (CharBuf*)VA_Fetch(self->elems, self->tick);
if (name) {
- return Folder_Local_Is_Directory(self->folder, name);
+ return RAMFolder_Local_Is_Directory(self->folder, name);
}
}
return false;
Modified: lucene/lucy/trunk/core/Lucy/Store/RAMFolder.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Store/RAMFolder.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Store/RAMFolder.c (original)
+++ lucene/lucy/trunk/core/Lucy/Store/RAMFolder.c Sun Dec 27 02:25:02 2009
@@ -72,7 +72,7 @@
/* Make sure the filepath isn't a directory, and that it either exists
* or we have permission to create it. */
if (file) {
- if (!Obj_Is_A(file, RAMFILE)) {
+ if (!RAMFile_Is_A(file, RAMFILE)) {
Err_set_error(Err_new(CB_newf("Not a file: '%o'", fullpath)));
DECREF(fullpath);
return NULL;
@@ -150,28 +150,36 @@
}
/* Extract RAMFolders from compound reader wrappers, if necessary. */
- inner_from_folder = Obj_Is_A(from_folder, COMPOUNDFILEREADER)
- ? (RAMFolder*)CFReader_Get_Real_Folder(from_folder)
- : (RAMFolder*)from_folder;
- inner_to_folder = Obj_Is_A(to_folder, COMPOUNDFILEREADER)
- ? (RAMFolder*)CFReader_Get_Real_Folder(to_folder)
- : (RAMFolder*)to_folder;
- if (!Obj_Is_A(inner_from_folder, RAMFOLDER)) {
+ 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)) {
+ 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)) {
Err_set_error(Err_new(CB_newf("Not a RAMFolder, but a '%o'",
- Obj_Get_Class_Name(inner_from_folder))));
+ Obj_Get_Class_Name((Obj*)inner_from_folder))));
return false;
}
- if (!Obj_Is_A(inner_to_folder, RAMFOLDER)) {
+ if (!RAMFolder_Is_A(inner_to_folder, RAMFOLDER)) {
Err_set_error(Err_new(CB_newf("Not a RAMFolder, but a '%o'",
- Obj_Get_Class_Name(inner_to_folder))));
+ Obj_Get_Class_Name((Obj*)inner_to_folder))));
return false;
}
/* Find the original element. */
elem = Hash_Fetch(inner_from_folder->entries, (Obj*)from_name);
if (!elem) {
- if ( Obj_Is_A(from_folder, COMPOUNDFILEREADER)
- && CFReader_Local_Exists(from_folder, (CharBuf*)from_name)
+ if ( Folder_Is_A(from_folder, COMPOUNDFILEREADER)
+ && Folder_Local_Exists(from_folder, (CharBuf*)from_name)
) {
Err_set_error(Err_new(CB_newf("Source file '%o' is virtual",
from)));
@@ -219,7 +227,7 @@
DECREF(Hash_Delete(inner_from_folder->entries, (Obj*)from_name));
if (Obj_Is_A(elem, FOLDER)) {
CharBuf *newpath = S_fullpath(inner_to_folder, (CharBuf*)to_name);
- Folder_Set_Path(elem, newpath);
+ Folder_Set_Path((Folder*)elem, newpath);
DECREF(newpath);
}
}
@@ -288,10 +296,15 @@
;
}
else if (Obj_Is_A(entry, FOLDER)) {
- RAMFolder *inner_folder = Obj_Is_A(entry, COMPOUNDFILEREADER)
- ? (RAMFolder*)CERTIFY(
- CFReader_Get_Real_Folder(entry), RAMFOLDER)
- : (RAMFolder*)CERTIFY(entry, RAMFOLDER);
+ RAMFolder *inner_folder;
+ if (Obj_Is_A(entry, COMPOUNDFILEREADER)) {
+ inner_folder = (RAMFolder*)CERTIFY(
+ CFReader_Get_Real_Folder((CompoundFileReader*)entry),
+ RAMFOLDER);
+ }
+ else {
+ inner_folder = (RAMFolder*)CERTIFY(entry, RAMFOLDER);
+ }
if (Hash_Get_Size(inner_folder->entries)) {
/* Can't delete non-empty dir. */
return false;
@@ -312,7 +325,7 @@
RAMFolder_local_find_folder(RAMFolder *self, const CharBuf *path)
{
Folder *local_folder = (Folder*)Hash_Fetch(self->entries, (Obj*)path);
- if (local_folder && Obj_Is_A(local_folder, FOLDER)) {
+ if (local_folder && Folder_Is_A(local_folder, FOLDER)) {
return local_folder;
}
return NULL;
Modified: lucene/lucy/trunk/core/Lucy/Test/Index/TestSegment.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Index/TestSegment.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Index/TestSegment.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Index/TestSegment.c Sun Dec 27 02:25:02 2009
@@ -40,13 +40,13 @@
test_metadata_storage(TestBatch *batch)
{
Segment *segment = Seg_new(1);
- Obj *got;
+ CharBuf *got;
Seg_Store_Metadata_Str(segment, "foo", 3, (Obj*)CB_newf("bar"));
- got = Seg_Fetch_Metadata_Str(segment, "foo", 3);
+ got = (CharBuf*)Seg_Fetch_Metadata_Str(segment, "foo", 3);
ASSERT_TRUE(batch,
got
- && Obj_Is_A(got, CHARBUF)
+ && CB_Is_A(got, CHARBUF)
&& CB_Equals_Str(got, "bar", 3),
"metadata round trip");
DECREF(segment);
@@ -107,7 +107,7 @@
RAMFolder *folder = RAMFolder_new(NULL);
Segment *segment = Seg_new(100);
Segment *got = Seg_new(100);
- Obj *meta;
+ CharBuf *meta;
ZombieCharBuf flotsam = ZCB_LITERAL("flotsam");
ZombieCharBuf jetsam = ZCB_LITERAL("jetsam");
@@ -126,8 +126,8 @@
Seg_Field_Num(got, (CharBuf*)&jetsam)
== Seg_Field_Num(segment, (CharBuf*)&jetsam),
"Round trip field names through file");
- meta = Seg_Fetch_Metadata_Str(got, "foo", 3);
- ASSERT_TRUE(batch, meta && Obj_Is_A(meta, CHARBUF)
+ meta = (CharBuf*)Seg_Fetch_Metadata_Str(got, "foo", 3);
+ ASSERT_TRUE(batch, meta && CB_Is_A(meta, CHARBUF)
&& CB_Equals_Str(meta, "bar", 3), "Round trip metadata through file");
DECREF(got);
Modified: lucene/lucy/trunk/core/Lucy/Test/Object/TestHash.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Object/TestHash.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Object/TestHash.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Object/TestHash.c Sun Dec 27 02:25:02 2009
@@ -98,7 +98,7 @@
"Fetch against non-existent key returns NULL");
Hash_Store(hash, (Obj*)&forty, INCREF(&foo));
- ASSERT_TRUE(batch, Hash_Equals(&foo, Hash_Fetch(hash, (Obj*)&forty)),
+ ASSERT_TRUE(batch, ZCB_Equals(&foo, Hash_Fetch(hash, (Obj*)&forty)),
"Hash_Store replaces existing value");
ASSERT_FALSE(batch, Hash_Equals(hash, (Obj*)dupe),
"replacement value spoils equals");
Modified: lucene/lucy/trunk/core/Lucy/Test/Object/TestObj.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Object/TestObj.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Object/TestObj.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Object/TestObj.c Sun Dec 27 02:25:02 2009
@@ -92,10 +92,10 @@
{
CharBuf *charbuf = CB_new(0);
VTable *bb_vtable = CB_Get_VTable(charbuf);
- CharBuf *klass = Obj_Get_Class_Name(charbuf);
+ CharBuf *klass = CB_Get_Class_Name(charbuf);
- ASSERT_TRUE(batch, Obj_Is_A(charbuf, CHARBUF), "CharBuf Is_A CharBuf.");
- ASSERT_TRUE(batch, Obj_Is_A(charbuf, OBJ), "CharBuf Is_A Obj.");
+ ASSERT_TRUE(batch, CB_Is_A(charbuf, CHARBUF), "CharBuf Is_A CharBuf.");
+ ASSERT_TRUE(batch, CB_Is_A(charbuf, OBJ), "CharBuf Is_A Obj.");
ASSERT_TRUE(batch, bb_vtable == CHARBUF, "Get_VTable");
ASSERT_TRUE(batch, CB_Equals(VTable_Get_Name(CHARBUF), (Obj*)klass),
"Get_Class_Name");
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestCompoundFileReader.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestCompoundFileReader.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestCompoundFileReader.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestCompoundFileReader.c Sun Dec 27 02:25:02 2009
@@ -31,7 +31,7 @@
OutStream_Close(bar_out);
DECREF(foo_out);
DECREF(bar_out);
- Folder_Consolidate(folder, (CharBuf*)&EMPTY);
+ RAMFolder_Consolidate(folder, (CharBuf*)&EMPTY);
return (Folder*)folder;
}
@@ -116,7 +116,7 @@
CompoundFileReader *cf_reader = CFReader_open(real_folder);
ASSERT_FALSE(batch,
- Folder_Local_Is_Directory(cf_reader, (CharBuf*)&stuff),
+ CFReader_Local_Is_Directory(cf_reader, (CharBuf*)&stuff),
"Local_Is_Directory returns false for non-existent entry");
ASSERT_TRUE(batch, CFReader_MkDir(cf_reader, (CharBuf*)&stuff),
@@ -126,10 +126,10 @@
"Local_MkDir pass-through");
ASSERT_TRUE(batch,
Folder_Find_Folder(real_folder, (CharBuf*)&stuff) ==
- Folder_Find_Folder(cf_reader, (CharBuf*)&stuff),
+ CFReader_Find_Folder(cf_reader, (CharBuf*)&stuff),
"Local_Find_Folder pass-through");
ASSERT_TRUE(batch,
- Folder_Local_Is_Directory(cf_reader, (CharBuf*)&stuff),
+ CFReader_Local_Is_Directory(cf_reader, (CharBuf*)&stuff),
"Local_Is_Directory pass through");
Err_set_error(NULL);
@@ -147,7 +147,7 @@
ASSERT_TRUE(batch,
CFReader_Find_Folder(cf_reader, (CharBuf*)&foo) == NULL,
"Virtual file not reported as directory");
- ASSERT_FALSE(batch, Folder_Local_Is_Directory(cf_reader, (CharBuf*)&foo),
+ ASSERT_FALSE(batch, CFReader_Local_Is_Directory(cf_reader, (CharBuf*)&foo),
"Local_Is_Directory returns false for virtual file");
DECREF(real_folder);
@@ -237,7 +237,7 @@
FileHandle *fh;
{
- OutStream *outstream = Folder_Open_Out(cf_reader, (CharBuf*)&baz);
+ OutStream *outstream = CFReader_Open_Out(cf_reader, (CharBuf*)&baz);
OutStream_Write_Bytes(outstream, "baz", 3);
OutStream_Close(outstream);
DECREF(outstream);
@@ -280,11 +280,11 @@
ASSERT_TRUE(batch, instream != NULL,
"Local_Open_In for virtual file");
ASSERT_TRUE(batch, CB_Starts_With(InStream_Get_Filename(instream),
- Folder_Get_Path(cf_reader)), "InStream's path includes directory");
+ CFReader_Get_Path(cf_reader)), "InStream's path includes directory");
DECREF(instream);
{
- OutStream *outstream = Folder_Open_Out(cf_reader, (CharBuf*)&baz);
+ OutStream *outstream = CFReader_Open_Out(cf_reader, (CharBuf*)&baz);
OutStream_Write_Bytes(outstream, "baz", 3);
OutStream_Close(outstream);
DECREF(outstream);
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestFSDirHandle.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestFSDirHandle.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestFSDirHandle.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestFSDirHandle.c Sun Dec 27 02:25:02 2009
@@ -67,9 +67,9 @@
"File correctly identified by Entry_Is_Dir");
DECREF(dh);
- Folder_Delete(folder, &foo_boffo);
- Folder_Delete(folder, &foo);
- Folder_Delete(folder, &boffo);
+ FSFolder_Delete(folder, &foo_boffo);
+ FSFolder_Delete(folder, &foo);
+ FSFolder_Delete(folder, &boffo);
DECREF(folder);
rmdir("_fsdir_test");
}
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestFSFolder.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestFSFolder.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestFSFolder.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestFSFolder.c Sun Dec 27 02:25:02 2009
@@ -50,11 +50,11 @@
{
FSFolder *folder = FSFolder_new(&test_dir_name);
rmdir("_fsfolder_test");
- ASSERT_FALSE(batch, Folder_Check(folder),
+ ASSERT_FALSE(batch, FSFolder_Check(folder),
"Check() returns false when folder dir doesn't exist");
- Folder_Initialize(folder);
+ FSFolder_Initialize(folder);
PASS(batch, "Initialize() concludes without incident");
- ASSERT_TRUE(batch, Folder_Check(folder),
+ ASSERT_TRUE(batch, FSFolder_Check(folder),
"Initialize() created dir, and now Check() succeeds");
DECREF(folder);
S_tear_down();
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestFolder.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestFolder.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestFolder.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestFolder.c Sun Dec 27 02:25:02 2009
@@ -127,12 +127,12 @@
Folder *found = Folder_Find_Folder(folder, &foo_bar);
ASSERT_TRUE(batch,
encloser
- && Obj_Is_A(encloser, FOLDER)
+ && Folder_Is_A(encloser, FOLDER)
&& CB_Ends_With(Folder_Get_Path(encloser), &foo),
"Enclosing_Folder() - find one directory down");
ASSERT_TRUE(batch,
found
- && Obj_Is_A(found, FOLDER)
+ && Folder_Is_A(found, FOLDER)
&& CB_Ends_With(Folder_Get_Path(found), &bar),
"Find_Folder() - 'foo/bar'");
}
@@ -142,12 +142,12 @@
Folder *found = Folder_Find_Folder(folder, &foo_bar_baz);
ASSERT_TRUE(batch,
encloser
- && Obj_Is_A(encloser, FOLDER)
+ && Folder_Is_A(encloser, FOLDER)
&& CB_Ends_With(Folder_Get_Path(encloser), &bar),
"Find two directories down");
ASSERT_TRUE(batch,
found
- && Obj_Is_A(found, FOLDER)
+ && Folder_Is_A(found, FOLDER)
&& CB_Ends_With(Folder_Get_Path(found), &baz),
"Find_Folder() - 'foo/bar/baz'");
}
@@ -158,7 +158,7 @@
Folder *found = Folder_Find_Folder(folder, &foo_bar_baz_boffo);
ASSERT_TRUE(batch,
encloser
- && Obj_Is_A(encloser, FOLDER)
+ && Folder_Is_A(encloser, FOLDER)
&& CB_Ends_With(Folder_Get_Path(encloser), &baz),
"Recurse to find a directory containing a real file");
ASSERT_TRUE(batch, found == NULL,
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestFolderCommon.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestFolderCommon.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestFolderCommon.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestFolderCommon.c Sun Dec 27 02:25:02 2009
@@ -110,7 +110,7 @@
local = Folder_Local_Find_Folder(folder, &foo);
ASSERT_TRUE(batch,
local
- && Obj_Is_A(local, FOLDER)
+ && Folder_Is_A(local, FOLDER)
&& CB_Ends_With(Folder_Get_Path(local), &foo),
"Find local directory");
@@ -181,13 +181,13 @@
fh = Folder_Local_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY | FH_EXCLUSIVE);
- ASSERT_TRUE(batch, fh && Obj_Is_A(fh, FILEHANDLE),
+ ASSERT_TRUE(batch, fh && FH_Is_A(fh, FILEHANDLE),
"opened FileHandle");
DECREF(fh);
fh = Folder_Local_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
- ASSERT_TRUE(batch, fh && Obj_Is_A(fh, FILEHANDLE),
+ ASSERT_TRUE(batch, fh && FH_Is_A(fh, FILEHANDLE),
"opened FileHandle for append");
DECREF(fh);
@@ -199,7 +199,7 @@
"failure due to FH_EXLUSIVE flag sets Err_error");
fh = Folder_Local_Open_FileHandle(folder, &boffo, FH_READ_ONLY);
- ASSERT_TRUE(batch, fh && Obj_Is_A(fh, FILEHANDLE),
+ ASSERT_TRUE(batch, fh && FH_Is_A(fh, FILEHANDLE),
"opened FileHandle for reading");
DECREF(fh);
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c Sun Dec 27 02:25:02 2009
@@ -115,7 +115,7 @@
for (i = 0; i < 1024; i++) {
RAMFH_Write(fh, "foo ", 4);
}
- FH_Close(fh);
+ RAMFH_Close(fh);
/* Reopen for reading. */
DECREF(fh);
Modified: lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c Sun Dec 27 02:25:02 2009
@@ -28,9 +28,9 @@
test_Initialize_and_Check(TestBatch *batch)
{
RAMFolder *folder = RAMFolder_new(NULL);
- Folder_Initialize(folder);
+ RAMFolder_Initialize(folder);
PASS(batch, "Initialized concludes without incident");
- ASSERT_TRUE(batch, Folder_Check(folder), "Check succeeds");
+ ASSERT_TRUE(batch, RAMFolder_Check(folder), "Check succeeds");
DECREF(folder);
}
@@ -38,16 +38,16 @@
test_Local_Exists(TestBatch *batch)
{
RAMFolder *folder = RAMFolder_new(NULL);
- FileHandle *fh = Folder_Open_FileHandle(folder, &boffo,
+ FileHandle *fh = RAMFolder_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
- Folder_Local_MkDir(folder, &foo);
+ RAMFolder_Local_MkDir(folder, &foo);
- ASSERT_TRUE(batch, Folder_Local_Exists(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Local_Exists(folder, &boffo),
"Local_Exists() returns true for file");
- ASSERT_TRUE(batch, Folder_Local_Exists(folder, &foo),
+ ASSERT_TRUE(batch, RAMFolder_Local_Exists(folder, &foo),
"Local_Exists() returns true for dir");
- ASSERT_FALSE(batch, Folder_Local_Exists(folder, &bar),
+ ASSERT_FALSE(batch, RAMFolder_Local_Exists(folder, &bar),
"Local_Exists() returns false for non-existent entry");
DECREF(folder);
@@ -57,16 +57,16 @@
test_Local_Is_Directory(TestBatch *batch)
{
RAMFolder *folder = RAMFolder_new(NULL);
- FileHandle *fh = Folder_Open_FileHandle(folder, &boffo,
+ FileHandle *fh = RAMFolder_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
- Folder_Local_MkDir(folder, &foo);
+ RAMFolder_Local_MkDir(folder, &foo);
- ASSERT_FALSE(batch, Folder_Local_Is_Directory(folder, &boffo),
+ ASSERT_FALSE(batch, RAMFolder_Local_Is_Directory(folder, &boffo),
"Local_Is_Directory() returns false for file");
- ASSERT_TRUE(batch, Folder_Local_Is_Directory(folder, &foo),
+ ASSERT_TRUE(batch, RAMFolder_Local_Is_Directory(folder, &foo),
"Local_Is_Directory() returns true for dir");
- ASSERT_FALSE(batch, Folder_Local_Is_Directory(folder, &bar),
+ ASSERT_FALSE(batch, RAMFolder_Local_Is_Directory(folder, &bar),
"Local_Is_Directory() returns false for non-existent entry");
DECREF(folder);
@@ -79,12 +79,12 @@
RAMFolder *local;
FileHandle *fh;
- Folder_MkDir(folder, &foo);
- Folder_MkDir(folder, &foo_bar);
- fh = Folder_Open_FileHandle(folder, &boffo,
+ RAMFolder_MkDir(folder, &foo);
+ RAMFolder_MkDir(folder, &foo_bar);
+ fh = RAMFolder_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
- fh = Folder_Open_FileHandle(folder, &foo_boffo,
+ fh = RAMFolder_Open_FileHandle(folder, &foo_boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
@@ -109,7 +109,7 @@
local = (RAMFolder*)RAMFolder_Local_Find_Folder(folder, &foo);
ASSERT_TRUE(batch,
local
- && Obj_Is_A(local, RAMFOLDER)
+ && RAMFolder_Is_A(local, RAMFOLDER)
&& CB_Equals_Str(RAMFolder_Get_Path(local), "foo", 3),
"Find local directory");
@@ -122,30 +122,30 @@
RAMFolder *folder = RAMFolder_new(NULL);
bool_t result;
- result = Folder_Local_MkDir(folder, &foo);
+ result = RAMFolder_Local_MkDir(folder, &foo);
ASSERT_TRUE(batch, result, "Local_MkDir succeeds and returns true");
Err_set_error(NULL);
- result = Folder_Local_MkDir(folder, &foo);
+ result = RAMFolder_Local_MkDir(folder, &foo);
ASSERT_FALSE(batch, result,
"Local_MkDir returns false when a dir already exists");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Local_MkDir sets Err_error when a dir already exists");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo),
"Existing dir untouched after failed Local_MkDir");
{
- FileHandle *fh = Folder_Open_FileHandle(folder, &boffo,
+ FileHandle *fh = RAMFolder_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
Err_set_error(NULL);
- result = Folder_Local_MkDir(folder, &foo);
+ result = RAMFolder_Local_MkDir(folder, &foo);
ASSERT_FALSE(batch, result,
"Local_MkDir returns false when a file already exists");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Local_MkDir sets Err_error when a file already exists");
- ASSERT_TRUE(batch, Folder_Exists(folder, &boffo) &&
- !Folder_Local_Is_Directory(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &boffo) &&
+ !RAMFolder_Local_Is_Directory(folder, &boffo),
"Existing file untouched after failed Local_MkDir");
}
@@ -156,7 +156,7 @@
test_Local_Open_Dir(TestBatch *batch)
{
RAMFolder *folder = RAMFolder_new(NULL);
- DirHandle *dh = Folder_Local_Open_Dir(folder);
+ DirHandle *dh = RAMFolder_Local_Open_Dir(folder);
ASSERT_TRUE(batch, dh && DH_Is_A(dh, RAMDIRHANDLE),
"Local_Open_Dir returns a RAMDirHandle");
DECREF(dh);
@@ -169,32 +169,32 @@
RAMFolder *folder = RAMFolder_new(NULL);
FileHandle *fh;
- fh = Folder_Local_Open_FileHandle(folder, &boffo,
+ fh = RAMFolder_Local_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
- ASSERT_TRUE(batch, fh && Obj_Is_A(fh, RAMFILEHANDLE),
+ ASSERT_TRUE(batch, fh && FH_Is_A(fh, RAMFILEHANDLE),
"opened FileHandle");
DECREF(fh);
- fh = Folder_Local_Open_FileHandle(folder, &boffo,
+ fh = RAMFolder_Local_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY);
- ASSERT_TRUE(batch, fh && Obj_Is_A(fh, RAMFILEHANDLE),
+ ASSERT_TRUE(batch, fh && FH_Is_A(fh, RAMFILEHANDLE),
"opened FileHandle for append");
DECREF(fh);
Err_set_error(NULL);
- fh = Folder_Local_Open_FileHandle(folder, &boffo,
+ fh = RAMFolder_Local_Open_FileHandle(folder, &boffo,
FH_CREATE | FH_WRITE_ONLY | FH_EXCLUSIVE);
ASSERT_TRUE(batch, fh == NULL, "FH_EXLUSIVE flag prevents open");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"failure due to FH_EXLUSIVE flag sets Err_error");
- fh = Folder_Local_Open_FileHandle(folder, &boffo, FH_READ_ONLY);
- ASSERT_TRUE(batch, fh && Obj_Is_A(fh, RAMFILEHANDLE),
+ fh = RAMFolder_Local_Open_FileHandle(folder, &boffo, FH_READ_ONLY);
+ ASSERT_TRUE(batch, fh && FH_Is_A(fh, RAMFILEHANDLE),
"opened FileHandle for reading");
DECREF(fh);
Err_set_error(NULL);
- fh = Folder_Local_Open_FileHandle(folder, &nope, FH_READ_ONLY);
+ fh = RAMFolder_Local_Open_FileHandle(folder, &nope, FH_READ_ONLY);
ASSERT_TRUE(batch, fh == NULL,
"Can't open non-existent file for reading");
ASSERT_TRUE(batch, Err_get_error() != NULL,
@@ -209,22 +209,22 @@
RAMFolder *folder = RAMFolder_new(NULL);
FileHandle *fh;
- fh = Folder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
+ fh = RAMFolder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
- ASSERT_TRUE(batch, Folder_Local_Delete(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Local_Delete(folder, &boffo),
"Local_Delete on file succeeds");
- Folder_Local_MkDir(folder, &foo);
- fh = Folder_Open_FileHandle(folder, &foo_boffo,
+ RAMFolder_Local_MkDir(folder, &foo);
+ fh = RAMFolder_Open_FileHandle(folder, &foo_boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
Err_set_error(NULL);
- ASSERT_FALSE(batch, Folder_Local_Delete(folder, &foo),
+ ASSERT_FALSE(batch, RAMFolder_Local_Delete(folder, &foo),
"Local_Delete on non-empty dir fails");
- Folder_Delete(folder, &foo_boffo);
- ASSERT_TRUE(batch, Folder_Local_Delete(folder, &foo),
+ RAMFolder_Delete(folder, &foo_boffo);
+ ASSERT_TRUE(batch, RAMFolder_Local_Delete(folder, &foo),
"Local_Delete on empty dir succeeds");
DECREF(folder);
@@ -237,114 +237,114 @@
FileHandle *fh;
bool_t result;
- Folder_MkDir(folder, &foo);
- Folder_MkDir(folder, &foo_bar);
- fh = Folder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
+ RAMFolder_MkDir(folder, &foo);
+ RAMFolder_MkDir(folder, &foo_bar);
+ fh = RAMFolder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
/* Move files. */
- result = Folder_Rename(folder, &boffo, &banana);
+ result = RAMFolder_Rename(folder, &boffo, &banana);
ASSERT_TRUE(batch, result, "Rename succeeds and returns true");
- ASSERT_TRUE(batch, Folder_Exists(folder, &banana),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &banana),
"File exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &boffo),
"File no longer exists at old path");
- result = Folder_Rename(folder, &banana, &foo_bar_boffo);
+ result = RAMFolder_Rename(folder, &banana, &foo_bar_boffo);
ASSERT_TRUE(batch, result, "Rename to file in nested dir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar_boffo),
"File exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &banana),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &banana),
"File no longer exists at old path");
- result = Folder_Rename(folder, &foo_bar_boffo, &boffo);
+ result = RAMFolder_Rename(folder, &foo_bar_boffo, &boffo);
ASSERT_TRUE(batch, result, "Rename from file in nested dir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &boffo),
"File exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &foo_bar_boffo),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &foo_bar_boffo),
"File no longer exists at old path");
- fh = Folder_Open_FileHandle(folder, &foo_boffo,
+ fh = RAMFolder_Open_FileHandle(folder, &foo_boffo,
FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
- result = Folder_Rename(folder, &boffo, &foo_boffo);
+ result = RAMFolder_Rename(folder, &boffo, &foo_boffo);
ASSERT_TRUE(batch, result, "Clobber");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &boffo),
"File no longer exists at old path");
/* Move Dirs. */
- Folder_MkDir(folder, &baz);
- result = Folder_Rename(folder, &baz, &boffo);
+ RAMFolder_MkDir(folder, &baz);
+ result = RAMFolder_Rename(folder, &baz, &boffo);
ASSERT_TRUE(batch, result, "Rename dir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &boffo),
"Folder exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &baz),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &baz),
"Folder no longer exists at old path");
- result = Folder_Rename(folder, &boffo, &foo_foo);
+ result = RAMFolder_Rename(folder, &boffo, &foo_foo);
ASSERT_TRUE(batch, result, "Rename dir into nested subdir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_foo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_foo),
"Folder exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &boffo),
"Folder no longer exists at old path");
- result = Folder_Rename(folder, &foo_foo, &foo_bar_baz);
+ result = RAMFolder_Rename(folder, &foo_foo, &foo_bar_baz);
ASSERT_TRUE(batch, result, "Rename dir from nested subdir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar_baz),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar_baz),
"Folder exists at new path");
- ASSERT_FALSE(batch, Folder_Exists(folder, &foo_foo),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &foo_foo),
"Folder no longer exists at old path");
/* Test failed clobbers. */
Err_set_error(NULL);
- result = Folder_Rename(folder, &foo_boffo, &foo_bar);
+ result = RAMFolder_Rename(folder, &foo_boffo, &foo_bar);
ASSERT_FALSE(batch, result, "Rename file clobbering dir fails");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Failed rename sets Err_error");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File still exists at old path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar),
"Dir still exists after failed clobber");
Err_set_error(NULL);
- result = Folder_Rename(folder, &foo_bar, &foo_boffo);
+ result = RAMFolder_Rename(folder, &foo_bar, &foo_boffo);
ASSERT_FALSE(batch, result, "Rename dir clobbering file fails");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Failed rename sets Err_error");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar),
"Dir still exists at old path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File still exists after failed clobber");
/* Test that "renaming" succeeds where to and from are the same. */
- result = Folder_Rename(folder, &foo_boffo, &foo_boffo);
+ result = RAMFolder_Rename(folder, &foo_boffo, &foo_boffo);
ASSERT_TRUE(batch, result, "Renaming file to itself succeeds");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File still exists");
- result = Folder_Rename(folder, &foo_bar, &foo_bar);
+ result = RAMFolder_Rename(folder, &foo_bar, &foo_bar);
ASSERT_TRUE(batch, result, "Renaming dir to itself succeeds");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar),
"Dir still exists");
/* Invalid filepaths. */
Err_set_error(NULL);
- result = Folder_Rename(folder, &foo_boffo, &nope_nyet);
+ result = RAMFolder_Rename(folder, &foo_boffo, &nope_nyet);
ASSERT_FALSE(batch, result, "Rename into non-existent subdir fails");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Renaming into non-existent subdir sets Err_error");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"Entry still exists at old path");
Err_set_error(NULL);
- result = Folder_Rename(folder, &nope_nyet, &boffo);
+ result = RAMFolder_Rename(folder, &nope_nyet, &boffo);
ASSERT_FALSE(batch, result, "Rename non-existent file fails");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Renaming non-existent source file sets Err_error");
@@ -359,88 +359,88 @@
FileHandle *fh;
bool_t result;
- Folder_MkDir(folder, &foo);
- Folder_MkDir(folder, &foo_bar);
- fh = Folder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
+ RAMFolder_MkDir(folder, &foo);
+ RAMFolder_MkDir(folder, &foo_bar);
+ fh = RAMFolder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
/* Link files. */
- result = Folder_Hard_Link(folder, &boffo, &banana);
+ result = RAMFolder_Hard_Link(folder, &boffo, &banana);
ASSERT_TRUE(batch, result, "Hard_Link succeeds and returns true");
- ASSERT_TRUE(batch, Folder_Exists(folder, &banana),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &banana),
"File exists at new path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &boffo),
"File still exists at old path");
- Folder_Delete(folder, &boffo);
+ RAMFolder_Delete(folder, &boffo);
- result = Folder_Hard_Link(folder, &banana, &foo_bar_boffo);
+ result = RAMFolder_Hard_Link(folder, &banana, &foo_bar_boffo);
ASSERT_TRUE(batch, result, "Hard_Link to target within nested dir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar_boffo),
"File exists at new path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &banana),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &banana),
"File still exists at old path");
- Folder_Delete(folder, &banana);
+ RAMFolder_Delete(folder, &banana);
- result = Folder_Hard_Link(folder, &foo_bar_boffo, &foo_boffo);
+ result = RAMFolder_Hard_Link(folder, &foo_bar_boffo, &foo_boffo);
ASSERT_TRUE(batch, result, "Hard_Link from file in nested dir");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File exists at new path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_bar_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_bar_boffo),
"File still exists at old path");
- Folder_Delete(folder, &foo_bar_boffo);
+ RAMFolder_Delete(folder, &foo_bar_boffo);
/* Invalid clobbers. */
- fh = Folder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
+ fh = RAMFolder_Open_FileHandle(folder, &boffo, FH_CREATE | FH_WRITE_ONLY);
DECREF(fh);
- result = Folder_Hard_Link(folder, &foo_boffo, &boffo);
+ result = RAMFolder_Hard_Link(folder, &foo_boffo, &boffo);
ASSERT_FALSE(batch, result, "Clobber of file fails");
- ASSERT_TRUE(batch, Folder_Exists(folder, &boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &boffo),
"File still exists at new path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File still exists at old path");
- Folder_Delete(folder, &boffo);
+ RAMFolder_Delete(folder, &boffo);
- Folder_MkDir(folder, &baz);
- result = Folder_Hard_Link(folder, &foo_boffo, &baz);
+ RAMFolder_MkDir(folder, &baz);
+ result = RAMFolder_Hard_Link(folder, &foo_boffo, &baz);
ASSERT_FALSE(batch, result, "Clobber of dir fails");
- ASSERT_TRUE(batch, Folder_Exists(folder, &baz),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &baz),
"Dir still exists at new path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File still exists at old path");
- Folder_Delete(folder, &baz);
+ RAMFolder_Delete(folder, &baz);
/* Invalid Hard_Link of dir. */
- Folder_MkDir(folder, &baz);
- result = Folder_Hard_Link(folder, &baz, &banana);
+ RAMFolder_MkDir(folder, &baz);
+ result = RAMFolder_Hard_Link(folder, &baz, &banana);
ASSERT_FALSE(batch, result, "Hard_Link dir fails");
- ASSERT_FALSE(batch, Folder_Exists(folder, &banana),
+ ASSERT_FALSE(batch, RAMFolder_Exists(folder, &banana),
"Nothing at new path");
- ASSERT_TRUE(batch, Folder_Exists(folder, &baz),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &baz),
"Folder still exists at old path");
- Folder_Delete(folder, &baz);
+ RAMFolder_Delete(folder, &baz);
/* Test that linking to yourself fails. */
- result = Folder_Hard_Link(folder, &foo_boffo, &foo_boffo);
+ result = RAMFolder_Hard_Link(folder, &foo_boffo, &foo_boffo);
ASSERT_FALSE(batch, result, "Hard_Link file to itself fails");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"File still exists");
/* Invalid filepaths. */
Err_set_error(NULL);
- result = Folder_Rename(folder, &foo_boffo, &nope_nyet);
+ result = RAMFolder_Rename(folder, &foo_boffo, &nope_nyet);
ASSERT_FALSE(batch, result, "Hard_Link into non-existent subdir fails");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Hard_Link into non-existent subdir sets Err_error");
- ASSERT_TRUE(batch, Folder_Exists(folder, &foo_boffo),
+ ASSERT_TRUE(batch, RAMFolder_Exists(folder, &foo_boffo),
"Entry still exists at old path");
Err_set_error(NULL);
- result = Folder_Rename(folder, &nope_nyet, &boffo);
+ result = RAMFolder_Rename(folder, &nope_nyet, &boffo);
ASSERT_FALSE(batch, result, "Hard_Link non-existent source file fails");
ASSERT_TRUE(batch, Err_get_error() != NULL,
"Hard_Link non-existent source file sets Err_error");
Modified: lucene/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c Sun Dec 27 02:25:02 2009
@@ -12,28 +12,28 @@
ZombieCharBuf *got = ⌖
got = IxFileNames_local_part((CharBuf*)&source, got);
- ASSERT_TRUE(batch, CB_Equals(got, (Obj*)&source), "simple name");
+ ASSERT_TRUE(batch, ZCB_Equals(got, (Obj*)&source), "simple name");
ZCB_Assign_Str(&source, "foo.txt", 7);
got = IxFileNames_local_part((CharBuf*)&source, got);
- ASSERT_TRUE(batch, CB_Equals(got, (Obj*)&source), "name with extension");
+ ASSERT_TRUE(batch, ZCB_Equals(got, (Obj*)&source), "name with extension");
ZCB_Assign_Str(&source, "/foo", 4);
got = IxFileNames_local_part((CharBuf*)&source, got);
- ASSERT_TRUE(batch, CB_Equals_Str(got, "foo", 3), "strip leading slash");
+ ASSERT_TRUE(batch, ZCB_Equals_Str(got, "foo", 3), "strip leading slash");
ZCB_Assign_Str(&source, "/foo/", 5);
got = IxFileNames_local_part((CharBuf*)&source, got);
- ASSERT_TRUE(batch, CB_Equals_Str(got, "foo", 3), "strip trailing slash");
+ ASSERT_TRUE(batch, ZCB_Equals_Str(got, "foo", 3), "strip trailing slash");
ZCB_Assign_Str(&source, "foo/bar\\ ", 9);
got = IxFileNames_local_part((CharBuf*)&source, got);
- ASSERT_TRUE(batch, CB_Equals_Str(got, "bar\\ ", 5),
+ ASSERT_TRUE(batch, ZCB_Equals_Str(got, "bar\\ ", 5),
"Include garbage like backslashes and spaces");
ZCB_Assign_Str(&source, "foo/bar/baz.txt", 15);
got = IxFileNames_local_part((CharBuf*)&source, got);
- ASSERT_TRUE(batch, CB_Equals_Str(got, "baz.txt", 7), "find last component");
+ ASSERT_TRUE(batch, ZCB_Equals_Str(got, "baz.txt", 7), "find last component");
}
static void
Modified: lucene/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c (original)
+++ lucene/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c Sun Dec 27 02:25:02 2009
@@ -31,7 +31,7 @@
static i32_t
S_pop_num(NumPriorityQueue *pq)
{
- Float64 *num = (Float64*)PriQ_Pop(pq);
+ Float64 *num = (Float64*)NumPriQ_Pop(pq);
i32_t retval;
if (!num) { THROW(ERR, "Queue is empty"); }
retval = (i32_t)Float64_Get_Value(num);
@@ -43,26 +43,30 @@
test_Peek_and_Pop_All(TestBatch *batch)
{
NumPriorityQueue *pq = NumPriQ_new(5);
+ Float64 *val;
S_insert_num(pq, 3);
S_insert_num(pq, 1);
S_insert_num(pq, 2);
S_insert_num(pq, 20);
S_insert_num(pq, 10);
- ASSERT_INT_EQ(batch, (long)Float64_Get_Value(PriQ_Peek(pq)), 1,
+ val = (Float64*)CERTIFY(NumPriQ_Peek(pq), FLOAT64);
+ ASSERT_INT_EQ(batch, (long)Float64_Get_Value(val), 1,
"peek at the least item in the queue" );
{
- VArray *got = PriQ_Pop_All(pq);
- ASSERT_INT_EQ(batch, (long)Float64_Get_Value(VA_Fetch(got, 0)), 20,
- "pop_all");
- ASSERT_INT_EQ(batch, (long)Float64_Get_Value(VA_Fetch(got, 1)), 10,
- "pop_all");
- ASSERT_INT_EQ(batch, (long)Float64_Get_Value(VA_Fetch(got, 2)), 3,
- "pop_all");
- ASSERT_INT_EQ(batch, (long)Float64_Get_Value(VA_Fetch(got, 3)), 2,
- "pop_all");
- ASSERT_INT_EQ(batch, (long)Float64_Get_Value(VA_Fetch(got, 4)), 1,
- "pop_all");
+ VArray *got = NumPriQ_Pop_All(pq);
+
+ val = (Float64*)CERTIFY(VA_Fetch(got, 0), FLOAT64);
+ ASSERT_INT_EQ(batch, (long)Float64_Get_Value(val), 20, "pop_all");
+ val = (Float64*)CERTIFY(VA_Fetch(got, 1), FLOAT64);
+ ASSERT_INT_EQ(batch, (long)Float64_Get_Value(val), 10, "pop_all");
+ val = (Float64*)CERTIFY(VA_Fetch(got, 2), FLOAT64);
+ ASSERT_INT_EQ(batch, (long)Float64_Get_Value(val), 3, "pop_all");
+ val = (Float64*)CERTIFY(VA_Fetch(got, 3), FLOAT64);
+ ASSERT_INT_EQ(batch, (long)Float64_Get_Value(val), 2, "pop_all");
+ val = (Float64*)CERTIFY(VA_Fetch(got, 4), FLOAT64);
+ ASSERT_INT_EQ(batch, (long)Float64_Get_Value(val), 1, "pop_all");
+
DECREF(got);
}
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm Sun Dec 27 02:25:02 2009
@@ -14,7 +14,7 @@
CODE:
if (lucy_VTable_registry == NULL)
lucy_VTable_init_registry();
- RETVAL = (SV*)Lucy_Obj_To_Host(lucy_VTable_registry);
+ RETVAL = (SV*)Lucy_Obj_To_Host((lucy_Obj*)lucy_VTable_registry);
OUTPUT: RETVAL
END_XS_CODE
Modified: lucene/lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/xs/XSBind.c?rev=894044&r1=894043&r2=894044&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/xs/XSBind.c (original)
+++ lucene/lucy/trunk/perl/xs/XSBind.c Sun Dec 27 02:25:02 2009
@@ -87,7 +87,7 @@
* ZombieCharBuf. */
STRLEN size;
char *ptr = SvPVutf8(sv, size);
- Lucy_ViewCB_Assign_Str(zcb, ptr, size);
+ Lucy_ZCB_Assign_Str(zcb, ptr, size);
retval = (lucy_Obj*)zcb;
}
else if (SvROK(sv)) {
@@ -134,18 +134,18 @@
return S_lucy_hash_to_perl_hash((lucy_Hash*)obj);
}
else if (Lucy_Obj_Is_A(obj, LUCY_FLOATNUM)) {
- return newSVnv(Lucy_Num_To_F64(obj));
+ return newSVnv(Lucy_Obj_To_F64(obj));
}
else if (sizeof(IV) == 8 && Lucy_Obj_Is_A(obj, LUCY_INTNUM)) {
- chy_i64_t num = Lucy_Num_To_I64(obj);
+ chy_i64_t num = Lucy_Obj_To_I64(obj);
return newSViv((IV)num);
}
else if (sizeof(IV) == 4 && Lucy_Obj_Is_A(obj, LUCY_INTEGER32)) {
- chy_i32_t num = (chy_i32_t)Lucy_Num_To_I64(obj);
+ chy_i32_t num = (chy_i32_t)Lucy_Obj_To_I64(obj);
return newSViv((IV)num);
}
else if (sizeof(IV) == 4 && Lucy_Obj_Is_A(obj, LUCY_INTEGER64)) {
- chy_i64_t num = Lucy_Num_To_I64(obj);
+ chy_i64_t num = Lucy_Obj_To_I64(obj);
return newSVnv((double)num); /* lossy */
}
else {
@@ -312,10 +312,10 @@
while (Lucy_Hash_Iter_Next(hash, (lucy_Obj**)&key, &val)) {
/* Recurse for each value. */
SV *val_sv = XSBind_lucy_to_perl(val);
- if (!Lucy_Obj_Is_A(key, LUCY_CHARBUF)) {
+ if (!Lucy_Obj_Is_A((lucy_Obj*)key, LUCY_CHARBUF)) {
LUCY_THROW(LUCY_ERR,
"Can't convert a key of class %o to a Perl hash key",
- Lucy_Obj_Get_Class_Name(key));
+ Lucy_Obj_Get_Class_Name((lucy_Obj*)key));
}
else {
STRLEN key_size = Lucy_CB_Get_Size(key);