unicode 0.1.1 → 0.2.0

data/ustring.c

@@ -5,10 +5,12 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "ustring.h"
 
 UString*
-UStr_alloc(UString* str)
+UniStr_alloc(UString* str)
 {
   str->size = USTR_INITIAL_STRING_LEN;
   str->len = 0;
@@ -21,7 +23,7 @@ UStr_alloc(UString* str)
 }
 
 UString*
-UStr_enlarge(UString* str, int size)
+UniStr_enlarge(UString* str, int size)
 {
   unsigned char* newptr;
 
@@ -36,7 +38,7 @@ UStr_enlarge(UString* str, int size)
 }
 
 void
-UStr_free(UString* str)
+UniStr_free(UString* str)
 {
   str->size = 0;
   str->len = 0;
@@ -44,10 +46,10 @@ UStr_free(UString* str)
 }
 
 int
-UStr_addChars(UString* s, const unsigned char* a, int len)
+UniStr_addChars(UString* s, const unsigned char* a, int len)
 {
   if (s->len + len >= s->size) {
-    UStr_enlarge(s, len + USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, len + USTR_STRING_EXTEND_LEN);
   }
   memcpy(s->str + s->len, a, len);
   s->len += len;
@@ -56,10 +58,10 @@ UStr_addChars(UString* s, const unsigned char* a, int len)
 }
 
 int
-UStr_addChar(UString* s, unsigned char a)
+UniStr_addChar(UString* s, unsigned char a)
 {
   if (s->len + 1 >= s->size) {
-    UStr_enlarge(s, USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, USTR_STRING_EXTEND_LEN);
   }
   *(s->str + s->len) = a;
   (s->len)++;
@@ -68,10 +70,10 @@ UStr_addChar(UString* s, unsigned char a)
 }
 
 int
-UStr_addChar2(UString* s, unsigned char a1, unsigned char a2)
+UniStr_addChar2(UString* s, unsigned char a1, unsigned char a2)
 {
   if (s->len + 2 >= s->size) {
-    UStr_enlarge(s, USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, USTR_STRING_EXTEND_LEN);
   }
   *(s->str + s->len) = a1;
   *(s->str + s->len + 1) = a2;
@@ -81,10 +83,10 @@ UStr_addChar2(UString* s, unsigned char a1, unsigned char a2)
 }
 
 int
-UStr_addChar3(UString* s, unsigned char a1, unsigned char a2, unsigned char a3)
+UniStr_addChar3(UString* s, unsigned char a1, unsigned char a2, unsigned char a3)
 {
   if (s->len + 3 >= s->size) {
-    UStr_enlarge(s, USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, USTR_STRING_EXTEND_LEN);
   }
   *(s->str + s->len) = a1;
   *(s->str + s->len + 1) = a2;
@@ -95,11 +97,11 @@ UStr_addChar3(UString* s, unsigned char a1, unsigned char a2, unsigned char a3)
 }
 
 int
-UStr_addChar4(UString* s, unsigned char a1, unsigned char a2,
+UniStr_addChar4(UString* s, unsigned char a1, unsigned char a2,
 	      unsigned char a3, unsigned char a4)
 {
   if (s->len + 4 >= s->size) {
-    UStr_enlarge(s, USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, USTR_STRING_EXTEND_LEN);
   }
   *(s->str + s->len) = a1;
   *(s->str + s->len + 1) = a2;
@@ -111,11 +113,11 @@ UStr_addChar4(UString* s, unsigned char a1, unsigned char a2,
 }
 
 int
-UStr_addChar5(UString* s, unsigned char a1, unsigned char a2,
+UniStr_addChar5(UString* s, unsigned char a1, unsigned char a2,
 	      unsigned char a3, unsigned char a4, unsigned char a5)
 {
   if (s->len + 5 >= s->size) {
-    UStr_enlarge(s, USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, USTR_STRING_EXTEND_LEN);
   }
   *(s->str + s->len) = a1;
   *(s->str + s->len + 1) = a2;
@@ -128,12 +130,12 @@ UStr_addChar5(UString* s, unsigned char a1, unsigned char a2,
 }
 
 int
-UStr_addChar6(UString* s, unsigned char a1, unsigned char a2,
+UniStr_addChar6(UString* s, unsigned char a1, unsigned char a2,
 	      unsigned char a3, unsigned char a4,
 	      unsigned char a5, unsigned char a6)
 {
   if (s->len + 6 >= s->size) {
-    UStr_enlarge(s, USTR_STRING_EXTEND_LEN);
+    UniStr_enlarge(s, USTR_STRING_EXTEND_LEN);
   }
   *(s->str + s->len) = a1;
   *(s->str + s->len + 1) = a2;
@@ -147,29 +149,29 @@ UStr_addChar6(UString* s, unsigned char a1, unsigned char a2,
 }
 
 int
-UStr_addWChar(UString* ustr, int c)
+UniStr_addWChar(UString* ustr, unsigned int c)
 {
   if (c < 128) {         /* 0x0000-0x00FF */
-    UStr_addChar(ustr, c);
+    UniStr_addChar(ustr, c);
   }
   else if (c < 2048) {        /* 0x0100-0x07FF */
     unsigned char b2 = c & 63;
     unsigned char b1 = c >> 6;
-    UStr_addChar2(ustr, b1 | 192, b2 | 128);
+    UniStr_addChar2(ustr, b1 | 192, b2 | 128);
 
   }
   else if (c < 0x10000) {     /* 0x0800-0xFFFF */
     unsigned char b3 = c & 63;
     unsigned char b2 = (c >> 6) & 63;
     unsigned char b1 = c >> 12;
-    UStr_addChar3(ustr, b1 | 224, b2 | 128, b3 | 128);
+    UniStr_addChar3(ustr, b1 | 224, b2 | 128, b3 | 128);
   }
   else if (c < 0x200000) {     /* 0x00010000-0x001FFFFF */
     unsigned char b4 = c & 63;
     unsigned char b3 = (c >> 6) & 63;
     unsigned char b2 = (c >> 12) & 63;
     unsigned char b1 = c >> 18;
-    UStr_addChar4(ustr, b1 | 240, b2 | 128, b3 | 128, b4 | 128);
+    UniStr_addChar4(ustr, b1 | 240, b2 | 128, b3 | 128, b4 | 128);
   }
   else if (c < 0x4000000) {     /* 0x00200000-0x03FFFFFF */
     unsigned char b5 = c & 63;
@@ -177,7 +179,7 @@ UStr_addWChar(UString* ustr, int c)
     unsigned char b3 = (c >> 12) & 63;
     unsigned char b2 = (c >> 18) & 63;
     unsigned char b1 = c >> 24;
-    UStr_addChar5(ustr, b1 | 248, b2 | 128, b3 | 128, b4 | 128, b5 | 128);
+    UniStr_addChar5(ustr, b1 | 248, b2 | 128, b3 | 128, b4 | 128, b5 | 128);
   }
   else if (c < 0x80000000) {     /* 0x04000000-0x7FFFFFFF */
     unsigned char b6 = c & 63;
@@ -186,7 +188,7 @@ UStr_addWChar(UString* ustr, int c)
     unsigned char b3 = (c >> 18) & 63;
     unsigned char b2 = (c >> 24) & 63;
     unsigned char b1 = (c >> 30) & 63;
-    UStr_addChar6(ustr, b1 | 252, b2 | 128, b3 | 128,
+    UniStr_addChar6(ustr, b1 | 252, b2 | 128, b3 | 128,
 		  b4 | 128, b5 | 128, b6 | 128);
   }
 
@@ -194,7 +196,7 @@ UStr_addWChar(UString* ustr, int c)
 }
 
 void
-UStr_dump(UString* s)
+UniStr_dump(UString* s)
 {
   int i;
 

data/ustring.h

@@ -23,23 +23,23 @@ typedef struct _UString {
   int size;
 } UString;
 
-UString* UStr_alloc(UString* str);
-UString* UStr_enlarge(UString* str, int size);
-void UStr_free(UString* str);
-int UStr_addUhars(UString* s, const unsigned char* a, int len);
-int UStr_addChar(UString* s, unsigned char a);
-int UStr_addChar2(UString* s, unsigned char a1, unsigned char a2);
-int UStr_addChar3(UString* s, unsigned char a1, unsigned char a2,
+UString* UniStr_alloc(UString* str);
+UString* UniStr_enlarge(UString* str, int size);
+void UniStr_free(UString* str);
+int UniStr_addChars(UString* s, const unsigned char* a, int len);
+int UniStr_addChar(UString* s, unsigned char a);
+int UniStr_addChar2(UString* s, unsigned char a1, unsigned char a2);
+int UniStr_addChar3(UString* s, unsigned char a1, unsigned char a2,
 		  unsigned char a3);
-int UStr_addChar4(UString* s, unsigned char a1, unsigned char a2,
+int UniStr_addChar4(UString* s, unsigned char a1, unsigned char a2,
 		  unsigned char a3, unsigned char a4);
-int UStr_addChar5(UString* s, unsigned char a1, unsigned char a2,
+int UniStr_addChar5(UString* s, unsigned char a1, unsigned char a2,
 		  unsigned char a3, unsigned char a4, unsigned char a5);
-int UStr_addChar6(UString* s, unsigned char a1, unsigned char a2,
+int UniStr_addChar6(UString* s, unsigned char a1, unsigned char a2,
 		  unsigned char a3, unsigned char a4,
 		  unsigned char a5, unsigned char a6);
-int UStr_addWChar(UString* s, int c);
-void UStr_dump(UString* s);
+int UniStr_addWChar(UString* s, unsigned int c);
+void UniStr_dump(UString* s);
 
 #ifdef __cplusplus
 }

data/wstring.c

@@ -5,6 +5,8 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "wstring.h"
 
 WString*
@@ -115,13 +117,11 @@ WStr_allocWithUTF8(WString* s, const char* in)
   int rest = 0;
 
   WStr_alloc(s);
-
-  if (in == 0)
+  if (in == NULL)
     return s;
-
   for (i = 0; in[i] != '\0'; i++) {
     unsigned char c = in[i];
-    if (c >= 128 && c < 192) {
+    if ((c & 0xc0) == 0x80) {
       if (rest == 0)
 	return NULL;
       u = (u << 6) | (c & 63);
@@ -130,29 +130,29 @@ WStr_allocWithUTF8(WString* s, const char* in)
 	WStr_addWChar(s, u);
       }
     }
-    else if (c < 128) {      /* 0b0nnnnnnn (7bit) */
+    else if ((c & 0x80) == 0) {      /* 0b0nnnnnnn (7bit) */
       if (c == 0)
 	return NULL;
       WStr_addWChar(s, c);
       rest = 0;
     }
-    else if (c < 224) {      /* 0b110nnnnn (11bit) */
+    else if ((c & 0xe0) == 0xc0) {      /* 0b110nnnnn (11bit) */
       rest = 1;
       u = c & 31;
     }
-    else if (c < 240) {      /* 0b1110nnnn (16bit) */
+    else if ((c & 0xf0) == 0xe0) {      /* 0b1110nnnn (16bit) */
       rest = 2;
       u = c & 15;
     }
-    else if (c < 248) {      /* 0b11110nnn (21bit) */
+    else if ((c & 0xf8) == 0xf0) {      /* 0b11110nnn (21bit) */
       rest = 3;
       u = c & 7;
     }
-    else if (c < 252) {      /* 0b111110nn (26bit) */
+    else if ((c & 0xfc) == 0xf8) {      /* 0b111110nn (26bit) */
       rest = 4;
       u = c & 3;
     }
-    else if (c < 254) {      /* 0b1111110n (31bit) */
+    else if ((c & 0xfe) == 0xfc) {      /* 0b1111110n (31bit) */
       rest = 5;
       u = c & 1;
     }
@@ -170,7 +170,7 @@ WStr_convertIntoUString(WString* wstr, UString* ustr)
   int i;
 
   for (i = 0; i < wstr->len; i++) {
-    UStr_addWChar(ustr, wstr->str[i]);
+    UniStr_addWChar(ustr, wstr->str[i]);
   }
 
   return ustr;

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Yoshida Masato
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2005-08-13 00:00:00 +02:00
+date: 2009-12-29 00:00:00 +01:00
 default_executable: 
 dependencies: []