word_scoop 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949ccab549473271deddc4eef724b8dae5cda1acaf438c0915c38a999ada4625
-  data.tar.gz: 940837d338047d67a92ed656dbe069025709979c6d2b653da923b0f11943d086
+  metadata.gz: db11a9d520375459e1bb1f4c955b9a89479df88b420e97e1ac36ed5895e3b200
+  data.tar.gz: b928612fd50a9fbf62595aa6425ceee3f1d2013f4d8323869b7ca881a32f8bb5
 SHA512:
-  metadata.gz: 8d6ee443279d208c714cdc976a97a67d1c977da5530ae49d8828b7e5d37c47bb2bed34513c4c13a0c4c468fecc5ec5d9424458c8888fb834468ce7d697a717b8
-  data.tar.gz: c27a5e1c29ad02cf492ec9551ed6434a527fc267573cc00fcc9c72077b64d979d2a586e9c8ac4dbd97fad0258a3fc9661704ff22bc8496364d3c05c553876352
+  metadata.gz: 162a7ffc6e9a726455a733229199de59cf74afec6eb98353e86449c3f94a9eb2a4181116906a8f718c775151281bc8dfd3c09f4a31132878317609a4d9dc6a2a
+  data.tar.gz: 118469f06e3c14b60894f5e84ae5f6059d76a379491d1016407db0d34af3bbbfe53c35a82615f637df255d94ff745bb8f229da44181c343da5eb99dcdd2665cc

data/ext/word_scoop/word_scoop.c

@@ -9,13 +9,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include <ruby/encoding.h>
 #include "word_scoop.h"
 
+static VALUE t_add(VALUE, VALUE);
 
 // initialize node
-node initialize_node(char moji)
+static node
+initialize_node(char moji)
 {
     node work = (node)malloc(sizeof(struct _node));
     if (!work) {
@@ -32,7 +35,8 @@ node initialize_node(char moji)
 }
 
 // add child node
-void add_child(node parent, node child)
+static void
+add_child(node parent, node child)
 {
     if (parent->child_head) {
         child->next = parent->child_head;
@@ -41,10 +45,11 @@ void add_child(node parent, node child)
 }
 
 // search node by use character
-node search_child(node n, char moji)
+static node
+search_child(node n, char moji)
 {
     node child;
-    
+
     child = n->child_head;
     while(child) {
         if (child->moji == moji) {
@@ -58,10 +63,11 @@ node search_child(node n, char moji)
 
 // search node by use character.
 // if nothing, create new node
-node search_child_or_create(node n, char moji)
+static node
+search_child_or_create(node n, char moji)
 {
     node child;
-    
+
     child = search_child(n, moji);
     if(!child) {
         child = initialize_node(moji);
@@ -72,9 +78,9 @@ node search_child_or_create(node n, char moji)
 }
 
 // free memory all child and self
-void destroy_node(node n)
+static void
+destroy_node(node n)
 {
-    int i;
     node now, next;
 
     now = n->child_head;
@@ -88,7 +94,8 @@ void destroy_node(node n)
 }
 
 // add encoding info
-static VALUE add_encode(VALUE str, rb_encoding *enc)
+static VALUE
+add_encode(VALUE str, rb_encoding *enc)
 {
   rb_enc_associate(str, enc);
   return str;
@@ -101,7 +108,8 @@ static VALUE add_encode(VALUE str, rb_encoding *enc)
 /**
  * new
  **/
-static VALUE t_new(int argc, VALUE *argv, VALUE klass)
+static VALUE
+t_new(int argc, VALUE *argv, VALUE klass)
 {
     node root;
     VALUE obj, array, string;
@@ -123,11 +131,12 @@ static VALUE t_new(int argc, VALUE *argv, VALUE klass)
 /**
  * add
  **/
-static VALUE t_add(VALUE self, VALUE str)
+static VALUE
+t_add(VALUE self, VALUE str)
 {
     node root, now;
     char *keyword;
-    int i, len;
+    long i, len;
 
     keyword = StringValuePtr(str);
 
@@ -156,11 +165,13 @@ static VALUE t_add(VALUE self, VALUE str)
 /**
  * search
  **/
-static VALUE t_search(VALUE self, VALUE str)
+static VALUE
+t_search(VALUE self, VALUE str)
 {
     node root, now, ret;
     char *text;
-    int i, head_i, tail_i, total_len;
+    long i, total_len;
+    long head_i, tail_i;
     VALUE array;
     rb_encoding *enc;
 
@@ -213,12 +224,14 @@ static VALUE t_search(VALUE self, VALUE str)
 /**
  * filter_html
  **/
-static VALUE t_filter_html(VALUE self, VALUE str)
+static VALUE
+t_filter_html(VALUE self, VALUE str)
 {
     node root, now, ret;
     bool in_tag;
-    char *text, *inner_tag;
-    int i, head_i, tail_i, copy_head_i, total_len;
+    char *text;
+    const char* inner_tag;
+    long i, head_i, tail_i, copy_head_i, total_len;
     VALUE change_str, url_base, word;
     rb_encoding *enc;
 
@@ -331,7 +344,8 @@ static VALUE t_filter_html(VALUE self, VALUE str)
 /**
  * define class
  **/
-void Init_word_scoop() {
+void
+Init_word_scoop() {
     VALUE cWordScoop;
 
     cWordScoop = rb_define_class("WordScoop", rb_cObject);

data/ext/word_scoop/word_scoop.h

@@ -7,11 +7,6 @@
 //************************************
 
 
-// bool type
-#define true    1
-#define false   0
-typedef char bool;
-
 #define CR '\r'
 #define LF '\n'
 #define TAB '\t'
@@ -39,44 +34,3 @@ typedef struct _node {
     struct _node    *child_head;// head of child list
     struct _node    *next;      // pointer of sibling node
 } *node;
-
-
-// initialize node
-node initialize_node(char);
-
-// add child node
-void add_child(node, node);
-
-// search node by use character
-node search_child(node, char);
-
-// search node by use character.
-// if nothing, create new node
-node search_child_or_create(node, char);
-
-// free memory all child and self
-void destroy_node(node);
-
-// add encoding info
-static VALUE add_encode(VALUE, rb_encoding *);
-
-//-----------------------------------------------------------
-// Ruby Methods
-// ----------------------------------------------------------
-
-// new
-static VALUE t_new(int, VALUE *, VALUE);
-
-// add
-static VALUE t_add(VALUE, VALUE);
-
-// search
-static VALUE t_search(VALUE, VALUE);
-
-//filter_html
-static VALUE t_filter_html(VALUE, VALUE);
-
-
-// defined class
-void Init_word_scoop();
-

data/lib/word_scoop/version.rb

@@ -1,3 +1,3 @@
 class WordScoop
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: word_scoop
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler