raabro 1.0.2 → 1.0.3

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = raabro CHANGELOG.txt
 
 
+== raabro 1.0.3  released 2015-09-23
+
+- drop the shrink! concept
+
+
 == raabro 1.0.2  released 2015-09-23
 
 - don't let parse() shrink tree when prune: false

data/lib/raabro.rb

@@ -26,7 +26,7 @@
 
 module Raabro
 
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   class Input
 
@@ -81,17 +81,6 @@ module Raabro
       @children = successful_children
     end
 
-    def shrink!
-
-      @children =
-        @children.inject([]) do |a, c|
-          a << c.shrink! if c.result == 1 && c.name
-          a
-        end
-
-      self
-    end
-
     def string
 
       @input.string[@offset, @length]
@@ -401,6 +390,8 @@ module Raabro
 
     def parse(input, opts={})
 
+      opts[:prune] = true unless opts.has_key?(:prune)
+
       root = self.respond_to?(:root) ? :root : @last
 
       t =
@@ -413,7 +404,6 @@ module Raabro
       return nil if opts[:prune] != false && t.result != 1
 
       t = t.children.first if t.parter == :all
-      t = (opts[:prune] == false) || (opts[:shrink] == false) ? t : t.shrink!
 
       return rewrite(t) if opts[:rewrite] != false && respond_to?(:rewrite)
 

data/spec/sample_xel_spec.rb

@@ -36,7 +36,7 @@ module Sample::Xel include Raabro
         tree.string.to_i
       when :fun
         [ tree.children[0].string ] +
-        tree.children[1].children.collect { |e| rewrite(e) }
+        tree.children[1].children.select(&:name).collect { |e| rewrite(e) }
       else
         fail ArgumentError.new("cannot rewrite #{tree.to_a.inspect}")
     end
@@ -73,7 +73,7 @@ describe Raabro do
         expect(t.result).to eq(1)
 
         expect(
-          Sample::Xel.rewrite(t.shrink!)
+          Sample::Xel.rewrite(t)
         ).to eq(
           [ 'SUM', 1, [ 'MUL', 4, 5 ] ]
         )
@@ -100,10 +100,13 @@ describe Raabro do
   1 :fun 0,9
     1 :funame 0,3 "MUL"
     1 :args 3,6
+      1 nil 3,1 "("
       1 :exp 4,1
         1 :num 4,1 "7"
+      1 nil 5,1 ","
       1 :exp 6,2
         1 :num 6,2 "-3"
+      1 nil 8,1 ")"
         }.strip)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raabro
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: