raabro 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacf8b3ef595904e286ba4ed9544c3e7901e8815479a1a01cb70e02f40e03eda
-  data.tar.gz: b359e9b7c05039623d288dfc69c931b2b38e2ae8ee1c3e211d66f9218c12e32e
+  metadata.gz: 6c97c1720256a9bd016f9a3644bf6a0a407afde36122fe666a415f65d8f11fa2
+  data.tar.gz: 0e52242404f2309cbccfd92f7ee1d4ef06777c883d1c40254bddcf033a63752e
 SHA512:
-  metadata.gz: f31a3a5db74555d01b7d6a384ab4bd91dbf5beec8544aa99d7b012a60ce87767b51c1f6e74dd81e5c99b56eaea1bd0cb3cc1096452d58119a1fc33ada07e803e
-  data.tar.gz: 75b99b8c242258baab31f85d325585ad5c611ec0d98ce80110a1972d2b39762b035cb49fc66b0964b32edf8a1867b6a858756836ab40da6625921af8afd4eb3f
+  metadata.gz: fa0aebdcbfaeadd23dfd1ac8c442e52b839bced502c0ae144c5562bc97fc0e2a54c3114b0e048f47fdcb46c8ac2a7def92b7cd6169256195957bb7acbd65a9a6
+  data.tar.gz: e9c3eab148ede2853cafa1ec3fceec9967af83b4c3453017666f01741a0d51cb5eb200dde64e5d7c62ede442768b5f861a3a8bdb5587ded9a6a5afde73844b05

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # raabro CHANGELOG.md
 
 
+## raabro 1.4.0  released 2020-10-06
+
+* Ensure that jseq, for n elts, parses n-1 separators
+* Introduce Tree #symbol, #symbod, #strind and #strinpd
+
+
 ## raabro 1.3.3  released 2020-09-24
 
 * Merge Henrik's rewrite_ optimization

data/lib/raabro.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 
 module Raabro
 
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 
   class Input
 
@@ -79,10 +80,19 @@ module Raabro
     end
 
     def string; @input.string[@offset, @length]; end
-    def strinp; @input.string[@offset, @length].strip; end
+    def strinp; string.strip; end
     alias strim strinp
     def nonstring(l=7); @input.string[@offset, l]; end
 
+    def stringd; string.downcase; end
+    alias strind stringd
+    def stringpd; strinp.downcase; end
+    alias strinpd stringpd
+
+    def symbol; strinp.to_sym; end
+    def symbold; symbol.downcase; end
+    alias symbod symbold
+
     def lookup(name=nil)
 
       name = name ? name.to_s : nil
@@ -466,26 +476,36 @@ module Raabro
 
       if r.result == 1
 
-        i = 0
+        on_elt = false
+        count = 0
+        empty_stack = 0
 
         loop do
 
-          st = i > 0 ? _parse(seppa, input) : nil
-          et = st == nil || st.result == 1 ? _parse(eltpa, input) : nil
+          on_elt = ! on_elt
 
-          break if st && et && st.empty? && et.result == 0
-          break if st && et && st.empty? && et.empty?
+          cr = _parse(on_elt ? eltpa : seppa, input)
 
-          r.children << st if st
-          r.children << et if et
+          empty_stack = cr.empty? ? empty_stack + 1 : 0
+          cr.result = 0 if empty_stack > 1
+            #
+            # prevent "no progress"
 
-          break if et == nil
-          break if et.result != 1
+          r.children.push(cr)
+
+          if cr.result != 1
+            if on_elt && count > 0
+              lsep = r.children[-2]
+              lsep.result = 0
+              input.offset = lsep.offset
+            end
+            break
+          end
 
-          i = i + 1
+          count += 1
         end
 
-        r.result = 0 if jseq && i == 0
+        r.result = 0 if jseq && count < 1
       end
 
       if r.result == 1 && endpa

data/raabro.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'John Mettraux' ]
   s.email = [ 'jmettraux+flor@gmail.com' ]
-  s.homepage = 'http://github.com/floraison/raabro'
+  s.homepage = 'https://github.com/floraison/raabro'
   s.license = 'MIT'
   s.summary = 'a very dumb PEG parser library'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raabro
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,7 +38,7 @@ files:
 - README.md
 - lib/raabro.rb
 - raabro.gemspec
-homepage: http://github.com/floraison/raabro
+homepage: https://github.com/floraison/raabro
 licenses:
 - MIT
 metadata: {}