You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2012/11/18 19:46:19 UTC
[lucy-commits] [7/23] Switch to 'bool'
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/Folder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Folder.cfh b/core/Lucy/Store/Folder.cfh
index e0e9e12..cf3c522 100644
--- a/core/Lucy/Store/Folder.cfh
+++ b/core/Lucy/Store/Folder.cfh
@@ -86,7 +86,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param path A relative filepath.
* @return true on success, false on failure (sets Err_error).
*/
- public bool_t
+ public bool
MkDir(Folder *self, const CharBuf *path);
/** List all local entries within a directory. Set Err_error and return
@@ -111,7 +111,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param path A relative filepath.
* @return true if <code>path</code> exists.
*/
- public bool_t
+ public bool
Exists(Folder *self, const CharBuf *path);
/** Indicate whether a directory exists at <code>path</code>.
@@ -119,7 +119,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param path A relative filepath.
* @return true if <code>path</code> is a directory.
*/
- bool_t
+ bool
Is_Directory(Folder *self, const CharBuf *path);
/** Delete an entry from the folder.
@@ -127,7 +127,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param path A relative filepath.
* @return true if the deletion was successful.
*/
- public bool_t
+ public bool
Delete(Folder *self, const CharBuf *path);
/** Delete recursively, starting at <code>path</code>
@@ -136,7 +136,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @return true if the whole tree is deleted successfully, false if any
* part remains.
*/
- public bool_t
+ public bool
Delete_Tree(Folder *self, const CharBuf *path);
/** Rename a file or directory, or set Err_error and return false on
@@ -147,7 +147,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param to The filepath after renaming.
* @return true on success, false on failure.
*/
- public abstract bool_t
+ public abstract bool
Rename(Folder *self, const CharBuf *from, const CharBuf *to);
/** Create a hard link at path <code>to</code> pointing at the existing
@@ -155,7 +155,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
*
* @return true on success, false on failure.
*/
- public abstract bool_t
+ public abstract bool
Hard_Link(Folder *self, const CharBuf *from, const CharBuf *to);
/** Read a file and return its contents.
@@ -202,7 +202,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
*
* @return true on success.
*/
- public abstract bool_t
+ public abstract bool
Check(Folder *self);
/** Close the folder and release implementation-specific resources.
@@ -233,7 +233,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param name The name of the subdirectory.
* @return true on success, false on failure (sets Err_error)
*/
- abstract bool_t
+ abstract bool
Local_MkDir(Folder *self, const CharBuf *name);
/** Indicate whether a local entry exists for the supplied
@@ -241,7 +241,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
*
* @param name The name of the local entry.
*/
- abstract bool_t
+ abstract bool
Local_Exists(Folder *self, const CharBuf *name);
/** Indicate whether a local subdirectory exists with the supplied
@@ -249,7 +249,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
*
* @param name The name of the local subdirectory.
*/
- abstract bool_t
+ abstract bool
Local_Is_Directory(Folder *self, const CharBuf *name);
/** Return the Folder object representing the specified directory, if such
@@ -266,7 +266,7 @@ public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
* @param name The name of the entry to be deleted.
* @return true if the deletion was successful.
*/
- abstract bool_t
+ abstract bool
Local_Delete(Folder *self, const CharBuf *name);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/InStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/InStream.c b/core/Lucy/Store/InStream.c
index 1f481e1..977d4a4 100644
--- a/core/Lucy/Store/InStream.c
+++ b/core/Lucy/Store/InStream.c
@@ -345,7 +345,7 @@ SI_read_bytes(InStream *self, char* buf, size_t len) {
// read.
const int64_t sub_file_pos = SI_tell(self);
const int64_t real_file_pos = sub_file_pos + self->offset;
- bool_t success
+ bool success
= FH_Read(self->file_handle, buf, real_file_pos, len);
if (!success) {
RETHROW(INCREF(Err_get_error()));
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/Lock.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Lock.c b/core/Lucy/Store/Lock.c
index d0a0ae8..323b01d 100644
--- a/core/Lucy/Store/Lock.c
+++ b/core/Lucy/Store/Lock.c
@@ -88,10 +88,10 @@ Lock_get_host(Lock *self) {
return self->host;
}
-bool_t
+bool
Lock_obtain(Lock *self) {
int32_t time_left = self->interval == 0 ? 0 : self->timeout;
- bool_t locked = Lock_Request(self);
+ bool locked = Lock_Request(self);
while (!locked) {
time_left -= self->interval;
@@ -122,17 +122,17 @@ LFLock_init(LockFileLock *self, Folder *folder, const CharBuf *name,
return self;
}
-bool_t
+bool
LFLock_shared(LockFileLock *self) {
UNUSED_VAR(self); return false;
}
-bool_t
+bool
LFLock_request(LockFileLock *self) {
Hash *file_data;
- bool_t wrote_json;
- bool_t success = false;
- bool_t deletion_failed = false;
+ bool wrote_json;
+ bool success = false;
+ bool deletion_failed = false;
if (Folder_Exists(self->folder, self->lock_path)) {
Err_set_error((Err*)LockErr_new(CB_newf("Can't obtain lock: '%o' exists",
@@ -205,7 +205,7 @@ LFLock_release(LockFileLock *self) {
}
}
-bool_t
+bool
LFLock_is_locked(LockFileLock *self) {
return Folder_Exists(self->folder, self->lock_path);
}
@@ -215,11 +215,11 @@ LFLock_clear_stale(LockFileLock *self) {
LFLock_Maybe_Delete_File(self, self->lock_path, false, true);
}
-bool_t
+bool
LFLock_maybe_delete_file(LockFileLock *self, const CharBuf *path,
- bool_t delete_mine, bool_t delete_other) {
+ bool delete_mine, bool delete_other) {
Folder *folder = self->folder;
- bool_t success = false;
+ bool success = false;
ZombieCharBuf *scratch = ZCB_WRAP(path);
// Only delete locks that start with our lock name.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/Lock.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Lock.cfh b/core/Lucy/Store/Lock.cfh
index faa76ec..b9187d8 100644
--- a/core/Lucy/Store/Lock.cfh
+++ b/core/Lucy/Store/Lock.cfh
@@ -52,7 +52,7 @@ public abstract class Lucy::Store::Lock inherits Clownfish::Obj {
/** Returns true if the Lock is shared, false if the Lock is exclusive.
*/
- public abstract bool_t
+ public abstract bool
Shared(Lock *self);
/** Call Request() once per <code>interval</code> until Request() returns
@@ -60,7 +60,7 @@ public abstract class Lucy::Store::Lock inherits Clownfish::Obj {
*
* @return true on success, false on failure (sets Err_error).
*/
- public bool_t
+ public bool
Obtain(Lock *self);
/** Make one attempt to acquire the lock.
@@ -74,7 +74,7 @@ public abstract class Lucy::Store::Lock inherits Clownfish::Obj {
*
* @return true on success, false on failure (sets Err_error).
*/
- public abstract bool_t
+ public abstract bool
Request(Lock *self);
/** Release the lock.
@@ -87,7 +87,7 @@ public abstract class Lucy::Store::Lock inherits Clownfish::Obj {
*
* @return true if the resource is locked, false otherwise.
*/
- public abstract bool_t
+ public abstract bool
Is_Locked(Lock *self);
/** Release all locks that meet the following three conditions: the lock
@@ -123,16 +123,16 @@ class Lucy::Store::LockFileLock cnick LFLock
init(LockFileLock *self, Folder *folder, const CharBuf *name,
const CharBuf *host, int32_t timeout = 0, int32_t interval = 100);
- public bool_t
+ public bool
Shared(LockFileLock *self);
- public bool_t
+ public bool
Request(LockFileLock *self);
public void
Release(LockFileLock *self);
- public bool_t
+ public bool
Is_Locked(LockFileLock *self);
public void
@@ -147,9 +147,9 @@ class Lucy::Store::LockFileLock cnick LFLock
* process's pid. If delete_other is false, don't delete lock files which
* don't match this process's pid.
*/
- bool_t
+ bool
Maybe_Delete_File(LockFileLock *self, const CharBuf *filepath,
- bool_t delete_mine, bool_t delete_other);
+ bool delete_mine, bool delete_other);
public void
Destroy(LockFileLock *self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMDirHandle.c b/core/Lucy/Store/RAMDirHandle.c
index 67c7674..1553895 100644
--- a/core/Lucy/Store/RAMDirHandle.c
+++ b/core/Lucy/Store/RAMDirHandle.c
@@ -37,7 +37,7 @@ RAMDH_init(RAMDirHandle *self, RAMFolder *folder) {
return self;
}
-bool_t
+bool
RAMDH_close(RAMDirHandle *self) {
if (self->elems) {
VA_Dec_RefCount(self->elems);
@@ -50,7 +50,7 @@ RAMDH_close(RAMDirHandle *self) {
return true;
}
-bool_t
+bool
RAMDH_next(RAMDirHandle *self) {
if (self->elems) {
self->tick++;
@@ -68,7 +68,7 @@ RAMDH_next(RAMDirHandle *self) {
return false;
}
-bool_t
+bool
RAMDH_entry_is_dir(RAMDirHandle *self) {
if (self->elems) {
CharBuf *name = (CharBuf*)VA_Fetch(self->elems, self->tick);
@@ -79,7 +79,7 @@ RAMDH_entry_is_dir(RAMDirHandle *self) {
return false;
}
-bool_t
+bool
RAMDH_entry_is_symlink(RAMDirHandle *self) {
UNUSED_VAR(self);
return false;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMDirHandle.cfh b/core/Lucy/Store/RAMDirHandle.cfh
index 1dd87ae..2d097eb 100644
--- a/core/Lucy/Store/RAMDirHandle.cfh
+++ b/core/Lucy/Store/RAMDirHandle.cfh
@@ -31,16 +31,16 @@ class Lucy::Store::RAMDirHandle cnick RAMDH
inert RAMDirHandle*
init(RAMDirHandle *self, RAMFolder *folder);
- bool_t
+ bool
Next(RAMDirHandle *self);
- bool_t
+ bool
Entry_Is_Dir(RAMDirHandle *self);
- bool_t
+ bool
Entry_Is_Symlink(RAMDirHandle *self);
- bool_t
+ bool
Close(RAMDirHandle *self);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMFile.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFile.c b/core/Lucy/Store/RAMFile.c
index b2f25d6..3e41a7f 100644
--- a/core/Lucy/Store/RAMFile.c
+++ b/core/Lucy/Store/RAMFile.c
@@ -20,13 +20,13 @@
#include "Lucy/Store/RAMFile.h"
RAMFile*
-RAMFile_new(ByteBuf *contents, bool_t read_only) {
+RAMFile_new(ByteBuf *contents, bool read_only) {
RAMFile *self = (RAMFile*)VTable_Make_Obj(RAMFILE);
return RAMFile_init(self, contents, read_only);
}
RAMFile*
-RAMFile_init(RAMFile *self, ByteBuf *contents, bool_t read_only) {
+RAMFile_init(RAMFile *self, ByteBuf *contents, bool read_only) {
self->contents = contents ? (ByteBuf*)INCREF(contents) : BB_new(0);
self->read_only = read_only;
return self;
@@ -43,13 +43,13 @@ RAMFile_get_contents(RAMFile *self) {
return self->contents;
}
-bool_t
+bool
RAMFile_read_only(RAMFile *self) {
return self->read_only;
}
void
-RAMFile_set_read_only(RAMFile *self, bool_t read_only) {
+RAMFile_set_read_only(RAMFile *self, bool read_only) {
self->read_only = read_only;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMFile.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFile.cfh b/core/Lucy/Store/RAMFile.cfh
index a8285e4..f58a03d 100644
--- a/core/Lucy/Store/RAMFile.cfh
+++ b/core/Lucy/Store/RAMFile.cfh
@@ -20,18 +20,18 @@ parcel Lucy;
*/
class Lucy::Store::RAMFile inherits Clownfish::Obj {
- bool_t read_only;
+ bool read_only;
ByteBuf *contents;
inert incremented RAMFile*
- new(ByteBuf *contents = NULL, bool_t read_only = false);
+ new(ByteBuf *contents = NULL, bool read_only = false);
/**
* @param contents Existing file contents, if any.
* @param read_only Indicate that the file contents may not be modified.
*/
inert RAMFile*
- init(RAMFile *self, ByteBuf *contents = NULL, bool_t read_only = false);
+ init(RAMFile *self, ByteBuf *contents = NULL, bool read_only = false);
/** Accessor for the file's contents.
*/
@@ -40,13 +40,13 @@ class Lucy::Store::RAMFile inherits Clownfish::Obj {
/** Accessor for <code>read_only</code> property.
*/
- bool_t
+ bool
Read_Only(RAMFile *self);
/** Set the object's <code>read_only</code> property.
*/
void
- Set_Read_Only(RAMFile *self, bool_t read_only);
+ Set_Read_Only(RAMFile *self, bool read_only);
public void
Destroy(RAMFile *self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFileHandle.c b/core/Lucy/Store/RAMFileHandle.c
index 282d8b0..828cabe 100644
--- a/core/Lucy/Store/RAMFileHandle.c
+++ b/core/Lucy/Store/RAMFileHandle.c
@@ -32,10 +32,10 @@ RAMFH_open(const CharBuf *path, uint32_t flags, RAMFile *file) {
RAMFileHandle*
RAMFH_do_open(RAMFileHandle *self, const CharBuf *path, uint32_t flags,
RAMFile *file) {
- bool_t must_create
+ bool must_create
= (flags & (FH_CREATE | FH_EXCLUSIVE)) == (FH_CREATE | FH_EXCLUSIVE)
? true : false;
- bool_t can_create
+ bool can_create
= (flags & (FH_CREATE | FH_WRITE_ONLY)) == (FH_CREATE | FH_WRITE_ONLY)
? true : false;
@@ -75,7 +75,7 @@ RAMFH_destroy(RAMFileHandle *self) {
SUPER_DESTROY(self, RAMFILEHANDLE);
}
-bool_t
+bool
RAMFH_window(RAMFileHandle *self, FileWindow *window, int64_t offset,
int64_t len) {
int64_t end = offset + len;
@@ -100,14 +100,14 @@ RAMFH_window(RAMFileHandle *self, FileWindow *window, int64_t offset,
}
}
-bool_t
+bool
RAMFH_release_window(RAMFileHandle *self, FileWindow *window) {
UNUSED_VAR(self);
FileWindow_Set_Window(window, NULL, 0, 0);
return true;
}
-bool_t
+bool
RAMFH_read(RAMFileHandle *self, char *dest, int64_t offset, size_t len) {
int64_t end = offset + len;
if (!(self->flags & FH_READ_ONLY)) {
@@ -131,7 +131,7 @@ RAMFH_read(RAMFileHandle *self, char *dest, int64_t offset, size_t len) {
}
}
-bool_t
+bool
RAMFH_write(RAMFileHandle *self, const void *data, size_t len) {
if (self->ram_file->read_only) {
Err_set_error(Err_new(CB_newf("Attempt to write to read-only RAMFile")));
@@ -142,7 +142,7 @@ RAMFH_write(RAMFileHandle *self, const void *data, size_t len) {
return true;
}
-bool_t
+bool
RAMFH_grow(RAMFileHandle *self, int64_t len) {
if (len > INT32_MAX) {
Err_set_error(Err_new(CB_newf("Can't support RAM files of size %i64 (> %i32)",
@@ -170,7 +170,7 @@ RAMFH_length(RAMFileHandle *self) {
return self->len;
}
-bool_t
+bool
RAMFH_close(RAMFileHandle *self) {
UNUSED_VAR(self);
return true;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFileHandle.cfh b/core/Lucy/Store/RAMFileHandle.cfh
index 2c1ea03..956f1b0 100644
--- a/core/Lucy/Store/RAMFileHandle.cfh
+++ b/core/Lucy/Store/RAMFileHandle.cfh
@@ -48,28 +48,28 @@ class Lucy::Store::RAMFileHandle cnick RAMFH
RAMFile*
Get_File(RAMFileHandle *self);
- bool_t
+ bool
Grow(RAMFileHandle *self, int64_t len);
public void
Destroy(RAMFileHandle *self);
- bool_t
+ bool
Window(RAMFileHandle *self, FileWindow *window, int64_t offset, int64_t len);
- bool_t
+ bool
Release_Window(RAMFileHandle *self, FileWindow *window);
- bool_t
+ bool
Read(RAMFileHandle *self, char *dest, int64_t offset, size_t len);
- bool_t
+ bool
Write(RAMFileHandle *self, const void *data, size_t len);
int64_t
Length(RAMFileHandle *self);
- bool_t
+ bool
Close(RAMFileHandle *self);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFolder.c b/core/Lucy/Store/RAMFolder.c
index 909c2a3..c0d21f0 100644
--- a/core/Lucy/Store/RAMFolder.c
+++ b/core/Lucy/Store/RAMFolder.c
@@ -47,13 +47,13 @@ RAMFolder_initialize(RAMFolder *self) {
UNUSED_VAR(self);
}
-bool_t
+bool
RAMFolder_check(RAMFolder *self) {
UNUSED_VAR(self);
return true;
}
-bool_t
+bool
RAMFolder_local_mkdir(RAMFolder *self, const CharBuf *name) {
if (Hash_Fetch(self->entries, (Obj*)name)) {
Err_set_error(Err_new(CB_newf("Can't MkDir, '%o' already exists",
@@ -75,7 +75,7 @@ RAMFolder_local_open_filehandle(RAMFolder *self, const CharBuf *name,
RAMFileHandle *fh;
CharBuf *fullpath = S_fullpath(self, name);
RAMFile *file = (RAMFile*)Hash_Fetch(self->entries, (Obj*)name);
- bool_t can_create
+ bool can_create
= (flags & (FH_WRITE_ONLY | FH_CREATE)) == (FH_WRITE_ONLY | FH_CREATE)
? true : false;
@@ -119,12 +119,12 @@ RAMFolder_local_open_dir(RAMFolder *self) {
return (DirHandle*)dh;
}
-bool_t
+bool
RAMFolder_local_exists(RAMFolder *self, const CharBuf *name) {
return !!Hash_Fetch(self->entries, (Obj*)name);
}
-bool_t
+bool
RAMFolder_local_is_directory(RAMFolder *self, const CharBuf *name) {
Obj *entry = Hash_Fetch(self->entries, (Obj*)name);
if (entry && Obj_Is_A(entry, FOLDER)) { return true; }
@@ -134,7 +134,7 @@ RAMFolder_local_is_directory(RAMFolder *self, const CharBuf *name) {
#define OP_RENAME 1
#define OP_HARD_LINK 2
-static bool_t
+static bool
S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
Folder *from_folder, Folder *to_folder,
ZombieCharBuf *from_name, ZombieCharBuf *to_name,
@@ -200,7 +200,7 @@ S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
if (op == OP_RENAME) {
Obj *existing = Hash_Fetch(inner_to_folder->entries, (Obj*)to_name);
if (existing) {
- bool_t conflict = false;
+ bool conflict = false;
// Return success fast if file is copied on top of itself.
if (inner_from_folder == inner_to_folder
@@ -264,33 +264,33 @@ S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
return true;
}
-bool_t
+bool
RAMFolder_rename(RAMFolder *self, const CharBuf* from, const CharBuf *to) {
Folder *from_folder = RAMFolder_Enclosing_Folder(self, from);
Folder *to_folder = RAMFolder_Enclosing_Folder(self, to);
ZombieCharBuf *from_name = IxFileNames_local_part(from, ZCB_BLANK());
ZombieCharBuf *to_name = IxFileNames_local_part(to, ZCB_BLANK());
- bool_t result = S_rename_or_hard_link(self, from, to, from_folder,
+ bool result = S_rename_or_hard_link(self, from, to, from_folder,
to_folder, from_name, to_name,
OP_RENAME);
if (!result) { ERR_ADD_FRAME(Err_get_error()); }
return result;
}
-bool_t
+bool
RAMFolder_hard_link(RAMFolder *self, const CharBuf *from, const CharBuf *to) {
Folder *from_folder = RAMFolder_Enclosing_Folder(self, from);
Folder *to_folder = RAMFolder_Enclosing_Folder(self, to);
ZombieCharBuf *from_name = IxFileNames_local_part(from, ZCB_BLANK());
ZombieCharBuf *to_name = IxFileNames_local_part(to, ZCB_BLANK());
- bool_t result = S_rename_or_hard_link(self, from, to, from_folder,
+ bool result = S_rename_or_hard_link(self, from, to, from_folder,
to_folder, from_name, to_name,
OP_HARD_LINK);
if (!result) { ERR_ADD_FRAME(Err_get_error()); }
return result;
}
-bool_t
+bool
RAMFolder_local_delete(RAMFolder *self, const CharBuf *name) {
Obj *entry = Hash_Fetch(self->entries, (Obj*)name);
if (entry) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/RAMFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFolder.cfh b/core/Lucy/Store/RAMFolder.cfh
index b8a57b4..6472449 100644
--- a/core/Lucy/Store/RAMFolder.cfh
+++ b/core/Lucy/Store/RAMFolder.cfh
@@ -36,7 +36,7 @@ public class Lucy::Store::RAMFolder inherits Lucy::Store::Folder {
public void
Initialize(RAMFolder *self);
- public bool_t
+ public bool
Check(RAMFolder *self);
public void
@@ -48,25 +48,25 @@ public class Lucy::Store::RAMFolder inherits Lucy::Store::Folder {
incremented nullable DirHandle*
Local_Open_Dir(RAMFolder *self);
- bool_t
+ bool
Local_MkDir(RAMFolder *self, const CharBuf *name);
- bool_t
+ bool
Local_Exists(RAMFolder *self, const CharBuf *name);
- bool_t
+ bool
Local_Is_Directory(RAMFolder *self, const CharBuf *name);
nullable Folder*
Local_Find_Folder(RAMFolder *self, const CharBuf *name);
- bool_t
+ bool
Local_Delete(RAMFolder *self, const CharBuf *name);
- public bool_t
+ public bool
Rename(RAMFolder *self, const CharBuf* from, const CharBuf *to);
- public bool_t
+ public bool
Hard_Link(RAMFolder *self, const CharBuf *from, const CharBuf *to);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/SharedLock.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/SharedLock.c b/core/Lucy/Store/SharedLock.c
index 0a97780..5e5b2e0 100644
--- a/core/Lucy/Store/SharedLock.c
+++ b/core/Lucy/Store/SharedLock.c
@@ -45,13 +45,13 @@ ShLock_init(SharedLock *self, Folder *folder, const CharBuf *name,
return self;
}
-bool_t
+bool
ShLock_shared(SharedLock *self) {
UNUSED_VAR(self);
return true;
}
-bool_t
+bool
ShLock_request(SharedLock *self) {
uint32_t i = 0;
ShLock_Request_t super_request
@@ -74,7 +74,7 @@ ShLock_request(SharedLock *self) {
CB_setf(self->lock_path, "locks/%o-%u32.lock", self->name, ++i);
} while (Folder_Exists(self->folder, self->lock_path));
- bool_t success = super_request(self);
+ bool success = super_request(self);
if (!success) { ERR_ADD_FRAME(Err_get_error()); }
return success;
}
@@ -124,7 +124,7 @@ ShLock_clear_stale(SharedLock *self) {
DECREF(dh);
}
-bool_t
+bool
ShLock_is_locked(SharedLock *self) {
DirHandle *dh;
CharBuf *entry;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Store/SharedLock.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/SharedLock.cfh b/core/Lucy/Store/SharedLock.cfh
index 0ef61ff..0a642b2 100644
--- a/core/Lucy/Store/SharedLock.cfh
+++ b/core/Lucy/Store/SharedLock.cfh
@@ -58,16 +58,16 @@ class Lucy::Store::SharedLock cnick ShLock
init(SharedLock *self, Folder *folder, const CharBuf *name,
const CharBuf *host, int32_t timeout = 0, int32_t interval = 100);
- public bool_t
+ public bool
Shared(SharedLock *self);
- public bool_t
+ public bool
Request(SharedLock *self);
public void
Release(SharedLock *self);
- public bool_t
+ public bool
Is_Locked(SharedLock *self);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test.c b/core/Lucy/Test.c
index c0fc1f8..75ca9d2 100644
--- a/core/Lucy/Test.c
+++ b/core/Lucy/Test.c
@@ -54,73 +54,73 @@ TestBatch_plan(TestBatch *self) {
printf("1..%" PRId64 "\n", self->num_tests);
}
-bool_t
-TestBatch_test_true(void *vself, bool_t condition, const char *pattern, ...) {
+bool
+TestBatch_test_true(void *vself, bool condition, const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VTest_True((TestBatch*)vself, condition,
+ bool result = TestBatch_VTest_True((TestBatch*)vself, condition,
pattern, args);
va_end(args);
return result;
}
-bool_t
-TestBatch_test_false(void *vself, bool_t condition, const char *pattern, ...) {
+bool
+TestBatch_test_false(void *vself, bool condition, const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VTest_False((TestBatch*)vself, condition,
+ bool result = TestBatch_VTest_False((TestBatch*)vself, condition,
pattern, args);
va_end(args);
return result;
}
-bool_t
+bool
TestBatch_test_int_equals(void *vself, long got, long expected,
const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VTest_Int_Equals((TestBatch*)vself, got,
+ bool result = TestBatch_VTest_Int_Equals((TestBatch*)vself, got,
expected, pattern, args);
va_end(args);
return result;
}
-bool_t
+bool
TestBatch_test_float_equals(void *vself, double got, double expected,
const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VTest_Float_Equals((TestBatch*)vself, got,
+ bool result = TestBatch_VTest_Float_Equals((TestBatch*)vself, got,
expected, pattern, args);
va_end(args);
return result;
}
-bool_t
+bool
TestBatch_test_string_equals(void *vself, const char *got,
const char *expected, const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VTest_String_Equals((TestBatch*)vself, got,
+ bool result = TestBatch_VTest_String_Equals((TestBatch*)vself, got,
expected, pattern, args);
va_end(args);
return result;
}
-bool_t
+bool
TestBatch_pass(void *vself, const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VPass((TestBatch*)vself, pattern, args);
+ bool result = TestBatch_VPass((TestBatch*)vself, pattern, args);
va_end(args);
return result;
}
-bool_t
+bool
TestBatch_fail(void *vself, const char *pattern, ...) {
va_list args;
va_start(args, pattern);
- bool_t result = TestBatch_VFail((TestBatch*)vself, pattern, args);
+ bool result = TestBatch_VFail((TestBatch*)vself, pattern, args);
va_end(args);
return result;
}
@@ -133,8 +133,8 @@ TestBatch_skip(void *vself, const char *pattern, ...) {
va_end(args);
}
-bool_t
-TestBatch_vtest_true(TestBatch *self, bool_t condition, const char *pattern,
+bool
+TestBatch_vtest_true(TestBatch *self, bool condition, const char *pattern,
va_list args) {
// Increment test number.
self->test_num++;
@@ -156,8 +156,8 @@ TestBatch_vtest_true(TestBatch *self, bool_t condition, const char *pattern,
}
}
-bool_t
-TestBatch_vtest_false(TestBatch *self, bool_t condition,
+bool
+TestBatch_vtest_false(TestBatch *self, bool condition,
const char *pattern, va_list args) {
// Increment test number.
self->test_num++;
@@ -179,7 +179,7 @@ TestBatch_vtest_false(TestBatch *self, bool_t condition,
}
}
-bool_t
+bool
TestBatch_vtest_int_equals(TestBatch *self, long got, long expected,
const char *pattern, va_list args) {
// Increment test number.
@@ -203,7 +203,7 @@ TestBatch_vtest_int_equals(TestBatch *self, long got, long expected,
}
}
-bool_t
+bool
TestBatch_vtest_float_equals(TestBatch *self, double got, double expected,
const char *pattern, va_list args) {
double diff = expected / got;
@@ -229,7 +229,7 @@ TestBatch_vtest_float_equals(TestBatch *self, double got, double expected,
}
}
-bool_t
+bool
TestBatch_vtest_string_equals(TestBatch *self, const char *got,
const char *expected, const char *pattern,
va_list args) {
@@ -254,7 +254,7 @@ TestBatch_vtest_string_equals(TestBatch *self, const char *got,
}
}
-bool_t
+bool
TestBatch_vpass(TestBatch *self, const char *pattern, va_list args) {
// Increment test number.
self->test_num++;
@@ -268,7 +268,7 @@ TestBatch_vpass(TestBatch *self, const char *pattern, va_list args) {
return true;
}
-bool_t
+bool
TestBatch_vfail(TestBatch *self, const char *pattern, va_list args) {
// Increment test number.
self->test_num++;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test.cfh b/core/Lucy/Test.cfh
index 49de23c..8a84888 100644
--- a/core/Lucy/Test.cfh
+++ b/core/Lucy/Test.cfh
@@ -36,57 +36,57 @@ class Lucy::Test::TestBatch inherits Clownfish::Obj {
void
Plan(TestBatch *self);
- inert bool_t
- test_true(void *vself, bool_t condition, const char *pattern, ...);
+ inert bool
+ test_true(void *vself, bool condition, const char *pattern, ...);
- inert bool_t
- test_false(void *vself, bool_t condition, const char *pattern, ...);
+ inert bool
+ test_false(void *vself, bool condition, const char *pattern, ...);
- inert bool_t
+ inert bool
test_int_equals(void *vself, long got, long expected,
const char *pattern, ...);
- inert bool_t
+ inert bool
test_float_equals(void *vself, double got, double expected,
const char *pattern, ...);
- inert bool_t
+ inert bool
test_string_equals(void *vself, const char *got, const char *expected,
const char *pattern, ...);
- inert bool_t
+ inert bool
pass(void *vself, const char *pattern, ...);
- inert bool_t
+ inert bool
fail(void *vself, const char *pattern, ...);
inert void
skip(void *vself, const char *pattern, ...);
- bool_t
- VTest_True(TestBatch *self, bool_t condition, const char *pattern,
+ bool
+ VTest_True(TestBatch *self, bool condition, const char *pattern,
va_list args);
- bool_t
- VTest_False(TestBatch *self, bool_t condition, const char *pattern,
+ bool
+ VTest_False(TestBatch *self, bool condition, const char *pattern,
va_list args);
- bool_t
+ bool
VTest_Int_Equals(TestBatch *self, long got, long expected,
const char *pattern, va_list args);
- bool_t
+ bool
VTest_Float_Equals(TestBatch *self, double got, double expected,
const char *pattern, va_list args);
- bool_t
+ bool
VTest_String_Equals(TestBatch *self, const char *got, const char *expected,
const char *pattern, va_list args);
- bool_t
+ bool
VPass(TestBatch *self, const char *pattern, va_list args);
- bool_t
+ bool
VFail(TestBatch *self, const char *pattern, va_list args);
void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Analysis/TestNormalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestNormalizer.c b/core/Lucy/Test/Analysis/TestNormalizer.c
index 5a90bbe..2bc7d63 100644
--- a/core/Lucy/Test/Analysis/TestNormalizer.c
+++ b/core/Lucy/Test/Analysis/TestNormalizer.c
@@ -80,9 +80,9 @@ test_normalization(TestBatch *batch) {
Hash *test = (Hash*)VA_Fetch(tests, i);
CharBuf *form = (CharBuf*)Hash_Fetch_Str(
test, "normalization_form", 18);
- bool_t case_fold = Bool_Get_Value((BoolNum*)Hash_Fetch_Str(
+ bool case_fold = Bool_Get_Value((BoolNum*)Hash_Fetch_Str(
test, "case_fold", 9));
- bool_t strip_accents = Bool_Get_Value((BoolNum*)Hash_Fetch_Str(
+ bool strip_accents = Bool_Get_Value((BoolNum*)Hash_Fetch_Str(
test, "strip_accents", 13));
Normalizer *normalizer = Normalizer_new(form, case_fold, strip_accents);
VArray *words = (VArray*)Hash_Fetch_Str(test, "words", 5);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Object/TestBitVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Object/TestBitVector.c b/core/Lucy/Test/Object/TestBitVector.c
index 3fed17c..673cb26 100644
--- a/core/Lucy/Test/Object/TestBitVector.c
+++ b/core/Lucy/Test/Object/TestBitVector.c
@@ -191,7 +191,7 @@ S_verify_logical_op(BitVector *bit_vec, BitVector *set_1, BitVector *set_2,
int i;
for (i = 0; i < 50; i++) {
- bool_t wanted;
+ bool wanted;
switch (op) {
case OP_OR:
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Search/TestSortSpec.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.c b/core/Lucy/Test/Search/TestSortSpec.c
index 8364944..2c9eaec 100644
--- a/core/Lucy/Test/Search/TestSortSpec.c
+++ b/core/Lucy/Test/Search/TestSortSpec.c
@@ -143,8 +143,8 @@ TestReverseType_init(TestReverseType *self) {
}
TestReverseType*
-TestReverseType_init2(TestReverseType *self, float boost, bool_t indexed,
- bool_t stored, bool_t sortable) {
+TestReverseType_init2(TestReverseType *self, float boost, bool indexed,
+ bool stored, bool sortable) {
FType_init((FieldType*)self);
self->boost = boost;
self->indexed = indexed;
@@ -332,7 +332,7 @@ S_test_sorted_search(IndexSearcher *searcher, CharBuf *query,
va_start(args, num_wanted);
while (NULL != (field = va_arg(args, CharBuf*))) {
- bool_t reverse = va_arg(args, bool_t);
+ bool reverse = va_arg(args, int);
SortRule *rule = SortRule_new(SortRule_FIELD, field, reverse);
VA_Push(rules, (Obj*)rule);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Search/TestSortSpec.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.cfh b/core/Lucy/Test/Search/TestSortSpec.cfh
index 653a0bb..254212d 100644
--- a/core/Lucy/Test/Search/TestSortSpec.cfh
+++ b/core/Lucy/Test/Search/TestSortSpec.cfh
@@ -29,8 +29,8 @@ class Lucy::Test::Search::TestReverseType inherits Lucy::Plan::Int32Type {
init(TestReverseType *self);
inert TestReverseType*
- init2(TestReverseType *self, float boost = 1.0, bool_t indexed = true,
- bool_t stored = true, bool_t sortable = false);
+ init2(TestReverseType *self, float boost = 1.0, bool indexed = true,
+ bool stored = true, bool sortable = false);
public int32_t
Compare_Values(TestReverseType *self, Obj *a, Obj *b);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/MockFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/MockFileHandle.c b/core/Lucy/Test/Store/MockFileHandle.c
index 4551499..09df022 100644
--- a/core/Lucy/Test/Store/MockFileHandle.c
+++ b/core/Lucy/Test/Store/MockFileHandle.c
@@ -35,7 +35,7 @@ MockFileHandle_init(MockFileHandle *self, const CharBuf *path,
return self;
}
-bool_t
+bool
MockFileHandle_window(MockFileHandle *self, FileWindow *window,
int64_t offset, int64_t len) {
UNUSED_VAR(self);
@@ -43,7 +43,7 @@ MockFileHandle_window(MockFileHandle *self, FileWindow *window,
return true;
}
-bool_t
+bool
MockFileHandle_release_window(MockFileHandle *self, FileWindow *window) {
UNUSED_VAR(self);
FileWindow_Set_Window(window, NULL, 0, 0);
@@ -55,7 +55,7 @@ MockFileHandle_length(MockFileHandle *self) {
return self->len;
}
-bool_t
+bool
MockFileHandle_close(MockFileHandle *self) {
UNUSED_VAR(self);
return true;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/MockFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/MockFileHandle.cfh b/core/Lucy/Test/Store/MockFileHandle.cfh
index 980466e..b142c00 100644
--- a/core/Lucy/Test/Store/MockFileHandle.cfh
+++ b/core/Lucy/Test/Store/MockFileHandle.cfh
@@ -28,16 +28,16 @@ class Lucy::Store::MockFileHandle inherits Lucy::Store::FileHandle {
inert MockFileHandle*
init(MockFileHandle *self, const CharBuf *path = NULL, int64_t length);
- bool_t
+ bool
Window(MockFileHandle *self, FileWindow *window, int64_t offset, int64_t len);
- bool_t
+ bool
Release_Window(MockFileHandle *self, FileWindow *window);
int64_t
Length(MockFileHandle *self);
- bool_t
+ bool
Close(MockFileHandle *self);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestCompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.c b/core/Lucy/Test/Store/TestCompoundFileReader.c
index a536bc1..d5b49d0 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.c
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.c
@@ -238,9 +238,9 @@ test_Local_Open_Dir(TestBatch *batch) {
CompoundFileReader *cf_reader = CFReader_open(real_folder);
DirHandle *dh;
CharBuf *entry;
- bool_t saw_foo = false;
- bool_t saw_stuff = false;
- bool_t stuff_was_dir = false;
+ bool saw_foo = false;
+ bool saw_stuff = false;
+ bool stuff_was_dir = false;
CFReader_MkDir(cf_reader, stuff);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestCompoundFileWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.c b/core/Lucy/Test/Store/TestCompoundFileWriter.c
index 376f12d..e24e623 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.c
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.c
@@ -111,7 +111,7 @@ test_offsets(TestBatch *batch) {
CharBuf *file;
Obj *filestats;
- bool_t offsets_ok = true;
+ bool offsets_ok = true;
TEST_TRUE(batch, Hash_Get_Size(files) > 0, "Multiple files");
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestFSDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSDirHandle.c b/core/Lucy/Test/Store/TestFSDirHandle.c
index 033a2e6..bc03d31 100644
--- a/core/Lucy/Test/Store/TestFSDirHandle.c
+++ b/core/Lucy/Test/Store/TestFSDirHandle.c
@@ -39,10 +39,10 @@ test_all(TestBatch *batch) {
CharBuf *foo_boffo = (CharBuf*)ZCB_WRAP_STR("foo/boffo", 9);
CharBuf *test_dir = (CharBuf*)ZCB_WRAP_STR("_fsdir_test", 11);
FSFolder *folder = FSFolder_new(test_dir);
- bool_t saw_foo = false;
- bool_t saw_boffo = false;
- bool_t foo_was_dir = false;
- bool_t boffo_was_dir = false;
+ bool saw_foo = false;
+ bool saw_boffo = false;
+ bool foo_was_dir = false;
+ bool boffo_was_dir = false;
int count = 0;
// Clean up after previous failed runs.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestFSFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.c b/core/Lucy/Test/Store/TestFSFileHandle.c
index 84dd3e1..40ecabb 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.c
+++ b/core/Lucy/Test/Store/TestFSFileHandle.c
@@ -176,7 +176,7 @@ test_Close(TestBatch *batch) {
int saved_fd = fh->fd;
fh->fd = -1;
Err_set_error(NULL);
- bool_t result = FSFH_Close(fh);
+ bool result = FSFH_Close(fh);
TEST_FALSE(batch, result, "Failed Close() returns false");
TEST_TRUE(batch, Err_get_error() != NULL,
"Failed Close() sets Err_error");
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestFSFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFolder.c b/core/Lucy/Test/Store/TestFSFolder.c
index b198e86..66030e6 100644
--- a/core/Lucy/Test/Store/TestFSFolder.c
+++ b/core/Lucy/Test/Store/TestFSFolder.c
@@ -43,7 +43,7 @@
#ifndef CHY_HAS_WINDOWS_H
#define ENABLE_SYMLINK_TESTS
// Create the symlinks needed by test_protect_symlinks().
-static bool_t
+static bool
S_create_test_symlinks(void);
#endif /* CHY_HAS_WINDOWS_H */
@@ -108,7 +108,7 @@ test_protect_symlinks(TestBatch *batch) {
}
else {
VArray *list = FSFolder_List_R(folder, NULL);
- bool_t saw_bazooka_boffo = false;
+ bool saw_bazooka_boffo = false;
for (uint32_t i = 0, max = VA_Get_Size(list); i < max; i++) {
CharBuf *entry = (CharBuf*)VA_Fetch(list, i);
if (CB_Ends_With_Str(entry, "bazooka/boffo", 13)) {
@@ -186,7 +186,7 @@ TestFSFolder_run_tests() {
#error "Don't have either windows.h or unistd.h"
#endif
-static bool_t
+static bool
S_create_test_symlinks(void) {
#ifdef CHY_HAS_WINDOWS_H
if (!CreateSymbolicLink("_fstest\\bar\\banana", "_fstest\\foo\\boffo", 0)
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolder.c b/core/Lucy/Test/Store/TestFolder.c
index 7ced993..9264301 100644
--- a/core/Lucy/Test/Store/TestFolder.c
+++ b/core/Lucy/Test/Store/TestFolder.c
@@ -409,7 +409,7 @@ static void
test_Delete(TestBatch *batch) {
Folder *folder = (Folder*)RAMFolder_new(NULL);
FileHandle *fh;
- bool_t result;
+ bool result;
Folder_MkDir(folder, foo);
Folder_MkDir(folder, foo_bar);
@@ -445,7 +445,7 @@ static void
test_Delete_Tree(TestBatch *batch) {
Folder *folder = (Folder*)RAMFolder_new(NULL);
FileHandle *fh;
- bool_t result;
+ bool result;
// Create tree to be deleted.
Folder_MkDir(folder, foo);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestFolderCommon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolderCommon.c b/core/Lucy/Test/Store/TestFolderCommon.c
index d0ec895..5cf6d8b 100644
--- a/core/Lucy/Test/Store/TestFolderCommon.c
+++ b/core/Lucy/Test/Store/TestFolderCommon.c
@@ -169,7 +169,7 @@ test_Local_Find_Folder(TestBatch *batch, set_up_t set_up,
static void
test_Local_MkDir(TestBatch *batch, set_up_t set_up, tear_down_t tear_down) {
Folder *folder = set_up();
- bool_t result;
+ bool result;
result = Folder_Local_MkDir(folder, foo);
TEST_TRUE(batch, result, "Local_MkDir succeeds and returns true");
@@ -288,7 +288,7 @@ static void
test_Rename(TestBatch *batch, set_up_t set_up, tear_down_t tear_down) {
Folder *folder = set_up();
OutStream *outstream;
- bool_t result;
+ bool result;
Folder_MkDir(folder, foo);
Folder_MkDir(folder, foo_bar);
@@ -425,7 +425,7 @@ static void
test_Hard_Link(TestBatch *batch, set_up_t set_up, tear_down_t tear_down) {
Folder *folder = set_up();
OutStream *outstream;
- bool_t result;
+ bool result;
Folder_MkDir(folder, foo);
Folder_MkDir(folder, foo_bar);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestRAMDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMDirHandle.c b/core/Lucy/Test/Store/TestRAMDirHandle.c
index 4a8e9a4..65a886c 100644
--- a/core/Lucy/Test/Store/TestRAMDirHandle.c
+++ b/core/Lucy/Test/Store/TestRAMDirHandle.c
@@ -29,10 +29,10 @@ test_all(TestBatch *batch) {
CharBuf *foo = (CharBuf*)ZCB_WRAP_STR("foo", 3);
CharBuf *boffo = (CharBuf*)ZCB_WRAP_STR("boffo", 5);
CharBuf *foo_boffo = (CharBuf*)ZCB_WRAP_STR("foo/boffo", 9);
- bool_t saw_foo = false;
- bool_t saw_boffo = false;
- bool_t foo_was_dir = false;
- bool_t boffo_was_dir = false;
+ bool saw_foo = false;
+ bool saw_boffo = false;
+ bool foo_was_dir = false;
+ bool boffo_was_dir = false;
int count = 0;
// Set up folder contents.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Store/TestRAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.c b/core/Lucy/Test/Store/TestRAMFolder.c
index 7378916..1da1b5c 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.c
+++ b/core/Lucy/Test/Store/TestRAMFolder.c
@@ -161,7 +161,7 @@ test_Local_Find_Folder(TestBatch *batch) {
static void
test_Local_MkDir(TestBatch *batch) {
RAMFolder *folder = RAMFolder_new(NULL);
- bool_t result;
+ bool result;
result = RAMFolder_Local_MkDir(folder, foo);
TEST_TRUE(batch, result, "Local_MkDir succeeds and returns true");
@@ -270,7 +270,7 @@ static void
test_Rename(TestBatch *batch) {
RAMFolder *folder = RAMFolder_new(NULL);
FileHandle *fh;
- bool_t result;
+ bool result;
RAMFolder_MkDir(folder, foo);
RAMFolder_MkDir(folder, foo_bar);
@@ -391,7 +391,7 @@ static void
test_Hard_Link(TestBatch *batch) {
RAMFolder *folder = RAMFolder_new(NULL);
FileHandle *fh;
- bool_t result;
+ bool result;
RAMFolder_MkDir(folder, foo);
RAMFolder_MkDir(folder, foo_bar);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/TestUtils.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestUtils.c b/core/Lucy/Test/TestUtils.c
index 47850bb..a4844e4 100644
--- a/core/Lucy/Test/TestUtils.c
+++ b/core/Lucy/Test/TestUtils.c
@@ -201,8 +201,8 @@ TestUtils_make_not_query(Query* negated_query) {
RangeQuery*
TestUtils_make_range_query(const char *field, const char *lower_term,
- const char *upper_term, bool_t include_lower,
- bool_t include_upper) {
+ const char *upper_term, bool include_lower,
+ bool include_upper) {
CharBuf *f = (CharBuf*)ZCB_WRAP_STR(field, strlen(field));
CharBuf *lterm = (CharBuf*)ZCB_WRAP_STR(lower_term, strlen(lower_term));
CharBuf *uterm = (CharBuf*)ZCB_WRAP_STR(upper_term, strlen(upper_term));
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/TestUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestUtils.cfh b/core/Lucy/Test/TestUtils.cfh
index f55474f..5fb5d77 100644
--- a/core/Lucy/Test/TestUtils.cfh
+++ b/core/Lucy/Test/TestUtils.cfh
@@ -91,8 +91,8 @@ inert class Lucy::Test::TestUtils {
inert incremented RangeQuery*
make_range_query(const char *field, const char *lower_term = NULL,
const char *upper_term = NULL,
- bool_t include_lower = true,
- bool_t include_upper = true);
+ bool include_lower = true,
+ bool include_upper = true);
/** Return either an ORQuery or an ANDQuery depending on the value of
* <code>boolop</code>. Takes a NULL-terminated list of Query objects.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Util/TestJson.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestJson.c b/core/Lucy/Test/Util/TestJson.c
index 6e2cd1f..b5e646e 100644
--- a/core/Lucy/Test/Util/TestJson.c
+++ b/core/Lucy/Test/Util/TestJson.c
@@ -195,7 +195,7 @@ test_spew_and_slurp(TestBatch *batch) {
Folder *folder = (Folder*)RAMFolder_new(NULL);
CharBuf *foo = (CharBuf*)ZCB_WRAP_STR("foo", 3);
- bool_t result = Json_spew_json(dump, folder, foo);
+ bool result = Json_spew_json(dump, folder, foo);
TEST_TRUE(batch, result, "spew_json returns true on success");
TEST_TRUE(batch, Folder_Exists(folder, foo),
"spew_json wrote file");
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Util/TestMemory.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemory.c b/core/Lucy/Test/Util/TestMemory.c
index eea940a..5c2e4f7 100644
--- a/core/Lucy/Test/Util/TestMemory.c
+++ b/core/Lucy/Test/Util/TestMemory.c
@@ -23,7 +23,7 @@
static void
test_oversize__growth_rate(TestBatch *batch) {
- bool_t success = true;
+ bool success = true;
uint64_t size = 0;
double growth_count = 0;
double average_growth_rate = 0.0;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Util/TestPriorityQueue.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestPriorityQueue.c b/core/Lucy/Test/Util/TestPriorityQueue.c
index 735bd59..a66446e 100644
--- a/core/Lucy/Test/Util/TestPriorityQueue.c
+++ b/core/Lucy/Test/Util/TestPriorityQueue.c
@@ -28,7 +28,7 @@ NumPriQ_new(uint32_t max_size) {
return (NumPriorityQueue*)PriQ_init((PriorityQueue*)self, max_size);
}
-bool_t
+bool
NumPriQ_less_than(NumPriorityQueue *self, Obj *a, Obj *b) {
Float64 *num_a = (Float64*)a;
Float64 *num_b = (Float64*)b;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Util/TestPriorityQueue.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestPriorityQueue.cfh b/core/Lucy/Test/Util/TestPriorityQueue.cfh
index e389fc1..d575a2c 100644
--- a/core/Lucy/Test/Util/TestPriorityQueue.cfh
+++ b/core/Lucy/Test/Util/TestPriorityQueue.cfh
@@ -22,7 +22,7 @@ class Lucy::Test::Util::NumPriorityQueue cnick NumPriQ
inert incremented NumPriorityQueue*
new(uint32_t max_size);
- bool_t
+ bool
Less_Than(NumPriorityQueue *self, Obj *a, Obj *b);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Test/Util/TestStringHelper.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestStringHelper.c b/core/Lucy/Test/Util/TestStringHelper.c
index d978d33..650aad8 100644
--- a/core/Lucy/Test/Util/TestStringHelper.c
+++ b/core/Lucy/Test/Util/TestStringHelper.c
@@ -27,13 +27,13 @@
* it implements the standard in a more linear, easy-to-grok way.
*/
#define TRAIL_OK(n) (n >= 0x80 && n <= 0xBF)
-static bool_t
+static bool
S_utf8_valid_alt(const char *maybe_utf8, size_t size) {
const uint8_t *string = (const uint8_t*)maybe_utf8;
const uint8_t *const end = string + size;
while (string < end) {
int count = StrHelp_UTF8_COUNT[*string];
- bool_t valid = false;
+ bool valid = false;
if (count == 1) {
if (string[0] <= 0x7F) {
valid = true;
@@ -184,9 +184,9 @@ test_utf8_round_trip(TestBatch *batch) {
static void
S_test_validity(TestBatch *batch, const char *content, size_t size,
- bool_t expected, const char *description) {
- bool_t sane = StrHelp_utf8_valid(content, size);
- bool_t double_check = S_utf8_valid_alt(content, size);
+ bool expected, const char *description) {
+ bool sane = StrHelp_utf8_valid(content, size);
+ bool double_check = S_utf8_valid_alt(content, size);
if (sane != double_check) {
FAIL(batch, "Disagreement: %s", description);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/Json.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Json.c b/core/Lucy/Util/Json.c
index 55c9482..c0885c8 100644
--- a/core/Lucy/Util/Json.c
+++ b/core/Lucy/Util/Json.c
@@ -39,7 +39,7 @@ LucyParseJsonTrace(FILE *trace, char *line_prefix);
// Encode JSON for supplied "dump". On failure, sets Err_error and returns
// false.
-static bool_t
+static bool
S_to_json(Obj *dump, CharBuf *json, int32_t depth);
// Parse JSON from raw UTF-8 in memory.
@@ -67,11 +67,11 @@ S_unescape_text(char *const top, char *const end);
// Check that the supplied text begins with the specified keyword, which must
// then end on a word boundary (i.e. match "null" but not the first four
// letters of "nullify").
-static INLINE bool_t
+static INLINE bool
SI_check_keyword(char *json, char* end, const char *keyword, size_t len);
// Make it possible to be loosen constraints during testing.
-static bool_t tolerant = false;
+static bool tolerant = false;
// Indentation: two spaces per level.
static const char indentation[] = " ";
@@ -115,7 +115,7 @@ Json_slurp_json(Folder *folder, const CharBuf *path) {
return dump;
}
-bool_t
+bool
Json_spew_json(Obj *dump, Folder *folder, const CharBuf *path) {
CharBuf *json = Json_to_json(dump);
if (!json) {
@@ -165,7 +165,7 @@ Json_to_json(Obj *dump) {
}
void
-Json_set_tolerant(bool_t tolerance) {
+Json_set_tolerant(bool tolerance) {
tolerant = tolerance;
}
@@ -253,7 +253,7 @@ S_cat_whitespace(CharBuf *json, int32_t depth) {
}
}
-static bool_t
+static bool
S_to_json(Obj *dump, CharBuf *json, int32_t depth) {
// Guard against infinite recursion in self-referencing data structures.
if (depth > MAX_DEPTH) {
@@ -489,7 +489,7 @@ static Float64*
S_parse_number(char **json_ptr, char *const limit) {
char *top = *json_ptr;
char *end = top;
- bool_t terminated = false;
+ bool terminated = false;
// We can't assume NULL termination for the JSON string, so we need to
// ensure that strtod() cannot overrun and access invalid memory.
@@ -528,7 +528,7 @@ S_parse_string(char **json_ptr, char *const limit) {
// Find terminating double quote, determine whether there are any escapes.
char *top = *json_ptr + 1;
char *end = NULL;
- bool_t saw_backslash = false;
+ bool saw_backslash = false;
for (char *text = top; text < limit; text++) {
if (*text == '"') {
end = text;
@@ -651,7 +651,7 @@ S_unescape_text(char *const top, char *const end) {
return CB_new_steal_from_trusted_str(target_buf, target_size, cap);
}
-static INLINE bool_t
+static INLINE bool
SI_check_keyword(char *json, char* end, const char *keyword, size_t len) {
if ((size_t)(end - json) > len
&& strncmp(json, keyword, len) == 0
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/Json.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Json.cfh b/core/Lucy/Util/Json.cfh
index b27123b..3dcd0a9 100644
--- a/core/Lucy/Util/Json.cfh
+++ b/core/Lucy/Util/Json.cfh
@@ -39,7 +39,7 @@ class Lucy::Util::Json inherits Clownfish::Obj {
* file.
* @return true if the write succeeds, false on failure (sets Err_error).
*/
- inert bool_t
+ inert bool
spew_json(Obj *dump, Folder *folder, const CharBuf *path);
/** Decode the JSON in the file at <code>path</code> and return a data
@@ -54,7 +54,7 @@ class Lucy::Util::Json inherits Clownfish::Obj {
* on anything other than a hash or an array. Testing only.
*/
inert void
- set_tolerant(bool_t tolerant);
+ set_tolerant(bool tolerant);
}
@@ -63,7 +63,7 @@ __C__
struct lucy_JsonParserState
{
lucy_Obj *result;
- chy_bool_t errors;
+ bool errors;
};
typedef struct lucy_JsonParserState lucy_JsonParserState;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/PriorityQueue.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/PriorityQueue.c b/core/Lucy/Util/PriorityQueue.c
index 21d9c01..048d410 100644
--- a/core/Lucy/Util/PriorityQueue.c
+++ b/core/Lucy/Util/PriorityQueue.c
@@ -88,7 +88,7 @@ S_put(PriorityQueue *self, Obj *element) {
S_up_heap(self);
}
-bool_t
+bool
PriQ_insert(PriorityQueue *self, Obj *element) {
Obj *least = PriQ_Jostle(self, element);
DECREF(least);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/PriorityQueue.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/PriorityQueue.cfh b/core/Lucy/Util/PriorityQueue.cfh
index 2f8afd1..86acd8d 100644
--- a/core/Lucy/Util/PriorityQueue.cfh
+++ b/core/Lucy/Util/PriorityQueue.cfh
@@ -43,14 +43,14 @@ class Lucy::Util::PriorityQueue cnick PriQ
/** Compare queue elements.
*/
- abstract bool_t
+ abstract bool
Less_Than(PriorityQueue *self, Obj *a, Obj *b);
/** Possibly insert an element. Add to the Queue if either...
* a) the queue isn't full, or
* b) the element belongs in the queue and should displace another.
*/
- bool_t
+ bool
Insert(PriorityQueue *self, decremented Obj *element);
/** Equivalent to Insert(), except for the return value. If the Queue has
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/ProcessID.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/ProcessID.c b/core/Lucy/Util/ProcessID.c
index b875b4b..dbdcdba 100644
--- a/core/Lucy/Util/ProcessID.c
+++ b/core/Lucy/Util/ProcessID.c
@@ -27,7 +27,7 @@ lucy_PID_getpid(void) {
return GetCurrentProcessId();
}
-chy_bool_t
+bool
lucy_PID_active(int pid) {
// Attempt to open a handle to the process with permissions to terminate
// -- but don't actually terminate.
@@ -61,7 +61,7 @@ lucy_PID_getpid(void) {
return getpid();
}
-chy_bool_t
+bool
lucy_PID_active(int pid) {
if (kill(pid, 0) == 0) {
return true; // signal succeeded, therefore pid active
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/ProcessID.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/ProcessID.cfh b/core/Lucy/Util/ProcessID.cfh
index 4bb3d12..7dbc9b1 100644
--- a/core/Lucy/Util/ProcessID.cfh
+++ b/core/Lucy/Util/ProcessID.cfh
@@ -28,7 +28,7 @@ inert class Lucy::Util::ProcessID cnick PID {
/** Return true if the supplied process ID is associated with an active
* process.
*/
- inert bool_t
+ inert bool
active(int pid);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Util/SortExternal.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/SortExternal.cfh b/core/Lucy/Util/SortExternal.cfh
index cca21c8..cb5779e 100644
--- a/core/Lucy/Util/SortExternal.cfh
+++ b/core/Lucy/Util/SortExternal.cfh
@@ -61,7 +61,7 @@ abstract class Lucy::Util::SortExternal cnick SortEx
uint32_t *slice_sizes;
uint32_t mem_thresh;
size_t width;
- bool_t flipped;
+ bool flipped;
inert SortExternal*
init(SortExternal *self, size_t width);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/LucyX/Search/ProximityMatcher.c
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityMatcher.c b/core/LucyX/Search/ProximityMatcher.c
index 92f9162..c7cc495 100644
--- a/core/LucyX/Search/ProximityMatcher.c
+++ b/core/LucyX/Search/ProximityMatcher.c
@@ -138,7 +138,7 @@ ProximityMatcher_advance(ProximityMatcher *self, int32_t target) {
// Find a doc which contains all the terms.
while (1) {
- bool_t agreement = true;
+ bool agreement = true;
// Scoot all posting lists up to at least the current minimum.
for (uint32_t i = 0; i < num_elements; i++) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/LucyX/Search/ProximityMatcher.cfh
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityMatcher.cfh b/core/LucyX/Search/ProximityMatcher.cfh
index 131b59d..1c20d17 100644
--- a/core/LucyX/Search/ProximityMatcher.cfh
+++ b/core/LucyX/Search/ProximityMatcher.cfh
@@ -30,8 +30,8 @@ class LucyX::Search::ProximityMatcher inherits Lucy::Search::Matcher {
float proximity_boost;
Compiler *compiler;
float weight;
- bool_t first_time;
- bool_t more;
+ bool first_time;
+ bool more;
uint32_t within;
inert incremented ProximityMatcher*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/LucyX/Search/ProximityQuery.c
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityQuery.c b/core/LucyX/Search/ProximityQuery.c
index 045fbc3..9ad3396 100644
--- a/core/LucyX/Search/ProximityQuery.c
+++ b/core/LucyX/Search/ProximityQuery.c
@@ -95,7 +95,7 @@ ProximityQuery_deserialize(ProximityQuery *self, InStream *instream) {
return S_do_init(self, field, terms, boost, within);
}
-bool_t
+bool
ProximityQuery_equals(ProximityQuery *self, Obj *other) {
ProximityQuery *twin = (ProximityQuery*)other;
if (twin == self) { return true; }
@@ -132,7 +132,7 @@ ProximityQuery_to_string(ProximityQuery *self) {
Compiler*
ProximityQuery_make_compiler(ProximityQuery *self, Searcher *searcher,
- float boost, bool_t subordinate) {
+ float boost, bool subordinate) {
if (VA_Get_Size(self->terms) == 1) {
// Optimize for one-term "phrases".
Obj *term = VA_Fetch(self->terms, 0);
@@ -234,7 +234,7 @@ ProximityCompiler_deserialize(ProximityCompiler *self, InStream *instream) {
return self;
}
-bool_t
+bool
ProximityCompiler_equals(ProximityCompiler *self, Obj *other) {
ProximityCompiler *twin = (ProximityCompiler*)other;
if (!Obj_Is_A(other, PROXIMITYCOMPILER)) { return false; }
@@ -265,7 +265,7 @@ ProximityCompiler_apply_norm_factor(ProximityCompiler *self, float factor) {
Matcher*
ProximityCompiler_make_matcher(ProximityCompiler *self, SegReader *reader,
- bool_t need_score) {
+ bool need_score) {
UNUSED_VAR(need_score);
ProximityQuery *const parent = (ProximityQuery*)self->parent;
VArray *const terms = parent->terms;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/LucyX/Search/ProximityQuery.cfh
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityQuery.cfh b/core/LucyX/Search/ProximityQuery.cfh
index 4acdc52..2506961 100644
--- a/core/LucyX/Search/ProximityQuery.cfh
+++ b/core/LucyX/Search/ProximityQuery.cfh
@@ -56,9 +56,9 @@ public class LucyX::Search::ProximityQuery inherits Lucy::Search::Query
public incremented Compiler*
Make_Compiler(ProximityQuery *self, Searcher *searcher, float boost,
- bool_t subordinate = false);
+ bool subordinate = false);
- public bool_t
+ public bool
Equals(ProximityQuery *self, Obj *other);
public incremented CharBuf*
@@ -91,7 +91,7 @@ class LucyX::Search::ProximityCompiler
float boost, uint32_t within);
public incremented nullable Matcher*
- Make_Matcher(ProximityCompiler *self, SegReader *reader, bool_t need_score);
+ Make_Matcher(ProximityCompiler *self, SegReader *reader, bool need_score);
public float
Get_Weight(ProximityCompiler *self);
@@ -106,7 +106,7 @@ class LucyX::Search::ProximityCompiler
Highlight_Spans(ProximityCompiler *self, Searcher *searcher,
DocVector *doc_vec, const CharBuf *field);
- public bool_t
+ public bool
Equals(ProximityCompiler *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/example-lang/src/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/example-lang/src/Lucy/Document/Doc.c b/example-lang/src/Lucy/Document/Doc.c
index 1c2c9a6..db1d8f7 100644
--- a/example-lang/src/Lucy/Document/Doc.c
+++ b/example-lang/src/Lucy/Document/Doc.c
@@ -79,10 +79,10 @@ lucy_Doc_load(lucy_Doc *self, lucy_Obj *dump) {
UNREACHABLE_RETURN(lucy_Doc*);
}
-chy_bool_t
+bool
lucy_Doc_equals(lucy_Doc *self, lucy_Obj *other) {
THROW(LUCY_ERR, "TODO");
- UNREACHABLE_RETURN(chy_bool_t);
+ UNREACHABLE_RETURN(bool);
}
void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/buildlib/Lucy/Build/Binding/Analysis.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Analysis.pm b/perl/buildlib/Lucy/Build/Binding/Analysis.pm
index 11f23fe..981041c 100644
--- a/perl/buildlib/Lucy/Build/Binding/Analysis.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Analysis.pm
@@ -115,7 +115,7 @@ CODE:
// parse params, only if there's more than one arg
if (items > 1) {
SV *text_sv = NULL;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&text_sv, "text", 4, false),
NULL);
@@ -349,7 +349,7 @@ CODE:
int32_t pos_inc = 1;
float boost = 1.0f;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&text_sv, "text", 4, true),
ALLOT_U32(&start_off, "start_offset", 12, true),
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/buildlib/Lucy/Build/Binding/Document.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Document.pm b/perl/buildlib/Lucy/Build/Binding/Document.pm
index 3223cea..94706b4 100644
--- a/perl/buildlib/Lucy/Build/Binding/Document.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Document.pm
@@ -60,7 +60,7 @@ CODE:
{
SV* fields_sv = NULL;
int32_t doc_id = 0;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&fields_sv, "fields", 6, false),
ALLOT_I32(&doc_id, "doc_id", 6, false),
@@ -138,7 +138,7 @@ CODE:
SV *fields_sv = NULL;
int32_t doc_id = 0;
float score = 0.0f;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&fields_sv, "fields", 6, false),
ALLOT_I32(&doc_id, "doc_id", 6, false),
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/buildlib/Lucy/Build/Binding/Index.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Index.pm b/perl/buildlib/Lucy/Build/Binding/Index.pm
index 8e52ecf..bfaec63 100644
--- a/perl/buildlib/Lucy/Build/Binding/Index.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Index.pm
@@ -573,7 +573,7 @@ PPCODE:
doc_sv = ST(1);
}
else if (items > 2) {
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&doc_sv, "doc", 3, true),
ALLOT_F32(&boost, "boost", 5, false),
@@ -1107,7 +1107,7 @@ value(self, ...)
CODE:
{
int32_t ord = 0;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_I32(&ord, "ord", 3, false),
NULL);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/buildlib/Lucy/Build/Binding/Object.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Object.pm b/perl/buildlib/Lucy/Build/Binding/Object.pm
index ec4076b..8adbbfe 100644
--- a/perl/buildlib/Lucy/Build/Binding/Object.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Object.pm
@@ -319,7 +319,7 @@ CODE:
SV *ints_sv = NULL;
lucy_I32Array *self = NULL;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&ints_sv, "ints", 4, true),
NULL);
@@ -548,7 +548,7 @@ END_DESCRIPTION
my $xs_code = <<'END_XS_CODE';
MODULE = Lucy PACKAGE = Clownfish::Obj
-chy_bool_t
+bool
is_a(self, class_name)
lucy_Obj *self;
const lucy_CharBuf *class_name;
@@ -756,7 +756,7 @@ CODE:
CHY_UNUSED_VAR(unused_sv);
lucy_CharBuf *class_name = NULL;
lucy_VTable *parent = NULL;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_OBJ(&class_name, "class_name", 10, true,
LUCY_CHARBUF, alloca(cfish_ZCB_size())),
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/buildlib/Lucy/Build/Binding/Search.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Search.pm b/perl/buildlib/Lucy/Build/Binding/Search.pm
index 790a5e6..51d6193 100644
--- a/perl/buildlib/Lucy/Build/Binding/Search.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Search.pm
@@ -503,7 +503,7 @@ CODE:
SV *type_sv;
SV *value_sv;
- chy_bool_t args_ok
+ bool args_ok
= XSBind_allot_params(&(ST(0)), 1, items,
ALLOT_SV(&type_sv, "type", 4, true),
ALLOT_SV(&value_sv, "value", 5, false),
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/buildlib/Lucy/Build/Binding/Util.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Util.pm b/perl/buildlib/Lucy/Build/Binding/Util.pm
index 13980f8..6820869 100644
--- a/perl/buildlib/Lucy/Build/Binding/Util.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Util.pm
@@ -48,7 +48,7 @@ DEBUG(message)
PPCODE:
LUCY_DEBUG("%s", message);
-chy_bool_t
+bool
DEBUG_ENABLED()
CODE:
RETVAL = LUCY_DEBUG_ENABLED;
@@ -247,7 +247,7 @@ utf8ify(sv)
PPCODE:
sv_utf8_upgrade(sv);
-chy_bool_t
+bool
utf8_valid(sv)
SV *sv;
CODE:
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/xs/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Document/Doc.c b/perl/xs/Lucy/Document/Doc.c
index b42231e..552432d 100644
--- a/perl/xs/Lucy/Document/Doc.c
+++ b/perl/xs/Lucy/Document/Doc.c
@@ -204,7 +204,7 @@ lucy_Doc_load(lucy_Doc *self, lucy_Obj *dump) {
return loaded;
}
-chy_bool_t
+bool
lucy_Doc_equals(lucy_Doc *self, lucy_Obj *other) {
lucy_Doc *twin = (lucy_Doc*)other;
HV *my_fields;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/perl/xs/XSBind.c b/perl/xs/XSBind.c
index bfa24a5..249d38f 100644
--- a/perl/xs/XSBind.c
+++ b/perl/xs/XSBind.c
@@ -258,7 +258,7 @@ S_perl_hash_to_cfish_hash(HV *phash) {
}
else {
char *key_str = HeKEY(entry);
- chy_bool_t pure_ascii = true;
+ bool pure_ascii = true;
for (STRLEN i = 0; i < key_len; i++) {
if ((key_str[i] & 0x80) == 0x80) { pure_ascii = false; }
}
@@ -394,11 +394,11 @@ XSBind_enable_overload(void *pobj) {
SvAMAGIC_on(perl_obj);
}
-static chy_bool_t
+static bool
S_extract_from_sv(SV *value, void *target, const char *label,
- chy_bool_t required, int type, cfish_VTable *vtable,
+ bool required, int type, cfish_VTable *vtable,
void *allocation) {
- chy_bool_t valid_assignment = false;
+ bool valid_assignment = false;
if (XSBind_sv_defined(value)) {
switch (type) {
@@ -447,7 +447,7 @@ S_extract_from_sv(SV *value, void *target, const char *label,
valid_assignment = true;
break;
case XSBIND_WANT_BOOL:
- *((chy_bool_t*)target) = !!SvTRUE(value);
+ *((bool*)target) = !!SvTRUE(value);
valid_assignment = true;
break;
case XSBIND_WANT_F32:
@@ -502,7 +502,7 @@ S_extract_from_sv(SV *value, void *target, const char *label,
return true;
}
-chy_bool_t
+bool
XSBind_allot_params(SV** stack, int32_t start, int32_t num_stack_elems, ...) {
va_list args;
size_t size = sizeof(int64_t) + num_stack_elems / 64;
@@ -557,7 +557,7 @@ XSBind_allot_params(SV** stack, int32_t start, int32_t num_stack_elems, ...) {
else {
// Found the arg. Extract the value.
SV *value = stack[found_arg + 1];
- chy_bool_t got_arg = S_extract_from_sv(value, target, label,
+ bool got_arg = S_extract_from_sv(value, target, label,
required, type, vtable,
allocation);
if (!got_arg) {
@@ -741,7 +741,7 @@ lucy_VTable_find_parent_class(const lucy_CharBuf *class_name) {
void*
lucy_VTable_to_host(lucy_VTable *self) {
- chy_bool_t first_time = self->ref.count < 4 ? true : false;
+ bool first_time = self->ref.count < 4 ? true : false;
Lucy_VTable_To_Host_t to_host
= CFISH_SUPER_METHOD_PTR(LUCY_VTABLE, Lucy_VTable_To_Host);
SV *host_obj = (SV*)to_host(self);
@@ -906,7 +906,7 @@ lucy_Err_trap(Cfish_Err_Attempt_t routine, void *context) {
void*
lucy_LFReg_to_host(lucy_LockFreeRegistry *self) {
- chy_bool_t first_time = self->ref.count < 4 ? true : false;
+ bool first_time = self->ref.count < 4 ? true : false;
Lucy_LFReg_To_Host_t to_host
= CFISH_SUPER_METHOD_PTR(LUCY_LOCKFREEREGISTRY, Lucy_LFReg_To_Host);
SV *host_obj = (SV*)to_host(self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/perl/xs/XSBind.h
----------------------------------------------------------------------
diff --git a/perl/xs/XSBind.h b/perl/xs/XSBind.h
index 1743552..1c74a54 100644
--- a/perl/xs/XSBind.h
+++ b/perl/xs/XSBind.h
@@ -52,7 +52,7 @@ cfish_XSBind_new_blank_obj(SV *either_sv);
/** Test whether an SV is defined. Handles "get" magic, unlike SvOK on its
* own.
*/
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
cfish_XSBind_sv_defined(SV *sv) {
if (!sv || !SvANY(sv)) { return false; }
if (SvGMAGICAL(sv)) { mg_get(sv); }
@@ -210,7 +210,7 @@ cfish_XSBind_enable_overload(void *pobj);
* (generally, the XS variable "items").
* @return true on success, false on failure (sets Err_error).
*/
-XSBIND_EXTERN chy_bool_t
+XSBIND_EXTERN bool
cfish_XSBind_allot_params(SV** stack, int32_t start,
int32_t num_stack_elems, ...);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/ruby/src/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/ruby/src/Lucy/Document/Doc.c b/ruby/src/Lucy/Document/Doc.c
index 1c2c9a6..db1d8f7 100644
--- a/ruby/src/Lucy/Document/Doc.c
+++ b/ruby/src/Lucy/Document/Doc.c
@@ -79,10 +79,10 @@ lucy_Doc_load(lucy_Doc *self, lucy_Obj *dump) {
UNREACHABLE_RETURN(lucy_Doc*);
}
-chy_bool_t
+bool
lucy_Doc_equals(lucy_Doc *self, lucy_Obj *other) {
THROW(LUCY_ERR, "TODO");
- UNREACHABLE_RETURN(chy_bool_t);
+ UNREACHABLE_RETURN(bool);
}
void