sexpr 0.3.0 → 0.4.0

data/spec/parser/citrus/test_new.rb

@@ -20,9 +20,5 @@ module Sexpr::Parser
       p.parser.should eq(bool_expr_parser)
     end
 
-    it 'passes the options' do
-      Citrus.new(bool_expr_parser, {:hello => "World"}).options[:hello].should eq("World")
-    end
-
   end
 end

data/spec/parser/citrus/test_parse.rb

@@ -8,6 +8,10 @@ module Sexpr::Parser
       parser.parse("true").should be_a(::Citrus::Match)
     end
 
+    it 'is idempotent' do
+      parser.parse(parser.parse("true")).should be_a(::Citrus::Match)
+    end
+
     it 'raises a Citrus::ParserError when parsing fails' do
       lambda{
         parser.parse("bl and or")

data/spec/parser/citrus/test_registration.rb

@@ -10,11 +10,5 @@ module Sexpr::Parser
       Sexpr::Parser.factor(bool_expr_parser).should be_a(Citrus)
     end
 
-    it 'should accept factor options, defaulting to defaults' do
-      cit = Sexpr::Parser.factor(bool_expr_parser, {:hello => "World"})
-      cit.options[:hello].should eq("World")
-      cit.options.should have_key(:from_match_to_sexpr)
-    end
-
   end
 end

data/spec/parser/citrus/test_to_sexpr.rb

@@ -1,15 +1,30 @@
 require 'spec_helper'
 module Sexpr::Parser
-  describe Citrus, "sexpr" do
+  describe Citrus, "to_sexpr" do
 
-    it 'calls value by default' do
-      parser = Citrus.new(bool_expr_parser)
-      parser.sexpr("true").should eq([:bool_lit, true])
+    let(:parser){
+      Citrus.new(bool_expr_parser)
+    }
+
+    subject{ parser.to_sexpr(parser.parse("not x")) }
+
+    it 'calls sexpr' do
+      subject.should eq([:bool_not, [:var_ref, "x"]])
+    end
+
+    it 'returns a Sexpr object' do
+      subject.should be_a(Sexpr)
+    end
+
+    it 'tags the modules recursively' do
+      subject.last.should be_a(Sexpr)
     end
 
-    it 'delegates to from_match_to_sexpr if specified' do
-      parser = Citrus.new(bool_expr_parser, :from_match_to_sexpr => lambda{|x| 12})
-      parser.sexpr("true").should eq(12)
+    it 'sets the markers' do
+      [subject, subject.last].each do |s|
+        s.tracking_markers.should be_a(Hash)
+        s.tracking_markers[:citrus_match].should_not be_nil
+      end
     end
 
   end

data/spec/processor/helper/test_call.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+module Sexpr
+  class Processor
+    describe Helper, "call" do
+
+      let(:helper)    { FooHelper.new    }
+      let(:processor) { FooProcessor.new }
+      let(:toplevel) {
+        Proc.new do |rw,node|
+          rw.should eq(processor)
+          [:toplevel, node]
+        end
+      }
+
+      it 'dispatches to the method when it exists' do
+        expected = \
+          [:foo_hello,
+            [:toplevel,
+              [:hello, "world"] ]]
+        got = helper.call(processor, [:hello, "world"], &toplevel)
+        got.should eq(expected)
+      end
+
+      it 'falls back to yielding when no method' do
+        expected = \
+          [:toplevel,
+            [:nosuchone] ]
+        got = helper.call(processor, [:nosuchone], &toplevel)
+        got.should eq(expected)
+      end
+
+      it 'calls next_in_chain when set' do
+        helper.next_in_chain = Class.new do
+          def call(rw, node)
+            raise unless rw.is_a?(FooProcessor)
+            yield rw, [:next, node]
+          end
+        end.new
+
+        expected = \
+          [:foo_hello,
+            [:toplevel,
+              [:next,
+                [:hello, "world"] ]]]
+        got = helper.call(processor, [:hello, "world"], &toplevel)
+        got.should eq(expected)
+      end
+
+    end
+  end
+end

data/spec/processor/test_build_helper_chain.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, "build_helper_chain" do
+
+    def chain(helpers)
+      Processor.build_helper_chain(helpers)
+    end
+
+    it 'returns a NullHelper instance when the chain is empty' do
+      chain([]).should be_a(Processor::NullHelper)
+    end
+
+    it 'returns an instance of the first helper when a singleton chain' do
+      chain([ FooHelper ]).should be_a(FooHelper)
+    end
+
+    it 'returns chained helpers when a list' do
+      chain = chain([ FooHelper, BarHelper ])
+      chain.should be_a(FooHelper)
+      chain.next_in_chain.should be_a(BarHelper)
+    end
+
+  end
+end

data/spec/processor/test_call.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, 'call' do
+
+    let(:procclass){
+      Class.new(Processor) do
+
+        def on_hello(sexpr)
+          [:seen_hello, sexpr]
+        end
+
+        def on_missing(sexpr)
+          if sexpr.first == :nosuchone
+            [:seen_missing, sexpr]
+          else
+            super
+          end
+        end
+
+      end
+    }
+    let(:proc){ procclass.new }
+
+    it 'dispatches to existing methods' do
+      ast = [:hello, "world"]
+      proc.call(ast).should eq([:seen_hello, [:hello, "world"]])
+    end
+
+    it 'calls on_missing when not found' do
+      ast = [:nosuchone, "world"]
+      proc.call(ast).should eq([:seen_missing, [:nosuchone, "world"]])
+    end
+
+    it 'raises unexpected by default in on_missing' do
+      ast = [:nonono, "world"]
+      lambda{ proc.call(ast) }.should raise_error(UnexpectedSexprError, /nonono/)
+    end
+
+    it 'raises an ArgumentError unless called on a sexpr' do
+      lambda{
+        proc.call("world").should raise_error(ArgumentError, /world/)
+      }
+    end
+
+  end
+end

data/spec/processor/test_helper.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, "helper" do
+
+    it 'installs the helping class in the registered helpers' do
+      Processor.helpers.should eq([])
+      FooProcessor.helpers.should eq([FooHelper])
+      BarProcessor.helpers.should eq([FooHelper, BarHelper])
+    end
+
+    it 'extends the processor classes with Methods modules' do
+      FooProcessor.included_modules.should be_include(FooHelper::Methods)
+      FooProcessor.included_modules.should_not be_include(BarHelper::Methods)
+      BarProcessor.included_modules.should be_include(FooHelper::Methods)
+      BarProcessor.included_modules.should be_include(BarHelper::Methods)
+    end
+
+  end
+end

data/spec/processor/test_main_processor.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, "main_processor" do
+
+    let(:procclass){ Class.new(Processor) }
+
+    it 'defaults to self' do
+      proc = procclass.new
+      proc.main_processor.should eq(proc)
+    end
+
+    it 'may be specified through options' do
+      proc = procclass.new(:main_processor => :hello)
+      proc.main_processor.should eq(:hello)
+    end
+
+  end
+end

data/spec/processor/test_sexpr_coercions.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+module Sexpr
+  class Processor
+    describe SexprCoercions do
+
+      let(:helper){ SexprCoercions.new }
+      let(:processor){ Processor.new }
+
+      it 'extends input sexprs' do
+        sexpr = [:hello, "world"]
+        seen = helper.call(processor, sexpr) do |_,n|
+          n.should be_a(Sexpr)
+          n
+        end
+        seen.should eq(sexpr)
+      end
+
+      it 'extends output sexprs' do
+        sexpr = [:hello, "world"]
+        seen = helper.call(processor, sexpr) do |_,n|
+          n.should be_a(Sexpr)
+          [:result]
+        end
+        seen.should eq([:result])
+        seen.should be_a(Sexpr)
+      end
+
+      it 'does not require the output to be a sexpr' do
+        sexpr = [:hello, "world"]
+        seen = helper.call(processor, sexpr) do |_,n|
+          n.should be_a(Sexpr)
+          "blah"
+        end
+        seen.should eq("blah")
+        seen.should_not be_a(Sexpr)
+      end
+
+      it 'fails with a string, unless the underlying grammar may parse' do
+        lambda{
+          helper.call(processor, "blah") do |_,n| end
+        }.should raise_error(NoParserError)
+      end
+
+    end
+  end
+end

data/spec/rewriter/test_copy_and_apply.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+module Sexpr
+  describe Rewriter, "copy_and_apply" do
+
+    let(:rwclass){
+      Class.new(Rewriter){
+        def on_hello(sexpr)
+          copy_and_apply(sexpr)
+        end
+        def on_lit(sexpr)
+          [:lit, sexpr.last.upcase]
+        end
+      }
+    }
+    let(:rw){ rwclass.new }
+
+    it 'provides a friendly way of rewriting' do
+      sexpr = [:hello, [:lit, "world"]]
+      rw.call(sexpr).should eq([:hello, [:lit, "WORLD"]])
+    end
+
+    it 'extends input and output sexpr with the Sexpr module' do
+      sexpr = [:hello, [:lit, "world"]]
+      rw.call(sexpr).should be_a(Sexpr)
+      sexpr.should be_a(Sexpr)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,28 @@ $LOAD_PATH.unshift (root/"lib").to_s
 require 'sexpr'
 require (root/"examples/bool_expr/bool_expr").to_s
 
+class FooHelper < Sexpr::Processor::Helper
+  module Methods
+  end
+
+  def on_hello(rw, node)
+    raise unless rw.is_a?(FooProcessor)
+    [:foo_hello, yield(rw, node)]
+  end
+
+end
+class FooProcessor < Sexpr::Processor
+  helper FooHelper
+end
+
+class BarHelper < Sexpr::Processor::Helper
+  module Methods
+  end
+end
+class BarProcessor < FooProcessor
+  helper BarHelper
+end
+
 def fixtures_path
   Path.dir/"../examples/bool_expr"
 end

data/spec/test_readme_examples.rb

@@ -43,12 +43,23 @@ describe "the README examples" do
     # the grammar can also be used to automatically have support on top of
     # such s-expressions
     expr = grammar.sexpr([:bool_lit, true])
+    (Sexpr===expr).should be_true
 
     (expr.sexpr_type).should eq(:bool_lit)
     # => :bool_lit
 
     (expr.sexpr_body).should eq([true])
     # => [true]
+
+    copy = expr.sexpr_copy do |base,child|
+      # copy a s-expression ala Enumerable#inject (base is [:bool_lit] initially)
+      base << [:bool_lit, !child]
+    end
+    copy.should eq([:bool_lit, [:bool_lit, false]])
+    # => [:bool_lit, [:bool_lit, false]]
+
+    (Sexpr===copy).should be_true
+
   end
 
 end

data/spec/test_rewriter.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+module Sexpr
+  describe Rewriter do
+
+    it 'has a SexprCoercions helper by default' do
+      Rewriter.helpers.should eq([Processor::SexprCoercions])
+    end
+
+    it 'allows subclassing while conserving helpers' do
+      subclass = Class.new(Rewriter)
+      subclass.helpers.should eq([Processor::SexprCoercions])
+      subclass.helpers.object_id.should_not eq(Rewriter.helpers.object_id)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexpr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epath
-  requirement: &70125157365880 !ruby/object:Gem::Requirement
+  requirement: &84257100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70125157365880
+  version_requirements: *84257100
 - !ruby/object:Gem::Dependency
   name: citrus
-  requirement: &70125157365260 !ruby/object:Gem::Requirement
+  requirement: &84256730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70125157365260
+  version_requirements: *84256730
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70125157364640 !ruby/object:Gem::Requirement
+  requirement: &84256430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70125157364640
+  version_requirements: *84256430
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70125157383820 !ruby/object:Gem::Requirement
+  requirement: &84256090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70125157383820
+  version_requirements: *84256090
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &70125157383220 !ruby/object:Gem::Requirement
+  requirement: &84255790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *70125157383220
+  version_requirements: *84255790
 description: Sexpr helps manipulating s-expressions in ruby.
 email:
 - blambeau@gmail.com
@@ -81,78 +81,94 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- examples/bool_expr/bool_expr.citrus
 - examples/bool_expr/bool_expr.rb
+- examples/bool_expr/bool_expr.citrus
 - examples/bool_expr/bool_expr.sexp.yml
-- lib/sexpr/errors.rb
-- lib/sexpr/grammar/matching.rb
-- lib/sexpr/grammar/options.rb
-- lib/sexpr/grammar/parsing.rb
-- lib/sexpr/grammar/tagging.rb
-- lib/sexpr/grammar.rb
-- lib/sexpr/loader.rb
-- lib/sexpr/matcher/alternative.rb
-- lib/sexpr/matcher/many.rb
-- lib/sexpr/matcher/reference.rb
+- lib/sexpr.rb
+- lib/sexpr/matcher/terminal.rb
 - lib/sexpr/matcher/rule.rb
+- lib/sexpr/matcher/alternative.rb
 - lib/sexpr/matcher/sequence.rb
-- lib/sexpr/matcher/terminal.rb
-- lib/sexpr/matcher.rb
+- lib/sexpr/matcher/reference.rb
+- lib/sexpr/matcher/many.rb
+- lib/sexpr/rewriter.rb
+- lib/sexpr/grammar.rb
 - lib/sexpr/node.rb
+- lib/sexpr/processor/sexpr_coercions.rb
+- lib/sexpr/processor/helper.rb
+- lib/sexpr/processor/null_helper.rb
+- lib/sexpr/processor.rb
 - lib/sexpr/parser/citrus.rb
+- lib/sexpr/parser/ext.rb
+- lib/sexpr/errors.rb
+- lib/sexpr/loader.rb
+- lib/sexpr/grammar/parsing.rb
+- lib/sexpr/grammar/tagging.rb
+- lib/sexpr/grammar/options.rb
+- lib/sexpr/grammar/matching.rb
 - lib/sexpr/parser.rb
+- lib/sexpr/matcher.rb
 - lib/sexpr/version.rb
-- lib/sexpr.rb
 - LICENCE.md
 - Manifest.txt
 - Rakefile
 - README.md
-- spec/grammar/matching/test_compile_rule.rb
-- spec/grammar/matching/test_compile_rule_defn.rb
-- spec/grammar/options/test_install_parser.rb
-- spec/grammar/options/test_install_path.rb
-- spec/grammar/options/test_install_root.rb
-- spec/grammar/tagging/test_looks_a_sexpr.rb
-- spec/grammar/tagging/test_mod2rulename.rb
-- spec/grammar/tagging/test_rule2modname.rb
-- spec/grammar/tagging/test_tag_sexpr.rb
-- spec/grammar/test_new.rb
-- spec/grammar/test_parse.rb
-- spec/grammar/test_sexpr.rb
-- spec/grammar.yml
-- spec/matcher/alternative/test_eat.rb
-- spec/matcher/alternative/test_match_q.rb
-- spec/matcher/many/test_eat.rb
-- spec/matcher/many/test_initialize.rb
-- spec/matcher/many/test_match_q.rb
+- spec/spec_helper.rb
 - spec/matcher/reference/test_eat.rb
 - spec/matcher/reference/test_match_q.rb
 - spec/matcher/rule/test_eat.rb
 - spec/matcher/rule/test_match_q.rb
+- spec/matcher/many/test_eat.rb
+- spec/matcher/many/test_initialize.rb
+- spec/matcher/many/test_match_q.rb
 - spec/matcher/sequence/test_eat.rb
 - spec/matcher/sequence/test_match_q.rb
 - spec/matcher/terminal/test_eat.rb
-- spec/matcher/terminal/test_match_q.rb
 - spec/matcher/terminal/test_terminal_match.rb
-- spec/node/test_sexpr_body.rb
-- spec/node/test_sexpr_type.rb
+- spec/matcher/terminal/test_match_q.rb
+- spec/matcher/alternative/test_eat.rb
+- spec/matcher/alternative/test_match_q.rb
+- spec/rewriter/test_copy_and_apply.rb
+- spec/processor/test_helper.rb
+- spec/processor/test_sexpr_coercions.rb
+- spec/processor/test_main_processor.rb
+- spec/processor/test_build_helper_chain.rb
+- spec/processor/test_call.rb
+- spec/processor/helper/test_call.rb
+- spec/test_rewriter.rb
+- spec/grammar.yml
 - spec/parser/citrus/test_new.rb
-- spec/parser/citrus/test_parse.rb
-- spec/parser/citrus/test_recognize.rb
 - spec/parser/citrus/test_registration.rb
+- spec/parser/citrus/test_parse.rb
 - spec/parser/citrus/test_to_sexpr.rb
+- spec/parser/citrus/test_recognize.rb
 - spec/parser/test_factor.rb
 - spec/parser/test_input_text.rb
-- spec/spec_helper.rb
+- spec/test_sexpr.rb
 - spec/test_load.rb
+- spec/grammar/test_new.rb
+- spec/grammar/tagging/test_mod2rulename.rb
+- spec/grammar/tagging/test_rule2modname.rb
+- spec/grammar/tagging/test_looks_a_sexpr.rb
+- spec/grammar/tagging/test_tag_sexpr.rb
+- spec/grammar/test_sexpr.rb
+- spec/grammar/options/test_install_root.rb
+- spec/grammar/options/test_install_parser.rb
+- spec/grammar/options/test_install_path.rb
+- spec/grammar/test_parse.rb
+- spec/grammar/matching/test_compile_rule.rb
+- spec/grammar/matching/test_compile_rule_defn.rb
+- spec/node/test_tracking_markers.rb
+- spec/node/test_sexpr_copy.rb
+- spec/node/test_sexpr_body.rb
+- spec/node/test_sexpr_type.rb
 - spec/test_readme_examples.rb
-- spec/test_sexpr.rb
 - tasks/debug_mail.rake
-- tasks/debug_mail.txt
+- tasks/yard.rake
 - tasks/gem.rake
 - tasks/spec_test.rake
 - tasks/unit_test.rake
-- tasks/yard.rake
+- tasks/debug_mail.txt
 homepage: https://github.com/blambeau/sexp
 licenses: []
 post_install_message: 
@@ -167,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -235845001447098495
+      hash: -185808739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,48 +192,58 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A compilation framework around s-expressions
 test_files:
-- spec/grammar/matching/test_compile_rule.rb
-- spec/grammar/matching/test_compile_rule_defn.rb
-- spec/grammar/options/test_install_parser.rb
-- spec/grammar/options/test_install_path.rb
-- spec/grammar/options/test_install_root.rb
-- spec/grammar/tagging/test_looks_a_sexpr.rb
-- spec/grammar/tagging/test_mod2rulename.rb
-- spec/grammar/tagging/test_rule2modname.rb
-- spec/grammar/tagging/test_tag_sexpr.rb
-- spec/grammar/test_new.rb
-- spec/grammar/test_parse.rb
-- spec/grammar/test_sexpr.rb
-- spec/grammar.yml
-- spec/matcher/alternative/test_eat.rb
-- spec/matcher/alternative/test_match_q.rb
-- spec/matcher/many/test_eat.rb
-- spec/matcher/many/test_initialize.rb
-- spec/matcher/many/test_match_q.rb
+- spec/spec_helper.rb
 - spec/matcher/reference/test_eat.rb
 - spec/matcher/reference/test_match_q.rb
 - spec/matcher/rule/test_eat.rb
 - spec/matcher/rule/test_match_q.rb
+- spec/matcher/many/test_eat.rb
+- spec/matcher/many/test_initialize.rb
+- spec/matcher/many/test_match_q.rb
 - spec/matcher/sequence/test_eat.rb
 - spec/matcher/sequence/test_match_q.rb
 - spec/matcher/terminal/test_eat.rb
-- spec/matcher/terminal/test_match_q.rb
 - spec/matcher/terminal/test_terminal_match.rb
-- spec/node/test_sexpr_body.rb
-- spec/node/test_sexpr_type.rb
+- spec/matcher/terminal/test_match_q.rb
+- spec/matcher/alternative/test_eat.rb
+- spec/matcher/alternative/test_match_q.rb
+- spec/rewriter/test_copy_and_apply.rb
+- spec/processor/test_helper.rb
+- spec/processor/test_sexpr_coercions.rb
+- spec/processor/test_main_processor.rb
+- spec/processor/test_build_helper_chain.rb
+- spec/processor/test_call.rb
+- spec/processor/helper/test_call.rb
+- spec/test_rewriter.rb
+- spec/grammar.yml
 - spec/parser/citrus/test_new.rb
-- spec/parser/citrus/test_parse.rb
-- spec/parser/citrus/test_recognize.rb
 - spec/parser/citrus/test_registration.rb
+- spec/parser/citrus/test_parse.rb
 - spec/parser/citrus/test_to_sexpr.rb
+- spec/parser/citrus/test_recognize.rb
 - spec/parser/test_factor.rb
 - spec/parser/test_input_text.rb
-- spec/spec_helper.rb
+- spec/test_sexpr.rb
 - spec/test_load.rb
+- spec/grammar/test_new.rb
+- spec/grammar/tagging/test_mod2rulename.rb
+- spec/grammar/tagging/test_rule2modname.rb
+- spec/grammar/tagging/test_looks_a_sexpr.rb
+- spec/grammar/tagging/test_tag_sexpr.rb
+- spec/grammar/test_sexpr.rb
+- spec/grammar/options/test_install_root.rb
+- spec/grammar/options/test_install_parser.rb
+- spec/grammar/options/test_install_path.rb
+- spec/grammar/test_parse.rb
+- spec/grammar/matching/test_compile_rule.rb
+- spec/grammar/matching/test_compile_rule_defn.rb
+- spec/node/test_tracking_markers.rb
+- spec/node/test_sexpr_copy.rb
+- spec/node/test_sexpr_body.rb
+- spec/node/test_sexpr_type.rb
 - spec/test_readme_examples.rb
-- spec/test_sexpr.rb