raabro 1.1.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2fa1cb664d06179ef03c05a8aa87173c1e097f8d
-  data.tar.gz: 01f4350acf6028d2b33f5ca0de6775eb7e8d9a8c
+SHA256:
+  metadata.gz: 6c97c1720256a9bd016f9a3644bf6a0a407afde36122fe666a415f65d8f11fa2
+  data.tar.gz: 0e52242404f2309cbccfd92f7ee1d4ef06777c883d1c40254bddcf033a63752e
 SHA512:
-  metadata.gz: 6521b4ace2882213adf5c248181387bcb179df9c1b0b68f8f238cc5de582f773092925a3584146fc5b2944ff981743f8d06708a2965da8bb07c265acc39e3160
-  data.tar.gz: ce28d1b1114ed171efa5e292f4af867c8a98420eeb157daad52315c44ecde15825a4db20d5e99f3bcf42dc57b968a282b2b5245cdbf7693118accd1923e30098
+  metadata.gz: fa0aebdcbfaeadd23dfd1ac8c442e52b839bced502c0ae144c5562bc97fc0e2a54c3114b0e048f47fdcb46c8ac2a7def92b7cd6169256195957bb7acbd65a9a6
+  data.tar.gz: e9c3eab148ede2853cafa1ec3fceec9967af83b4c3453017666f01741a0d51cb5eb200dde64e5d7c62ede442768b5f861a3a8bdb5587ded9a6a5afde73844b05

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 # 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
+
+
+## raabro 1.3.2  released 2020-09-24
+
+* Make a tiny rewrite_ optimization
+
+
+## raabro 1.3.1  released 2020-05-10
+
+* Add '!' (not) seq quantifier
+
+
+## raabro 1.3.0  released 2020-05-10
+
+* Add `nott` parser element
+* Add Tree#strinp and #strim
+* Skip 1.2.0 to align on http://github.com/jmettraux/jaabro
+
+
 ## raabro 1.1.6  released 2018-06-22
 
 * Remove unused `add` var, gh-2, thanks to https://github.com/utilum

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # 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
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015-2018, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2015-2020, 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/Makefile

@@ -28,7 +28,7 @@ build: gemspec_validate
 	mv $(NAME)-$(VERSION).gem pkg/
 
 push: build
-	gem push pkg/$(NAME)-$(VERSION).gem
+	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
 
 spec:
 	bundle exec rspec

data/README.md

@@ -27,31 +27,44 @@ module Fun include Raabro
   #
   # Last function is the root, "i" stands for "input".
 
-  def pa(i); rex(nil, i, /\(\s*/); end
-  def pz(i); rex(nil, i, /\)\s*/); end
-  def com(i); rex(nil, i, /,\s*/); end
+  def pstart(i); rex(nil, i, /\(\s*/); end
+  def pend(i); rex(nil, i, /\)\s*/); end
+    # parenthese start and end, including trailing white space
+
+  def comma(i); rex(nil, i, /,\s*/); end
+    # a comma, including trailing white space
 
   def num(i); rex(:num, i, /-?[0-9]+\s*/); end
+    # name is :num, a positive or negative integer
+
+  def args(i); eseq(nil, i, :pstart, :exp, :comma, :pend); end
+    # a set of :exp, beginning with a (, punctuated by commas and ending with )
 
-  def args(i); eseq(nil, i, :pa, :exp, :com, :pz); end
   def funame(i); rex(nil, i, /[a-z][a-z0-9]*/); end
   def fun(i); seq(:fun, i, :funame, :args); end
+    # name is :fun, a function composed of a function name
+    # followed by arguments
 
   def exp(i); alt(nil, i, :fun, :num); end
+    # an expression is either (alt) a function or a number
 
   # rewrite
   #
   # Names above (:num, :fun, ...) get a rewrite_xxx function.
   # "t" stands for "tree".
-  #
-  # The trees with a nil name are handled by rewrite_(tree) a default
-  # rewrite function
 
+  def rewrite_exp(t); rewrite(t.children[0]); end
   def rewrite_num(t); t.string.to_i; end
 
   def rewrite_fun(t)
-    [ t.children[0].string ] +
-    t.children[1].odd_children.collect { |a| rewrite(a) }
+
+    funame, args = t.children
+
+    [ funame.string ] +
+    args.gather.collect { |e| rewrite(e) }
+      #
+      # #gather collect all the children in a tree that have
+      # a name, in this example, names can be :exp, :num, :fun
   end
 end
 
@@ -121,6 +134,9 @@ def altg(name, input, *parsers)
 def rep(name, input, parser, min, max=0)
   # repeats the the wrapped parser
 
+def nott(name, input, parser)
+  # succeeds if the wrapped parser fails, fails if it succeeds
+
 def ren(name, input, parser)
   # renames the output of the wrapped parser
 
@@ -143,6 +159,8 @@ def eseq(name, input, startpa, eltpa, seppa, endpa)
 
 `seq` is special, it understands "quantifiers": `'?'`, `'+'` or `'*'`. They make behave `seq` a bit like a classical regex.
 
+The `'!'` (bang, not) quantifier is explained at the end of this section.
+
 ```ruby
 module CartParser include Raabro
 
@@ -162,6 +180,16 @@ end
 
 (Yes, this sample parser parses string like "appletomatocabbage", it's not very useful, but I hope you get the point about `.seq`)
 
+The `'!'` (bang, not) quantifier is a kind of "negative lookahead".
+
+```ruby
+  def menu(i)
+    seq(:menu, i, :mise_en_bouche, :main, :main, '!', :dessert)
+  end
+```
+
+Lousy example, but here a main cannot follow a main.
+
 
 ## trees
 

data/lib/raabro.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 
 module Raabro
 
-  VERSION = '1.1.6'
+  VERSION = '1.4.0'
 
   class Input
 
@@ -78,15 +79,19 @@ module Raabro
       @children = successful_children
     end
 
-    def string
+    def string; @input.string[@offset, @length]; end
+    def strinp; string.strip; end
+    alias strim strinp
+    def nonstring(l=7); @input.string[@offset, l]; end
 
-      @input.string[@offset, @length]
-    end
-
-    def nonstring(l=7)
+    def stringd; string.downcase; end
+    alias strind stringd
+    def stringpd; strinp.downcase; end
+    alias strinpd stringpd
 
-      @input.string[@offset, l]
-    end
+    def symbol; strinp.to_sym; end
+    def symbold; symbol.downcase; end
+    alias symbod symbold
 
     def lookup(name=nil)
 
@@ -177,7 +182,7 @@ module Raabro
            .collect(&:inspect).join('/')
           "parsing failed .../#{path}"
         else
-          "parsing failed, not all input was consumed"
+          'parsing failed, not all input was consumed'
         end
       visual =
         visual(line, column)
@@ -187,7 +192,7 @@ module Raabro
 
     def lookup_error(stack=[])
 
-#print "le(): "; Raabro.pp(self, colors: true)
+#print 'le(): '; Raabro.pp(self, colors: true)
       return nil if @result != 0
       return [ self, stack ] if @children.empty?
       @children.each { |c|
@@ -263,10 +268,11 @@ module Raabro
         # so that :plus and co can be overriden
 
       case parser
-        when '?', :q, :qmark then [ 0, 1 ]
-        when '*', :s, :star then [ 0, 0 ]
-        when '+', :p, :plus then [ 1, 0 ]
-        else nil
+      when '?', :q, :qmark then [ 0, 1 ]
+      when '*', :s, :star then [ 0, 0 ]
+      when '+', :p, :plus then [ 1, 0 ]
+      when '!' then :bang
+      else nil
       end
     end
 
@@ -298,7 +304,11 @@ module Raabro
         pa = parsers.shift
         break unless pa
 
-        if q = _quantify(parsers.first)
+        if parsers.first == '!'
+          parsers.shift
+          c = nott(nil, input, pa)
+          r.children << c
+        elsif q = _quantify(parsers.first)
           parsers.shift
           c = rep(nil, input, pa, *q)
           r.children.concat(c.children)
@@ -409,6 +419,22 @@ module Raabro
     end
     alias rename ren
 
+    def nott(name, input, parser)
+
+      start = input.offset
+
+      r = ::Raabro::Tree.new(name, :nott, input)
+      c = _parse(parser, input)
+      r.children << c
+
+      r.length = 0
+      r.result = c.result == 1 ? 0 : 1
+
+      input.offset = start
+
+      r
+    end
+
     def all(name, input, parser)
 
       start = input.offset
@@ -450,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
@@ -549,7 +585,7 @@ module Raabro
 
     def rewrite(tree)
 
-      return !! methods.find { |m| m.to_s.match(/^rewrite_/) } if tree == 0
+      return !! methods.find { |m| m.to_s.start_with?('rewrite_') } if tree == 0
         # return true when "rewrite_xxx" methods seem to have been provided
 
       send("rewrite_#{tree.name}", tree)

data/raabro.gemspec

@@ -10,8 +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.rubyforge_project = 'rufus'
+  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.1.6
+  version: 1.4.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 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: {}
@@ -57,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: a very dumb PEG parser library