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 2013/05/30 22:36:31 UTC
[lucy-commits] [13/26] git commit: refs/heads/separate-clownfish-wip2 - Move
Clownfish classes to parcel Clownfish
Move Clownfish classes to parcel Clownfish
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/05fa0688
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/05fa0688
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/05fa0688
Branch: refs/heads/separate-clownfish-wip2
Commit: 05fa06888213def35a7907d9816fa53d90b69e48
Parents: fa4918d
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 16:54:45 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu May 30 22:30:17 2013 +0200
----------------------------------------------------------------------
c/src/Clownfish/Err.c | 1 +
c/src/Clownfish/LockFreeRegistry.c | 3 +-
c/src/Clownfish/Obj.c | 3 +-
c/src/Clownfish/VTable.c | 5 +-
c/src/Lucy/Analysis/RegexTokenizer.c | 1 +
c/src/Lucy/Document/Doc.c | 1 +
c/src/Lucy/Index/DocReader.c | 1 +
c/src/Lucy/Index/Inverter.c | 1 +
clownfish/compiler/src/CFCBindAliases.c | 229 ---------------
clownfish/compiler/src/CFCBindClass.c | 9 +-
clownfish/compiler/src/CFCBindCore.c | 20 +-
clownfish/compiler/src/CFCDumpable.c | 14 +-
clownfish/compiler/src/CFCPerl.c | 3 +-
clownfish/compiler/src/CFCPerlSub.c | 4 +-
clownfish/compiler/src/CFCPerlTypeMap.c | 30 +--
clownfish/runtime/core/Clownfish/ByteBuf.c | 5 +-
clownfish/runtime/core/Clownfish/CharBuf.c | 7 +-
clownfish/runtime/core/Clownfish/Err.c | 7 +-
clownfish/runtime/core/Clownfish/Hash.c | 5 +-
.../runtime/core/Clownfish/LockFreeRegistry.c | 3 +-
clownfish/runtime/core/Clownfish/Method.c | 3 +-
clownfish/runtime/core/Clownfish/Num.c | 19 +-
clownfish/runtime/core/Clownfish/Obj.c | 5 +-
clownfish/runtime/core/Clownfish/Test.c | 3 +-
.../runtime/core/Clownfish/Test/TestByteBuf.c | 1 +
.../runtime/core/Clownfish/Test/TestCharBuf.c | 1 +
clownfish/runtime/core/Clownfish/Test/TestErr.c | 1 +
clownfish/runtime/core/Clownfish/Test/TestHash.c | 1 +
.../core/Clownfish/Test/TestLockFreeRegistry.c | 1 +
clownfish/runtime/core/Clownfish/Test/TestNum.c | 1 +
clownfish/runtime/core/Clownfish/Test/TestObj.c | 1 +
clownfish/runtime/core/Clownfish/Test/TestUtils.c | 1 +
clownfish/runtime/core/Clownfish/Test/TestVArray.c | 1 +
.../runtime/core/Clownfish/Test/Util/TestAtomic.c | 1 +
.../runtime/core/Clownfish/Test/Util/TestMemory.c | 1 +
.../core/Clownfish/Test/Util/TestNumberUtils.c | 1 +
.../core/Clownfish/Test/Util/TestStringHelper.c | 1 +
clownfish/runtime/core/Clownfish/Util/Atomic.c | 3 +-
clownfish/runtime/core/Clownfish/Util/Memory.c | 3 +-
.../runtime/core/Clownfish/Util/NumberUtils.c | 3 +-
clownfish/runtime/core/Clownfish/Util/SortUtils.c | 3 +-
.../runtime/core/Clownfish/Util/StringHelper.c | 3 +-
clownfish/runtime/core/Clownfish/VArray.c | 3 +-
clownfish/runtime/core/Clownfish/VTable.c | 9 +-
clownfish/runtime/perl/xs/XSBind.c | 6 +-
core/Clownfish.cfp | 5 +
core/Clownfish/ByteBuf.c | 5 +-
core/Clownfish/ByteBuf.cfh | 2 +-
core/Clownfish/CharBuf.c | 7 +-
core/Clownfish/CharBuf.cfh | 4 +-
core/Clownfish/Err.c | 7 +-
core/Clownfish/Err.cfh | 6 +-
core/Clownfish/Hash.c | 5 +-
core/Clownfish/Hash.cfh | 2 +-
core/Clownfish/LockFreeRegistry.c | 3 +-
core/Clownfish/LockFreeRegistry.cfh | 2 +-
core/Clownfish/Method.c | 3 +-
core/Clownfish/Method.cfh | 2 +-
core/Clownfish/Num.c | 19 +-
core/Clownfish/Num.cfh | 2 +-
core/Clownfish/Obj.c | 5 +-
core/Clownfish/Obj.cfh | 4 +-
core/Clownfish/Test/TestBatch.c | 3 +-
core/Clownfish/Test/TestBatch.cfh | 2 +-
core/Clownfish/Test/TestFormatter.c | 3 +-
core/Clownfish/Test/TestFormatter.cfh | 2 +-
core/Clownfish/Test/TestRunner.c | 3 +-
core/Clownfish/Test/TestRunner.cfh | 2 +-
core/Clownfish/Util/Atomic.c | 3 +-
core/Clownfish/Util/Atomic.cfh | 4 +-
core/Clownfish/Util/Memory.c | 3 +-
core/Clownfish/Util/Memory.cfh | 4 +-
core/Clownfish/Util/NumberUtils.c | 3 +-
core/Clownfish/Util/NumberUtils.cfh | 4 +-
core/Clownfish/Util/SortUtils.c | 3 +-
core/Clownfish/Util/SortUtils.cfh | 2 +-
core/Clownfish/Util/StringHelper.c | 3 +-
core/Clownfish/Util/StringHelper.cfh | 4 +-
core/Clownfish/VArray.c | 3 +-
core/Clownfish/VArray.cfh | 4 +-
core/Clownfish/VTable.c | 9 +-
core/Clownfish/VTable.cfh | 2 +-
core/Lucy.c | 6 +-
core/Lucy/Search/Matcher.c | 1 +
core/Lucy/Search/QueryParser.c | 2 +-
core/Lucy/Util/Debug.c | 1 +
core/Lucy/Util/ToolSet.h | 1 +
example-lang/src/Lucy/Object/LockFreeRegistry.c | 2 +-
example-lang/src/Lucy/Object/Obj.c | 2 +-
example-lang/src/Lucy/Object/VTable.c | 4 +-
perl/buildlib/Lucy/Build/Binding/Object.pm | 20 +-
perl/buildlib/Lucy/Build/Binding/Util.pm | 2 +-
perl/xs/XSBind.c | 6 +-
ruby/src/Lucy/Object/LockFreeRegistry.c | 2 +-
ruby/src/Lucy/Object/Obj.c | 2 +-
ruby/src/Lucy/Object/VTable.c | 4 +-
96 files changed, 222 insertions(+), 410 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Clownfish/Err.c
----------------------------------------------------------------------
diff --git a/c/src/Clownfish/Err.c b/c/src/Clownfish/Err.c
index 2adb533..a932ee2 100644
--- a/c/src/Clownfish/Err.c
+++ b/c/src/Clownfish/Err.c
@@ -15,6 +15,7 @@
*/
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include <setjmp.h>
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Clownfish/LockFreeRegistry.c
----------------------------------------------------------------------
diff --git a/c/src/Clownfish/LockFreeRegistry.c b/c/src/Clownfish/LockFreeRegistry.c
index 92c121c..83683c3 100644
--- a/c/src/Clownfish/LockFreeRegistry.c
+++ b/c/src/Clownfish/LockFreeRegistry.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_LOCKFREEREGISTRY
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Clownfish/LockFreeRegistry.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Clownfish/Obj.c
----------------------------------------------------------------------
diff --git a/c/src/Clownfish/Obj.c b/c/src/Clownfish/Obj.c
index cf344b1..b27f632 100644
--- a/c/src/Clownfish/Obj.c
+++ b/c/src/Clownfish/Obj.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
+#define C_CFISH_OBJ
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Clownfish/Obj.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/c/src/Clownfish/VTable.c b/c/src/Clownfish/VTable.c
index 09fce4e..22dc34e 100644
--- a/c/src/Clownfish/VTable.c
+++ b/c/src/Clownfish/VTable.c
@@ -15,9 +15,10 @@
*/
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
#include "Clownfish/VTable.h"
#include "Clownfish/CharBuf.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Analysis/RegexTokenizer.c b/c/src/Lucy/Analysis/RegexTokenizer.c
index d2d3bbb..e2e5277 100644
--- a/c/src/Lucy/Analysis/RegexTokenizer.c
+++ b/c/src/Lucy/Analysis/RegexTokenizer.c
@@ -16,6 +16,7 @@
#define C_LUCY_REGEXTOKENIZER
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "charmony.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Document/Doc.c b/c/src/Lucy/Document/Doc.c
index 8b44af2..92d33f3 100644
--- a/c/src/Lucy/Document/Doc.c
+++ b/c/src/Lucy/Document/Doc.c
@@ -16,6 +16,7 @@
#define C_LUCY_DOC
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Lucy/Document/Doc.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Lucy/Index/DocReader.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Index/DocReader.c b/c/src/Lucy/Index/DocReader.c
index e06e7ee..79fcd4f 100644
--- a/c/src/Lucy/Index/DocReader.c
+++ b/c/src/Lucy/Index/DocReader.c
@@ -17,6 +17,7 @@
#define C_LUCY_DOCREADER
#define C_LUCY_DEFAULTDOCREADER
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Lucy/Index/DocReader.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/c/src/Lucy/Index/Inverter.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Index/Inverter.c b/c/src/Lucy/Index/Inverter.c
index cfaafcd..0700075 100644
--- a/c/src/Lucy/Index/Inverter.c
+++ b/c/src/Lucy/Index/Inverter.c
@@ -17,6 +17,7 @@
#define C_LUCY_INVERTER
#define C_LUCY_INVERTERENTRY
#define CHY_USE_SHORT_NAMES
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Lucy/Index/Inverter.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCBindAliases.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindAliases.c b/clownfish/compiler/src/CFCBindAliases.c
index c32f925..12890ad 100644
--- a/clownfish/compiler/src/CFCBindAliases.c
+++ b/clownfish/compiler/src/CFCBindAliases.c
@@ -25,235 +25,6 @@ struct alias {
struct alias aliases[] = {
{"CFISH_VISIBLE", "LUCY_VISIBLE"},
-
- {"cfish_Obj", "lucy_Obj"},
- {"CFISH_OBJ", "LUCY_OBJ"},
- {"cfish_Obj_dec_refcount", "lucy_Obj_dec_refcount"},
- {"cfish_Obj_get_refcount", "lucy_Obj_get_refcount"},
- {"cfish_Obj_inc_refcount", "lucy_Obj_inc_refcount"},
- {"cfish_Obj_to_host", "lucy_Obj_to_host"},
- {"Cfish_Obj_Dec_RefCount", "Lucy_Obj_Dec_RefCount"},
- {"Cfish_Obj_Deserialize", "Lucy_Obj_Deserialize"},
- {"Cfish_Obj_Destroy", "Lucy_Obj_Destroy"},
- {"Cfish_Obj_Destroy_OFFSET", "Lucy_Obj_Destroy_OFFSET"},
- {"Cfish_Obj_Destroy_t", "Lucy_Obj_Destroy_t"},
- {"Cfish_Obj_Dump", "Lucy_Obj_Dump"},
- {"Cfish_Obj_Get_Class_Name", "Lucy_Obj_Get_Class_Name"},
- {"Cfish_Obj_Inc_RefCount", "Lucy_Obj_Inc_RefCount"},
- {"Cfish_Obj_Is_A", "Lucy_Obj_Is_A"},
- {"Cfish_Obj_Load", "Lucy_Obj_Load"},
- {"Cfish_Obj_Load_OFFSET", "Lucy_Obj_Load_OFFSET"},
- {"Cfish_Obj_Load_t", "Lucy_Obj_Load_t"},
- {"Cfish_Obj_Serialize", "Lucy_Obj_Serialize"},
- {"Cfish_Obj_To_F64", "Lucy_Obj_To_F64"},
- {"Cfish_Obj_To_I64", "Lucy_Obj_To_I64"},
- {"Cfish_Obj_To_Bool", "Lucy_Obj_To_Bool"},
- {"Cfish_Obj_To_Host", "Lucy_Obj_To_Host"},
-
- {"cfish_ByteBuf", "lucy_ByteBuf"},
- {"CFISH_BYTEBUF", "LUCY_BYTEBUF"},
- {"cfish_BB_init", "lucy_BB_init"},
- {"Cfish_BB_Deserialize", "Lucy_BB_Deserialize"},
- {"Cfish_BB_Get_Buf", "Lucy_BB_Get_Buf"},
- {"Cfish_BB_Get_Size", "Lucy_BB_Get_Size"},
- {"Cfish_BB_Mimic_Bytes", "Lucy_BB_Mimic_Bytes"},
- {"Cfish_BB_To_Host", "Lucy_BB_To_Host"},
- {"cfish_ViewByteBuf", "lucy_ViewByteBuf"},
- {"cfish_ViewBB_new", "lucy_ViewBB_new"},
- {"Cfish_ViewBB_Assign_Bytes", "Lucy_ViewBB_Assign_Bytes"},
-
- {"cfish_CharBuf", "lucy_CharBuf"},
- {"CFISH_CHARBUF", "LUCY_CHARBUF"},
- {"cfish_CB_clone", "lucy_CB_clone"},
- {"cfish_CB_newf", "lucy_CB_newf"},
- {"cfish_CB_new_from_trusted_utf8", "lucy_CB_new_from_trusted_utf8"},
- {"cfish_CB_init", "lucy_CB_init"},
- {"Cfish_CB_Cat_Trusted_Str", "Lucy_CB_Cat_Trusted_Str"},
- {"Cfish_CB_Clone", "Lucy_CB_Clone"},
- {"Cfish_CB_Deserialize", "Lucy_CB_Deserialize"},
- {"Cfish_CB_Find_Str", "Lucy_CB_Find_Str"},
- {"Cfish_CB_Get_Ptr8", "Lucy_CB_Get_Ptr8"},
- {"Cfish_CB_Get_Size", "Lucy_CB_Get_Size"},
- {"Cfish_CB_Mimic_Str", "Lucy_CB_Mimic_Str"},
- {"Cfish_CB_Nip_One_OFFSET", "Lucy_CB_Nip_One_OFFSET"},
- {"Cfish_CB_Nip_One_t", "Lucy_CB_Nip_One_t"},
- {"Cfish_CB_To_Host", "Lucy_CB_To_Host"},
- {"cfish_ViewCharBuf", "lucy_ViewCharBuf"},
- {"CFISH_VIEWCHARBUF", "LUCY_VIEWCHARBUF"},
- {"cfish_ViewCB_new_from_trusted_utf8", "lucy_ViewCB_new_from_trusted_utf8"},
- {"Cfish_ViewCB_Assign_Str", "Lucy_ViewCB_Assign_Str"},
- {"cfish_ZombieCharBuf", "lucy_ZombieCharBuf"},
- {"CFISH_ZOMBIECHARBUF", "LUCY_ZOMBIECHARBUF"},
- {"cfish_ZCB_new", "lucy_ZCB_new"},
- {"cfish_ZCB_size", "lucy_ZCB_size"},
- {"cfish_ZCB_wrap", "lucy_ZCB_wrap"},
- {"cfish_ZCB_wrap_str", "lucy_ZCB_wrap_str"},
- {"Cfish_ZCB_Assign_Str", "Lucy_ZCB_Assign_Str"},
- {"Cfish_ZCB_Assign_Trusted_Str", "Lucy_ZCB_Assign_Trusted_Str"},
-
- {"CFISH_FLOATNUM", "LUCY_FLOATNUM"},
- {"CFISH_INTNUM", "LUCY_INTNUM"},
- {"CFISH_INTEGER32", "LUCY_INTEGER32"},
- {"CFISH_INTEGER64", "LUCY_INTEGER64"},
- {"CFISH_FLOAT32", "LUCY_FLOAT32"},
- {"CFISH_FLOAT64", "LUCY_FLOAT64"},
- {"cfish_Bool_false_singleton", "lucy_Bool_false_singleton"},
- {"cfish_Bool_true_singleton", "lucy_Bool_true_singleton"},
- {"cfish_Bool_singleton", "lucy_Bool_singleton"},
- {"Cfish_Bool_Dec_RefCount_OFFSET", "Lucy_Bool_Dec_RefCount_OFFSET"},
- {"Cfish_Bool_Dec_RefCount_t", "Lucy_Bool_Dec_RefCount_t"},
-
- {"cfish_Err", "lucy_Err"},
- {"CFISH_ERR", "LUCY_ERR"},
- {"cfish_Err_certify", "lucy_Err_certify"},
- {"cfish_Err_do_throw", "lucy_Err_do_throw"},
- {"cfish_Err_downcast", "lucy_Err_downcast"},
- {"cfish_Err_get_error", "lucy_Err_get_error"},
- {"cfish_Err_init_class", "lucy_Err_init_class"},
- {"cfish_Err_make_mess", "lucy_Err_make_mess"},
- {"cfish_Err_new", "lucy_Err_new"},
- {"cfish_Err_rethrow", "lucy_Err_rethrow"},
- {"cfish_Err_set_error", "lucy_Err_set_error"},
- {"cfish_Err_throw_at", "lucy_Err_throw_at"},
- {"cfish_Err_throw_mess", "lucy_Err_throw_mess"},
- {"cfish_Err_to_host", "lucy_Err_to_host"},
- {"cfish_Err_trap", "lucy_Err_trap"},
- {"cfish_Err_warn_at", "lucy_Err_warn_at"},
- {"cfish_Err_warn_mess", "lucy_Err_warn_mess"},
- {"Cfish_Err_Add_Frame", "Lucy_Err_Add_Frame"},
- {"Cfish_Err_Cat_Mess", "Lucy_Err_Cat_Mess"},
- {"Cfish_Err_Make_OFFSET", "Lucy_Err_Make_OFFSET"},
- {"Cfish_Err_Make_t", "Lucy_Err_Make_t"},
- {"Cfish_Err_To_Host", "Lucy_Err_To_Host"},
- {"Cfish_Err_To_Host_OFFSET", "Lucy_Err_To_Host_OFFSET"},
- {"Cfish_Err_To_Host_t", "Lucy_Err_To_Host_t"},
-
- {"cfish_Hash", "lucy_Hash"},
- {"CFISH_HASH", "LUCY_HASH"},
- {"cfish_Hash_new", "lucy_Hash_new"},
- {"cfish_Hash_fetch", "lucy_Hash_fetch"},
- {"cfish_Hash_store", "lucy_Hash_store"},
- {"Cfish_Hash_Deserialize", "Lucy_Hash_Deserialize"},
- {"Cfish_Hash_Fetch_Str", "Lucy_Hash_Fetch_Str"},
- {"Cfish_Hash_Iterate", "Lucy_Hash_Iterate"},
- {"Cfish_Hash_Next", "Lucy_Hash_Next"},
- {"Cfish_Hash_Store_Str", "Lucy_Hash_Store_Str"},
- {"Cfish_Hash_Store", "Lucy_Hash_Store"},
- {"Cfish_Hash_To_Host", "Lucy_Hash_To_Host"},
-
- {"cfish_LockFreeRegistry", "lucy_LockFreeRegistry"},
- {"CFISH_LOCKFREEREGISTRY", "LUCY_LOCKFREEREGISTRY"},
- {"cfish_LFReg_to_host", "lucy_LFReg_to_host"},
- {"Cfish_LFReg_To_Host", "Lucy_LFReg_To_Host"},
- {"Cfish_LFReg_To_Host_OFFSET", "Lucy_LFReg_To_Host_OFFSET"},
- {"Cfish_LFReg_To_Host_t", "Lucy_LFReg_To_Host_t"},
-
- {"cfish_Memory_wrapped_calloc", "lucy_Memory_wrapped_calloc"},
- {"cfish_Memory_wrapped_free", "lucy_Memory_wrapped_free"},
- {"cfish_Memory_wrapped_malloc", "lucy_Memory_wrapped_malloc"},
- {"cfish_Memory_wrapped_realloc", "lucy_Memory_wrapped_realloc"},
-
- {"cfish_Float32", "lucy_Float32"},
- {"cfish_Float32_init", "lucy_Float32_init"},
- {"Cfish_Float32_Set_Value", "Lucy_Float32_Set_Value"},
- {"cfish_Float64", "lucy_Float64"},
- {"cfish_Float64_init", "lucy_Float64_init"},
- {"Cfish_Float64_Set_Value", "Lucy_Float64_Set_Value"},
- {"cfish_Integer32", "lucy_Integer32"},
- {"Cfish_Int32_Set_Value", "Lucy_Int32_Set_Value"},
- {"cfish_Integer64", "lucy_Integer64"},
- {"Cfish_Int64_Set_Value", "Lucy_Int64_Set_Value"},
-
- {"cfish_NumUtil_decode_bigend_f32", "lucy_NumUtil_decode_bigend_f32"},
- {"cfish_NumUtil_decode_bigend_f64", "lucy_NumUtil_decode_bigend_f64"},
- {"cfish_NumUtil_decode_bigend_u16", "lucy_NumUtil_decode_bigend_u16"},
- {"cfish_NumUtil_decode_bigend_u32", "lucy_NumUtil_decode_bigend_u32"},
- {"cfish_NumUtil_decode_bigend_u64", "lucy_NumUtil_decode_bigend_u64"},
- {"cfish_NumUtil_decode_c32", "lucy_NumUtil_decode_c32"},
- {"cfish_NumUtil_decode_c64", "lucy_NumUtil_decode_c64"},
- {"cfish_NumUtil_encode_bigend_f32", "lucy_NumUtil_encode_bigend_f32"},
- {"cfish_NumUtil_encode_bigend_f64", "lucy_NumUtil_encode_bigend_f64"},
- {"cfish_NumUtil_encode_bigend_u16", "lucy_NumUtil_encode_bigend_u16"},
- {"cfish_NumUtil_encode_bigend_u32", "lucy_NumUtil_encode_bigend_u32"},
- {"cfish_NumUtil_encode_bigend_u64", "lucy_NumUtil_encode_bigend_u64"},
- {"cfish_NumUtil_encode_c32", "lucy_NumUtil_encode_c32"},
- {"cfish_NumUtil_encode_c64", "lucy_NumUtil_encode_c64"},
- {"cfish_NumUtil_encode_padded_c32", "lucy_NumUtil_encode_padded_c32"},
- {"cfish_NumUtil_u1clear", "lucy_NumUtil_u1clear"},
- {"cfish_NumUtil_u1flip", "lucy_NumUtil_u1flip"},
- {"cfish_NumUtil_u1get", "lucy_NumUtil_u1get"},
- {"cfish_NumUtil_u1set", "lucy_NumUtil_u1set"},
- {"cfish_NumUtil_u1masks", "lucy_NumUtil_u1masks"},
- {"cfish_NumUtil_u2get", "lucy_NumUtil_u2get"},
- {"cfish_NumUtil_u2set", "lucy_NumUtil_u2set"},
- {"cfish_NumUtil_u2masks", "lucy_NumUtil_u2masks"},
- {"cfish_NumUtil_u2shifts", "lucy_NumUtil_u2shifts"},
- {"cfish_NumUtil_u4get", "lucy_NumUtil_u4get"},
- {"cfish_NumUtil_u4set", "lucy_NumUtil_u4set"},
- {"cfish_NumUtil_u4masks", "lucy_NumUtil_u4masks"},
- {"cfish_NumUtil_u4shifts", "lucy_NumUtil_u4shifts"},
- {"cfish_NumUtil_skip_cint", "lucy_NumUtil_skip_cint"},
-
- {"cfish_StrHelp_to_base36", "lucy_StrHelp_to_base36"},
- {"cfish_StrHelp_utf8_valid", "lucy_StrHelp_utf8_valid"},
- {"cfish_StrHelp_UTF8_COUNT", "lucy_StrHelp_UTF8_COUNT"},
-
- {"cfish_TestBatch_fail", "lucy_TestBatch_fail"},
- {"cfish_TestBatch_pass", "lucy_TestBatch_pass"},
- {"cfish_TestBatch_skip", "lucy_TestBatch_skip"},
- {"cfish_TestBatch_test_false", "lucy_TestBatch_test_false"},
- {"cfish_TestBatch_test_float_equals", "lucy_TestBatch_test_float_equals"},
- {"cfish_TestBatch_test_int_equals", "lucy_TestBatch_test_int_equals"},
- {"cfish_TestBatch_test_string_equals", "lucy_TestBatch_test_string_equals"},
- {"cfish_TestBatch_test_true", "lucy_TestBatch_test_true"},
- {"cfish_TestFormatter", "lucy_TestFormatter"},
- {"cfish_TestFormatterCF", "lucy_TestFormatterCF"},
- {"cfish_TestFormatterCF_new", "lucy_TestFormatterCF_new"},
- {"cfish_TestFormatterTAP", "lucy_TestFormatterTAP"},
- {"cfish_TestFormatterTAP_new", "lucy_TestFormatterTAP_new"},
-
- {"cfish_VArray", "lucy_VArray"},
- {"CFISH_VARRAY", "LUCY_VARRAY"},
- {"cfish_VA_new", "lucy_VA_new"},
- {"cfish_VA_store", "lucy_VA_store"},
- {"Cfish_VA_Clone", "Lucy_VA_Clone"},
- {"Cfish_VA_Delete", "Lucy_VA_Delete"},
- {"Cfish_VA_Deserialize", "Lucy_VA_Deserialize"},
- {"Cfish_VA_Fetch", "Lucy_VA_Fetch"},
- {"Cfish_VA_Get_Size", "Lucy_VA_Get_Size"},
- {"Cfish_VA_Pop", "Lucy_VA_Pop"},
- {"Cfish_VA_Push", "Lucy_VA_Push"},
- {"Cfish_VA_Resize", "Lucy_VA_Resize"},
- {"Cfish_VA_Shallow_Copy", "Lucy_VA_Shallow_Copy"},
- {"Cfish_VA_Shift", "Lucy_VA_Shift"},
- {"Cfish_VA_Store", "Lucy_VA_Store"},
- {"Cfish_VA_To_Host", "Lucy_VA_To_Host"},
-
- {"cfish_VTable", "lucy_VTable"},
- {"CFISH_VTABLE", "LUCY_VTABLE"},
- {"cfish_VTable_add_alias_to_registry", "lucy_VTable_add_alias_to_registry"},
- {"cfish_VTable_bootstrap", "lucy_VTable_bootstrap"},
- {"cfish_VTable_fetch_vtable", "lucy_VTable_fetch_vtable"},
- {"cfish_VTable_find_parent_class", "lucy_VTable_find_parent_class"},
- {"cfish_VTable_foster_obj", "lucy_VTable_foster_obj"},
- {"cfish_VTable_fresh_host_methods", "lucy_VTable_fresh_host_methods"},
- {"cfish_VTable_init_obj", "lucy_VTable_init_obj"},
- {"cfish_VTable_init_registry", "lucy_VTable_init_registry"},
- {"cfish_VTable_make_obj", "lucy_VTable_make_obj"},
- {"cfish_VTable_offset_of_parent", "lucy_VTable_offset_of_parent"},
- {"cfish_VTable_register_with_host", "lucy_VTable_register_with_host"},
- {"cfish_VTable_registry", "lucy_VTable_registry"},
- {"cfish_VTable_singleton", "lucy_VTable_singleton"},
- {"cfish_VTable_to_host", "lucy_VTable_to_host"},
- {"Cfish_VTable_Foster_Obj", "Lucy_VTable_Foster_Obj"},
- {"Cfish_VTable_Get_Name", "Lucy_VTable_Get_Name"},
- {"Cfish_VTable_Make_Obj", "Lucy_VTable_Make_Obj"},
- {"Cfish_VTable_To_Host", "Lucy_VTable_To_Host"},
- {"Cfish_VTable_To_Host_OFFSET", "Lucy_VTable_To_Host_OFFSET"},
- {"Cfish_VTable_To_Host_t", "Lucy_VTable_To_Host_t"},
-
- {"CFISH_USE_SHORT_NAMES", "LUCY_USE_SHORT_NAMES"},
-
{NULL, NULL}
};
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCBindClass.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindClass.c b/clownfish/compiler/src/CFCBindClass.c
index 2cd5efd..9c4548a 100644
--- a/clownfish/compiler/src/CFCBindClass.c
+++ b/clownfish/compiler/src/CFCBindClass.c
@@ -119,7 +119,8 @@ CFCBindClass_to_c_header(CFCBindClass *self) {
static char*
S_to_c_header_inert(CFCBindClass *self) {
- const char *prefix = CFCClass_get_prefix(self->client);
+ //const char *prefix = CFCClass_get_prefix(self->client);
+ const char *prefix = "lucy_";
char *inert_func_decs = S_sub_declarations(self);
char *inert_var_defs = S_inert_var_declarations(self);
char *short_names = S_short_names(self);
@@ -155,8 +156,10 @@ static char*
S_to_c_header_dynamic(CFCBindClass *self) {
const char *privacy_symbol = CFCClass_privacy_symbol(self->client);
const char *vt_var = CFCClass_full_vtable_var(self->client);
- const char *prefix = CFCClass_get_prefix(self->client);
- const char *PREFIX = CFCClass_get_PREFIX(self->client);
+ //const char *prefix = CFCClass_get_prefix(self->client);
+ //const char *PREFIX = CFCClass_get_PREFIX(self->client);
+ const char *prefix = "lucy_";
+ const char *PREFIX = "LUCY_";
char *struct_def = S_struct_definition(self);
char *parent_include = S_parent_include(self);
char *sub_declarations = S_sub_declarations(self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCBindCore.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindCore.c b/clownfish/compiler/src/CFCBindCore.c
index 63bcda3..ec36cab 100644
--- a/clownfish/compiler/src/CFCBindCore.c
+++ b/clownfish/compiler/src/CFCBindCore.c
@@ -146,7 +146,7 @@ S_write_parcel_h(CFCBindCore *self) {
}
if (!CFCClass_included(klass)) {
if (parcel && CFCClass_get_parcel(klass) != parcel) {
- CFCUtil_die("Multiple parcels not yet supported.");
+ //CFCUtil_die("Multiple parcels not yet supported.");
}
parcel = CFCClass_get_parcel(klass);
}
@@ -156,8 +156,10 @@ S_write_parcel_h(CFCBindCore *self) {
if (!parcel) {
CFCUtil_die("No source classes found.");
}
- const char *prefix = CFCParcel_get_prefix(parcel);
- const char *PREFIX = CFCParcel_get_PREFIX(parcel);
+ //const char *prefix = CFCParcel_get_prefix(parcel);
+ //const char *PREFIX = CFCParcel_get_PREFIX(parcel);
+ const char *prefix = "lucy_";
+ const char *PREFIX = "LUCY_";
// Create Clownfish aliases if necessary.
char *aliases = CFCBindAliases_c_aliases();
@@ -341,7 +343,7 @@ S_write_parcel_c(CFCBindCore *self) {
privacy_syms = CFCUtil_cat(privacy_syms, "#define ",
privacy_sym, "\n", NULL);
if (parcel && CFCClass_get_parcel(klass) != parcel) {
- CFCUtil_die("Multiple parcels not yet supported.");
+ //CFCUtil_die("Multiple parcels not yet supported.");
}
parcel = CFCClass_get_parcel(klass);
}
@@ -351,12 +353,13 @@ S_write_parcel_c(CFCBindCore *self) {
if (!parcel) {
CFCUtil_die("No source classes found.");
}
- const char *prefix = CFCParcel_get_prefix(parcel);
+ //const char *prefix = CFCParcel_get_prefix(parcel);
+ const char *prefix = "lucy_";
char pattern[] =
"%s\n"
"\n"
- "#define C_LUCY_VTABLE\n"
+ "#define C_CFISH_VTABLE\n"
"%s\n"
"#include \"%sparcel.h\"\n"
"#include \"callbacks.h\"\n"
@@ -425,7 +428,7 @@ CFCBindCore_write_callbacks_h(CFCBindCore *self) {
CFCBase_decref((CFCBase*)class_binding);
if (parcel && CFCClass_get_parcel(klass) != parcel) {
- CFCUtil_die("Multiple parcels not yet supported.");
+ //CFCUtil_die("Multiple parcels not yet supported.");
}
parcel = CFCClass_get_parcel(klass);
}
@@ -436,7 +439,8 @@ CFCBindCore_write_callbacks_h(CFCBindCore *self) {
if (!parcel) {
CFCUtil_die("No source classes found.");
}
- const char *prefix = CFCParcel_get_prefix(parcel);
+ //const char *prefix = CFCParcel_get_prefix(parcel);
+ const char *prefix = "lucy_";
const char pattern[] =
"%s\n"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCDumpable.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCDumpable.c b/clownfish/compiler/src/CFCDumpable.c
index 006f62a..150b363 100644
--- a/clownfish/compiler/src/CFCDumpable.c
+++ b/clownfish/compiler/src/CFCDumpable.c
@@ -115,8 +115,8 @@ S_make_method_obj(CFCClass *klass, const char *method_name) {
const char *klass_cnick = CFCClass_get_cnick(klass);
CFCParcel *klass_parcel = CFCClass_get_parcel(klass);
- CFCType *return_type
- = CFCType_new_object(CFCTYPE_INCREMENTED, klass_parcel, "lucy_Obj", 1);
+ CFCType *return_type = CFCType_new_object(CFCTYPE_INCREMENTED,
+ klass_parcel, "cfish_Obj", 1);
CFCType *self_type = CFCType_new_object(0, klass_parcel,
klass_full_struct_sym, 1);
CFCVariable *self_var = CFCVariable_new(NULL, NULL, NULL, NULL, "self",
@@ -128,7 +128,7 @@ S_make_method_obj(CFCClass *klass, const char *method_name) {
CFCParamList_add_param(param_list, self_var, NULL);
}
else if (strcmp(method_name, "Load") == 0) {
- CFCType *dump_type = CFCType_new_object(0, klass_parcel, "lucy_Obj",
+ CFCType *dump_type = CFCType_new_object(0, klass_parcel, "cfish_Obj",
1);
CFCVariable *dump_var = CFCVariable_new(NULL, NULL, NULL, NULL, "dump",
dump_type, false);
@@ -178,7 +178,7 @@ S_add_dump_method(CFCClass *klass) {
"cfish_Obj*\n"
"%s(%s *self)\n"
"{\n"
- " %s super_dump = SUPER_METHOD_PTR(%s, %s);\n"
+ " %s super_dump = CFISH_SUPER_METHOD_PTR(%s, %s);\n"
" cfish_Hash *dump = (cfish_Hash*)super_dump(self);\n";
char *autocode
= CFCUtil_sprintf(pattern, full_func_sym, full_struct,
@@ -234,7 +234,7 @@ S_add_load_method(CFCClass *klass) {
"%s(%s *self, cfish_Obj *dump)\n"
"{\n"
" cfish_Hash *source = (cfish_Hash*)CFISH_CERTIFY(dump, CFISH_HASH);\n"
- " %s super_load = SUPER_METHOD_PTR(%s, %s);\n"
+ " %s super_load = CFISH_SUPER_METHOD_PTR(%s, %s);\n"
" %s *loaded = (%s*)super_load(self, dump);\n";
char *autocode
= CFCUtil_sprintf(pattern, full_func_sym, full_struct,
@@ -286,7 +286,7 @@ S_process_dump_member(CFCClass *klass, CFCVariable *member, char *buf,
const char *specifier = CFCType_get_specifier(type);
// Skip the VTable.
- if (strcmp(specifier, "lucy_VTable") == 0) {
+ if (strcmp(specifier, "cfish_VTable") == 0) {
return;
}
@@ -347,7 +347,7 @@ S_process_load_member(CFCClass *klass, CFCVariable *member, char *buf,
const char *specifier = CFCType_get_specifier(type);
// Skip the VTable.
- if (strcmp(specifier, "lucy_VTable") == 0) {
+ if (strcmp(specifier, "cfish_VTable") == 0) {
return;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCPerl.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerl.c b/clownfish/compiler/src/CFCPerl.c
index c7f971b..7263632 100644
--- a/clownfish/compiler/src/CFCPerl.c
+++ b/clownfish/compiler/src/CFCPerl.c
@@ -114,7 +114,8 @@ CFCPerl_init(CFCPerl *self, CFCParcel *parcel, CFCHierarchy *hierarchy,
}
// Derive the name of the "parcel.h" file.
- self->parcel_h_file = CFCUtil_sprintf("%sparcel.h", prefix);
+ //self->parcel_h_file = CFCUtil_sprintf("%sparcel.h", prefix);
+ self->parcel_h_file = CFCUtil_sprintf("%sparcel.h", "lucy_");
return self;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCPerlSub.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerlSub.c b/clownfish/compiler/src/CFCPerlSub.c
index af98cde..2b35ac5 100644
--- a/clownfish/compiler/src/CFCPerlSub.c
+++ b/clownfish/compiler/src/CFCPerlSub.c
@@ -147,9 +147,7 @@ S_allot_params_arg(CFCType *type, const char *label, int required) {
// Share buffers rather than copy between Perl scalars and Clownfish
// string types.
int use_sv_buffer = false;
- if (strcmp(struct_sym, "lucy_CharBuf") == 0
- || strcmp(struct_sym, "cfish_CharBuf") == 0
- || strcmp(struct_sym, "lucy_Obj") == 0
+ if (strcmp(struct_sym, "cfish_CharBuf") == 0
|| strcmp(struct_sym, "cfish_Obj") == 0
) {
use_sv_buffer = true;
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/compiler/src/CFCPerlTypeMap.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerlTypeMap.c b/clownfish/compiler/src/CFCPerlTypeMap.c
index 22b0f15..08d12da 100644
--- a/clownfish/compiler/src/CFCPerlTypeMap.c
+++ b/clownfish/compiler/src/CFCPerlTypeMap.c
@@ -42,9 +42,7 @@ CFCPerlTypeMap_from_perl(CFCType *type, const char *xs_var) {
const char *struct_sym = CFCType_get_specifier(type);
const char *vtable_var = CFCType_get_vtable_var(type);
const char *allocation;
- if (strcmp(struct_sym, "lucy_CharBuf") == 0
- || strcmp(struct_sym, "cfish_CharBuf") == 0
- || strcmp(struct_sym, "lucy_Obj") == 0
+ if (strcmp(struct_sym, "cfish_CharBuf") == 0
|| strcmp(struct_sym, "cfish_Obj") == 0
) {
// Share buffers rather than copy between Perl scalars and
@@ -275,32 +273,6 @@ CFCPerlTypeMap_write_xs_typemap(CFCHierarchy *hierarchy) {
const char *full_struct_sym = CFCClass_full_struct_sym(klass);
const char *vtable_var = CFCClass_full_vtable_var(klass);
- /* Temporary hack until the Clownfish parcel is ready. */
- if (strcmp(full_struct_sym, "lucy_ByteBuf") == 0) {
- full_struct_sym = "cfish_ByteBuf";
- vtable_var = "CFISH_BYTEBUF";
- }
- else if (strcmp(full_struct_sym, "lucy_CharBuf") == 0) {
- full_struct_sym = "cfish_CharBuf";
- vtable_var = "CFISH_CHARBUF";
- }
- else if (strcmp(full_struct_sym, "lucy_Hash") == 0) {
- full_struct_sym = "cfish_Hash";
- vtable_var = "CFISH_HASH";
- }
- else if (strcmp(full_struct_sym, "lucy_Obj") == 0) {
- full_struct_sym = "cfish_Obj";
- vtable_var = "CFISH_OBJ";
- }
- else if (strcmp(full_struct_sym, "lucy_VArray") == 0) {
- full_struct_sym = "cfish_VArray";
- vtable_var = "CFISH_VARRAY";
- }
- else if (strcmp(full_struct_sym, "lucy_VTable") == 0) {
- full_struct_sym = "cfish_VTable";
- vtable_var = "CFISH_VTABLE";
- }
-
start = CFCUtil_cat(start, full_struct_sym, "*\t", vtable_var, "_\n",
NULL);
input = CFCUtil_cat(input, vtable_var, "_\n"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/ByteBuf.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/ByteBuf.c b/clownfish/runtime/core/Clownfish/ByteBuf.c
index 1c48214..685faf1 100644
--- a/clownfish/runtime/core/Clownfish/ByteBuf.c
+++ b/clownfish/runtime/core/Clownfish/ByteBuf.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_BYTEBUF
-#define C_LUCY_VIEWBYTEBUF
+#define C_CFISH_BYTEBUF
+#define C_CFISH_VIEWBYTEBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/CharBuf.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/CharBuf.c b/clownfish/runtime/core/Clownfish/CharBuf.c
index 9953dc6..0e19c83 100644
--- a/clownfish/runtime/core/Clownfish/CharBuf.c
+++ b/clownfish/runtime/core/Clownfish/CharBuf.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_CHARBUF
-#define C_LUCY_VIEWCHARBUF
-#define C_LUCY_ZOMBIECHARBUF
+#define C_CFISH_CHARBUF
+#define C_CFISH_VIEWCHARBUF
+#define C_CFISH_ZOMBIECHARBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Err.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Err.c b/clownfish/runtime/core/Clownfish/Err.c
index ee9f930..c933137 100644
--- a/clownfish/runtime/core/Clownfish/Err.c
+++ b/clownfish/runtime/core/Clownfish/Err.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_ERR
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_ERR
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Hash.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Hash.c b/clownfish/runtime/core/Clownfish/Hash.c
index 1e2cd56..57c8ee5 100644
--- a/clownfish/runtime/core/Clownfish/Hash.c
+++ b/clownfish/runtime/core/Clownfish/Hash.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_HASH
-#define C_LUCY_HASHTOMBSTONE
+#define C_CFISH_HASH
+#define C_CFISH_HASHTOMBSTONE
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/LockFreeRegistry.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/LockFreeRegistry.c b/clownfish/runtime/core/Clownfish/LockFreeRegistry.c
index 519dc51..c31e118 100644
--- a/clownfish/runtime/core/Clownfish/LockFreeRegistry.c
+++ b/clownfish/runtime/core/Clownfish/LockFreeRegistry.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_LOCKFREEREGISTRY
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Method.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Method.c b/clownfish/runtime/core/Clownfish/Method.c
index 13f3abb..96979da 100644
--- a/clownfish/runtime/core/Clownfish/Method.c
+++ b/clownfish/runtime/core/Clownfish/Method.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_METHOD
+#define C_CFISH_METHOD
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Num.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Num.c b/clownfish/runtime/core/Clownfish/Num.c
index bc84c30..462ad18 100644
--- a/clownfish/runtime/core/Clownfish/Num.c
+++ b/clownfish/runtime/core/Clownfish/Num.c
@@ -14,15 +14,16 @@
* limitations under the License.
*/
-#define C_LUCY_NUM
-#define C_LUCY_INTNUM
-#define C_LUCY_FLOATNUM
-#define C_LUCY_INTEGER32
-#define C_LUCY_INTEGER64
-#define C_LUCY_FLOAT32
-#define C_LUCY_FLOAT64
-#define C_LUCY_BOOLNUM
-#define C_LUCY_VIEWCHARBUF
+#define C_CFISH_NUM
+#define C_CFISH_INTNUM
+#define C_CFISH_FLOATNUM
+#define C_CFISH_INTEGER32
+#define C_CFISH_INTEGER64
+#define C_CFISH_FLOAT32
+#define C_CFISH_FLOAT64
+#define C_CFISH_BOOLNUM
+#define C_CFISH_VIEWCHARBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Obj.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Obj.c b/clownfish/runtime/core/Clownfish/Obj.c
index bb1b3cb..c6b8712 100644
--- a/clownfish/runtime/core/Clownfish/Obj.c
+++ b/clownfish/runtime/core/Clownfish/Obj.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test.c b/clownfish/runtime/core/Clownfish/Test.c
index 14573b8..20f9c78 100644
--- a/clownfish/runtime/core/Clownfish/Test.c
+++ b/clownfish/runtime/core/Clownfish/Test.c
@@ -18,7 +18,8 @@
#include <stdlib.h>
#include <string.h>
-#define C_LUCY_TESTBATCH
+#define C_CFISH_TESTBATCH
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestByteBuf.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestByteBuf.c b/clownfish/runtime/core/Clownfish/Test/TestByteBuf.c
index c411753..c8506b3 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestByteBuf.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestByteBuf.c
@@ -17,6 +17,7 @@
#include <string.h>
#define C_LUCY_TESTBYTEBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestCharBuf.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestCharBuf.c b/clownfish/runtime/core/Clownfish/Test/TestCharBuf.c
index afefbea..122d0c4 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestCharBuf.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestCharBuf.c
@@ -18,6 +18,7 @@
#include <stdio.h>
#define C_LUCY_TESTCHARBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestErr.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestErr.c b/clownfish/runtime/core/Clownfish/Test/TestErr.c
index 26255a8..4ee3f06 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestErr.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestErr.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestHash.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestHash.c b/clownfish/runtime/core/Clownfish/Test/TestHash.c
index 4f28765..00da68f 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestHash.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestHash.c
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <time.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestLockFreeRegistry.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestLockFreeRegistry.c b/clownfish/runtime/core/Clownfish/Test/TestLockFreeRegistry.c
index 0323f61..716d4d9 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestLockFreeRegistry.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestLockFreeRegistry.c
@@ -16,6 +16,7 @@
#include <string.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestNum.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestNum.c b/clownfish/runtime/core/Clownfish/Test/TestNum.c
index f2c3252..00721ce 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestNum.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestNum.c
@@ -16,6 +16,7 @@
#define C_LUCY_TESTNUM
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestObj.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestObj.c b/clownfish/runtime/core/Clownfish/Test/TestObj.c
index 4d7c76b..b2a4414 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestObj.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestObj.c
@@ -17,6 +17,7 @@
#include <stdio.h>
#define C_LUCY_TESTOBJ
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestUtils.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestUtils.c b/clownfish/runtime/core/Clownfish/Test/TestUtils.c
index 4a39702..db1000a 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestUtils.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestUtils.c
@@ -18,6 +18,7 @@
#include <stdlib.h>
#define C_LUCY_TESTUTILS
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/TestVArray.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestVArray.c b/clownfish/runtime/core/Clownfish/Test/TestVArray.c
index 5d6a69d..b30d7b1 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestVArray.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestVArray.c
@@ -17,6 +17,7 @@
#include <string.h>
#define C_LUCY_TESTVARRAY
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/Util/TestAtomic.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/Util/TestAtomic.c b/clownfish/runtime/core/Clownfish/Test/Util/TestAtomic.c
index 7d0b978..9adae1c 100644
--- a/clownfish/runtime/core/Clownfish/Test/Util/TestAtomic.c
+++ b/clownfish/runtime/core/Clownfish/Test/Util/TestAtomic.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c b/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
index 7481b66..65c5850 100644
--- a/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
+++ b/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c b/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
index c662e8e..66db928 100644
--- a/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
+++ b/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <time.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Test/Util/TestStringHelper.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/Util/TestStringHelper.c b/clownfish/runtime/core/Clownfish/Test/Util/TestStringHelper.c
index be05145..08a9d72 100644
--- a/clownfish/runtime/core/Clownfish/Test/Util/TestStringHelper.c
+++ b/clownfish/runtime/core/Clownfish/Test/Util/TestStringHelper.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Util/Atomic.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Util/Atomic.c b/clownfish/runtime/core/Clownfish/Util/Atomic.c
index 62c43e2..e950c4b 100644
--- a/clownfish/runtime/core/Clownfish/Util/Atomic.c
+++ b/clownfish/runtime/core/Clownfish/Util/Atomic.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_ATOMIC
+#define C_CFISH_ATOMIC
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Clownfish/Util/Atomic.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Util/Memory.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Util/Memory.c b/clownfish/runtime/core/Clownfish/Util/Memory.c
index 0f52e98..9a36d1b 100644
--- a/clownfish/runtime/core/Clownfish/Util/Memory.c
+++ b/clownfish/runtime/core/Clownfish/Util/Memory.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_MEMORY
+#define C_CFISH_MEMORY
#include <stdlib.h>
#include <stdio.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "Clownfish/Util/Memory.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Util/NumberUtils.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Util/NumberUtils.c b/clownfish/runtime/core/Clownfish/Util/NumberUtils.c
index ba73cf9..12f3a23 100644
--- a/clownfish/runtime/core/Clownfish/Util/NumberUtils.c
+++ b/clownfish/runtime/core/Clownfish/Util/NumberUtils.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_NUMBERUTILS
+#define C_CFISH_NUMBERUTILS
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Util/SortUtils.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Util/SortUtils.c b/clownfish/runtime/core/Clownfish/Util/SortUtils.c
index 3b17077..4efd5ef 100644
--- a/clownfish/runtime/core/Clownfish/Util/SortUtils.c
+++ b/clownfish/runtime/core/Clownfish/Util/SortUtils.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_SORTUTILS
+#define C_CFISH_SORTUTILS
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/Util/StringHelper.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Util/StringHelper.c b/clownfish/runtime/core/Clownfish/Util/StringHelper.c
index 58f278d..185b6a2 100644
--- a/clownfish/runtime/core/Clownfish/Util/StringHelper.c
+++ b/clownfish/runtime/core/Clownfish/Util/StringHelper.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_STRINGHELPER
+#define C_CFISH_STRINGHELPER
#include <string.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/VArray.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/VArray.c b/clownfish/runtime/core/Clownfish/VArray.c
index c9b6e47..cc7806a 100644
--- a/clownfish/runtime/core/Clownfish/VArray.c
+++ b/clownfish/runtime/core/Clownfish/VArray.c
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#define C_LUCY_VARRAY
+#define C_CFISH_VARRAY
#include <string.h>
#include <stdlib.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/core/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/VTable.c b/clownfish/runtime/core/Clownfish/VTable.c
index 0ff58e2..c91aa03 100644
--- a/clownfish/runtime/core/Clownfish/VTable.c
+++ b/clownfish/runtime/core/Clownfish/VTable.c
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#define C_LUCY_VTABLE
-#define C_LUCY_OBJ
-#define C_LUCY_CHARBUF
-#define C_LUCY_METHOD
+#define C_CFISH_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_CHARBUF
+#define C_CFISH_METHOD
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/clownfish/runtime/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/xs/XSBind.c b/clownfish/runtime/perl/xs/XSBind.c
index 70db4da..d47c484 100644
--- a/clownfish/runtime/perl/xs/XSBind.c
+++ b/clownfish/runtime/perl/xs/XSBind.c
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
+#define C_CFISH_LOCKFREEREGISTRY
#define NEED_newRV_noinc
#include "XSBind.h"
#include "Clownfish/LockFreeRegistry.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish.cfp
----------------------------------------------------------------------
diff --git a/core/Clownfish.cfp b/core/Clownfish.cfp
new file mode 100644
index 0000000..ae91f8a
--- /dev/null
+++ b/core/Clownfish.cfp
@@ -0,0 +1,5 @@
+{
+ "name": "Clownfish",
+ "nickname": "Cfish",
+ "version": "v0.3.0"
+}
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/ByteBuf.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/ByteBuf.c b/core/Clownfish/ByteBuf.c
index 3bcc12d..bbd0484 100644
--- a/core/Clownfish/ByteBuf.c
+++ b/core/Clownfish/ByteBuf.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_BYTEBUF
-#define C_LUCY_VIEWBYTEBUF
+#define C_CFISH_BYTEBUF
+#define C_CFISH_VIEWBYTEBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/ByteBuf.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/ByteBuf.cfh b/core/Clownfish/ByteBuf.cfh
index 6967d08..15b28f3 100644
--- a/core/Clownfish/ByteBuf.cfh
+++ b/core/Clownfish/ByteBuf.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/**
* Growable buffer holding arbitrary bytes.
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/CharBuf.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/CharBuf.c b/core/Clownfish/CharBuf.c
index fda1646..23bf180 100644
--- a/core/Clownfish/CharBuf.c
+++ b/core/Clownfish/CharBuf.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_CHARBUF
-#define C_LUCY_VIEWCHARBUF
-#define C_LUCY_ZOMBIECHARBUF
+#define C_CFISH_CHARBUF
+#define C_CFISH_VIEWCHARBUF
+#define C_CFISH_ZOMBIECHARBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/CharBuf.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/CharBuf.cfh b/core/Clownfish/CharBuf.cfh
index 6eeca16..2601f6a 100644
--- a/core/Clownfish/CharBuf.cfh
+++ b/core/Clownfish/CharBuf.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/**
* Growable buffer holding Unicode characters.
@@ -395,7 +395,7 @@ __C__
#define CFISH_ZCB_WRAP_STR(ptr, size) \
cfish_ZCB_wrap_str(alloca(cfish_ZCB_size()), ptr, size)
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define ZCB_BLANK CFISH_ZCB_BLANK
#define ZCB_WRAP CFISH_ZCB_WRAP
#define ZCB_WRAP_STR CFISH_ZCB_WRAP_STR
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Err.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Err.c b/core/Clownfish/Err.c
index 0a6e979..f6d395d 100644
--- a/core/Clownfish/Err.c
+++ b/core/Clownfish/Err.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_ERR
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_ERR
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Err.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Err.cfh b/core/Clownfish/Err.cfh
index 80ca136..7bc4f86 100644
--- a/core/Clownfish/Err.cfh
+++ b/core/Clownfish/Err.cfh
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
__C__
typedef void
(*Cfish_Err_Attempt_t)(void *context);
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define Err_Attempt_t Cfish_Err_Attempt_t
#endif
__END_C__
@@ -241,7 +241,7 @@ cfish_Err_abstract_class_check(cfish_Obj *obj, cfish_VTable *vtable) {
#define CFISH_ABSTRACT_CLASS_CHECK(_obj, _vtable) \
cfish_Err_abstract_class_check(((cfish_Obj*)_obj), _vtable)
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define THROW CFISH_THROW
#define RETHROW CFISH_RETHROW
#define WARN CFISH_WARN
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Hash.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Hash.c b/core/Clownfish/Hash.c
index 59c4854..b85683b 100644
--- a/core/Clownfish/Hash.c
+++ b/core/Clownfish/Hash.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_HASH
-#define C_LUCY_HASHTOMBSTONE
+#define C_CFISH_HASH
+#define C_CFISH_HASHTOMBSTONE
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Hash.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Hash.cfh b/core/Clownfish/Hash.cfh
index 787184f..5724883 100644
--- a/core/Clownfish/Hash.cfh
+++ b/core/Clownfish/Hash.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/**
* Hashtable.
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/LockFreeRegistry.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/LockFreeRegistry.c b/core/Clownfish/LockFreeRegistry.c
index 11ab071..ccf3c30 100644
--- a/core/Clownfish/LockFreeRegistry.c
+++ b/core/Clownfish/LockFreeRegistry.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_LOCKFREEREGISTRY
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/LockFreeRegistry.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/LockFreeRegistry.cfh b/core/Clownfish/LockFreeRegistry.cfh
index 18ac4bb..2a3d62a 100644
--- a/core/Clownfish/LockFreeRegistry.cfh
+++ b/core/Clownfish/LockFreeRegistry.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Specialized lock free hash table for storing VTables.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Method.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Method.c b/core/Clownfish/Method.c
index 8a76d2b..9d36299 100644
--- a/core/Clownfish/Method.c
+++ b/core/Clownfish/Method.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_METHOD
+#define C_CFISH_METHOD
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Method.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Method.cfh b/core/Clownfish/Method.cfh
index 17df64a..5cac0b2 100644
--- a/core/Clownfish/Method.cfh
+++ b/core/Clownfish/Method.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Method metadata.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Num.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Num.c b/core/Clownfish/Num.c
index e40f825..7dcc0dd 100644
--- a/core/Clownfish/Num.c
+++ b/core/Clownfish/Num.c
@@ -14,15 +14,16 @@
* limitations under the License.
*/
-#define C_LUCY_NUM
-#define C_LUCY_INTNUM
-#define C_LUCY_FLOATNUM
-#define C_LUCY_INTEGER32
-#define C_LUCY_INTEGER64
-#define C_LUCY_FLOAT32
-#define C_LUCY_FLOAT64
-#define C_LUCY_BOOLNUM
-#define C_LUCY_VIEWCHARBUF
+#define C_CFISH_NUM
+#define C_CFISH_INTNUM
+#define C_CFISH_FLOATNUM
+#define C_CFISH_INTEGER32
+#define C_CFISH_INTEGER64
+#define C_CFISH_FLOAT32
+#define C_CFISH_FLOAT64
+#define C_CFISH_BOOLNUM
+#define C_CFISH_VIEWCHARBUF
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Num.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Num.cfh b/core/Clownfish/Num.cfh
index a684fe1..51f28e9 100644
--- a/core/Clownfish/Num.cfh
+++ b/core/Clownfish/Num.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Abstract base class for numbers.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Obj.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Obj.c b/core/Clownfish/Obj.c
index a805910..fd943c6 100644
--- a/core/Clownfish/Obj.c
+++ b/core/Clownfish/Obj.c
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Obj.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Obj.cfh b/core/Clownfish/Obj.cfh
index a7370fb..55e10cd 100644
--- a/core/Clownfish/Obj.cfh
+++ b/core/Clownfish/Obj.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Base class for all objects.
*/
@@ -213,7 +213,7 @@ cfish_Obj_decref(cfish_Obj *self) {
#define CFISH_DECREF(_self) cfish_Obj_decref((cfish_Obj*)_self)
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define SUPER_DESTROY(_self, _vtable) CFISH_SUPER_DESTROY(_self, _vtable)
#define INCREF(_self) CFISH_INCREF(_self)
#define DECREF(_self) CFISH_DECREF(_self)
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Test/TestBatch.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Test/TestBatch.c b/core/Clownfish/Test/TestBatch.c
index 403c224..f77a71a 100644
--- a/core/Clownfish/Test/TestBatch.c
+++ b/core/Clownfish/Test/TestBatch.c
@@ -18,7 +18,8 @@
#include <stdio.h>
#include <string.h>
-#define C_LUCY_TESTBATCH
+#define C_CFISH_TESTBATCH
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Clownfish/Test/TestBatch.h"
#include "Clownfish/CharBuf.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Test/TestBatch.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Test/TestBatch.cfh b/core/Clownfish/Test/TestBatch.cfh
index 42b84cb..01113a0 100644
--- a/core/Clownfish/Test/TestBatch.cfh
+++ b/core/Clownfish/Test/TestBatch.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
abstract class Clownfish::Test::TestBatch inherits Clownfish::Obj {
TestFormatter *formatter;
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Test/TestFormatter.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Test/TestFormatter.c b/core/Clownfish/Test/TestFormatter.c
index 6bccc14..5a700a2 100644
--- a/core/Clownfish/Test/TestFormatter.c
+++ b/core/Clownfish/Test/TestFormatter.c
@@ -16,7 +16,8 @@
#include <stdio.h>
-#define C_LUCY_TESTFORMATTER
+#define C_CFISH_TESTFORMATTER
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Test/TestFormatter.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Test/TestFormatter.cfh b/core/Clownfish/Test/TestFormatter.cfh
index 4487b37..2ba63bf 100644
--- a/core/Clownfish/Test/TestFormatter.cfh
+++ b/core/Clownfish/Test/TestFormatter.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/**
* Abstract base class for Clownfish test formatters.
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Test/TestRunner.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Test/TestRunner.c b/core/Clownfish/Test/TestRunner.c
index 0779e5d..8091c36 100644
--- a/core/Clownfish/Test/TestRunner.c
+++ b/core/Clownfish/Test/TestRunner.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_TESTRUNNER
+#define C_CFISH_TESTRUNNER
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Test/TestRunner.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Test/TestRunner.cfh b/core/Clownfish/Test/TestRunner.cfh
index 61a951c..a59010a 100644
--- a/core/Clownfish/Test/TestRunner.cfh
+++ b/core/Clownfish/Test/TestRunner.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/**
* Run multiple test batches and collect statistics.
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/Atomic.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Atomic.c b/core/Clownfish/Util/Atomic.c
index 8bf776a..83ca2bd 100644
--- a/core/Clownfish/Util/Atomic.c
+++ b/core/Clownfish/Util/Atomic.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_ATOMIC
+#define C_CFISH_ATOMIC
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#include "Clownfish/Util/Atomic.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/Atomic.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Atomic.cfh b/core/Clownfish/Util/Atomic.cfh
index da741ce..d9d20c4 100644
--- a/core/Clownfish/Util/Atomic.cfh
+++ b/core/Clownfish/Util/Atomic.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Provide atomic memory operations.
*/
@@ -100,7 +100,7 @@ cfish_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
#endif // Big platform if-else chain.
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define Atomic_cas_ptr cfish_Atomic_cas_ptr
#endif
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/Memory.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Memory.c b/core/Clownfish/Util/Memory.c
index 0f52e98..9a36d1b 100644
--- a/core/Clownfish/Util/Memory.c
+++ b/core/Clownfish/Util/Memory.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_MEMORY
+#define C_CFISH_MEMORY
#include <stdlib.h>
#include <stdio.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "Clownfish/Util/Memory.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/Memory.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Memory.cfh b/core/Clownfish/Util/Memory.cfh
index e5ed310..93df35d 100644
--- a/core/Clownfish/Util/Memory.cfh
+++ b/core/Clownfish/Util/Memory.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
inert class Clownfish::Util::Memory {
@@ -61,7 +61,7 @@ __C__
#define CFISH_REALLOCATE cfish_Memory_wrapped_realloc
#define CFISH_FREEMEM cfish_Memory_wrapped_free
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define MALLOCATE CFISH_MALLOCATE
#define CALLOCATE CFISH_CALLOCATE
#define REALLOCATE CFISH_REALLOCATE
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/NumberUtils.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/NumberUtils.c b/core/Clownfish/Util/NumberUtils.c
index ba73cf9..12f3a23 100644
--- a/core/Clownfish/Util/NumberUtils.c
+++ b/core/Clownfish/Util/NumberUtils.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_NUMBERUTILS
+#define C_CFISH_NUMBERUTILS
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/NumberUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/NumberUtils.cfh b/core/Clownfish/Util/NumberUtils.cfh
index e94b90c..cd6c750 100644
--- a/core/Clownfish/Util/NumberUtils.cfh
+++ b/core/Clownfish/Util/NumberUtils.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Provide various number-related utilies.
*
@@ -464,7 +464,7 @@ cfish_NumUtil_u4set(void *array, uint32_t tick, uint8_t value) {
ints[(tick >> 1)] = (ints[(tick >> 1)] & ~mask) | new_bits;
}
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define C32_MAX_BYTES CFISH_NUMUTIL_C32_MAX_BYTES
#define C64_MAX_BYTES CFISH_NUMUTIL_C64_MAX_BYTES
#endif
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/SortUtils.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/SortUtils.c b/core/Clownfish/Util/SortUtils.c
index 18eb88d..1a97413 100644
--- a/core/Clownfish/Util/SortUtils.c
+++ b/core/Clownfish/Util/SortUtils.c
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_SORTUTILS
+#define C_CFISH_SORTUTILS
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/SortUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/SortUtils.cfh b/core/Clownfish/Util/SortUtils.cfh
index 7667e81..39ac2d1 100644
--- a/core/Clownfish/Util/SortUtils.cfh
+++ b/core/Clownfish/Util/SortUtils.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
__C__
typedef int
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/StringHelper.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/StringHelper.c b/core/Clownfish/Util/StringHelper.c
index 7726f9d..764be2b 100644
--- a/core/Clownfish/Util/StringHelper.c
+++ b/core/Clownfish/Util/StringHelper.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define C_LUCY_STRINGHELPER
+#define C_CFISH_STRINGHELPER
#include <string.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/Util/StringHelper.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/StringHelper.cfh b/core/Clownfish/Util/StringHelper.cfh
index 9d7f4e0..482666f 100644
--- a/core/Clownfish/Util/StringHelper.cfh
+++ b/core/Clownfish/Util/StringHelper.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
inert class Clownfish::Util::StringHelper cnick StrHelp {
@@ -75,7 +75,7 @@ __C__
* terminating NULL.
*/
#define cfish_StrHelp_MAX_BASE36_BYTES 14
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define StrHelp_MAX_BASE36_BYTES cfish_StrHelp_MAX_BASE36_BYTES
#endif
__END_C__
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/VArray.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/VArray.c b/core/Clownfish/VArray.c
index 7da0d33..38aa128 100644
--- a/core/Clownfish/VArray.c
+++ b/core/Clownfish/VArray.c
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#define C_LUCY_VARRAY
+#define C_CFISH_VARRAY
#include <string.h>
#include <stdlib.h>
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/VArray.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VArray.cfh b/core/Clownfish/VArray.cfh
index f36e31d..f64b8b5 100644
--- a/core/Clownfish/VArray.cfh
+++ b/core/Clownfish/VArray.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
__C__
#include "Clownfish/Util/SortUtils.h"
@@ -22,7 +22,7 @@ __C__
typedef bool
(*Cfish_VA_Gather_Test_t)(cfish_VArray *self, uint32_t tick, void *data);
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define VA_Gather_Test_t Cfish_VA_Gather_Test_t
#endif
__END_C__
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.c b/core/Clownfish/VTable.c
index dbc5715..3bd393b 100644
--- a/core/Clownfish/VTable.c
+++ b/core/Clownfish/VTable.c
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#define C_LUCY_VTABLE
-#define C_LUCY_OBJ
-#define C_LUCY_CHARBUF
-#define C_LUCY_METHOD
+#define C_CFISH_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_CHARBUF
+#define C_CFISH_METHOD
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Clownfish/VTable.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.cfh b/core/Clownfish/VTable.cfh
index 9f2555d..1325fd4 100644
--- a/core/Clownfish/VTable.cfh
+++ b/core/Clownfish/VTable.cfh
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-parcel Lucy;
+parcel Clownfish;
/** Virtual method dispatch table.
*
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Lucy.c
----------------------------------------------------------------------
diff --git a/core/Lucy.c b/core/Lucy.c
index 3ed569c..ebd0c0b 100644
--- a/core/Lucy.c
+++ b/core/Lucy.c
@@ -20,8 +20,8 @@
void
lucy_init_parcel() {
- lucy_Bool_init_class();
- lucy_Hash_init_class();
- lucy_Err_init_class();
+ cfish_Bool_init_class();
+ cfish_Hash_init_class();
+ cfish_Err_init_class();
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Lucy/Search/Matcher.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Matcher.c b/core/Lucy/Search/Matcher.c
index 79673a3..c8ea31a 100644
--- a/core/Lucy/Search/Matcher.c
+++ b/core/Lucy/Search/Matcher.c
@@ -15,6 +15,7 @@
*/
#define C_LUCY_MATCHER
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Lucy/Search/QueryParser.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.c b/core/Lucy/Search/QueryParser.c
index d6e1110..b665f73 100644
--- a/core/Lucy/Search/QueryParser.c
+++ b/core/Lucy/Search/QueryParser.c
@@ -15,7 +15,7 @@
*/
#define C_LUCY_QUERYPARSER
-#define C_LUCY_VIEWCHARBUF
+#define C_CFISH_VIEWCHARBUF
#include <stdlib.h>
#include <ctype.h>
#include "Lucy/Util/ToolSet.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Lucy/Util/Debug.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Debug.c b/core/Lucy/Util/Debug.c
index 773aaa9..aa88c7e 100644
--- a/core/Lucy/Util/Debug.c
+++ b/core/Lucy/Util/Debug.c
@@ -15,6 +15,7 @@
*/
#define C_LUCY_DEBUG
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/core/Lucy/Util/ToolSet.h
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/ToolSet.h b/core/Lucy/Util/ToolSet.h
index a21fb1e..6ad0ebf 100644
--- a/core/Lucy/Util/ToolSet.h
+++ b/core/Lucy/Util/ToolSet.h
@@ -28,6 +28,7 @@ extern "C" {
* header files, so that the header files remain as sparse as possible.
*/
+#define CFISH_USE_SHORT_NAMES
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/example-lang/src/Lucy/Object/LockFreeRegistry.c
----------------------------------------------------------------------
diff --git a/example-lang/src/Lucy/Object/LockFreeRegistry.c b/example-lang/src/Lucy/Object/LockFreeRegistry.c
index 1f208c4..5991ad3 100644
--- a/example-lang/src/Lucy/Object/LockFreeRegistry.c
+++ b/example-lang/src/Lucy/Object/LockFreeRegistry.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_LOCKFREEREGISTRY
#include "CFBind.h"
#include "Clownfish/LockFreeRegistry.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/example-lang/src/Lucy/Object/Obj.c
----------------------------------------------------------------------
diff --git a/example-lang/src/Lucy/Object/Obj.c b/example-lang/src/Lucy/Object/Obj.c
index e529513..2e0551d 100644
--- a/example-lang/src/Lucy/Object/Obj.c
+++ b/example-lang/src/Lucy/Object/Obj.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
+#define C_CFISH_OBJ
#include "CFBind.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/example-lang/src/Lucy/Object/VTable.c
----------------------------------------------------------------------
diff --git a/example-lang/src/Lucy/Object/VTable.c b/example-lang/src/Lucy/Object/VTable.c
index 00c9901..3055f8d 100644
--- a/example-lang/src/Lucy/Object/VTable.c
+++ b/example-lang/src/Lucy/Object/VTable.c
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
#include "CFBind.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/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 0ba0bb6..210db4f 100644
--- a/perl/buildlib/Lucy/Build/Binding/Object.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Object.pm
@@ -110,7 +110,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::ByteBuf",
);
$binding->append_xs($xs_code);
@@ -180,7 +180,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::CharBuf",
);
$binding->append_xs($xs_code);
@@ -228,7 +228,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::Err",
);
$binding->bind_constructor( alias => '_new' );
@@ -298,7 +298,7 @@ PPCODE:
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::Hash",
);
$binding->exclude_method($_) for @hand_rolled;
@@ -385,7 +385,7 @@ END_XS_CODE
sub bind_lockfreeregistry {
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::LockFreeRegistry",
);
Clownfish::CFC::Binding::Perl::Class->register($binding);
@@ -409,7 +409,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::Float32",
);
$binding->append_xs($float32_xs_code);
@@ -436,7 +436,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::Float64",
);
$binding->append_xs($float64_xs_code);
@@ -634,7 +634,7 @@ PPCODE:
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::Obj",
);
$binding->bind_method( alias => '_load', method => 'Load' );
@@ -724,7 +724,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::VArray",
);
$binding->exclude_method($_) for @hand_rolled;
@@ -781,7 +781,7 @@ OUTPUT: RETVAL
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::VTable",
);
$binding->exclude_method($_) for @hand_rolled;
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/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 45b9ab4..186c517 100644
--- a/perl/buildlib/Lucy/Build/Binding/Util.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Util.pm
@@ -280,7 +280,7 @@ PPCODE:
END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
- parcel => "Lucy",
+ parcel => "Clownfish",
class_name => "Clownfish::Util::StringHelper",
);
$binding->append_xs($xs_code);
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/perl/xs/XSBind.c b/perl/xs/XSBind.c
index 8352355..092b5e9 100644
--- a/perl/xs/XSBind.c
+++ b/perl/xs/XSBind.c
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
+#define C_CFISH_LOCKFREEREGISTRY
#define NEED_newRV_noinc
#include "XSBind.h"
#include "Clownfish/LockFreeRegistry.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/ruby/src/Lucy/Object/LockFreeRegistry.c
----------------------------------------------------------------------
diff --git a/ruby/src/Lucy/Object/LockFreeRegistry.c b/ruby/src/Lucy/Object/LockFreeRegistry.c
index 1f208c4..5991ad3 100644
--- a/ruby/src/Lucy/Object/LockFreeRegistry.c
+++ b/ruby/src/Lucy/Object/LockFreeRegistry.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define C_LUCY_LOCKFREEREGISTRY
+#define C_CFISH_LOCKFREEREGISTRY
#include "CFBind.h"
#include "Clownfish/LockFreeRegistry.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/ruby/src/Lucy/Object/Obj.c
----------------------------------------------------------------------
diff --git a/ruby/src/Lucy/Object/Obj.c b/ruby/src/Lucy/Object/Obj.c
index e529513..2e0551d 100644
--- a/ruby/src/Lucy/Object/Obj.c
+++ b/ruby/src/Lucy/Object/Obj.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
+#define C_CFISH_OBJ
#include "CFBind.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/05fa0688/ruby/src/Lucy/Object/VTable.c
----------------------------------------------------------------------
diff --git a/ruby/src/Lucy/Object/VTable.c b/ruby/src/Lucy/Object/VTable.c
index 00c9901..3055f8d 100644
--- a/ruby/src/Lucy/Object/VTable.c
+++ b/ruby/src/Lucy/Object/VTable.c
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#define C_LUCY_OBJ
-#define C_LUCY_VTABLE
+#define C_CFISH_OBJ
+#define C_CFISH_VTABLE
#include "CFBind.h"