pluskid-rmmseg-cpp 0.2.0 → 0.2.1

data/ext/rmmseg/algor.cpp

@@ -81,7 +81,9 @@ namespace rmmseg
             svwl_filter(chunks);
         if (chunks.size() > 1)
             lsdmfocw_filter(chunks);
-        
+
+        if (chunks.size() < 1)
+            return Token(NULL, 0);
 
         Token token(m_text+m_pos, chunks[0].words[0]->nbytes);
         m_pos += chunks[0].words[0]->nbytes;

data/ext/rmmseg/rmmseg.cpp

@@ -68,7 +68,6 @@ extern "C" {
 
     static void tk_mark(Token *t)
     {
-        // start and end are Fixnums, no need to mark them
         rb_gc_mark(t->text);
     }
     static void tk_free(Token *t)
@@ -95,9 +94,14 @@ extern "C" {
     static VALUE cToken;
     static VALUE tk_create(const char* base, const rmmseg::Token &t)
     {
-        Token *tk = (Token *)malloc(sizeof(Token));
+        Token *tk = ALLOC(Token);
         int start = t.text-base;
         tk->text = rb_str_new(t.text, t.length);
+
+        // This is necessary, see
+        // http://pluskid.lifegoo.com/?p=348
+        rb_gc_mark(tk->text);
+
         tk->start = INT2FIX(start);
         tk->end = INT2FIX(start + t.length);
         return Data_Wrap_Struct(cToken,
@@ -127,7 +131,7 @@ extern "C" {
     static VALUE cAlgorithm;
     static VALUE algor_create(VALUE klass, VALUE text)
     {
-        Algorithm *algor = (Algorithm *)malloc(sizeof(Algorithm));
+        Algorithm *algor = ALLOC(Algorithm);
         void *mem;
         algor->text = text;
         mem = malloc(sizeof(rmmseg::Algorithm));

data/lib/rmmseg/ferret.rb

@@ -42,7 +42,10 @@ module RMMSeg
         if tok.nil?
           return nil
         else
-          return ::Ferret::Analysis::Token.new(tok.text, tok.start, tok.end)
+          @token.text = tok.text
+          @token.start = tok.start
+          @token.end = tok.end
+          return @token
         end
       end
       
@@ -53,6 +56,7 @@ module RMMSeg
 
       # Set the text to be tokenized
       def text=(str)
+        @token = ::Ferret::Analysis::Token.new("", 0, 0)
         @text = str
         @algor = Algorithm.new(@text)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pluskid-rmmseg-cpp
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - pluskid