raabro 1.3.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacf8b3ef595904e286ba4ed9544c3e7901e8815479a1a01cb70e02f40e03eda
-  data.tar.gz: b359e9b7c05039623d288dfc69c931b2b38e2ae8ee1c3e211d66f9218c12e32e
+  metadata.gz: 9b1e044dceb04da7a6f57861afd82bf3b6c534db46b15eb3ef80b9e1320bb009
+  data.tar.gz: df1ca803a864ffdfc9af86f72455cd44beeda2688ee9921d18640577f3059768
 SHA512:
-  metadata.gz: f31a3a5db74555d01b7d6a384ab4bd91dbf5beec8544aa99d7b012a60ce87767b51c1f6e74dd81e5c99b56eaea1bd0cb3cc1096452d58119a1fc33ada07e803e
-  data.tar.gz: 75b99b8c242258baab31f85d325585ad5c611ec0d98ce80110a1972d2b39762b035cb49fc66b0964b32edf8a1867b6a858756836ab40da6625921af8afd4eb3f
+  metadata.gz: cfae6a0f379f69167e06625bb9b6ae992ad9be178f8fcd117257a8733f3bd6828941a72b4184a37c0b88c9d4797b744da72a9c1db955a6226a0ba5b062928858
+  data.tar.gz: 7b98eb4991c75b89309d0c5daedc1759965263762523340371c6caba5e76d669f9b4d5638aae6ff56f1ed8356dda12eff9ac5c45c5d628987dc5f40c8f149c10

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 # raabro CHANGELOG.md
 
 
+## raabro 1.5.0  released 2026-07-22
+
+* Follow colours: true/false when Raabro.pp(t)
+* Use 0;90 for Raabro.pp dark gray
+* Harden alt() when no :subparser returns nil
+* Harden seq() when no :subparser returns nil
+
+
+## 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/CREDITS.md

@@ -1,9 +1,10 @@
 
 # raabro credits
 
-* Henryk Nyh https://github.com/henrik optimized rewrite_, gh-6
-* Utilum https://github.com/utilum removed unused var
-* John Mettraux https://github.com/jmettraux author and maintainer
+* Peter Goldstein, https://github.com/petergoldstein Travis to GHA, gh-7
+* Henryk, Nyh https://github.com/henrik optimized rewrite_, gh-6
+* Utilum, https://github.com/utilum removed unused var
+* John Mettraux, https://github.com/jmettraux author and maintainer
 
 
 ## aabro and jaabro credits

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015-2020, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2015-2025, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
 
 # raabro
 
-[![Build Status](https://secure.travis-ci.org/floraison/raabro.svg)](http://travis-ci.org/floraison/raabro)
+[![tests](https://github.com/floraison/raabro/workflows/test/badge.svg)](https://github.com/floraison/raabro/actions)
 [![Gem Version](https://badge.fury.io/rb/raabro.svg)](http://badge.fury.io/rb/raabro)
 
 A very dumb PEG parser library.
@@ -29,7 +29,7 @@ module Fun include Raabro
 
   def pstart(i); rex(nil, i, /\(\s*/); end
   def pend(i); rex(nil, i, /\)\s*/); end
-    # parenthese start and end, including trailing white space
+    # parentheses start and end, including trailing white space
 
   def comma(i); rex(nil, i, /,\s*/); end
     # a comma, including trailing white space
@@ -122,6 +122,14 @@ def rex(name, input, regex_or_string)
   # matching a regexp
   # no need for ^ or \A, checks the match occurs at current offset
 
+def blk(name, input, &block)
+  #
+  # takes a block returning nil or false when it doesn't match or the
+  # length of the matching string if it matches
+  #
+  # the block take 0, 1 [ string_from_parse_point ], or 2 [ str, input ]
+  # arguments
+
 def seq(name, input, *parsers)
   # a sequence of parsers
 
@@ -246,7 +254,7 @@ One can reparse with `error: true` and receive an error array with the parse err
 ```ruby
 err = Sample::Fun.parse('f(a, b', error: true)
   # yields:
-  # [ line, column, offest, error_message, error_visual ]
+  # [ line, column, offset, error_message, error_visual ]
 [ 1, 4, 3, 'parsing failed .../:exp/:fun/:arg', "f(a, b\n   ^---" ]
 ```
 

data/lib/raabro.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 
 module Raabro
 
-  VERSION = '1.3.3'
+  VERSION = '1.5.0'
 
   class Input
 
@@ -15,13 +16,16 @@ module Raabro
       @options = offset.is_a?(Hash) ? offset : options
     end
 
-    def match(str_or_regex)
+    def match(str_rex_or_block)
 
-      if str_or_regex.is_a?(Regexp)
-        m = @string[@offset..-1].match(str_or_regex)
+      if str_rex_or_block.is_a?(Regexp)
+        m = @string[@offset..-1].match(str_rex_or_block)
         m && (m.offset(0).first == 0) ? m[0].length : false
+      elsif str_rex_or_block.is_a?(Proc)
+        str_rex_or_block.call(
+          *[ @string[@offset..-1], self ].take(str_rex_or_block.arity))
       else # String or whatever responds to #to_s
-        s = str_or_regex.to_s
+        s = str_rex_or_block.to_s
         l = s.length
         @string[@offset, l] == s ? l : false
       end
@@ -79,10 +83,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
@@ -229,11 +242,11 @@ module Raabro
 
   module ModuleMethods
 
-    def _match(name, input, parter, regex_or_string)
+    def _match(name, input, parter, str_rex_or_block)
 
       r = Raabro::Tree.new(name, parter, input)
 
-      if l = input.match(regex_or_string)
+      if l = input.match(str_rex_or_block)
         r.result = 1
         r.length = l
         input.offset += l
@@ -252,10 +265,15 @@ module Raabro
       _match(name, input, :rex, Regexp.new(regex_or_string))
     end
 
+    def blk(name, input, &block)
+
+      _match(name, input, :blk, block)
+    end
+
     def _quantify(parser)
 
       return nil if parser.is_a?(Symbol) && respond_to?(parser)
-        # so that :plus and co can be overriden
+        # so that :plus and co can be overridden
 
       case parser
       when '?', :q, :qmark then [ 0, 1 ]
@@ -307,7 +325,7 @@ module Raabro
           r.children << c
         end
 
-        break if c.result != 1
+        break if c && c.result != 1
       end
 
       if c && c.result == 1
@@ -350,7 +368,7 @@ module Raabro
           end
         else
           c = cc
-          break if c.result == 1
+          break if c && c.result == 1
         end
       end
 
@@ -466,26 +484,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
+
+          cr = _parse(on_elt ? eltpa : seppa, input)
 
-          break if st && et && st.empty? && et.result == 0
-          break if st && et && st.empty? && et.empty?
+          empty_stack = cr.empty? ? empty_stack + 1 : 0
+          cr.result = 0 if empty_stack > 1
+            #
+            # prevent "no progress"
 
-          r.children << st if st
-          r.children << et if et
+          r.children.push(cr)
 
-          break if et == nil
-          break if et.result != 1
+          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
@@ -586,15 +614,6 @@ module Raabro
 
   make_includable
 
-    # Black       0;30     Dark Gray     1;30
-    # Blue        0;34     Light Blue    1;34
-    # Green       0;32     Light Green   1;32
-    # Cyan        0;36     Light Cyan    1;36
-    # Red         0;31     Light Red     1;31
-    # Purple      0;35     Light Purple  1;35
-    # Brown       0;33     Yellow        1;33
-    # Light Gray  0;37     White         1;37
-
   def self.pp(tree, depth=0, opts={})
 
     fail ArgumentError.new(
@@ -604,8 +623,8 @@ module Raabro
     depth, opts = 0, depth if depth.is_a?(Hash)
 
     _rs, _dg, _gn, _yl, _bl, _lg =
-      (opts[:colors] || opts[:colours] || $stdout.tty?) ?
-      [ "", "", "", "", "", "" ] :
+      (opts[:colors] || opts[:colours]) ?
+      [ "", "", "", "", "", "" ] :
       [ '', '', '', '', '', '' ]
 
     lc = tree.result == 1 ? _gn : _dg

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'
 
@@ -18,18 +18,29 @@ Gem::Specification.new do |s|
 A very dumb PEG parser library, with a horrible interface.
   }.strip
 
+  s.metadata = {
+    'changelog_uri' => s.homepage + '/blob/master/CHANGELOG.md',
+    'bug_tracker_uri' => s.homepage + '/issues',
+    'documentation_uri' => s.homepage,
+    'source_code_uri' => s.homepage,
+    'homepage_uri' =>  s.homepage,
+    #'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/floraison',
+    #'wiki_uri' => s.homepage + '/wiki',
+    'rubygems_mfa_required' => 'true',
+  }
+
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
-    'README.{md,txt}',
-    'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
-    'Makefile',
+    '{README,CHANGELOG,CREDITS,LICENSE}.{md,txt}',
+    #'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     "#{s.name}.gemspec",
   ]
 
   #s.add_runtime_dependency 'tzinfo'
 
-  s.add_development_dependency 'rspec', '~> 3.7'
+  #s.add_development_dependency 'rspec', '~> 3.7'
+  s.add_development_dependency 'probatio', '~> 1.6'
 
   s.require_path = 'lib'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: raabro
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.5.0
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2026-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: probatio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.6'
 description: A very dumb PEG parser library, with a horrible interface.
 email:
 - jmettraux+flor@gmail.com
@@ -34,15 +34,20 @@ files:
 - CHANGELOG.md
 - CREDITS.md
 - LICENSE.txt
-- Makefile
 - README.md
 - lib/raabro.rb
 - raabro.gemspec
-homepage: http://github.com/floraison/raabro
+homepage: https://github.com/floraison/raabro
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/floraison/raabro/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/floraison/raabro/issues
+  documentation_uri: https://github.com/floraison/raabro
+  source_code_uri: https://github.com/floraison/raabro
+  homepage_uri: https://github.com/floraison/raabro
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -57,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: a very dumb PEG parser library
 test_files: []

data/Makefile

@@ -1,39 +0,0 @@
-
-## gem tasks ##
-
-NAME = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
-VERSION = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
-
-count_lines:
-	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
-	find spec -name "*_spec.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
-cl: count_lines
-
-gemspec_validate:
-	@echo "---"
-	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); p s.validate"
-	@echo "---"
-
-name: gemspec_validate
-	@echo "$(NAME) $(VERSION)"
-
-cw:
-	find lib -name "*.rb" -exec ruby -cw {} \;
-
-build: gemspec_validate
-	gem build $(NAME).gemspec
-	mkdir -p pkg
-	mv $(NAME)-$(VERSION).gem pkg/
-
-push: build
-	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
-
-spec:
-	bundle exec rspec
-test: spec
-
-
-.PHONY: count_lines gemspec_validate name cw build push spec
-