match_at 2 → 3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b20934cbff3ba306998d01baf791fd6dd2ea9b4b
-  data.tar.gz: fe95877702b2dadaa6df96ce90ce9d12286efc6d
+  metadata.gz: d5eee137912b36f2e3d5cd1338d6519bbf530bd3
+  data.tar.gz: 9d9cffc18535c9cf277455dfc17b6964bce74b7b
 SHA512:
-  metadata.gz: ad86d7bd9683a9fe869a7c29e22162a15c45d3344a0b7a9456d373366efa3f3362c4b5576f659053dbd991f952d581389d813cfb73b99c1f36f261ee48a48778
-  data.tar.gz: bc97cfe8229b2a181d6ed9cb7ac6a18013673f8bf52a8815fc13ac05a2fa9ee850422df580afa5ade387ac6c595e87a2ae465ec0fdd6be6c1e603346d94c1d02
+  metadata.gz: c144b85c5c41c5aea39e86d0bda594ba5b812ee45d3cf27960d28ad1efc5e19049b568b542a81556f5dbe8a4c921fb7bfa1aaab01e57638014084be8bf66397e
+  data.tar.gz: bd71a51305170776436d503ebc1cff1e0f8fe7ee236f1a1f993a568b43c83669215a281e38dbed95861e961e4193d668d8c17a493056b8b252263208561bccf9

data/ext/match_at/match_at.c

@@ -27,7 +27,7 @@
 
 static VALUE match_at(VALUE RB_UNUSED_VAR(mod), VALUE str, VALUE rexp, VALUE pos);
 static VALUE match_at_p(VALUE RB_UNUSED_VAR(mod), VALUE str, VALUE rexp, VALUE pos);
-static bool do_match(VALUE str, VALUE rexp, VALUE pos, OnigRegion *region);
+static OnigPosition do_match(VALUE str, VALUE rexp, VALUE pos, OnigRegion *region);
 
 /**
  * Match the rexp  against str's position pos.  This is  lightweight because no
@@ -42,7 +42,22 @@ static bool do_match(VALUE str, VALUE rexp, VALUE pos, OnigRegion *region);
 VALUE
 match_at_p(VALUE mod, VALUE str, VALUE rexp, VALUE pos)
 {
-    return do_match(str, rexp, pos, NULL) ? Qtrue : Qfalse;
+    OnigPosition result = do_match(str, rexp, pos, NULL);
+
+    if (result >= 0) {
+        long n           = NUM2LONG(pos);
+        rb_encoding *enc = rb_enc_get(str);
+        const char *beg  = rb_string_value_ptr(&str);
+        const char *end  = RSTRING_END(str);
+        const char *ptr  = rb_enc_nth(beg, end, n, enc);
+        const char *term = &ptr[result];
+        long len         = rb_enc_strlen(ptr, term, enc);
+
+        return LONG2NUM(len);
+    }
+    else {
+        return Qnil;
+    }
 }
 
 /**
@@ -59,10 +74,11 @@ match_at_p(VALUE mod, VALUE str, VALUE rexp, VALUE pos)
 VALUE
 match_at(VALUE mod, VALUE str, VALUE rexp, VALUE pos)
 {
-    OnigRegion region = { 0 };
-    VALUE ret         = Qnil;
+    OnigRegion region   = { 0 };
+    VALUE ret           = Qnil;
+    OnigPosition result = do_match(str, rexp, pos, &region);
 
-    if (do_match(str, rexp, pos, &region)) {
+    if (result >= 0) {
         int err;
         ret = rb_funcall(rb_cMatch, rb_intern("allocate"), 0);
         err = rb_reg_region_copy(RMATCH_REGS(ret), &region);
@@ -81,7 +97,7 @@ match_at(VALUE mod, VALUE str, VALUE rexp, VALUE pos)
     return ret;
 }
 
-bool
+OnigPosition
 do_match(VALUE vstr, VALUE vreg, VALUE vpos, OnigRegion *region)
 {
     const char *str;
@@ -119,11 +135,8 @@ do_match(VALUE vstr, VALUE vreg, VALUE vpos, OnigRegion *region)
 	}
     }
 
-    if (result >= 0) {
-        return true;
-    }
-    else if (result == ONIG_MISMATCH) {
-        return false;
+    if ((result >= 0) || (result == ONIG_MISMATCH)) {
+        return result;
     }
     else {
         OnigUChar err[ONIG_MAX_ERROR_MESSAGE_LEN] = { 0 };

data/lib/match_at/version.rb

@@ -24,4 +24,4 @@
 # SOFTWARE.
 ;
 
-MatchAt::VERSION = 2
+MatchAt::VERSION = 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match_at
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '3'
 platform: ruby
 authors:
 - Urabe, Shyouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler