sexpr 0.5.1 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.6.0 / 2013-09-26
+
+* Major enhancements (possibly breaking changes)
+
+  * All grammar rules are now proper Matcher::Rule instances. A NonTerminal
+    matcher is added and is used for non-terminal rule productions and matching
+    (all but Terminal and Alternative).
+  * `Rewriter.sexpr_grammar` and `Rewriter#sexpr_grammar` have been removed.
+    `Processor.grammar` and `Processor#grammar` are provided instead.
+
+* Minor enhancements
+
+  * Added `Grammar#tagging_module_for(rulename)` that returns the user-defined
+    module used to tag a given grammar rule production.
+  * `Grammar#looks_a_sexpr?(arg)` became public.
+
 # 0.5.1 / 2012-03-13
 
 * Minor enhancements

data/Gemfile

@@ -1,9 +1,9 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem "epath", "~> 0.0.1"
+  gem "path", "~> 1.3"
   gem "citrus", "~> 2.4"
-  gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.8"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.10"
   gem "wlang", "~> 0.10.2"
 end

data/Gemfile.lock

@@ -2,17 +2,17 @@ GEM
   remote: http://rubygems.org/
   specs:
     citrus (2.4.1)
-    diff-lcs (1.1.3)
-    epath (0.0.1)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    diff-lcs (1.2.4)
+    path (1.3.3)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     wlang (0.10.2)
 
 PLATFORMS
@@ -21,7 +21,7 @@ PLATFORMS
 
 DEPENDENCIES
   citrus (~> 2.4)
-  epath (~> 0.0.1)
-  rake (~> 0.9.2)
-  rspec (~> 2.8)
+  path (~> 1.3)
+  rake (~> 10.0)
+  rspec (~> 2.10)
   wlang (~> 0.10.2)

data/Rakefile

@@ -1,7 +1,3 @@
-# Dynamically load the gem spec
-$gemspec_file = File.expand_path('../sexpr.gemspec', __FILE__)
-$gemspec      = Kernel.eval(File.read($gemspec_file))
-
 # We run tests by default
 task :default => :test
 

data/examples/bool_expr/bool_expr.rb

@@ -56,98 +56,4 @@ module BoolExpr
 
   end # class NotPushProcessor
 
-end # module BoolExpr
-
-describe BoolExpr do
-  subject{ BoolExpr }
-
-  describe "the parsing feature" do
-
-    it 'parses boolean expressions without error' do
-      subject.parse("x and y").should be_a(Citrus::Match)
-      subject.parse("not(y)").should be_a(Citrus::Match)
-      subject.parse("not(true)").should be_a(Citrus::Match)
-    end
-
-    it 'provides a shortcut to get s-expressions directly' do
-      subject.sexpr("x and y").should eq([:bool_and, [:var_ref, "x"], [:var_ref, "y"]])
-    end
-
-  end # parsing
-
-  describe "the tagging feature" do
-
-    it 'tags parsing results with the Sexpr module' do
-      sexpr = subject.sexpr("x and y")
-      sexpr.should be_a(Sexpr)
-      sexpr.sexpr_type.should eq(:bool_and)
-      sexpr.sexpr_body.should eq([[:var_ref, "x"], [:var_ref, "y"]])
-    end
-
-    it 'tags parsing results with user modules' do
-      subject.sexpr("x and y").should be_a(BoolExpr::And)
-    end
-
-    it 'allows tagging manually' do
-      subject.sexpr([:bool_lit, true]).should be_a(BoolExpr::Lit)
-    end
-
-    it 'applies tagging recursively' do
-      sexpr = subject.sexpr([:bool_not, [:bool_lit, true]])
-      sexpr.last.should be_a(BoolExpr::Lit)
-    end
-
-  end # taggging
-
-  describe 'the validation feature' do
-
-    it 'validates s-expressions' do
-      subject.match?([:bool_lit, true]).should be_true
-      subject.match?([:bool_lit, "x"]).should be_false
-    end
-
-    it 'validates s-expressions against specific rules' do
-      subject[:bool_lit].match?([:bool_lit, true]).should be_true
-      subject[:bool_and].match?([:bool_lit, true]).should be_false
-    end
-
-  end # validating
-
-  describe BoolExpr::NotPushProcessor do
-
-    def _(expr)
-      BoolExpr.sexpr(expr)
-    end
-
-    def rw(expr)
-      BoolExpr::NotPushProcessor.new.call(expr)
-    end
-
-    it 'does nothing on variable references' do
-      rw("not x").should eq([:bool_not, [:var_ref, "x"]])
-    end
-
-    it 'rewrites literals through negating them' do
-      rw("not true").should  eq(_ "false")
-      rw("not false").should eq(_ "true")
-    end
-
-    it 'rewrites not through removing them' do
-      rw("not not true").should eq(_ "true")
-    end
-
-    it 'rewrites or through and of negated terms' do
-      rw("not(x or y)").should eq(_ "not(x) and not(y)")
-    end
-
-    it 'rewrites and through or of negated terms' do
-      rw("not(x and y)").should eq(_ "not(x) or not(y)")
-    end
-
-    it 'rewrites recursively' do
-      rw("not(x and not(y))").should eq(_ "not(x) or y")
-    end
-
-  end # rewriting
-
-end if defined?(RSpec)
+end # module BoolExpr

data/lib/sexpr/grammar/matching.rb

@@ -15,7 +15,7 @@ module Sexpr
       end
       alias :=== :match?
 
-      private
+    private
 
       def compile_rules(rules)
         Hash[rules.map{|k,v|
@@ -26,10 +26,10 @@ module Sexpr
       def compile_rule(name, defn)
         case rule = compile_rule_defn(defn)
         when Matcher::Terminal, Matcher::Alternative
-          rule
         else
-          Matcher::Rule.new(name, rule)
+          rule = Matcher::NonTerminal.new(name, rule)
         end
+        Matcher::Rule.new(name, rule)
       end
 
       def compile_rule_defn(arg, grammar = self)

data/lib/sexpr/grammar/parsing.rb

@@ -11,7 +11,7 @@ module Sexpr
         parser!.parse(input, options)
       end
 
-      private
+    private
 
       def parser!
         unless p = parser

data/lib/sexpr/grammar/tagging.rb

@@ -19,6 +19,15 @@ module Sexpr
         nil
       end
 
+      def tagging_module_for(rulename)
+        if ref = tagging_reference
+          modname = rule2modname(rulename)
+          ref.const_get(modname, false) rescue default_tagging_module
+        else
+          default_tagging_module
+        end
+      end
+
       def sexpr(input, markers = nil)
         case input
         when Array
@@ -29,7 +38,11 @@ module Sexpr
         end
       end
 
-      private
+      def looks_a_sexpr?(arg)
+        arg.is_a?(Array) and arg.first.is_a?(Symbol)
+      end
+
+    private
 
       def tag_sexpr(sexpr, markers = nil, force = false)
         return sexpr unless looks_a_sexpr?(sexpr)
@@ -53,21 +66,11 @@ module Sexpr
       end
 
       def tag_sexpr_with_user_module(sexpr)
-        if ref = tagging_reference
-          rulename = sexpr.first
-          modname  = rule2modname(rulename)
-          tag      = ref.const_get(modname, false) rescue default_tagging_module
-          sexpr.extend(tag) if tag
-        elsif tag = default_tagging_module
-          sexpr.extend(tag)
-        end
+        tag = tagging_module_for(sexpr.first)
+        sexpr.extend(tag) if tag
         sexpr
       end
 
-      def looks_a_sexpr?(arg)
-        arg.is_a?(Array) and arg.first.is_a?(Symbol)
-      end
-
       def parser!
         raise NoParserError, "No parser set.", caller
       end

data/lib/sexpr/loader.rb

@@ -0,0 +1 @@
+

data/lib/sexpr/matcher.rb

@@ -10,6 +10,7 @@ end # module Sexpr
 require_relative "matcher/alternative"
 require_relative "matcher/many"
 require_relative "matcher/reference"
-require_relative "matcher/rule"
 require_relative "matcher/sequence"
-require_relative "matcher/terminal"
+require_relative "matcher/terminal"
+require_relative "matcher/non_terminal"
+require_relative "matcher/rule"

data/lib/sexpr/matcher/many.rb

@@ -28,11 +28,26 @@ module Sexpr
         i >= @min ? last : nil
       end
 
+      def parse(sexp, to = [])
+        i, last, got = 0, sexp, []
+        while sexp && (@max.nil? || i < @max)
+          if res = @term.parse(sexp, got)
+            last = res
+            i += 1
+          end
+          sexp = res
+        end
+        if i >= @min
+          got.each{|x| to << x }
+          last
+        end
+      end
+
       def inspect
         "(many #{term.inspect}, #{min}, #{max})"
       end
 
-      private
+    private
 
       def minmax(min, max)
         case min

data/lib/sexpr/matcher/non_terminal.rb

@@ -0,0 +1,31 @@
+module Sexpr
+  module Matcher
+    class NonTerminal
+      include Matcher
+
+      attr_reader :name
+      attr_reader :defn
+
+      def initialize(name, defn)
+        @name = name
+        @defn = defn
+      end
+
+      def match?(sexp)
+        return nil   unless sexp.is_a?(Array)
+        return false unless sexp.first && (sexp.first == name)
+        defn.match?(sexp[1..-1])
+      end
+
+      def eat(sexp)
+        return nil unless match?(sexp.first)
+        sexp[1..-1]
+      end
+
+      def inspect
+        "(non-terminal #{name}, #{defn.inspect})"
+      end
+
+    end # class NonTerminal
+  end # module Matcher
+end # module Sexpr

data/lib/sexpr/matcher/rule.rb

@@ -12,14 +12,11 @@ module Sexpr
       end
 
       def match?(sexp)
-        return nil unless sexp.is_a?(Array)
-        return false unless sexp.first && (sexp.first == name)
-        defn.match?(sexp[1..-1])
+        defn.match?(sexp)
       end
 
       def eat(sexp)
-        return nil unless match?(sexp.first)
-        sexp[1..-1]
+        defn.eat(sexp)
       end
 
       def inspect
@@ -28,4 +25,4 @@ module Sexpr
 
     end # class Rule
   end # module Matcher
-end # module Sexpr
+end # module Sexpr

data/lib/sexpr/node.rb

@@ -31,7 +31,7 @@ module Sexpr
     end
     alias :dup :sexpr_copy
 
-    private
+  private
 
     def sexpr_copy_tagging(copy)
       (class << self; self; end).included_modules.each do |mod|

data/lib/sexpr/parser.rb

@@ -28,7 +28,7 @@ module Sexpr
 
     end # class methods
 
-    private
+  private
 
     def input_text(input)
       case input

data/lib/sexpr/processor.rb

@@ -6,6 +6,12 @@ module Sexpr
 
     class << self
 
+      def grammar(grammar = nil)
+        @grammar = grammar if grammar
+        @grammar ||= (@grammar || superclass.grammar) rescue Sexpr
+        @grammar
+      end
+
       def preprocessors
         @preprocessors ||= superclass.preprocessors.dup rescue [ ]
       end
@@ -46,6 +52,10 @@ module Sexpr
       @options = options || {}
     end
 
+    def grammar
+      self.class.grammar
+    end
+
     def call(sexpr)
       apply(preprocess(sexpr))
     end
@@ -62,7 +72,7 @@ module Sexpr
       raise UnexpectedSexprError, "Unexpected sexpr: #{sexpr.inspect}"
     end
 
-    private
+  private
 
     def preprocess(sexpr)
       preprocessors = self.class.preprocessors

data/lib/sexpr/processor/helper.rb

@@ -16,7 +16,7 @@ module Sexpr
         yield(processor, sexpr)
       end
 
-      private
+    private
 
       def next_call(processor, sexpr, toplevel)
         if nic = next_in_chain

data/lib/sexpr/processor/sexpr_coercions.rb

@@ -5,40 +5,32 @@ module Sexpr
       module Methods
 
         def parse(*args)
-          sexpr_grammar.parse(*args)
+          grammar.parse(*args)
         end
 
         def sexpr(*args)
-          sexpr_grammar.sexpr(*args)
+          grammar.sexpr(*args)
         end
 
       end
 
       def call(processor, sexpr, &bl)
+        g = processor.class.grammar
+
         # input coercion
-        sexpr = grammar(processor).sexpr(sexpr)
+        sexpr = g.sexpr(sexpr)
 
         # recursive call
         sexpr = next_call(processor, sexpr, bl)
 
         # output coercion
         if sexpr.is_a?(Array) and sexpr.first.is_a?(Symbol)
-          grammar(processor).sexpr(sexpr)
+          g.sexpr(sexpr)
         else
           sexpr
         end
       end
 
-      private
-
-      def grammar(processor)
-        if processor.respond_to?(:sexpr_grammar)
-          processor.sexpr_grammar
-        else
-          Sexpr
-        end
-      end
-
     end # class SexprCoercions
   end  # class Processor
 end # module Sexpr