zscan 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea1628b5cfb954748386729a21dffe6c6d6d25b
-  data.tar.gz: 915abaa26d3e019bb92aa83df60401d7588feead
+  metadata.gz: 6a5bd6b35e34b41d8a18d878abea07f10f1cd645
+  data.tar.gz: 6e7b07d3f38f8914aead7fe1eab3f1d047e894cc
 SHA512:
-  metadata.gz: 6019ff48939fd372026edf8658f4dbf0c39b29f412e9be211b25134169b01bdc30530057f64481189177b62e1f02bfee6ee8f1983b9fb155b9140cc48ce70d46
-  data.tar.gz: 616662d24c577dadd4b6e6dc3b9e2af1b174ffcc526c336a45b8c96fcfd9682e2c30b590a88426f52eb2c410ab97a45162b13b3256b2258f69f64bc476d8bf44
+  metadata.gz: 0d38acf3d95a7e3d4b8094d1904566b9520fbcb9928ab94c18965bac645bca2d2f035172562b42592a812c5cc9bdb67266517fdb43527394427a84919e11cf96
+  data.tar.gz: 1c82a243bbc008bf5d040179fddf5f3b12d186c1ce25454661d34cc2562a0e0db4ff01966639cac610e2e05a4e33848cb540b0252944982f8a22cb00841bc2b6

data/ext/zscan.c

@@ -11,7 +11,6 @@ typedef struct {
   size_t pos;
   size_t bytepos;
   VALUE s;
-  struct re_registers regs;
   size_t stack_i;
   size_t stack_cap;
   Pos* stack;
@@ -26,15 +25,13 @@ static void zscan_mark(void* pp) {
 
 static void zscan_free(void* pp) {
   ZScan* p = pp;
-  onig_region_free(&(p->regs), 0);
   free(p->stack);
   ruby_xfree(p);
 }
 
-extern size_t onig_region_memsize P_((const struct re_registers *regs));
 static size_t zscan_memsize(const void* pp) {
   const ZScan* p = pp;
-  return p ? sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs) : 0;
+  return p ? sizeof(*p) : 0;
 }
 
 static const rb_data_type_t zscan_type = {
@@ -45,7 +42,6 @@ static const rb_data_type_t zscan_type = {
 static VALUE zscan_alloc(VALUE klass) {
   ZScan* p = ALLOC(ZScan);
   MEMZERO(p, ZScan, 1);
-  onig_region_init(&(p->regs));
   p->s = Qnil;
   p->stack_cap = 5;
   p->stack = (Pos*)malloc(sizeof(Pos) * 5);
@@ -168,12 +164,14 @@ static VALUE zscan_bmatch_p(VALUE self, VALUE pattern) {
   } else if (TYPE(pattern) == T_REGEXP) {
     regex_t *re = rb_reg_prepare_re(pattern, p->s);
     int tmpreg = re != RREGEXP(pattern)->ptr;
-    if (!tmpreg) RREGEXP(pattern)->usecnt++;
+    if (!tmpreg) {
+      RREGEXP(pattern)->usecnt++;
+    }
 
     char* ptr = RSTRING_PTR(p->s);
     UChar* ptr_end = (UChar*)(ptr + RSTRING_LEN(p->s));
     UChar* ptr_match_from = (UChar*)(ptr + p->bytepos);
-    long ret = onig_match(re, (UChar*)ptr, ptr_end, ptr_match_from, &(p->regs), ONIG_OPTION_NONE);
+    long ret = onig_match(re, (UChar*)ptr, ptr_end, ptr_match_from, NULL, ONIG_OPTION_NONE);
 
     if (!tmpreg) {
       RREGEXP(pattern)->usecnt--;
@@ -190,7 +188,7 @@ static VALUE zscan_bmatch_p(VALUE self, VALUE pattern) {
     if (ret == -2) {
       rb_raise(rb_eRuntimeError, "regexp buffer overflow");
     } else if (ret >= 0) {
-      return ULONG2NUM(p->regs.end[0]);
+      return LONG2NUM(ret);
     }
   } else {
     rb_raise(rb_eTypeError, "expect String or Regexp");

data/lib/zscan.rb

@@ -1,7 +1,7 @@
 require_relative "../ext/zscan"
 
 class ZScan
-  VERSION = '0.3'
+  VERSION = '0.4'
 
   def initialize s, dup=false
     _internal_init dup ? s.dup : s
@@ -58,11 +58,15 @@ if __FILE__ == $PROGRAM_NAME
   z.bytepos = 2
   assert '你', z.scan('你')
   assert '好', z.rest
+
   z.bytepos = 20
   assert 8, z.bytepos
-  assert 4, z.pos
+
   z.skip('ab')
   assert 8, z.bytepos
   assert 4, z.pos
-  z = nil
+
+  z = ZScan.new "a x:b+ $ \\k<x>"
+  z.pos = 1
+  assert ' ', z.scan(/\s*(\#.*$\s*)*/)
 end

data/zscan.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "zscan"
-  s.version = "0.3"
+  s.version = "0.4"
   s.author = "Zete Lui"
   s.homepage = "https://github.com/luikore/zscan"
   s.platform = Gem::Platform::RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zscan
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Zete Lui