lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [5/7] lucy-clownfish git commit: Non-inline helper to append to CharBufs
Date Sun, 15 Nov 2015 11:45:24 GMT
Non-inline helper to append to CharBufs

Reduces code size of CB_VCatF and makes it a little faster.


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

Branch: refs/heads/master
Commit: 5477135819d6f37bc8052f2450a4dfcd2acc2d6f
Parents: 6e1d5fd
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Thu Nov 12 16:03:33 2015 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Thu Nov 12 16:10:25 2015 +0100

----------------------------------------------------------------------
 runtime/core/Clownfish/CharBuf.c | 49 ++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/54771358/runtime/core/Clownfish/CharBuf.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/CharBuf.c b/runtime/core/Clownfish/CharBuf.c
index fa7a2b3..53541c2 100644
--- a/runtime/core/Clownfish/CharBuf.c
+++ b/runtime/core/Clownfish/CharBuf.c
@@ -33,6 +33,14 @@
 #include "Clownfish/Util/StringHelper.h"
 #include "Clownfish/Class.h"
 
+// Append trusted UTF-8 to the CharBuf.
+static void
+S_cat_utf8(CharBuf *self, const char* ptr, size_t size);
+
+// Inline version of S_cat_utf8.
+static CFISH_INLINE void
+SI_cat_utf8(CharBuf *self, const char* ptr, size_t size);
+
 // Ensure that the CharBuf's capacity is at least (size + extra).
 // If the buffer must be grown, oversize the allocation.
 static CFISH_INLINE void
@@ -136,7 +144,7 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
         while (slice_end < pattern_end && *slice_end != '%') { slice_end++; }
         if (pattern != slice_end) {
             size_t size = slice_end - pattern;
-            CB_Cat_Trusted_Utf8(self, pattern, size);
+            S_cat_utf8(self, pattern, size);
             pattern = slice_end;
         }
 
@@ -145,13 +153,13 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
 
             switch (*pattern) {
                 case '%': {
-                        CB_Cat_Trusted_Utf8(self, "%", 1);
+                        S_cat_utf8(self, "%", 1);
                     }
                     break;
                 case 'o': {
                         Obj *obj = va_arg(args, Obj*);
                         if (!obj) {
-                            CB_Cat_Trusted_Utf8(self, "[NULL]", 6);
+                            S_cat_utf8(self, "[NULL]", 6);
                         }
                         else if (Obj_is_a(obj, STRING)) {
                             CB_Cat(self, (String*)obj);
@@ -182,7 +190,7 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
                             S_die_invalid_pattern(pattern_start);
                         }
                         size = sprintf(buf, "%" PRId64, val);
-                        CB_Cat_Trusted_Utf8(self, buf, size);
+                        S_cat_utf8(self, buf, size);
                     }
                     break;
                 case 'u': {
@@ -204,7 +212,7 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
                             S_die_invalid_pattern(pattern_start);
                         }
                         size = sprintf(buf, "%" PRIu64, val);
-                        CB_Cat_Trusted_Utf8(self, buf, size);
+                        S_cat_utf8(self, buf, size);
                     }
                     break;
                 case 'f': {
@@ -212,7 +220,7 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
                             double num  = va_arg(args, double);
                             char bigbuf[512];
                             size_t size = sprintf(bigbuf, "%g", num);
-                            CB_Cat_Trusted_Utf8(self, bigbuf, size);
+                            S_cat_utf8(self, bigbuf, size);
                             pattern += 2;
                         }
                         else {
@@ -224,7 +232,7 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
                         if (pattern[1] == '3' && pattern[2] == '2') {
                             unsigned long val = va_arg(args, uint32_t);
                             size_t size = sprintf(buf, "%.8lx", val);
-                            CB_Cat_Trusted_Utf8(self, buf, size);
+                            S_cat_utf8(self, buf, size);
                             pattern += 2;
                         }
                         else {
@@ -235,15 +243,15 @@ CB_VCatF_IMP(CharBuf *self, const char *pattern, va_list args) {
                 case 's': {
                         char *string = va_arg(args, char*);
                         if (string == NULL) {
-                            CB_Cat_Trusted_Utf8(self, "[NULL]", 6);
+                            S_cat_utf8(self, "[NULL]", 6);
                         }
                         else {
                             size_t size = strlen(string);
                             if (StrHelp_utf8_valid(string, size)) {
-                                CB_Cat_Trusted_Utf8(self, string, size);
+                                S_cat_utf8(self, string, size);
                             }
                             else {
-                                CB_Cat_Trusted_Utf8(self, "[INVALID UTF8]", 14);
+                                S_cat_utf8(self, "[INVALID UTF8]", 14);
                             }
                         }
                     }
@@ -295,14 +303,6 @@ CB_Clone_IMP(CharBuf *self) {
     return clone;
 }
 
-static CFISH_INLINE void
-SI_cat_utf8(CharBuf *self, const char* ptr, size_t size) {
-    size_t old_size = self->size;
-    SI_add_grow_and_oversize(self, old_size, size);
-    memcpy(self->ptr + old_size, ptr, size);
-    self->size = old_size + size;
-}
-
 void
 CB_Cat_Utf8_IMP(CharBuf *self, const char* ptr, size_t size) {
     if (!StrHelp_utf8_valid(ptr, size)) {
@@ -331,6 +331,19 @@ CB_Get_Size_IMP(CharBuf *self) {
     return self->size;
 }
 
+static void
+S_cat_utf8(CharBuf *self, const char* ptr, size_t size) {
+    SI_cat_utf8(self, ptr, size);
+}
+
+static CFISH_INLINE void
+SI_cat_utf8(CharBuf *self, const char* ptr, size_t size) {
+    size_t old_size = self->size;
+    SI_add_grow_and_oversize(self, old_size, size);
+    memcpy(self->ptr + old_size, ptr, size);
+    self->size = old_size + size;
+}
+
 static CFISH_INLINE void
 SI_add_grow_and_oversize(CharBuf *self, size_t size, size_t extra) {
     size_t min_size = size + extra;


Mime
View raw message