rbtagger 0.4.0 → 0.4.1

data/ext/rule_tagger/rbtagger.c

@@ -82,8 +82,8 @@ BrillTagger_apply_lexical_rules( VALUE self, VALUE tokens, VALUE tags, VALUE wor
 {
   TaggerContext *tc;
   int i = 0;
-  int token_length = RARRAY(tokens)->len;
-  int tags_length = RARRAY(tags)->len;
+  int token_length = RARRAY_LEN(tokens);
+  int tags_length = RARRAY_LEN(tags);
   int rules_length;
   VALUE fetched;
   int EXTRAWDS = NUM2INT( extrawds );
@@ -150,8 +150,8 @@ BrillTagger_default_tag_finish( VALUE self, VALUE tokens, VALUE tags )
   int i;
   VALUE fetched, word;
   char *tempstr;
-  int token_length = RARRAY(tokens)->len;
-  int tags_length = RARRAY(tags)->len;
+  int token_length = RARRAY_LEN(tokens);
+  int tags_length = RARRAY_LEN(tags);
   TaggerContext *tc;
 
   Data_Get_Struct( self, TaggerContext, tc );
@@ -182,8 +182,8 @@ static VALUE
 BrillTagger_apply_contextual_rules( VALUE self, VALUE tokens, VALUE tags, VALUE rmove )
 {
   int i;
-  int token_length = RARRAY(tokens)->len;
-  int tags_length = RARRAY(tags)->len;
+  int token_length = RARRAY_LEN(tokens);
+  int tags_length = RARRAY_LEN(tags);
   int rules_length;
   int restrict_move = NUM2INT( rmove );
   char **text_tags, **text_tokens;

data/ext/rule_tagger/ruby-compat.h

@@ -17,4 +17,12 @@
 #define RSTRING_LEN(str) RSTRING(str)->len
 #endif
 
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ar) RARRAY(ar)->len
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ar) RARRAY(ar)->ptr
+#endif
+
 #endif

data/ext/word_tagger/rtagger.cc

@@ -21,6 +21,15 @@
 #define RSTRING_LEN(str) RSTRING(str)->len
 #endif
 
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ar) RARRAY(ar)->len
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ar) RARRAY(ar)->ptr
+#endif
+
+
 static VALUE rb_Tagger;
 static VALUE rb_NWordTagger;
 
@@ -83,7 +92,7 @@ VALUE Tagger_load_tags( VALUE self, VALUE tagarr )
   NWordTagger *tagger;
   Data_Get_Struct( self, NWordTagger, tagger );
   std::set<std::string> tags;
-  int len = RARRAY(tagarr)->len;
+  int len = RARRAY_LEN(tagarr);
   for( int i = 0; i < len; ++i ){
     std::string tag = RSTRING_PTR( rb_ary_entry( tagarr, i ) );
     tags.insert(tag);

data/lib/brill/tagger.rb

@@ -222,10 +222,10 @@ module Brill
       text = text.gsub(/\s+/,' ')
 
       # translate some common extended ascii characters to quotes
-      text.gsub!(/#{145.chr}/,'`')
-      text.gsub!(/#{146.chr}/,"'")
-      text.gsub!(/#{147.chr}/,"``")
-      text.gsub!(/#{148.chr}/,"''")
+      text.gsub!(/‘/,'`')
+      text.gsub!(/’/,"'")
+      text.gsub!(/“/,"``")
+      text.gsub!(/”/,"''")
 
       # Attempt to get correct directional quotes
       # s{\"\b} { `` }g;

data/lib/rbtagger/version.rb

@@ -2,7 +2,7 @@ module RbTagger #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbtagger
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Todd A. Fisher