raabro 1.1.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2fa1cb664d06179ef03c05a8aa87173c1e097f8d
-  data.tar.gz: 01f4350acf6028d2b33f5ca0de6775eb7e8d9a8c
+SHA256:
+  metadata.gz: 72a0f2a013fa2997e7c6e8edd1a821634dba5b593afdfb00369add4b257f3015
+  data.tar.gz: 4a62a9fcdb3571eab480dde394269c85768c9c6e48e6b07e4891032982ea970d
 SHA512:
-  metadata.gz: 6521b4ace2882213adf5c248181387bcb179df9c1b0b68f8f238cc5de582f773092925a3584146fc5b2944ff981743f8d06708a2965da8bb07c265acc39e3160
-  data.tar.gz: ce28d1b1114ed171efa5e292f4af867c8a98420eeb157daad52315c44ecde15825a4db20d5e99f3bcf42dc57b968a282b2b5245cdbf7693118accd1923e30098
+  metadata.gz: 7ab5adf883c241fefde881980f4b9783d26d49cbb651058803f1ee888d0e0eb7aa4ba6276c05e795eaa7bcae9d9b4c245add84d61e0f48ee1c720c5bc16eff7d
+  data.tar.gz: 139efc8e983e62d9d0911e7dd25276171948ea453c6caaf950fa67107d5b724ffb81dab705151ae77727e7b2a7b93688328339e4613ce4ceda32ad2748d74559

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 # raabro CHANGELOG.md
 
 
+## 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/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
 

data/lib/raabro.rb

@@ -1,7 +1,7 @@
 
 module Raabro
 
-  VERSION = '1.1.6'
+  VERSION = '1.3.0'
 
   class Input
 
@@ -78,15 +78,10 @@ module Raabro
       @children = successful_children
     end
 
-    def string
-
-      @input.string[@offset, @length]
-    end
-
-    def nonstring(l=7)
-
-      @input.string[@offset, l]
-    end
+    def string; @input.string[@offset, @length]; end
+    def strinp; @input.string[@offset, @length].strip; end
+    alias strim strinp
+    def nonstring(l=7); @input.string[@offset, l]; end
 
     def lookup(name=nil)
 
@@ -409,6 +404,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

data/raabro.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.authors = [ 'John Mettraux' ]
   s.email = [ 'jmettraux+flor@gmail.com' ]
   s.homepage = 'http://github.com/floraison/raabro'
-  #s.rubyforge_project = 'rufus'
   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.3.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -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