zscan 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5bd6b35e34b41d8a18d878abea07f10f1cd645
-  data.tar.gz: 6e7b07d3f38f8914aead7fe1eab3f1d047e894cc
+  metadata.gz: 743c9b854996ff1714f83f805a8d975b261993b5
+  data.tar.gz: 65254b0e114cd41b727e5481da48704b28ee2bf1
 SHA512:
-  metadata.gz: 0d38acf3d95a7e3d4b8094d1904566b9520fbcb9928ab94c18965bac645bca2d2f035172562b42592a812c5cc9bdb67266517fdb43527394427a84919e11cf96
-  data.tar.gz: 1c82a243bbc008bf5d040179fddf5f3b12d186c1ce25454661d34cc2562a0e0db4ff01966639cac610e2e05a4e33848cb540b0252944982f8a22cb00841bc2b6
+  metadata.gz: 028d305bcee7917a29caadbe8a4ff1254e682de582c5316ba0267d95ab0dd5fe01a47198fc5fda3aa5ba0e6c66ccd813d17fa464986c25bf528c3fc460a1e55d
+  data.tar.gz: eb2f9bff39078f3a835868147f3e36e388544ea6a939a053b0db3298cfef8d56945b06a78fba102b9b04345fef5ac5464e70d16f2999a25cd72f16c6489268ad

data/ext/zscan.c

@@ -104,11 +104,15 @@ static VALUE zscan_bytepos(VALUE self) {
 
 static VALUE zscan_bytepos_eq(VALUE self, VALUE v_bytepos) {
   P;
-  size_t bytepos = NUM2ULONG(v_bytepos);
-  size_t from, to;
+  long signed_bytepos = NUM2LONG(v_bytepos);
+  size_t from, to, bytepos;
 
-  if (bytepos > (size_t)RSTRING_LEN(p->s)) {
+  if (signed_bytepos > RSTRING_LEN(p->s)) {
     bytepos = RSTRING_LEN(p->s);
+  } else if (signed_bytepos < 0) {
+    bytepos = 0;
+  } else {
+    bytepos = signed_bytepos;
   }
 
   if (bytepos > p->bytepos) {
@@ -229,6 +233,15 @@ static VALUE zscan_drop_top(VALUE self) {
   return self;
 }
 
+static VALUE zscan_resume_top(VALUE self) {
+  P;
+  if (p->stack_i) {
+    p->pos = p->stack[p->stack_i].pos;
+    p->bytepos = p->stack[p->stack_i].bytepos;
+  }
+  return self;
+}
+
 void Init_zscan() {
   VALUE zscan = rb_define_class("ZScan", rb_cObject);
   rb_define_alloc_func(zscan, zscan_alloc);
@@ -244,4 +257,5 @@ void Init_zscan() {
   rb_define_method(zscan, "push_pos", zscan_push_pos, 0);
   rb_define_method(zscan, "pop_pos", zscan_pop_pos, 0);
   rb_define_method(zscan, "drop_top", zscan_drop_top, 0);
+  rb_define_method(zscan, "resume_top", zscan_resume_top, 0);
 }

data/lib/zscan.rb

@@ -1,7 +1,7 @@
 require_relative "../ext/zscan"
 
 class ZScan
-  VERSION = '0.4'
+  VERSION = '0.5'
 
   def initialize s, dup=false
     _internal_init dup ? s.dup : s
@@ -35,38 +35,3 @@ class ZScan
 
   private :_internal_init, :_internal_string
 end
-
-# coding: utf-8
-if __FILE__ == $PROGRAM_NAME
-  GC.stress = true
-  def assert a, b
-    raise "expected #{a.inspect} == #{b.inspect}" if a != b
-  end
-  z = ZScan.new 'ab你好'
-  assert 2, z.bmatch?('ab')
-  z.pos = 4
-  assert 8, z.bytepos
-  z.push_pos
-  assert nil, z.scan(/ab你/)
-  z.pos = 0
-  assert 'ab你', z.scan(/ab你/)
-  assert 3, z.pos
-  assert 5, z.bytepos
-  z.pop_pos
-  assert 4, z.pos
-  assert 8, z.bytepos
-  z.bytepos = 2
-  assert '你', z.scan('你')
-  assert '好', z.rest
-
-  z.bytepos = 20
-  assert 8, z.bytepos
-
-  z.skip('ab')
-  assert 8, z.bytepos
-  assert 4, z.pos
-
-  z = ZScan.new "a x:b+ $ \\k<x>"
-  z.pos = 1
-  assert ' ', z.scan(/\s*(\#.*$\s*)*/)
-end

data/readme.md

@@ -47,6 +47,10 @@ See also https://bugs.ruby-lang.org/issues/7092
 - `bytepos`
 - `bytepos= new_bytepos` note: complexity ~ `abs(new_bytepos - bytepos)`.
 - `advance n` move forward `n` codepoints, if `n < 0`, move backward. Stops at beginning or end.
-- `push_pos` efficiently pushes current pos into the stack.
-- `pop_pos` efficiently sets current pos to top of the stack, and pops it.
+
+## Efficient pos stack manipulation
+
+- `push_pos` pushes current pos into the stack.
+- `pop_pos` sets current pos to top of the stack, and pops it.
 - `drop_top` drops top of pos stack without changing current pos.
+- `resume_top` sets current pos to top of the stack.

data/zscan.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zscan
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies: []
 description: improved string scanner
 email: