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] [5/23] Switch to 'bool'
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/Util/Atomic.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Atomic.cfh b/core/Clownfish/Util/Atomic.cfh
index c673c1c..774f5a9 100644
--- a/core/Clownfish/Util/Atomic.cfh
+++ b/core/Clownfish/Util/Atomic.cfh
@@ -26,13 +26,13 @@ __C__
* matches <code>old_value</code>. If it does, set <code>target</code> to
* <code>new_value</code> and return true. Otherwise, return false.
*/
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value);
/************************** Single threaded *******************************/
#ifdef LUCY_NOTHREADS
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
if (*target == old_value) {
*target = new_value;
@@ -47,7 +47,7 @@ lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
#elif defined(CHY_HAS_OSATOMIC_CAS_PTR)
#include <libkern/OSAtomic.h>
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
return OSAtomicCompareAndSwapPtr(old_value, new_value, target);
}
@@ -55,11 +55,11 @@ lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
/********************************** Windows *******************************/
#elif defined(CHY_HAS_WINDOWS_H)
-chy_bool_t
+bool
lucy_Atomic_wrapped_cas_ptr(void *volatile *target, void *old_value,
void *new_value);
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
return lucy_Atomic_wrapped_cas_ptr(target, old_value, new_value);
}
@@ -68,7 +68,7 @@ lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
#elif defined(CHY_HAS_SYS_ATOMIC_H)
#include <sys/atomic.h>
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
return atomic_cas_ptr(target, old_value, new_value) == old_value;
}
@@ -79,7 +79,7 @@ lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
extern pthread_mutex_t lucy_Atomic_mutex;
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
pthread_mutex_lock(&lucy_Atomic_mutex);
if (*target == old_value) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/Util/NumberUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/NumberUtils.cfh b/core/Clownfish/Util/NumberUtils.cfh
index e820f5b..14b699b 100644
--- a/core/Clownfish/Util/NumberUtils.cfh
+++ b/core/Clownfish/Util/NumberUtils.cfh
@@ -130,7 +130,7 @@ inert class Clownfish::Util::NumberUtils cnick NumUtil {
/** Interpret <code>array</code> as an array of bits; return true if the
* bit at <code>tick</code> is set, false otherwise.
*/
- inert inline bool_t
+ inert inline bool
u1get(void *array, uint32_t tick);
/** Interpret <code>array</code> as an array of bits; set the bit at
@@ -393,7 +393,7 @@ lucy_NumUtil_skip_cint(char **source_ptr) {
*source_ptr = (char*)ptr;
}
-static CHY_INLINE chy_bool_t
+static CHY_INLINE bool
lucy_NumUtil_u1get(void *array, uint32_t tick) {
uint8_t *const u8bits = (uint8_t*)array;
const uint32_t byte_offset = tick >> 3;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/Util/StringHelper.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/StringHelper.c b/core/Clownfish/Util/StringHelper.c
index 9f356bf..58f278d 100644
--- a/core/Clownfish/Util/StringHelper.c
+++ b/core/Clownfish/Util/StringHelper.c
@@ -76,7 +76,7 @@ StrHelp_to_base36(uint64_t num, void *buffer) {
return size;
}
-bool_t
+bool
StrHelp_utf8_valid(const char *ptr, size_t size) {
const uint8_t *string = (const uint8_t*)ptr;
const uint8_t *const end = string + size;
@@ -127,7 +127,7 @@ StrHelp_utf8_valid(const char *ptr, size_t size) {
return true;
}
-bool_t
+bool
StrHelp_is_whitespace(uint32_t code_point) {
switch (code_point) {
// <control-0009>..<control-000D>
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/Util/StringHelper.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/StringHelper.cfh b/core/Clownfish/Util/StringHelper.cfh
index cd97f3c..60d6d78 100644
--- a/core/Clownfish/Util/StringHelper.cfh
+++ b/core/Clownfish/Util/StringHelper.cfh
@@ -41,12 +41,12 @@ inert class Clownfish::Util::StringHelper cnick StrHelp {
/** Return true if the string is valid UTF-8, false otherwise.
*/
- inert bool_t
+ inert bool
utf8_valid(const char *ptr, size_t len);
/** Returns true if the code point qualifies as Unicode whitespace.
*/
- inert bool_t
+ inert bool
is_whitespace(uint32_t code_point);
/** Encode a Unicode code point to a UTF-8 sequence.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/VArray.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/VArray.c b/core/Clownfish/VArray.c
index cb13779..08314cf 100644
--- a/core/Clownfish/VArray.c
+++ b/core/Clownfish/VArray.c
@@ -312,7 +312,7 @@ VA_sort(VArray *self, Lucy_Sort_Compare_t compare, void *context) {
Sort_quicksort(self->elems, self->size, sizeof(void*), compare, context);
}
-bool_t
+bool
VA_equals(VArray *self, Obj *other) {
VArray *twin = (VArray*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/VArray.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VArray.cfh b/core/Clownfish/VArray.cfh
index dcc0455..e6f8741 100644
--- a/core/Clownfish/VArray.cfh
+++ b/core/Clownfish/VArray.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
__C__
#include "Clownfish/Util/SortUtils.h"
-typedef chy_bool_t
+typedef bool
(*Lucy_VA_Gather_Test_t)(lucy_VArray *self, uint32_t tick, void *data);
#ifdef LUCY_USE_SHORT_NAMES
@@ -159,7 +159,7 @@ class Clownfish::VArray cnick VA inherits Clownfish::Obj {
public incremented VArray*
Slice(VArray *self, uint32_t offset, uint32_t length);
- public bool_t
+ public bool
Equals(VArray *self, Obj *other);
public incremented VArray*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.c b/core/Clownfish/VTable.c
index fe62c67..1946a96 100644
--- a/core/Clownfish/VTable.c
+++ b/core/Clownfish/VTable.c
@@ -284,7 +284,7 @@ S_scrunch_charbuf(CharBuf *source, CharBuf *target) {
}
}
-bool_t
+bool
VTable_add_to_registry(VTable *vtable) {
if (VTable_registry == NULL) {
VTable_init_registry();
@@ -294,14 +294,14 @@ VTable_add_to_registry(VTable *vtable) {
}
else {
CharBuf *klass = CB_Clone(vtable->name);
- bool_t retval
+ bool retval
= LFReg_Register(VTable_registry, (Obj*)klass, (Obj*)vtable);
DECREF(klass);
return retval;
}
}
-bool_t
+bool
VTable_add_alias_to_registry(VTable *vtable, CharBuf *alias) {
if (VTable_registry == NULL) {
VTable_init_registry();
@@ -311,7 +311,7 @@ VTable_add_alias_to_registry(VTable *vtable, CharBuf *alias) {
}
else {
CharBuf *klass = CB_Clone(alias);
- bool_t retval
+ bool retval
= LFReg_Register(VTable_registry, (Obj*)klass, (Obj*)vtable);
DECREF(klass);
return retval;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Clownfish/VTable.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.cfh b/core/Clownfish/VTable.cfh
index 6308d7b..d0a7e6c 100644
--- a/core/Clownfish/VTable.cfh
+++ b/core/Clownfish/VTable.cfh
@@ -64,10 +64,10 @@ class Clownfish::VTable inherits Clownfish::Obj {
*
* @return true on success, false if the class was already registered.
*/
- inert bool_t
+ inert bool
add_to_registry(VTable *vtable);
- inert bool_t
+ inert bool
add_alias_to_registry(VTable *vtable, CharBuf *alias);
/** Initialize the registry.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/CaseFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/CaseFolder.c b/core/Lucy/Analysis/CaseFolder.c
index ba6951d..313d0cd 100644
--- a/core/Lucy/Analysis/CaseFolder.c
+++ b/core/Lucy/Analysis/CaseFolder.c
@@ -50,7 +50,7 @@ CaseFolder_transform_text(CaseFolder *self, CharBuf *text) {
return Normalizer_Transform_Text(self->normalizer, text);
}
-bool_t
+bool
CaseFolder_equals(CaseFolder *self, Obj *other) {
CaseFolder *const twin = (CaseFolder*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/CaseFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/CaseFolder.cfh b/core/Lucy/Analysis/CaseFolder.cfh
index 8444e08..137905d 100644
--- a/core/Lucy/Analysis/CaseFolder.cfh
+++ b/core/Lucy/Analysis/CaseFolder.cfh
@@ -44,7 +44,7 @@ public class Lucy::Analysis::CaseFolder
public incremented Inversion*
Transform_Text(CaseFolder *self, CharBuf *text);
- public bool_t
+ public bool
Equals(CaseFolder *self, Obj *other);
public incremented Hash*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/EasyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/EasyAnalyzer.c b/core/Lucy/Analysis/EasyAnalyzer.c
index 5cb5995..8d1534c 100644
--- a/core/Lucy/Analysis/EasyAnalyzer.c
+++ b/core/Lucy/Analysis/EasyAnalyzer.c
@@ -88,7 +88,7 @@ EasyAnalyzer_load(EasyAnalyzer *self, Obj *dump) {
return EasyAnalyzer_init(loaded, language);
}
-bool_t
+bool
EasyAnalyzer_equals(EasyAnalyzer *self, Obj *other) {
EasyAnalyzer *const twin = (EasyAnalyzer*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/EasyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/EasyAnalyzer.cfh b/core/Lucy/Analysis/EasyAnalyzer.cfh
index 5006174..1c12f8b 100644
--- a/core/Lucy/Analysis/EasyAnalyzer.cfh
+++ b/core/Lucy/Analysis/EasyAnalyzer.cfh
@@ -70,7 +70,7 @@ public class Lucy::Analysis::EasyAnalyzer
public incremented EasyAnalyzer*
Load(EasyAnalyzer *self, Obj *dump);
- public bool_t
+ public bool
Equals(EasyAnalyzer *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/Inversion.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Inversion.cfh b/core/Lucy/Analysis/Inversion.cfh
index daff328..5303a43 100644
--- a/core/Lucy/Analysis/Inversion.cfh
+++ b/core/Lucy/Analysis/Inversion.cfh
@@ -28,7 +28,7 @@ class Lucy::Analysis::Inversion inherits Clownfish::Obj {
uint32_t size;
uint32_t cap;
uint32_t cur; /* pointer to current token */
- bool_t inverted; /* inversion has been inverted */
+ bool inverted; /* inversion has been inverted */
uint32_t *cluster_counts; /* counts per unique text */
uint32_t cluster_counts_size; /* num unique texts */
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/Normalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.c b/core/Lucy/Analysis/Normalizer.c
index 70dd075..3102882 100644
--- a/core/Lucy/Analysis/Normalizer.c
+++ b/core/Lucy/Analysis/Normalizer.c
@@ -28,14 +28,14 @@
#define INITIAL_BUFSIZE 63
Normalizer*
-Normalizer_new(const CharBuf *form, bool_t case_fold, bool_t strip_accents) {
+Normalizer_new(const CharBuf *form, bool case_fold, bool strip_accents) {
Normalizer *self = (Normalizer*)VTable_Make_Obj(NORMALIZER);
return Normalizer_init(self, form, case_fold, strip_accents);
}
Normalizer*
-Normalizer_init(Normalizer *self, const CharBuf *form, bool_t case_fold,
- bool_t strip_accents) {
+Normalizer_init(Normalizer *self, const CharBuf *form, bool case_fold,
+ bool strip_accents) {
int options = UTF8PROC_STABLE;
if (form == NULL
@@ -148,14 +148,14 @@ Normalizer_load(Normalizer *self, Obj *dump) {
Obj *obj = Hash_Fetch_Str(source, "normalization_form", 18);
CharBuf *form = (CharBuf*)CERTIFY(obj, CHARBUF);
obj = Hash_Fetch_Str(source, "case_fold", 9);
- bool_t case_fold = Bool_Get_Value((BoolNum*)CERTIFY(obj, BOOLNUM));
+ bool case_fold = Bool_Get_Value((BoolNum*)CERTIFY(obj, BOOLNUM));
obj = Hash_Fetch_Str(source, "strip_accents", 13);
- bool_t strip_accents = Bool_Get_Value((BoolNum*)CERTIFY(obj, BOOLNUM));
+ bool strip_accents = Bool_Get_Value((BoolNum*)CERTIFY(obj, BOOLNUM));
return Normalizer_init(loaded, form, case_fold, strip_accents);
}
-bool_t
+bool
Normalizer_equals(Normalizer *self, Obj *other) {
Normalizer *const twin = (Normalizer*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/Normalizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.cfh b/core/Lucy/Analysis/Normalizer.cfh
index 1145c51..bf839a8 100644
--- a/core/Lucy/Analysis/Normalizer.cfh
+++ b/core/Lucy/Analysis/Normalizer.cfh
@@ -33,8 +33,8 @@ public class Lucy::Analysis::Normalizer
int options;
inert incremented Normalizer*
- new(const CharBuf *normalization_form = NULL, bool_t case_fold = true,
- bool_t strip_accents = false);
+ new(const CharBuf *normalization_form = NULL, bool case_fold = true,
+ bool strip_accents = false);
/**
* @param normalization_form Unicode normalization form, can be one of
@@ -44,7 +44,7 @@ public class Lucy::Analysis::Normalizer
*/
public inert Normalizer*
init(Normalizer *self, const CharBuf *normalization_form = NULL,
- bool_t case_fold = true, bool_t strip_accents = false);
+ bool case_fold = true, bool strip_accents = false);
public incremented Inversion*
Transform(Normalizer *self, Inversion *inversion);
@@ -55,7 +55,7 @@ public class Lucy::Analysis::Normalizer
public incremented Normalizer*
Load(Normalizer *self, Obj *dump);
- public bool_t
+ public bool
Equals(Normalizer *self, Obj *other);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/PolyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/PolyAnalyzer.c b/core/Lucy/Analysis/PolyAnalyzer.c
index 97503c2..dd635c1 100644
--- a/core/Lucy/Analysis/PolyAnalyzer.c
+++ b/core/Lucy/Analysis/PolyAnalyzer.c
@@ -107,7 +107,7 @@ PolyAnalyzer_transform_text(PolyAnalyzer *self, CharBuf *text) {
return retval;
}
-bool_t
+bool
PolyAnalyzer_equals(PolyAnalyzer *self, Obj *other) {
PolyAnalyzer *const twin = (PolyAnalyzer*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/PolyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/PolyAnalyzer.cfh b/core/Lucy/Analysis/PolyAnalyzer.cfh
index 86aac97..a7cdd93 100644
--- a/core/Lucy/Analysis/PolyAnalyzer.cfh
+++ b/core/Lucy/Analysis/PolyAnalyzer.cfh
@@ -80,7 +80,7 @@ public class Lucy::Analysis::PolyAnalyzer
public incremented Inversion*
Transform_Text(PolyAnalyzer *self, CharBuf *text);
- public bool_t
+ public bool
Equals(PolyAnalyzer *self, Obj *other);
public incremented PolyAnalyzer*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.c b/core/Lucy/Analysis/RegexTokenizer.c
index 30cf650..628571f 100644
--- a/core/Lucy/Analysis/RegexTokenizer.c
+++ b/core/Lucy/Analysis/RegexTokenizer.c
@@ -69,7 +69,7 @@ RegexTokenizer_load(RegexTokenizer *self, Obj *dump) {
return RegexTokenizer_init(loaded, pattern);
}
-bool_t
+bool
RegexTokenizer_equals(RegexTokenizer *self, Obj *other) {
RegexTokenizer *const twin = (RegexTokenizer*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/RegexTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.cfh b/core/Lucy/Analysis/RegexTokenizer.cfh
index a1104db..77dc87c 100644
--- a/core/Lucy/Analysis/RegexTokenizer.cfh
+++ b/core/Lucy/Analysis/RegexTokenizer.cfh
@@ -90,7 +90,7 @@ public class Lucy::Analysis::RegexTokenizer
public incremented RegexTokenizer*
Load(RegexTokenizer *self, Obj *dump);
- public bool_t
+ public bool
Equals(RegexTokenizer *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/SnowballStemmer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.c b/core/Lucy/Analysis/SnowballStemmer.c
index e8eaea2..67be914 100644
--- a/core/Lucy/Analysis/SnowballStemmer.c
+++ b/core/Lucy/Analysis/SnowballStemmer.c
@@ -99,7 +99,7 @@ SnowStemmer_load(SnowballStemmer *self, Obj *dump) {
return SnowStemmer_init(loaded, language);
}
-bool_t
+bool
SnowStemmer_equals(SnowballStemmer *self, Obj *other) {
SnowballStemmer *const twin = (SnowballStemmer*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/SnowballStemmer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.cfh b/core/Lucy/Analysis/SnowballStemmer.cfh
index 147ec59..3419eb2 100644
--- a/core/Lucy/Analysis/SnowballStemmer.cfh
+++ b/core/Lucy/Analysis/SnowballStemmer.cfh
@@ -50,7 +50,7 @@ public class Lucy::Analysis::SnowballStemmer cnick SnowStemmer
public incremented SnowballStemmer*
Load(SnowballStemmer *self, Obj *dump);
- public bool_t
+ public bool
Equals(SnowballStemmer *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/SnowballStopFilter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.c b/core/Lucy/Analysis/SnowballStopFilter.c
index b8a47ea..50c995c 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.c
+++ b/core/Lucy/Analysis/SnowballStopFilter.c
@@ -72,7 +72,7 @@ SnowStop_transform(SnowballStopFilter *self, Inversion *inversion) {
return new_inversion;
}
-bool_t
+bool
SnowStop_equals(SnowballStopFilter *self, Obj *other) {
SnowballStopFilter *const twin = (SnowballStopFilter*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/SnowballStopFilter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.cfh b/core/Lucy/Analysis/SnowballStopFilter.cfh
index 4f65b31..3303a96 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.cfh
+++ b/core/Lucy/Analysis/SnowballStopFilter.cfh
@@ -92,7 +92,7 @@ public class Lucy::Analysis::SnowballStopFilter cnick SnowStop
public incremented Inversion*
Transform(SnowballStopFilter *self, Inversion *inversion);
- public bool_t
+ public bool
Equals(SnowballStopFilter *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/StandardTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/StandardTokenizer.c b/core/Lucy/Analysis/StandardTokenizer.c
index 21cafbf..a24c2b8 100644
--- a/core/Lucy/Analysis/StandardTokenizer.c
+++ b/core/Lucy/Analysis/StandardTokenizer.c
@@ -290,7 +290,7 @@ S_skip_extend_format(const char *text, size_t len, lucy_StringIter *iter) {
return wb;
}
-bool_t
+bool
StandardTokenizer_equals(StandardTokenizer *self, Obj *other) {
StandardTokenizer *const twin = (StandardTokenizer*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Analysis/StandardTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/StandardTokenizer.cfh b/core/Lucy/Analysis/StandardTokenizer.cfh
index 4be3489..04af965 100644
--- a/core/Lucy/Analysis/StandardTokenizer.cfh
+++ b/core/Lucy/Analysis/StandardTokenizer.cfh
@@ -50,7 +50,7 @@ public class Lucy::Analysis::StandardTokenizer
Tokenize_Str(StandardTokenizer *self, const char *text, size_t len,
Inversion *inversion);
- public bool_t
+ public bool
Equals(StandardTokenizer *self, Obj *other);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Document/Doc.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Document/Doc.cfh b/core/Lucy/Document/Doc.cfh
index be52e89..60c906d 100644
--- a/core/Lucy/Document/Doc.cfh
+++ b/core/Lucy/Document/Doc.cfh
@@ -79,7 +79,7 @@ public class Lucy::Document::Doc inherits Clownfish::Obj
/* Unimplemented methods.
*/
- public bool_t
+ public bool
Equals(Doc *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Document/HitDoc.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Document/HitDoc.c b/core/Lucy/Document/HitDoc.c
index ceb2a6b..edffe16 100644
--- a/core/Lucy/Document/HitDoc.c
+++ b/core/Lucy/Document/HitDoc.c
@@ -81,7 +81,7 @@ HitDoc_load(HitDoc *self, Obj *dump) {
return loaded;
}
-bool_t
+bool
HitDoc_equals(HitDoc *self, Obj *other) {
HitDoc *twin = (HitDoc*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Document/HitDoc.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Document/HitDoc.cfh b/core/Lucy/Document/HitDoc.cfh
index 56c7303..9e82ae2 100644
--- a/core/Lucy/Document/HitDoc.cfh
+++ b/core/Lucy/Document/HitDoc.cfh
@@ -50,7 +50,7 @@ public class Lucy::Document::HitDoc inherits Lucy::Document::Doc {
public float
Get_Score(HitDoc *self);
- public bool_t
+ public bool
Equals(HitDoc *self, Obj *other);
public incremented Hash*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Highlight/Highlighter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/Highlighter.c b/core/Lucy/Highlight/Highlighter.c
index 89d5b7f..555979f 100644
--- a/core/Lucy/Highlight/Highlighter.c
+++ b/core/Lucy/Highlight/Highlighter.c
@@ -258,7 +258,7 @@ Highlighter_find_best_fragment(Highlighter *self, const CharBuf *field_val,
// Return true if the window represented by "offset" and "length" overlaps a
// score span, or if there are no score spans so that no excerpt is measurably
// superior.
-static bool_t
+static bool
S_has_heat(HeatMap *heat_map, int32_t offset, int32_t length) {
VArray *spans = HeatMap_Get_Spans(heat_map);
uint32_t num_spans = VA_Get_Size(spans);
@@ -284,8 +284,8 @@ int32_t
Highlighter_raw_excerpt(Highlighter *self, const CharBuf *field_val,
const CharBuf *fragment, CharBuf *raw_excerpt,
int32_t top, HeatMap *heat_map, VArray *sentences) {
- bool_t found_starting_edge = false;
- bool_t found_ending_edge = false;
+ bool found_starting_edge = false;
+ bool found_ending_edge = false;
int32_t start = top;
int32_t end = 0;
double field_len = CB_Length(field_val);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/BackgroundMerger.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BackgroundMerger.c b/core/Lucy/Index/BackgroundMerger.c
index 538099b..db80f68 100644
--- a/core/Lucy/Index/BackgroundMerger.c
+++ b/core/Lucy/Index/BackgroundMerger.c
@@ -244,7 +244,7 @@ S_maybe_merge(BackgroundMerger *self) {
return num_to_merge;
}
-static bool_t
+static bool
S_merge_updated_deletions(BackgroundMerger *self) {
Hash *updated_deletions = NULL;
@@ -420,7 +420,7 @@ BGMerger_prepare_commit(BackgroundMerger *self) {
Snapshot *latest_snapshot
= Snapshot_Read_File(Snapshot_new(), self->folder, NULL);
CharBuf *latest_snapfile = Snapshot_Get_Path(latest_snapshot);
- bool_t index_updated
+ bool index_updated
= !CB_Equals(start_snapfile, (Obj*)latest_snapfile);
if (index_updated) {
@@ -475,7 +475,7 @@ BGMerger_commit(BackgroundMerger *self) {
}
if (self->needs_commit) {
- bool_t success = false;
+ bool success = false;
CharBuf *temp_snapfile = CB_Clone(self->snapfile);
// Rename temp snapshot file.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/BackgroundMerger.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BackgroundMerger.cfh b/core/Lucy/Index/BackgroundMerger.cfh
index 1eee574..d25c3b4 100644
--- a/core/Lucy/Index/BackgroundMerger.cfh
+++ b/core/Lucy/Index/BackgroundMerger.cfh
@@ -43,9 +43,9 @@ public class Lucy::Index::BackgroundMerger cnick BGMerger
CharBuf *snapfile;
Hash *doc_maps;
int64_t cutoff;
- bool_t optimize;
- bool_t needs_commit;
- bool_t prepared;
+ bool optimize;
+ bool needs_commit;
+ bool prepared;
public inert incremented BackgroundMerger*
new(Obj *index, IndexManager *manager = NULL);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/DeletionsWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.c b/core/Lucy/Index/DeletionsWriter.c
index cd661cc..9dc34d2 100644
--- a/core/Lucy/Index/DeletionsWriter.c
+++ b/core/Lucy/Index/DeletionsWriter.c
@@ -86,7 +86,7 @@ DefDelWriter_init(DefaultDeletionsWriter *self, Schema *schema,
uint32_t num_seg_readers = VA_Get_Size(self->seg_readers);
self->seg_starts = PolyReader_Offsets(polyreader);
self->bit_vecs = VA_new(num_seg_readers);
- self->updated = (bool_t*)CALLOCATE(num_seg_readers, sizeof(bool_t));
+ self->updated = (bool*)CALLOCATE(num_seg_readers, sizeof(bool));
self->searcher = IxSearcher_new((Obj*)polyreader);
self->name_to_tick = Hash_new(num_seg_readers);
@@ -305,7 +305,7 @@ DefDelWriter_delete_by_doc_id(DefaultDeletionsWriter *self, int32_t doc_id) {
}
}
-bool_t
+bool
DefDelWriter_updated(DefaultDeletionsWriter *self) {
for (uint32_t i = 0, max = VA_Get_Size(self->seg_readers); i < max; i++) {
if (self->updated[i]) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/DeletionsWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.cfh b/core/Lucy/Index/DeletionsWriter.cfh
index 8dbe951..4af5848 100644
--- a/core/Lucy/Index/DeletionsWriter.cfh
+++ b/core/Lucy/Index/DeletionsWriter.cfh
@@ -63,7 +63,7 @@ public abstract class Lucy::Index::DeletionsWriter cnick DelWriter
/** Returns true if there are updates that need to be written.
*/
- public abstract bool_t
+ public abstract bool
Updated(DeletionsWriter *self);
/** Produce an array of int32_t which wraps around deleted documents. The
@@ -104,7 +104,7 @@ class Lucy::Index::DefaultDeletionsWriter cnick DefDelWriter
Hash *name_to_tick;
I32Array *seg_starts;
VArray *bit_vecs;
- bool_t *updated;
+ bool *updated;
IndexSearcher *searcher;
inert int32_t current_file_format;
@@ -133,7 +133,7 @@ class Lucy::Index::DefaultDeletionsWriter cnick DefDelWriter
public void
Delete_By_Doc_ID(DefaultDeletionsWriter *self, int32_t doc_id);
- public bool_t
+ public bool
Updated(DefaultDeletionsWriter *self);
public incremented nullable Matcher*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/FilePurger.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/FilePurger.c b/core/Lucy/Index/FilePurger.c
index 840cdae..b592fdc 100644
--- a/core/Lucy/Index/FilePurger.c
+++ b/core/Lucy/Index/FilePurger.c
@@ -103,7 +103,7 @@ FilePurger_purge(FilePurger *self) {
for (uint32_t i = 0, max = VA_Get_Size(snapshots); i < max; i++) {
Snapshot *snapshot = (Snapshot*)VA_Fetch(snapshots, i);
- bool_t snapshot_has_failures = false;
+ bool snapshot_has_failures = false;
if (Hash_Get_Size(failures)) {
// Only delete snapshot files if all of their entries were
// successfully deleted.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/IndexManager.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexManager.c b/core/Lucy/Index/IndexManager.c
index 5d6af43..61bb761 100644
--- a/core/Lucy/Index/IndexManager.c
+++ b/core/Lucy/Index/IndexManager.c
@@ -111,7 +111,7 @@ S_compare_doc_count(void *context, const void *va, const void *vb) {
return SegReader_Doc_Count(a) - SegReader_Doc_Count(b);
}
-static bool_t
+static bool
S_check_cutoff(VArray *array, uint32_t tick, void *data) {
SegReader *seg_reader = (SegReader*)VA_Fetch(array, tick);
int64_t cutoff = *(int64_t*)data;
@@ -136,7 +136,7 @@ S_fibonacci(uint32_t n) {
VArray*
IxManager_recycle(IndexManager *self, PolyReader *reader,
DeletionsWriter *del_writer, int64_t cutoff,
- bool_t optimize) {
+ bool optimize) {
VArray *seg_readers = PolyReader_Get_Seg_Readers(reader);
VArray *candidates = VA_Gather(seg_readers, S_check_cutoff, &cutoff);
VArray *recyclables = VA_new(VA_Get_Size(candidates));
@@ -256,7 +256,7 @@ void
IxManager_write_merge_data(IndexManager *self, int64_t cutoff) {
ZombieCharBuf *merge_json = ZCB_WRAP_STR("merge.json", 10);
Hash *data = Hash_new(1);
- bool_t success;
+ bool success;
Hash_Store_Str(data, "cutoff", 6, (Obj*)CB_newf("%i64", cutoff));
success = Json_spew_json((Obj*)data, self->folder, (CharBuf*)merge_json);
DECREF(data);
@@ -284,7 +284,7 @@ IxManager_read_merge_data(IndexManager *self) {
}
}
-bool_t
+bool
IxManager_remove_merge_data(IndexManager *self) {
ZombieCharBuf *merge_json = ZCB_WRAP_STR("merge.json", 10);
return Folder_Delete(self->folder, (CharBuf*)merge_json) != 0;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/IndexManager.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexManager.cfh b/core/Lucy/Index/IndexManager.cfh
index d75003d..fa1b26d 100644
--- a/core/Lucy/Index/IndexManager.cfh
+++ b/core/Lucy/Index/IndexManager.cfh
@@ -86,7 +86,7 @@ public class Lucy::Index::IndexManager cnick IxManager
public incremented VArray*
Recycle(IndexManager *self, PolyReader *reader,
DeletionsWriter *del_writer, int64_t cutoff,
- bool_t optimize = false);
+ bool optimize = false);
/** Return a tick. All segments below that tick will be merged.
* Exposed for testing purposes only.
@@ -124,7 +124,7 @@ public class Lucy::Index::IndexManager cnick IxManager
public incremented Hash*
Read_Merge_Data(IndexManager *self);
- public bool_t
+ public bool
Remove_Merge_Data(IndexManager *self);
/** Create a shared lock on a snapshot file, which serves as a proxy for
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Indexer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Indexer.c b/core/Lucy/Index/Indexer.c
index c13854e..e019614 100644
--- a/core/Lucy/Index/Indexer.c
+++ b/core/Lucy/Index/Indexer.c
@@ -55,7 +55,7 @@ S_release_merge_lock(Indexer *self);
// Verify a Folder or derive an FSFolder from a CharBuf path. Call
// Folder_Initialize() if "create" is true.
static Folder*
-S_init_folder(Obj *index, bool_t create);
+S_init_folder(Obj *index, bool create);
// Find the schema file within a snapshot.
static CharBuf*
@@ -70,8 +70,8 @@ Indexer_new(Schema *schema, Obj *index, IndexManager *manager, int32_t flags) {
Indexer*
Indexer_init(Indexer *self, Schema *schema, Obj *index,
IndexManager *manager, int32_t flags) {
- bool_t create = (flags & Indexer_CREATE) ? true : false;
- bool_t truncate = (flags & Indexer_TRUNCATE) ? true : false;
+ bool create = (flags & Indexer_CREATE) ? true : false;
+ bool truncate = (flags & Indexer_TRUNCATE) ? true : false;
Folder *folder = S_init_folder(index, create);
Snapshot *latest_snapshot = Snapshot_new();
@@ -239,7 +239,7 @@ Indexer_destroy(Indexer *self) {
}
static Folder*
-S_init_folder(Obj *index, bool_t create) {
+S_init_folder(Obj *index, bool create) {
Folder *folder = NULL;
// Validate or acquire a Folder.
@@ -384,12 +384,12 @@ S_find_schema_file(Snapshot *snapshot) {
return retval;
}
-static bool_t
+static bool
S_maybe_merge(Indexer *self, VArray *seg_readers) {
- bool_t merge_happened = false;
+ bool merge_happened = false;
uint32_t num_seg_readers = VA_Get_Size(seg_readers);
Lock *merge_lock = IxManager_Make_Merge_Lock(self->manager);
- bool_t got_merge_lock = Lock_Obtain(merge_lock);
+ bool got_merge_lock = Lock_Obtain(merge_lock);
int64_t cutoff;
if (got_merge_lock) {
@@ -471,7 +471,7 @@ void
Indexer_prepare_commit(Indexer *self) {
VArray *seg_readers = PolyReader_Get_Seg_Readers(self->polyreader);
uint32_t num_seg_readers = VA_Get_Size(seg_readers);
- bool_t merge_happened = false;
+ bool merge_happened = false;
if (!self->write_lock || self->prepared) {
THROW(ERR, "Can't call Prepare_Commit() more than once");
@@ -536,7 +536,7 @@ Indexer_commit(Indexer *self) {
}
if (self->needs_commit) {
- bool_t success;
+ bool success;
// Rename temp snapshot file.
CharBuf *temp_snapfile = CB_Clone(self->snapfile);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Indexer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Indexer.cfh b/core/Lucy/Index/Indexer.cfh
index 47c1065..e316975 100644
--- a/core/Lucy/Index/Indexer.cfh
+++ b/core/Lucy/Index/Indexer.cfh
@@ -51,10 +51,10 @@ public class Lucy::Index::Indexer inherits Clownfish::Obj {
Lock *merge_lock;
Doc *stock_doc;
CharBuf *snapfile;
- bool_t truncate;
- bool_t optimize;
- bool_t needs_commit;
- bool_t prepared;
+ bool truncate;
+ bool optimize;
+ bool needs_commit;
+ bool prepared;
public inert int32_t TRUNCATE;
public inert int32_t CREATE;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Inverter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Inverter.cfh b/core/Lucy/Index/Inverter.cfh
index cc34a5a..1b6f60f 100644
--- a/core/Lucy/Index/Inverter.cfh
+++ b/core/Lucy/Index/Inverter.cfh
@@ -34,7 +34,7 @@ class Lucy::Index::Inverter inherits Clownfish::Obj {
InverterEntry *blank; /* Used when iterator is exhausted. */
float boost;
int32_t tick;
- bool_t sorted;
+ bool sorted;
inert incremented Inverter*
new(Schema *schema, Segment *segment);
@@ -151,8 +151,8 @@ private final class Lucy::Index::Inverter::InverterEntry cnick InvEntry
FieldType *type;
Analyzer *analyzer;
Similarity *sim;
- bool_t indexed;
- bool_t highlightable;
+ bool indexed;
+ bool highlightable;
inert incremented InverterEntry*
new(Schema *schema = NULL, const CharBuf *field_name, int32_t field_num);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Lexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Lexicon.cfh b/core/Lucy/Index/Lexicon.cfh
index 6d3c6a9..faf83c5 100644
--- a/core/Lucy/Index/Lexicon.cfh
+++ b/core/Lucy/Index/Lexicon.cfh
@@ -52,7 +52,7 @@ public class Lucy::Index::Lexicon cnick Lex inherits Clownfish::Obj {
*
* @return true until the iterator is exhausted, then false.
*/
- public abstract bool_t
+ public abstract bool
Next(Lexicon *self);
/** Reset the iterator. Next() must be called to proceed to the first
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/LexiconReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconReader.c b/core/Lucy/Index/LexiconReader.c
index 1856850..9a82ef6 100644
--- a/core/Lucy/Index/LexiconReader.c
+++ b/core/Lucy/Index/LexiconReader.c
@@ -131,7 +131,7 @@ DefLexReader_new(Schema *schema, Folder *folder, Snapshot *snapshot,
// Indicate whether it is safe to build a SegLexicon using the given
// parameters. Will return false if the field is not indexed or if no terms
// are present for this field in this segment.
-static bool_t
+static bool
S_has_data(Schema *schema, Folder *folder, Segment *segment, CharBuf *field) {
FieldType *type = Schema_Fetch_Type(schema, field);
@@ -144,7 +144,7 @@ S_has_data(Schema *schema, Folder *folder, Segment *segment, CharBuf *field) {
int32_t field_num = Seg_Field_Num(segment, field);
CharBuf *seg_name = Seg_Get_Name(segment);
CharBuf *file = CB_newf("%o/lexicon-%i32.dat", seg_name, field_num);
- bool_t retval = Folder_Exists(folder, file);
+ bool retval = Folder_Exists(folder, file);
DECREF(file);
return retval;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/LexiconWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconWriter.cfh b/core/Lucy/Index/LexiconWriter.cfh
index 977aa44..a3c85a9 100644
--- a/core/Lucy/Index/LexiconWriter.cfh
+++ b/core/Lucy/Index/LexiconWriter.cfh
@@ -31,7 +31,7 @@ class Lucy::Index::LexiconWriter cnick LexWriter
OutStream *ixix_out;
Hash *counts;
Hash *ix_counts;
- bool_t temp_mode;
+ bool temp_mode;
int32_t index_interval;
int32_t skip_interval;
int32_t count;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/PolyLexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyLexicon.c b/core/Lucy/Index/PolyLexicon.c
index 3aaca4e..52553a2 100644
--- a/core/Lucy/Index/PolyLexicon.c
+++ b/core/Lucy/Index/PolyLexicon.c
@@ -118,7 +118,7 @@ PolyLex_reset(PolyLexicon *self) {
}
}
-bool_t
+bool
PolyLex_next(PolyLexicon *self) {
SegLexQueue *lex_q = self->lex_q;
SegLexicon *top_seg_lexicon = (SegLexicon*)SegLexQ_Peek(lex_q);
@@ -195,7 +195,7 @@ SegLexQ_new(uint32_t max_size) {
return (SegLexQueue*)PriQ_init((PriorityQueue*)self, max_size);
}
-bool_t
+bool
SegLexQ_less_than(SegLexQueue *self, Obj *a, Obj *b) {
SegLexicon *const lex_a = (SegLexicon*)a;
SegLexicon *const lex_b = (SegLexicon*)b;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/PolyLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyLexicon.cfh b/core/Lucy/Index/PolyLexicon.cfh
index be39c3f..26f6961 100644
--- a/core/Lucy/Index/PolyLexicon.cfh
+++ b/core/Lucy/Index/PolyLexicon.cfh
@@ -38,7 +38,7 @@ class Lucy::Index::PolyLexicon cnick PolyLex
public void
Seek(PolyLexicon *self, Obj *target = NULL);
- public bool_t
+ public bool
Next(PolyLexicon *self);
public void
@@ -60,7 +60,7 @@ class Lucy::Index::SegLexQueue cnick SegLexQ
inert incremented SegLexQueue*
new(uint32_t max_size);
- bool_t
+ bool
Less_Than(SegLexQueue *self, Obj *a, Obj *b);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/PolyReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyReader.c b/core/Lucy/Index/PolyReader.c
index f90b264..ba64e16 100644
--- a/core/Lucy/Index/PolyReader.c
+++ b/core/Lucy/Index/PolyReader.c
@@ -34,9 +34,9 @@
#include "Clownfish/Util/StringHelper.h"
// Obtain/release read locks and commit locks.
-static bool_t
+static bool
S_obtain_read_lock(PolyReader *self, const CharBuf *snapshot_filename);
-static bool_t
+static bool
S_obtain_deletion_lock(PolyReader *self);
static void
S_release_read_lock(PolyReader *self);
@@ -380,7 +380,7 @@ PolyReader_do_open(PolyReader *self, Obj *index, Snapshot *snapshot,
if (PolyReader_race_condition_debug1) {
ZombieCharBuf *temp = ZCB_WRAP_STR("temp", 4);
if (Folder_Exists(folder, (CharBuf*)temp)) {
- bool_t success = Folder_Rename(folder, (CharBuf*)temp,
+ bool success = Folder_Rename(folder, (CharBuf*)temp,
PolyReader_race_condition_debug1);
if (!success) { RETHROW(INCREF(Err_get_error())); }
}
@@ -461,7 +461,7 @@ S_derive_folder(Obj *index) {
return folder;
}
-static bool_t
+static bool
S_obtain_deletion_lock(PolyReader *self) {
self->deletion_lock = IxManager_Make_Deletion_Lock(self->manager);
Lock_Clear_Stale(self->deletion_lock);
@@ -473,7 +473,7 @@ S_obtain_deletion_lock(PolyReader *self) {
return true;
}
-static bool_t
+static bool
S_obtain_read_lock(PolyReader *self, const CharBuf *snapshot_file_name) {
self->read_lock = IxManager_Make_Snapshot_Read_Lock(self->manager,
snapshot_file_name);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting.cfh b/core/Lucy/Index/Posting.cfh
index 4ef5724..5449c16 100644
--- a/core/Lucy/Index/Posting.cfh
+++ b/core/Lucy/Index/Posting.cfh
@@ -61,7 +61,7 @@ class Lucy::Index::Posting cnick Post inherits Lucy::Util::Stepper {
*/
abstract incremented Matcher*
Make_Matcher(Posting *self, Similarity *sim, PostingList *plist,
- Compiler *compiler, bool_t need_score);
+ Compiler *compiler, bool need_score);
}
abstract class Lucy::Index::Posting::PostingWriter cnick PostWriter
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting/MatchPosting.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/MatchPosting.c b/core/Lucy/Index/Posting/MatchPosting.c
index 5d91283..3ff887f 100644
--- a/core/Lucy/Index/Posting/MatchPosting.c
+++ b/core/Lucy/Index/Posting/MatchPosting.c
@@ -137,7 +137,7 @@ MatchPost_add_inversion_to_pool(MatchPosting *self, PostingPool *post_pool,
MatchPostingMatcher*
MatchPost_make_matcher(MatchPosting *self, Similarity *sim,
PostingList *plist, Compiler *compiler,
- bool_t need_score) {
+ bool need_score) {
MatchPostingMatcher *matcher
= (MatchPostingMatcher*)VTable_Make_Obj(MATCHPOSTINGMATCHER);
UNUSED_VAR(self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting/MatchPosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/MatchPosting.cfh b/core/Lucy/Index/Posting/MatchPosting.cfh
index 645e291..6c094ec 100644
--- a/core/Lucy/Index/Posting/MatchPosting.cfh
+++ b/core/Lucy/Index/Posting/MatchPosting.cfh
@@ -59,7 +59,7 @@ class Lucy::Index::Posting::MatchPosting cnick MatchPost
incremented MatchPostingMatcher*
Make_Matcher(MatchPosting *self, Similarity *sim, PostingList *plist,
- Compiler *compiler, bool_t need_score);
+ Compiler *compiler, bool need_score);
}
class Lucy::Index::Posting::MatchPostingMatcher cnick MatchPostMatcher
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting/RichPosting.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/RichPosting.c b/core/Lucy/Index/Posting/RichPosting.c
index 0c2a307..30b4f39 100644
--- a/core/Lucy/Index/Posting/RichPosting.c
+++ b/core/Lucy/Index/Posting/RichPosting.c
@@ -182,7 +182,7 @@ RichPost_read_raw(RichPosting *self, InStream *instream, int32_t last_doc_id,
RichPostingMatcher*
RichPost_make_matcher(RichPosting *self, Similarity *sim,
PostingList *plist, Compiler *compiler,
- bool_t need_score) {
+ bool need_score) {
RichPostingMatcher* matcher
= (RichPostingMatcher*)VTable_Make_Obj(RICHPOSTINGMATCHER);
UNUSED_VAR(self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting/RichPosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/RichPosting.cfh b/core/Lucy/Index/Posting/RichPosting.cfh
index 53c7d1d..dcdcbb5 100644
--- a/core/Lucy/Index/Posting/RichPosting.cfh
+++ b/core/Lucy/Index/Posting/RichPosting.cfh
@@ -57,7 +57,7 @@ class Lucy::Index::Posting::RichPosting cnick RichPost
incremented RichPostingMatcher*
Make_Matcher(RichPosting *self, Similarity *sim, PostingList *plist,
- Compiler *compiler, bool_t need_score);
+ Compiler *compiler, bool need_score);
}
class Lucy::Index::Posting::RichPostingMatcher cnick RichPostMatcher
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting/ScorePosting.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/ScorePosting.c b/core/Lucy/Index/Posting/ScorePosting.c
index d7c5386..08dee59 100644
--- a/core/Lucy/Index/Posting/ScorePosting.c
+++ b/core/Lucy/Index/Posting/ScorePosting.c
@@ -202,7 +202,7 @@ ScorePost_read_raw(ScorePosting *self, InStream *instream,
ScorePostingMatcher*
ScorePost_make_matcher(ScorePosting *self, Similarity *sim,
PostingList *plist, Compiler *compiler,
- bool_t need_score) {
+ bool need_score) {
ScorePostingMatcher *matcher
= (ScorePostingMatcher*)VTable_Make_Obj(SCOREPOSTINGMATCHER);
UNUSED_VAR(self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Posting/ScorePosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/ScorePosting.cfh b/core/Lucy/Index/Posting/ScorePosting.cfh
index 3076be7..18e313e 100644
--- a/core/Lucy/Index/Posting/ScorePosting.cfh
+++ b/core/Lucy/Index/Posting/ScorePosting.cfh
@@ -57,7 +57,7 @@ class Lucy::Index::Posting::ScorePosting cnick ScorePost
incremented ScorePostingMatcher*
Make_Matcher(ScorePosting *self, Similarity *sim, PostingList *plist,
- Compiler *compiler, bool_t need_score);
+ Compiler *compiler, bool need_score);
nullable uint32_t*
Get_Prox(ScorePosting *self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/PostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingList.cfh b/core/Lucy/Index/PostingList.cfh
index b8223cc..36dc026 100644
--- a/core/Lucy/Index/PostingList.cfh
+++ b/core/Lucy/Index/PostingList.cfh
@@ -58,7 +58,7 @@ public class Lucy::Index::PostingList cnick PList
*/
abstract Matcher*
Make_Matcher(PostingList *self, Similarity *similarity,
- Compiler *compiler, bool_t need_score);
+ Compiler *compiler, bool need_score);
/** Indexing helper function.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/PostingPool.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingPool.c b/core/Lucy/Index/PostingPool.c
index 140c51a..f2c1146 100644
--- a/core/Lucy/Index/PostingPool.c
+++ b/core/Lucy/Index/PostingPool.c
@@ -373,7 +373,7 @@ S_write_terms_and_postings(PostingPool *self, PostingWriter *post_writer,
empty_string, 0);
while (1) {
- bool_t same_text_as_last = true;
+ bool same_text_as_last = true;
if (posting == NULL) {
// On the last iter, use an empty string to make LexiconWriter
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/RawLexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawLexicon.c b/core/Lucy/Index/RawLexicon.c
index 9b6a6d8..eef6eac 100644
--- a/core/Lucy/Index/RawLexicon.c
+++ b/core/Lucy/Index/RawLexicon.c
@@ -62,7 +62,7 @@ RawLex_destroy(RawLexicon *self) {
SUPER_DESTROY(self, RAWLEXICON);
}
-bool_t
+bool
RawLex_next(RawLexicon *self) {
if (InStream_Tell(self->instream) >= self->len) { return false; }
TermStepper_Read_Delta(self->term_stepper, self->instream);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/RawLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawLexicon.cfh b/core/Lucy/Index/RawLexicon.cfh
index 06d579f..30d11cb 100644
--- a/core/Lucy/Index/RawLexicon.cfh
+++ b/core/Lucy/Index/RawLexicon.cfh
@@ -39,7 +39,7 @@ class Lucy::Index::RawLexicon cnick RawLex
public void
Destroy(RawLexicon *self);
- public bool_t
+ public bool
Next(RawLexicon *self);
public nullable Obj*
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SegLexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegLexicon.c b/core/Lucy/Index/SegLexicon.c
index aecdc30..06704f2 100644
--- a/core/Lucy/Index/SegLexicon.c
+++ b/core/Lucy/Index/SegLexicon.c
@@ -172,7 +172,7 @@ SegLex_get_segment(SegLexicon *self) {
return self->segment;
}
-bool_t
+bool
SegLex_next(SegLexicon *self) {
// If we've run out of terms, null out and return.
if (++self->term_num >= self->size) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SegLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegLexicon.cfh b/core/Lucy/Index/SegLexicon.cfh
index 3e28ab0..fe7e68a 100644
--- a/core/Lucy/Index/SegLexicon.cfh
+++ b/core/Lucy/Index/SegLexicon.cfh
@@ -71,7 +71,7 @@ class Lucy::Index::SegLexicon cnick SegLex
public int32_t
Doc_Freq(SegLexicon *self);
- public bool_t
+ public bool
Next(SegLexicon *self);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SegPostingList.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegPostingList.c b/core/Lucy/Index/SegPostingList.c
index d0195c8..ae9122e 100644
--- a/core/Lucy/Index/SegPostingList.c
+++ b/core/Lucy/Index/SegPostingList.c
@@ -291,7 +291,7 @@ S_seek_tinfo(SegPostingList *self, TermInfo *tinfo) {
Matcher*
SegPList_make_matcher(SegPostingList *self, Similarity *sim,
- Compiler *compiler, bool_t need_score) {
+ Compiler *compiler, bool need_score) {
return Post_Make_Matcher(self->posting, sim, (PostingList*)self, compiler,
need_score);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SegPostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegPostingList.cfh b/core/Lucy/Index/SegPostingList.cfh
index 6b45108..dfb23ea 100644
--- a/core/Lucy/Index/SegPostingList.cfh
+++ b/core/Lucy/Index/SegPostingList.cfh
@@ -76,7 +76,7 @@ class Lucy::Index::SegPostingList cnick SegPList
Matcher*
Make_Matcher(SegPostingList *self, Similarity *similarity,
- Compiler *compiler, bool_t need_score);
+ Compiler *compiler, bool need_score);
RawPosting*
Read_Raw(SegPostingList *self, int32_t last_doc_id, CharBuf *term_text,
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SegWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegWriter.c b/core/Lucy/Index/SegWriter.c
index 6a0dd18..02fe391 100644
--- a/core/Lucy/Index/SegWriter.c
+++ b/core/Lucy/Index/SegWriter.c
@@ -85,14 +85,14 @@ SegWriter_prep_seg_dir(SegWriter *self) {
// Clear stale segment files from crashed indexing sessions.
if (Folder_Exists(folder, seg_name)) {
- bool_t result = Folder_Delete_Tree(folder, seg_name);
+ bool result = Folder_Delete_Tree(folder, seg_name);
if (!result) {
THROW(ERR, "Couldn't completely remove '%o'", seg_name);
}
}
// Create the segment directory.
- bool_t result = Folder_MkDir(folder, seg_name);
+ bool result = Folder_MkDir(folder, seg_name);
if (!result) { RETHROW(INCREF(Err_get_error())); }
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Segment.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Segment.c b/core/Lucy/Index/Segment.c
index dcdbbb0..69365ed 100644
--- a/core/Lucy/Index/Segment.c
+++ b/core/Lucy/Index/Segment.c
@@ -61,7 +61,7 @@ Seg_num_to_name(int64_t number) {
return CB_newf("seg_%s", &base36);
}
-bool_t
+bool
Seg_valid_seg_name(const CharBuf *name) {
if (CB_Starts_With_Str(name, "seg_", 4)) {
ZombieCharBuf *scratch = ZCB_WRAP(name);
@@ -84,7 +84,7 @@ Seg_destroy(Segment *self) {
SUPER_DESTROY(self, SEGMENT);
}
-bool_t
+bool
Seg_read_file(Segment *self, Folder *folder) {
CharBuf *filename = CB_newf("%o/segmeta.json", self->name);
Hash *metadata = (Hash*)Json_slurp_json(folder, filename);
@@ -143,7 +143,7 @@ Seg_write_file(Segment *self, Folder *folder) {
Hash_Store_Str(self->metadata, "segmeta", 7, (Obj*)my_metadata);
CharBuf *filename = CB_newf("%o/segmeta.json", self->name);
- bool_t result = Json_spew_json((Obj*)self->metadata, folder, filename);
+ bool result = Json_spew_json((Obj*)self->metadata, folder, filename);
DECREF(filename);
if (!result) { RETHROW(INCREF(Err_get_error())); }
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Segment.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Segment.cfh b/core/Lucy/Index/Segment.cfh
index 2e16e65..faccd2d 100644
--- a/core/Lucy/Index/Segment.cfh
+++ b/core/Lucy/Index/Segment.cfh
@@ -54,7 +54,7 @@ public class Lucy::Index::Segment cnick Seg inherits Clownfish::Obj {
/** Return true if the CharBuf is a segment name, i.e. matches this
* pattern: /^seg_\w+$/
*/
- inert bool_t
+ inert bool
valid_seg_name(const CharBuf *name);
/** Register a new field and assign it a field number. If the field was
@@ -144,7 +144,7 @@ public class Lucy::Index::Segment cnick Seg inherits Clownfish::Obj {
* @return true if the file is read and decoded successfully, false
* otherwise.
*/
- public bool_t
+ public bool
Read_File(Segment *self, Folder *folder);
/** Compare by segment number.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Similarity.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Similarity.c b/core/Lucy/Index/Similarity.c
index 91841ff..3e4b9a3 100644
--- a/core/Lucy/Index/Similarity.c
+++ b/core/Lucy/Index/Similarity.c
@@ -114,7 +114,7 @@ Sim_deserialize(Similarity *self, InStream *instream) {
return self;
}
-bool_t
+bool
Sim_equals(Similarity *self, Obj *other) {
if (Sim_Get_VTable(self) != Obj_Get_VTable(other)) { return false; }
return true;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Similarity.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Similarity.cfh b/core/Lucy/Index/Similarity.cfh
index 5e4337c..bbb314b 100644
--- a/core/Lucy/Index/Similarity.cfh
+++ b/core/Lucy/Index/Similarity.cfh
@@ -130,7 +130,7 @@ public class Lucy::Index::Similarity cnick Sim
public incremented Similarity*
Load(Similarity *self, Obj *dump);
- public bool_t
+ public bool
Equals(Similarity *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Snapshot.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Snapshot.c b/core/Lucy/Index/Snapshot.c
index 4aa1a9e..beca285 100644
--- a/core/Lucy/Index/Snapshot.c
+++ b/core/Lucy/Index/Snapshot.c
@@ -62,7 +62,7 @@ Snapshot_add_entry(Snapshot *self, const CharBuf *entry) {
Hash_Store(self->entries, (Obj*)entry, (Obj*)CFISH_TRUE);
}
-bool_t
+bool
Snapshot_delete_entry(Snapshot *self, const CharBuf *entry) {
Obj *val = Hash_Delete(self->entries, (Obj*)entry);
if (val) {
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/Snapshot.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Snapshot.cfh b/core/Lucy/Index/Snapshot.cfh
index 60b300c..8df8c77 100644
--- a/core/Lucy/Index/Snapshot.cfh
+++ b/core/Lucy/Index/Snapshot.cfh
@@ -62,7 +62,7 @@ public class Lucy::Index::Snapshot inherits Clownfish::Obj : dumpable {
* @return true if the entry existed and was successfully deleted, false
* otherwise.
*/
- public bool_t
+ public bool
Delete_Entry(Snapshot *self, const CharBuf *entry);
/** Decode a snapshot file and initialize the object to reflect its
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SortCache.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache.c b/core/Lucy/Index/SortCache.c
index af112d1..00d41b2 100644
--- a/core/Lucy/Index/SortCache.c
+++ b/core/Lucy/Index/SortCache.c
@@ -50,13 +50,13 @@ SortCache_destroy(SortCache *self) {
SUPER_DESTROY(self, SORTCACHE);
}
-bool_t
+bool
SortCache_get_native_ords(SortCache *self) {
return self->native_ords;
}
void
-SortCache_set_native_ords(SortCache *self, bool_t native_ords) {
+SortCache_set_native_ords(SortCache *self, bool native_ords) {
self->native_ords = native_ords;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SortCache.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache.cfh b/core/Lucy/Index/SortCache.cfh
index 88ab4c4..1ee617a 100644
--- a/core/Lucy/Index/SortCache.cfh
+++ b/core/Lucy/Index/SortCache.cfh
@@ -27,7 +27,7 @@ class Lucy::Index::SortCache inherits Clownfish::Obj {
int32_t cardinality;
int32_t ord_width;
int32_t null_ord;
- bool_t native_ords;
+ bool native_ords;
public inert SortCache*
init(SortCache *self, const CharBuf *field, FieldType *type,
@@ -76,9 +76,9 @@ class Lucy::Index::SortCache inherits Clownfish::Obj {
* setting indicates whether this SortCache has such a bug.
*/
void
- Set_Native_Ords(SortCache *self, bool_t native_ords);
+ Set_Native_Ords(SortCache *self, bool native_ords);
- bool_t
+ bool
Get_Native_Ords(SortCache *self);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SortFieldWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortFieldWriter.c b/core/Lucy/Index/SortFieldWriter.c
index afd80af..57eb999 100644
--- a/core/Lucy/Index/SortFieldWriter.c
+++ b/core/Lucy/Index/SortFieldWriter.c
@@ -517,7 +517,7 @@ S_write_files(SortFieldWriter *self, OutStream *ord_out, OutStream *ix_out,
OutStream *dat_out) {
int8_t prim_id = self->prim_id;
int32_t doc_max = (int32_t)Seg_Get_Count(self->segment);
- bool_t has_nulls = self->count == doc_max ? false : true;
+ bool has_nulls = self->count == doc_max ? false : true;
size_t size = (doc_max + 1) * sizeof(int32_t);
int32_t *ords = (int32_t*)MALLOCATE(size);
int32_t ord = 0;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SortFieldWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortFieldWriter.cfh b/core/Lucy/Index/SortFieldWriter.cfh
index 843c7af..210be85 100644
--- a/core/Lucy/Index/SortFieldWriter.cfh
+++ b/core/Lucy/Index/SortFieldWriter.cfh
@@ -46,7 +46,7 @@ class Lucy::Index::SortFieldWriter
int64_t dat_end;
int32_t run_cardinality;
int32_t run_max;
- bool_t var_width;
+ bool var_width;
int32_t *sorted_ids;
int32_t run_ord;
int32_t run_tick;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SortReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortReader.c b/core/Lucy/Index/SortReader.c
index 5d3a15e..159d837 100644
--- a/core/Lucy/Index/SortReader.c
+++ b/core/Lucy/Index/SortReader.c
@@ -174,7 +174,7 @@ S_lazy_init_sort_cache(DefaultSortReader *self, const CharBuf *field) {
CharBuf *path = CB_new(40);
int32_t field_num = Seg_Field_Num(segment, field);
int8_t prim_id = FType_Primitive_ID(type);
- bool_t var_width = (prim_id == FType_TEXT || prim_id == FType_BLOB)
+ bool var_width = (prim_id == FType_TEXT || prim_id == FType_BLOB)
? true
: false;
CB_setf(path, "%o/sort-%i32.ord", seg_name, field_num);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/SortWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortWriter.cfh b/core/Lucy/Index/SortWriter.cfh
index 1061642..ab3ec91 100644
--- a/core/Lucy/Index/SortWriter.cfh
+++ b/core/Lucy/Index/SortWriter.cfh
@@ -37,7 +37,7 @@ class Lucy::Index::SortWriter inherits Lucy::Index::DataWriter {
OutStream *temp_dat_out;
MemoryPool *mem_pool;
size_t mem_thresh;
- bool_t flush_at_finish;
+ bool flush_at_finish;
inert int32_t current_file_format;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/TermVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/TermVector.c b/core/Lucy/Index/TermVector.c
index 9fc8164..9859fff 100644
--- a/core/Lucy/Index/TermVector.c
+++ b/core/Lucy/Index/TermVector.c
@@ -124,7 +124,7 @@ TV_deserialize(TermVector *self, InStream *instream) {
return self;
}
-bool_t
+bool
TV_equals(TermVector *self, Obj *other) {
TermVector *const twin = (TermVector*)other;
int32_t *const posits = self->positions->ints;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Index/TermVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/TermVector.cfh b/core/Lucy/Index/TermVector.cfh
index 2272bbe..5a83e50 100644
--- a/core/Lucy/Index/TermVector.cfh
+++ b/core/Lucy/Index/TermVector.cfh
@@ -52,7 +52,7 @@ class Lucy::Index::TermVector cnick TV
public incremented TermVector*
Deserialize(decremented TermVector *self, InStream *instream);
- public bool_t
+ public bool
Equals(TermVector *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Object/BitVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Object/BitVector.c b/core/Lucy/Object/BitVector.c
index 95ec274..7366a4c 100644
--- a/core/Lucy/Object/BitVector.c
+++ b/core/Lucy/Object/BitVector.c
@@ -152,7 +152,7 @@ BitVec_clear_all(BitVector *self) {
memset(self->bits, 0, byte_size);
}
-bool_t
+bool
BitVec_get(BitVector *self, uint32_t tick) {
if (tick >= self->cap) {
return false;
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Object/BitVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Object/BitVector.cfh b/core/Lucy/Object/BitVector.cfh
index 748b3b8..e0ade93 100644
--- a/core/Lucy/Object/BitVector.cfh
+++ b/core/Lucy/Object/BitVector.cfh
@@ -43,7 +43,7 @@ public class Lucy::Object::BitVector cnick BitVec
*
* @param tick The requested bit.
*/
- public bool_t
+ public bool
Get(BitVector *self, uint32_t tick);
/** Set the bit at <code>tick</code> to 1.
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/Architecture.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Architecture.c b/core/Lucy/Plan/Architecture.c
index 808496e..e32cb01 100644
--- a/core/Lucy/Plan/Architecture.c
+++ b/core/Lucy/Plan/Architecture.c
@@ -50,7 +50,7 @@ Arch_init(Architecture *self) {
return self;
}
-bool_t
+bool
Arch_equals(Architecture *self, Obj *other) {
Architecture *twin = (Architecture*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/Architecture.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Architecture.cfh b/core/Lucy/Plan/Architecture.cfh
index 1f3a386..7aafa7b 100644
--- a/core/Lucy/Plan/Architecture.cfh
+++ b/core/Lucy/Plan/Architecture.cfh
@@ -153,7 +153,7 @@ public class Lucy::Plan::Architecture cnick Arch inherits Clownfish::Obj {
/** Returns true for any Architecture object. Subclasses should override
* this weak check.
*/
- public bool_t
+ public bool
Equals(Architecture *self, Obj *other);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/BlobType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/BlobType.c b/core/Lucy/Plan/BlobType.c
index b099127..e8492c9 100644
--- a/core/Lucy/Plan/BlobType.c
+++ b/core/Lucy/Plan/BlobType.c
@@ -20,26 +20,26 @@
#include "Lucy/Plan/BlobType.h"
BlobType*
-BlobType_new(bool_t stored) {
+BlobType_new(bool stored) {
BlobType *self = (BlobType*)VTable_Make_Obj(BLOBTYPE);
return BlobType_init(self, stored);
}
BlobType*
-BlobType_init(BlobType *self, bool_t stored) {
+BlobType_init(BlobType *self, bool stored) {
FType_init((FieldType*)self);
self->stored = stored;
return self;
}
-bool_t
+bool
BlobType_binary(BlobType *self) {
UNUSED_VAR(self);
return true;
}
void
-BlobType_set_sortable(BlobType *self, bool_t sortable) {
+BlobType_set_sortable(BlobType *self, bool sortable) {
UNUSED_VAR(self);
if (sortable) { THROW(ERR, "BlobType fields can't be sortable"); }
}
@@ -56,7 +56,7 @@ BlobType_primitive_id(BlobType *self) {
return FType_BLOB;
}
-bool_t
+bool
BlobType_equals(BlobType *self, Obj *other) {
BlobType *twin = (BlobType*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/BlobType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/BlobType.cfh b/core/Lucy/Plan/BlobType.cfh
index 25b1c07..b68486c 100644
--- a/core/Lucy/Plan/BlobType.cfh
+++ b/core/Lucy/Plan/BlobType.cfh
@@ -28,20 +28,20 @@ public class Lucy::Plan::BlobType inherits Lucy::Plan::FieldType
* @param stored boolean indicating whether the field should be stored.
*/
public inert BlobType*
- init(BlobType *self, bool_t stored);
+ init(BlobType *self, bool stored);
public inert incremented BlobType*
- new(bool_t stored);
+ new(bool stored);
/** Returns true.
*/
- public bool_t
+ public bool
Binary(BlobType *self);
/** Throws an error unless <code>sortable</code> is false.
*/
public void
- Set_Sortable(BlobType *self, bool_t sortable);
+ Set_Sortable(BlobType *self, bool sortable);
incremented ViewByteBuf*
Make_Blank(BlobType *self);
@@ -58,7 +58,7 @@ public class Lucy::Plan::BlobType inherits Lucy::Plan::FieldType
public incremented BlobType*
Load(BlobType *self, Obj *dump);
- public bool_t
+ public bool
Equals(BlobType *self, Obj *other);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/FieldType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FieldType.c b/core/Lucy/Plan/FieldType.c
index 59976e8..00139ae 100644
--- a/core/Lucy/Plan/FieldType.c
+++ b/core/Lucy/Plan/FieldType.c
@@ -28,8 +28,8 @@ FType_init(FieldType *self) {
}
FieldType*
-FType_init2(FieldType *self, float boost, bool_t indexed, bool_t stored,
- bool_t sortable) {
+FType_init2(FieldType *self, float boost, bool indexed, bool stored,
+ bool sortable) {
self->boost = boost;
self->indexed = indexed;
self->stored = stored;
@@ -44,17 +44,17 @@ FType_set_boost(FieldType *self, float boost) {
}
void
-FType_set_indexed(FieldType *self, bool_t indexed) {
+FType_set_indexed(FieldType *self, bool indexed) {
self->indexed = !!indexed;
}
void
-FType_set_stored(FieldType *self, bool_t stored) {
+FType_set_stored(FieldType *self, bool stored) {
self->stored = !!stored;
}
void
-FType_set_sortable(FieldType *self, bool_t sortable) {
+FType_set_sortable(FieldType *self, bool sortable) {
self->sortable = !!sortable;
}
@@ -63,22 +63,22 @@ FType_get_boost(FieldType *self) {
return self->boost;
}
-bool_t
+bool
FType_indexed(FieldType *self) {
return self->indexed;
}
-bool_t
+bool
FType_stored(FieldType *self) {
return self->stored;
}
-bool_t
+bool
FType_sortable(FieldType *self) {
return self->sortable;
}
-bool_t
+bool
FType_binary(FieldType *self) {
UNUSED_VAR(self);
return false;
@@ -96,7 +96,7 @@ FType_compare_values(FieldType *self, Obj *a, Obj *b) {
return Obj_Compare_To(a, b);
}
-bool_t
+bool
FType_equals(FieldType *self, Obj *other) {
FieldType *twin = (FieldType*)other;
if (twin == self) { return true; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/FieldType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FieldType.cfh b/core/Lucy/Plan/FieldType.cfh
index 03f0a9a..6e86904 100644
--- a/core/Lucy/Plan/FieldType.cfh
+++ b/core/Lucy/Plan/FieldType.cfh
@@ -73,16 +73,16 @@ public abstract class Lucy::Plan::FieldType cnick FType
inherits Clownfish::Obj {
float boost;
- bool_t indexed;
- bool_t stored;
- bool_t sortable;
+ bool indexed;
+ bool stored;
+ bool sortable;
inert FieldType*
init(FieldType *self);
inert FieldType*
- init2(FieldType *self, float boost = 1.0, bool_t indexed = false,
- bool_t stored = false, bool_t sortable = false);
+ init2(FieldType *self, float boost = 1.0, bool indexed = false,
+ bool stored = false, bool sortable = false);
/** Setter for <code>boost</code>.
*/
@@ -97,36 +97,36 @@ public abstract class Lucy::Plan::FieldType cnick FType
/** Setter for <code>indexed</code>.
*/
public void
- Set_Indexed(FieldType *self, bool_t indexed);
+ Set_Indexed(FieldType *self, bool indexed);
/** Accessor for <code>indexed</code>.
*/
- public bool_t
+ public bool
Indexed(FieldType *self);
/** Setter for <code>stored</code>.
*/
public void
- Set_Stored(FieldType *self, bool_t stored);
+ Set_Stored(FieldType *self, bool stored);
/** Accessor for <code>stored</code>.
*/
- public bool_t
+ public bool
Stored(FieldType *self);
/** Setter for <code>sortable</code>.
*/
public void
- Set_Sortable(FieldType *self, bool_t sortable);
+ Set_Sortable(FieldType *self, bool sortable);
/** Accessor for <code>sortable</code>.
*/
- public bool_t
+ public bool
Sortable(FieldType *self);
/** Indicate whether the field contains binary data.
*/
- public bool_t
+ public bool
Binary(FieldType *self);
/** Compare two values for the field. The default implementation
@@ -161,7 +161,7 @@ public abstract class Lucy::Plan::FieldType cnick FType
/** Compares all common properties.
*/
- public bool_t
+ public bool
Equals(FieldType *self, Obj *other);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/FullTextType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FullTextType.c b/core/Lucy/Plan/FullTextType.c
index 2b81242..4c30b2b 100644
--- a/core/Lucy/Plan/FullTextType.c
+++ b/core/Lucy/Plan/FullTextType.c
@@ -35,8 +35,8 @@ FullTextType_init(FullTextType *self, Analyzer *analyzer) {
FullTextType*
FullTextType_init2(FullTextType *self, Analyzer *analyzer, float boost,
- bool_t indexed, bool_t stored, bool_t sortable,
- bool_t highlightable) {
+ bool indexed, bool stored, bool sortable,
+ bool highlightable) {
FType_init((FieldType*)self);
/* Assign */
@@ -56,7 +56,7 @@ FullTextType_destroy(FullTextType *self) {
SUPER_DESTROY(self, FULLTEXTTYPE);
}
-bool_t
+bool
FullTextType_equals(FullTextType *self, Obj *other) {
FullTextType *twin = (FullTextType*)other;
if (twin == self) { return true; }
@@ -127,10 +127,10 @@ FullTextType_load(FullTextType *self, Obj *dump) {
Obj *stored_dump = Hash_Fetch_Str(source, "stored", 6);
Obj *sort_dump = Hash_Fetch_Str(source, "sortable", 8);
Obj *hl_dump = Hash_Fetch_Str(source, "highlightable", 13);
- bool_t indexed = indexed_dump ? Obj_To_Bool(indexed_dump) : true;
- bool_t stored = stored_dump ? Obj_To_Bool(stored_dump) : true;
- bool_t sortable = sort_dump ? Obj_To_Bool(sort_dump) : false;
- bool_t hl = hl_dump ? Obj_To_Bool(hl_dump) : false;
+ bool indexed = indexed_dump ? Obj_To_Bool(indexed_dump) : true;
+ bool stored = stored_dump ? Obj_To_Bool(stored_dump) : true;
+ bool sortable = sort_dump ? Obj_To_Bool(sort_dump) : false;
+ bool hl = hl_dump ? Obj_To_Bool(hl_dump) : false;
// Extract an Analyzer.
Obj *analyzer_dump = Hash_Fetch_Str(source, "analyzer", 8);
@@ -158,7 +158,7 @@ FullTextType_load(FullTextType *self, Obj *dump) {
}
void
-FullTextType_set_highlightable(FullTextType *self, bool_t highlightable) {
+FullTextType_set_highlightable(FullTextType *self, bool highlightable) {
self->highlightable = highlightable;
}
@@ -167,7 +167,7 @@ FullTextType_get_analyzer(FullTextType *self) {
return self->analyzer;
}
-bool_t
+bool
FullTextType_highlightable(FullTextType *self) {
return self->highlightable;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/FullTextType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FullTextType.cfh b/core/Lucy/Plan/FullTextType.cfh
index 138eafe..7228f70 100644
--- a/core/Lucy/Plan/FullTextType.cfh
+++ b/core/Lucy/Plan/FullTextType.cfh
@@ -31,7 +31,7 @@ parcel Lucy;
public class Lucy::Plan::FullTextType
inherits Lucy::Plan::TextType : dumpable {
- bool_t highlightable;
+ bool highlightable;
Analyzer *analyzer;
/**
@@ -48,8 +48,8 @@ public class Lucy::Plan::FullTextType
inert FullTextType*
init2(FullTextType *self, Analyzer *analyzer, float boost = 1.0,
- bool_t indexed = true, bool_t stored = true,
- bool_t sortable = false, bool_t highlightable = false);
+ bool indexed = true, bool stored = true,
+ bool sortable = false, bool highlightable = false);
public inert incremented FullTextType*
new(Analyzer *analyzer);
@@ -59,11 +59,11 @@ public class Lucy::Plan::FullTextType
* term highlighting.
*/
public void
- Set_Highlightable(FullTextType *self, bool_t highlightable);
+ Set_Highlightable(FullTextType *self, bool highlightable);
/** Accessor for "highlightable" property.
*/
- public bool_t
+ public bool
Highlightable(FullTextType *self);
public Analyzer*
@@ -81,7 +81,7 @@ public class Lucy::Plan::FullTextType
public incremented FullTextType*
Load(FullTextType *self, Obj *dump);
- public bool_t
+ public bool
Equals(FullTextType *self, Obj *other);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/NumericType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/NumericType.c b/core/Lucy/Plan/NumericType.c
index e757088..a71602a 100644
--- a/core/Lucy/Plan/NumericType.c
+++ b/core/Lucy/Plan/NumericType.c
@@ -25,8 +25,8 @@ NumType_init(NumericType *self) {
}
NumericType*
-NumType_init2(NumericType *self, float boost, bool_t indexed, bool_t stored,
- bool_t sortable) {
+NumType_init2(NumericType *self, float boost, bool indexed, bool stored,
+ bool sortable) {
FType_init((FieldType*)self);
self->boost = boost;
self->indexed = indexed;
@@ -35,7 +35,7 @@ NumType_init2(NumericType *self, float boost, bool_t indexed, bool_t stored,
return self;
}
-bool_t
+bool
NumType_binary(NumericType *self) {
UNUSED_VAR(self);
return true;
@@ -112,9 +112,9 @@ NumType_load(NumericType *self, Obj *dump) {
Obj *indexed_dump = Hash_Fetch_Str(source, "indexed", 7);
Obj *stored_dump = Hash_Fetch_Str(source, "stored", 6);
Obj *sort_dump = Hash_Fetch_Str(source, "sortable", 8);
- bool_t indexed = indexed_dump ? Obj_To_Bool(indexed_dump) : true;
- bool_t stored = stored_dump ? Obj_To_Bool(stored_dump) : true;
- bool_t sortable = sort_dump ? Obj_To_Bool(sort_dump) : false;
+ bool indexed = indexed_dump ? Obj_To_Bool(indexed_dump) : true;
+ bool stored = stored_dump ? Obj_To_Bool(stored_dump) : true;
+ bool sortable = sort_dump ? Obj_To_Bool(sort_dump) : false;
return NumType_init2(loaded, boost, indexed, stored, sortable);
}
@@ -133,8 +133,8 @@ Float64Type_init(Float64Type *self) {
}
Float64Type*
-Float64Type_init2(Float64Type *self, float boost, bool_t indexed,
- bool_t stored, bool_t sortable) {
+Float64Type_init2(Float64Type *self, float boost, bool indexed,
+ bool stored, bool sortable) {
return (Float64Type*)NumType_init2((NumericType*)self, boost, indexed,
stored, sortable);
}
@@ -151,7 +151,7 @@ Float64Type_primitive_id(Float64Type *self) {
return FType_FLOAT64;
}
-bool_t
+bool
Float64Type_equals(Float64Type *self, Obj *other) {
if (self == (Float64Type*)other) { return true; }
if (!other) { return false; }
@@ -175,8 +175,8 @@ Float32Type_init(Float32Type *self) {
}
Float32Type*
-Float32Type_init2(Float32Type *self, float boost, bool_t indexed,
- bool_t stored, bool_t sortable) {
+Float32Type_init2(Float32Type *self, float boost, bool indexed,
+ bool stored, bool sortable) {
return (Float32Type*)NumType_init2((NumericType*)self, boost, indexed,
stored, sortable);
}
@@ -193,7 +193,7 @@ Float32Type_primitive_id(Float32Type *self) {
return FType_FLOAT32;
}
-bool_t
+bool
Float32Type_equals(Float32Type *self, Obj *other) {
if (self == (Float32Type*)other) { return true; }
if (!other) { return false; }
@@ -217,8 +217,8 @@ Int32Type_init(Int32Type *self) {
}
Int32Type*
-Int32Type_init2(Int32Type *self, float boost, bool_t indexed,
- bool_t stored, bool_t sortable) {
+Int32Type_init2(Int32Type *self, float boost, bool indexed,
+ bool stored, bool sortable) {
return (Int32Type*)NumType_init2((NumericType*)self, boost, indexed,
stored, sortable);
}
@@ -235,7 +235,7 @@ Int32Type_primitive_id(Int32Type *self) {
return FType_INT32;
}
-bool_t
+bool
Int32Type_equals(Int32Type *self, Obj *other) {
if (self == (Int32Type*)other) { return true; }
if (!other) { return false; }
@@ -259,8 +259,8 @@ Int64Type_init(Int64Type *self) {
}
Int64Type*
-Int64Type_init2(Int64Type *self, float boost, bool_t indexed,
- bool_t stored, bool_t sortable) {
+Int64Type_init2(Int64Type *self, float boost, bool indexed,
+ bool stored, bool sortable) {
return (Int64Type*)NumType_init2((NumericType*)self, boost, indexed,
stored, sortable);
}
@@ -277,7 +277,7 @@ Int64Type_primitive_id(Int64Type *self) {
return FType_INT64;
}
-bool_t
+bool
Int64Type_equals(Int64Type *self, Obj *other) {
if (self == (Int64Type*)other) { return true; }
if (!other) { return false; }
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/NumericType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/NumericType.cfh b/core/Lucy/Plan/NumericType.cfh
index 316308f..db514ec 100644
--- a/core/Lucy/Plan/NumericType.cfh
+++ b/core/Lucy/Plan/NumericType.cfh
@@ -23,12 +23,12 @@ class Lucy::Plan::NumericType cnick NumType
init(NumericType *self);
inert NumericType*
- init2(NumericType *self, float boost = 1.0, bool_t indexed = true,
- bool_t stored = true, bool_t sortable = false);
+ init2(NumericType *self, float boost = 1.0, bool indexed = true,
+ bool stored = true, bool sortable = false);
/** Returns true.
*/
- public bool_t
+ public bool
Binary(NumericType *self);
/** Return the primitive type specifier for the object type, e.g.
@@ -60,8 +60,8 @@ class Lucy::Plan::Float64Type
init(Float64Type *self);
inert Float64Type*
- init2(Float64Type *self, float boost = 1.0, bool_t indexed = true,
- bool_t stored = true, bool_t sortable = true);
+ init2(Float64Type *self, float boost = 1.0, bool indexed = true,
+ bool stored = true, bool sortable = true);
int8_t
Primitive_ID(Float64Type *self);
@@ -69,7 +69,7 @@ class Lucy::Plan::Float64Type
incremented CharBuf*
Specifier(Float64Type *self);
- public bool_t
+ public bool
Equals(Float64Type *self, Obj *other);
}
@@ -83,8 +83,8 @@ class Lucy::Plan::Float32Type
init(Float32Type *self);
inert Float32Type*
- init2(Float32Type *self, float boost = 1.0, bool_t indexed = true,
- bool_t stored = true, bool_t sortable = false);
+ init2(Float32Type *self, float boost = 1.0, bool indexed = true,
+ bool stored = true, bool sortable = false);
int8_t
Primitive_ID(Float32Type *self);
@@ -92,7 +92,7 @@ class Lucy::Plan::Float32Type
incremented CharBuf*
Specifier(Float32Type *self);
- public bool_t
+ public bool
Equals(Float32Type *self, Obj *other);
}
@@ -109,8 +109,8 @@ class Lucy::Plan::Int32Type
init(Int32Type *self);
inert Int32Type*
- init2(Int32Type *self, float boost = 1.0, bool_t indexed = true,
- bool_t stored = true, bool_t sortable = false);
+ init2(Int32Type *self, float boost = 1.0, bool indexed = true,
+ bool stored = true, bool sortable = false);
int8_t
Primitive_ID(Int32Type *self);
@@ -118,7 +118,7 @@ class Lucy::Plan::Int32Type
incremented CharBuf*
Specifier(Int32Type *self);
- public bool_t
+ public bool
Equals(Int32Type *self, Obj *other);
}
@@ -132,8 +132,8 @@ class Lucy::Plan::Int64Type
init(Int64Type *self);
inert Int64Type*
- init2(Int64Type *self, float boost = 1.0, bool_t indexed = true,
- bool_t stored = true, bool_t sortable = false);
+ init2(Int64Type *self, float boost = 1.0, bool indexed = true,
+ bool stored = true, bool sortable = false);
int8_t
Primitive_ID(Int64Type *self);
@@ -141,7 +141,7 @@ class Lucy::Plan::Int64Type
incremented CharBuf*
Specifier(Int64Type *self);
- public bool_t
+ public bool
Equals(Int64Type *self, Obj *other);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/Schema.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Schema.c b/core/Lucy/Plan/Schema.c
index 3f8a8b8..ba6de0b 100644
--- a/core/Lucy/Plan/Schema.c
+++ b/core/Lucy/Plan/Schema.c
@@ -92,7 +92,7 @@ S_add_unique(VArray *array, Obj *elem) {
VA_Push(array, INCREF(elem));
}
-bool_t
+bool
Schema_equals(Schema *self, Obj *other) {
Schema *twin = (Schema*)other;
if (twin == self) { return true; }
@@ -400,7 +400,7 @@ void
Schema_write(Schema *self, Folder *folder, const CharBuf *filename) {
Hash *dump = Schema_Dump(self);
ZombieCharBuf *schema_temp = ZCB_WRAP_STR("schema.temp", 11);
- bool_t success;
+ bool success;
Folder_Delete(folder, (CharBuf*)schema_temp); // Just in case.
Json_spew_json((Obj*)dump, folder, (CharBuf*)schema_temp);
success = Folder_Rename(folder, (CharBuf*)schema_temp, filename);
http://git-wip-us.apache.org/repos/asf/lucy/blob/ab68b5fb/core/Lucy/Plan/StringType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/StringType.c b/core/Lucy/Plan/StringType.c
index 3341209..d27cd37 100644
--- a/core/Lucy/Plan/StringType.c
+++ b/core/Lucy/Plan/StringType.c
@@ -33,8 +33,8 @@ StringType_init(StringType *self) {
}
StringType*
-StringType_init2(StringType *self, float boost, bool_t indexed,
- bool_t stored, bool_t sortable) {
+StringType_init2(StringType *self, float boost, bool indexed,
+ bool stored, bool sortable) {
FType_init((FieldType*)self);
self->boost = boost;
self->indexed = indexed;
@@ -43,7 +43,7 @@ StringType_init2(StringType *self, float boost, bool_t indexed,
return self;
}
-bool_t
+bool
StringType_equals(StringType *self, Obj *other) {
StringType *twin = (StringType*)other;
if (twin == self) { return true; }