unicode 0.4.2 → 0.4.3

data/wstring.c

@@ -43,7 +43,10 @@ WStr_free(WString* str)
 {
   str->size = 0;
   str->len = 0;
-  free(str->str);
+  if (str->str) {
+    free(str->str);
+    str->str = NULL;
+  }
 }
 
 int
@@ -164,6 +167,59 @@ WStr_allocWithUTF8(WString* s, const char* in)
   return s;
 }
 
+WString*
+WStr_allocWithUTF8L(WString* s, const char* in, int len)
+{
+  int i;
+  int u = 0;
+  int rest = 0;
+
+  WStr_alloc(s);
+  if (in == NULL)
+    return s;
+  for (i = 0; i < len; i++) {
+    unsigned char c = in[i];
+    if ((c & 0xc0) == 0x80) {
+      if (rest == 0)
+	return NULL;
+      u = (u << 6) | (c & 63);
+      rest--;
+      if (rest == 0) {
+	WStr_addWChar(s, u);
+      }
+    }
+    else if ((c & 0x80) == 0) {      /* 0b0nnnnnnn (7bit) */
+      WStr_addWChar(s, c);
+      rest = 0;
+    }
+    else if ((c & 0xe0) == 0xc0) {      /* 0b110nnnnn (11bit) */
+      rest = 1;
+      u = c & 31;
+    }
+    else if ((c & 0xf0) == 0xe0) {      /* 0b1110nnnn (16bit) */
+      rest = 2;
+      u = c & 15;
+    }
+    else if ((c & 0xf8) == 0xf0) {      /* 0b11110nnn (21bit) */
+      rest = 3;
+      u = c & 7;
+    }
+    else if ((c & 0xfc) == 0xf8) {      /* 0b111110nn (26bit) */
+      rest = 4;
+      u = c & 3;
+    }
+    else if ((c & 0xfe) == 0xfc) {      /* 0b1111110n (31bit) */
+      rest = 5;
+      u = c & 1;
+    }
+    else {
+      return NULL;
+    }
+  }
+
+  return s;
+}
+
 UString*
 WStr_convertIntoUString(WString* wstr, UString* ustr)
 {
@@ -176,6 +232,18 @@ WStr_convertIntoUString(WString* wstr, UString* ustr)
   return ustr;
 }
 
+UString*
+WStr_convertIntoUString2(WString* wstr, int start, int len, UString* ustr)
+{
+  int i;
+
+  for (i = start; i < wstr->len && i < start + len; i++) {
+    UniStr_addWChar(ustr, wstr->str[i]);
+  }
+
+  return ustr;
+}
+
 void
 WStr_dump(WString* s)
 {

data/wstring.h

@@ -24,6 +24,7 @@ typedef struct _WString {
 
 WString* WStr_alloc(WString* str);
 WString* WStr_allocWithUTF8(WString* s, const char* u);
+WString* WStr_allocWithUTF8L(WString* s, const char* u, int len);
 WString* WStr_enlarge(WString* str, int size);
 void WStr_free(WString* str);
 int WStr_addWChars(WString* s, const int* a, int len);
@@ -32,6 +33,7 @@ int WStr_pushWString(WString* s, const WString* add);
 int WStr_addWChar2(WString* s, int a1, int a2);
 int WStr_addWChar3(WString* s, int a1, int a2, int a3);
 UString* WStr_convertIntoUString(WString* wstr, UString* ustr);
+UString* WStr_convertIntoUString2(WString* wstr, int start, int len, UString* ustr);
 void WStr_dump(WString* s);
 
 #ifdef __cplusplus

metadata

@@ -1,32 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: unicode
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.4.3
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Yoshida Masato
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-03 00:00:00 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies: []
-
 description: Unicode normalization library.
 email: yoshidam@yoshidam.net
 executables: []
-
-extensions: 
+extensions:
 - extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - extconf.rb
 - unicode.c
 - ustring.c
@@ -40,36 +32,26 @@ files:
 - unidata.map
 homepage: http://www.yoshidam.net/Ruby.html#unicode
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Unicode normalization library.
 test_files: []
-