lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [14/50] [abbrv] git commit: refs/heads/master - Fix bulk renaming of ZombieCharBuf
Date Fri, 11 Oct 2013 13:31:52 GMT
Fix bulk renaming of ZombieCharBuf


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/ee999eb6
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/ee999eb6
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/ee999eb6

Branch: refs/heads/master
Commit: ee999eb61bfa3ad924e307fceb33ddc548857d38
Parents: b0ddea3
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Fri Sep 13 20:56:58 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Fri Oct 11 15:28:16 2013 +0200

----------------------------------------------------------------------
 clownfish/compiler/src/CFCPerlTypeMap.c                 |  2 +-
 clownfish/compiler/src/CFCRuby.c                        |  2 +-
 clownfish/runtime/core/Clownfish/String.cfh             | 12 ++++++------
 .../runtime/perl/buildlib/Clownfish/Build/Binding.pm    |  2 +-
 clownfish/runtime/perl/xs/XSBind.c                      |  2 +-
 core/Lucy/Store/Folder.c                                |  2 +-
 core/Lucy/Test/Store/TestCompoundFileReader.c           |  2 +-
 core/Lucy/Test/Store/TestFolderCommon.c                 |  2 +-
 core/Lucy/Test/Store/TestRAMFolder.c                    |  2 +-
 perl/buildlib/Lucy/Build/Binding/Misc.pm                |  2 +-
 perl/xs/Lucy/Index/DocReader.c                          |  2 +-
 perl/xs/Lucy/Index/Inverter.c                           |  2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/clownfish/compiler/src/CFCPerlTypeMap.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerlTypeMap.c b/clownfish/compiler/src/CFCPerlTypeMap.c
index a50e013..f568e15 100644
--- a/clownfish/compiler/src/CFCPerlTypeMap.c
+++ b/clownfish/compiler/src/CFCPerlTypeMap.c
@@ -234,7 +234,7 @@ static const char typemap_input[] =
     "    $var = (sizeof(UV) == 8) ? ($type)SvUV($arg) : ($type)SvNV($arg);\n"
     "\n"
     "CONST_CHARBUF\n"
-    "    $var = (const cfish_String*)CFISH_SStr_WRAP_STR(SvPVutf8_nolen($arg), SvCUR($arg));\n"
+    "    $var = (const cfish_String*)CFISH_SSTR_WRAP_STR(SvPVutf8_nolen($arg), SvCUR($arg));\n"
     "\n";
 
 static const char typemap_output[] =

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/clownfish/compiler/src/CFCRuby.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCRuby.c b/clownfish/compiler/src/CFCRuby.c
index 4b67022..b225fd9 100644
--- a/clownfish/compiler/src/CFCRuby.c
+++ b/clownfish/compiler/src/CFCRuby.c
@@ -205,7 +205,7 @@ S_write_boot_c(CFCRuby *self) {
         "%s() {\n"
         "    %sbootstrap_parcel();\n"
         "\n"
-        "    cfish_StackString *alias = CFISH_SStr_WRAP_STR(\"\", 0);\n"
+        "    cfish_StackString *alias = CFISH_SSTR_WRAP_STR(\"\", 0);\n"
         "}\n"
         "\n"
         "%s\n"

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/clownfish/runtime/core/Clownfish/String.cfh
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/String.cfh b/clownfish/runtime/core/Clownfish/String.cfh
index d54f473..f49ddd2 100644
--- a/clownfish/runtime/core/Clownfish/String.cfh
+++ b/clownfish/runtime/core/Clownfish/String.cfh
@@ -423,20 +423,20 @@ class Clownfish::StackStringIterator cnick SStrIter
 
 __C__
 
-#define CFISH_SStr_BLANK() cfish_SStr_new(cfish_alloca(cfish_SStr_size()))
+#define CFISH_SSTR_BLANK() cfish_SStr_new(cfish_alloca(cfish_SStr_size()))
 
-#define CFISH_SStr_WRAP(source) \
+#define CFISH_SSTR_WRAP(source) \
     cfish_SStr_wrap(cfish_alloca(cfish_SStr_size()), source)
 
-#define CFISH_SStr_WRAP_STR(ptr, size) \
+#define CFISH_SSTR_WRAP_STR(ptr, size) \
     cfish_SStr_wrap_str(cfish_alloca(cfish_SStr_size()), ptr, size)
 
 #define CFISH_STRITER_DONE  UINT32_MAX
 
 #ifdef CFISH_USE_SHORT_NAMES
-  #define SStr_BLANK             CFISH_SStr_BLANK
-  #define SSTR_WRAP              CFISH_SStr_WRAP
-  #define SSTR_WRAP_STR          CFISH_SStr_WRAP_STR
+  #define SSTR_BLANK             CFISH_SSTR_BLANK
+  #define SSTR_WRAP              CFISH_SSTR_WRAP
+  #define SSTR_WRAP_STR          CFISH_SSTR_WRAP_STR
   #define STRITER_DONE          CFISH_STRITER_DONE
 #endif
 __END_C__

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm b/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
index 5edf4c0..2d7ef0e 100644
--- a/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
+++ b/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
@@ -594,7 +594,7 @@ CODE:
     CFISH_UNUSED_VAR(unused_sv);
     STRLEN size;
     char *ptr = SvPVutf8(class_name_sv, size);
-    cfish_StackString *class_name = CFISH_SStr_WRAP_STR(ptr, size);
+    cfish_StackString *class_name = CFISH_SSTR_WRAP_STR(ptr, size);
     cfish_VTable *vtable
         = cfish_VTable_fetch_vtable((cfish_String*)class_name);
     RETVAL = vtable ? (SV*)CFISH_VTable_To_Host(vtable) : &PL_sv_undef;

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/clownfish/runtime/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/xs/XSBind.c b/clownfish/runtime/perl/xs/XSBind.c
index b466cf6..39d65d8 100644
--- a/clownfish/runtime/perl/xs/XSBind.c
+++ b/clownfish/runtime/perl/xs/XSBind.c
@@ -64,7 +64,7 @@ XSBind_new_blank_obj(SV *either_sv) {
         // Use the supplied class name string to find a VTable.
         STRLEN len;
         char *ptr = SvPVutf8(either_sv, len);
-        cfish_StackString *klass = CFISH_SStr_WRAP_STR(ptr, len);
+        cfish_StackString *klass = CFISH_SSTR_WRAP_STR(ptr, len);
         vtable = cfish_VTable_singleton((cfish_String*)klass, NULL);
     }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/core/Lucy/Store/Folder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Folder.c b/core/Lucy/Store/Folder.c
index c002e9d..9d7bb46 100644
--- a/core/Lucy/Store/Folder.c
+++ b/core/Lucy/Store/Folder.c
@@ -262,7 +262,7 @@ Folder_Open_Dir_IMP(Folder *self, const String *path) {
         folder = Folder_Find_Folder(self, path);
     }
     else {
-        StackString *empty = SStr_BLANK();
+        StackString *empty = SSTR_BLANK();
         folder = Folder_Find_Folder(self, (String*)empty);
     }
     if (!folder) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/core/Lucy/Test/Store/TestCompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.c b/core/Lucy/Test/Store/TestCompoundFileReader.c
index d28075b..bb7eb89 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.c
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.c
@@ -78,7 +78,7 @@ S_folder_with_contents() {
     OutStream_Close(bar_out);
     DECREF(foo_out);
     DECREF(bar_out);
-    StackString *empty = SStr_BLANK();
+    StackString *empty = SSTR_BLANK();
     RAMFolder_Consolidate(folder, (String*)empty);
     return (Folder*)folder;
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/core/Lucy/Test/Store/TestFolderCommon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolderCommon.c b/core/Lucy/Test/Store/TestFolderCommon.c
index f137544..ce13170 100644
--- a/core/Lucy/Test/Store/TestFolderCommon.c
+++ b/core/Lucy/Test/Store/TestFolderCommon.c
@@ -137,7 +137,7 @@ test_Local_Find_Folder(TestBatchRunner *runner, set_up_t set_up,
     local = Folder_Local_Find_Folder(folder, nope);
     TEST_TRUE(runner, local == NULL, "Non-existent entry yields NULL");
 
-    StackString *empty = SStr_BLANK();
+    StackString *empty = SSTR_BLANK();
     local = Folder_Local_Find_Folder(folder, (String*)empty);
     TEST_TRUE(runner, local == NULL, "Empty string yields NULL");
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/core/Lucy/Test/Store/TestRAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.c b/core/Lucy/Test/Store/TestRAMFolder.c
index e712697..13aeb9d 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.c
+++ b/core/Lucy/Test/Store/TestRAMFolder.c
@@ -139,7 +139,7 @@ test_Local_Find_Folder(TestBatchRunner *runner) {
     local = (RAMFolder*)RAMFolder_Local_Find_Folder(folder, nope);
     TEST_TRUE(runner, local == NULL, "Non-existent entry yields NULL");
 
-    StackString *empty = SStr_BLANK();
+    StackString *empty = SSTR_BLANK();
     local = (RAMFolder*)RAMFolder_Local_Find_Folder(folder, (String*)empty);
     TEST_TRUE(runner, local == NULL, "Empty string yields NULL");
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/perl/buildlib/Lucy/Build/Binding/Misc.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Misc.pm b/perl/buildlib/Lucy/Build/Binding/Misc.pm
index 287ef18..6f082bc 100644
--- a/perl/buildlib/Lucy/Build/Binding/Misc.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Misc.pm
@@ -141,7 +141,7 @@ PPCODE:
 {
     char *class_name = HvNAME(SvSTASH(SvRV(blank_obj)));
     cfish_StackString *klass
-        = CFISH_SStr_WRAP_STR(class_name, strlen(class_name));
+        = CFISH_SSTR_WRAP_STR(class_name, strlen(class_name));
     cfish_VTable *vtable
         = (cfish_VTable*)cfish_VTable_singleton((cfish_String*)klass, NULL);
     STRLEN len;

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/perl/xs/Lucy/Index/DocReader.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Index/DocReader.c b/perl/xs/Lucy/Index/DocReader.c
index 0f95a11..15eafe1 100644
--- a/perl/xs/Lucy/Index/DocReader.c
+++ b/perl/xs/Lucy/Index/DocReader.c
@@ -62,7 +62,7 @@ LUCY_DefDocReader_Fetch_Doc_IMP(lucy_DefaultDocReader *self, int32_t doc_id)
{
 
         // Find the Field's FieldType.
         cfish_StackString *field_name_zcb
-            = CFISH_SStr_WRAP_STR(field_name_ptr, field_name_len);
+            = CFISH_SSTR_WRAP_STR(field_name_ptr, field_name_len);
         type = LUCY_Schema_Fetch_Type(schema, (cfish_String*)field_name_zcb);
 
         // Read the field value.

http://git-wip-us.apache.org/repos/asf/lucy/blob/ee999eb6/perl/xs/Lucy/Index/Inverter.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Index/Inverter.c b/perl/xs/Lucy/Index/Inverter.c
index 67116e0..1d120b1 100644
--- a/perl/xs/Lucy/Index/Inverter.c
+++ b/perl/xs/Lucy/Index/Inverter.c
@@ -50,7 +50,7 @@ S_fetch_entry(lucy_Inverter *self, HE *hash_entry) {
         }
     }
 
-    cfish_StackString *field = CFISH_SStr_WRAP_STR(key, key_len);
+    cfish_StackString *field = CFISH_SSTR_WRAP_STR(key, key_len);
     int32_t field_num
         = LUCY_Seg_Field_Num(ivars->segment, (cfish_String*)field);
     if (!field_num) {


Mime
View raw message