sexpr 0.2.0 → 0.3.0

data/spec/test_readme_examples.rb

@@ -4,41 +4,51 @@ describe "the README examples" do
   it 'works as announced' do
 
     grammar = Sexpr.load(<<-YAML)
-
-      # alternative rule
-      bool_expr:
-        - bool_and
-        - bool_or
-        - bool_not
-        - var_ref
-        - literal
-
-      # non-terminal
-      bool_and:
-        - [ bool_expr, bool_expr ]
-      bool_or:
-        - [ bool_expr, bool_expr ]
-      bool_not:
-        - [ bool_expr ]
-      literal:
-        - [ truth_value ]
-      var_ref:
-        - [ var_name ]
-
-      # terminals
-      var_name:
-        !ruby/regexp /^[a-z]+$/
-      truth_value:
-        - true
-        - false
-
+      rules:
+        # alternative rule
+        bool_expr:
+          - bool_and
+          - bool_or
+          - bool_not
+          - var_ref
+          - bool_lit
+
+        # non-terminal
+        bool_and:
+          - [ bool_expr, bool_expr ]
+        bool_or:
+          - [ bool_expr, bool_expr ]
+        bool_not:
+          - [ bool_expr ]
+        bool_lit:
+          - [ truth_value ]
+        var_ref:
+          - [ var_name ]
+
+        # terminals
+        var_name:
+          !ruby/regexp /^[a-z]+$/
+        truth_value:
+          - true
+          - false
     YAML
 
-    f = (grammar === [:bool_and, [:bool_not, [:var_ref, "x"]], [:literal, true]])
+    # the grammar can be used to verify the structure of s-expressions
+    f = (grammar === [:bool_and, [:bool_not, [:var_ref, "x"]], [:bool_lit, true]])
     f.should be_true
 
-    f = (grammar === [:bool_and, [:literal, "true"]])
+    f = (grammar === [:bool_and, [:bool_lit, "true"]])
     f.should be_false
+
+    # the grammar can also be used to automatically have support on top of
+    # such s-expressions
+    expr = grammar.sexpr([:bool_lit, true])
+
+    (expr.sexpr_type).should eq(:bool_lit)
+    # => :bool_lit
+
+    (expr.sexpr_body).should eq([true])
+    # => [true]
   end
 
 end

data/spec/test_sexpr.rb

@@ -5,4 +5,4 @@ describe Sexpr do
     Sexpr.const_defined?(:VERSION).should be_true
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexpr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epath
-  requirement: &74756970 !ruby/object:Gem::Requirement
+  requirement: &70125157365880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *74756970
+  version_requirements: *70125157365880
+- !ruby/object:Gem::Dependency
+  name: citrus
+  requirement: &70125157365260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: *70125157365260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &74756420 !ruby/object:Gem::Requirement
+  requirement: &70125157364640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *74756420
+  version_requirements: *70125157364640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74755120 !ruby/object:Gem::Requirement
+  requirement: &70125157383820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *74755120
+  version_requirements: *70125157383820
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &74648330 !ruby/object:Gem::Requirement
+  requirement: &70125157383220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +65,7 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *74648330
+  version_requirements: *70125157383220
 description: Sexpr helps manipulating s-expressions in ruby.
 email:
 - blambeau@gmail.com
@@ -70,53 +81,78 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- lib/sexpr.rb
-- lib/sexpr/element.rb
-- lib/sexpr/terminal.rb
-- lib/sexpr/rule.rb
+- examples/bool_expr/bool_expr.citrus
+- examples/bool_expr/bool_expr.rb
+- 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/alternative.rb
-- lib/sexpr/sequence.rb
 - lib/sexpr/loader.rb
-- lib/sexpr/reference.rb
-- lib/sexpr/many.rb
+- lib/sexpr/matcher/alternative.rb
+- lib/sexpr/matcher/many.rb
+- lib/sexpr/matcher/reference.rb
+- lib/sexpr/matcher/rule.rb
+- lib/sexpr/matcher/sequence.rb
+- lib/sexpr/matcher/terminal.rb
+- lib/sexpr/matcher.rb
+- lib/sexpr/node.rb
+- lib/sexpr/parser/citrus.rb
+- lib/sexpr/parser.rb
 - lib/sexpr/version.rb
+- lib/sexpr.rb
 - LICENCE.md
 - Manifest.txt
 - Rakefile
 - README.md
-- spec/spec_helper.rb
-- spec/bool_expr.yml
-- spec/reference/test_eat.rb
-- spec/reference/test_match_q.rb
+- 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/rule/test_eat.rb
-- spec/rule/test_match_q.rb
-- spec/many/test_eat.rb
-- spec/many/test_initialize.rb
-- spec/many/test_match_q.rb
-- spec/test_sexpr.rb
+- 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/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/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/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_to_sexpr.rb
+- spec/parser/test_factor.rb
+- spec/parser/test_input_text.rb
+- spec/spec_helper.rb
 - spec/test_load.rb
-- spec/sequence/test_eat.rb
-- spec/sequence/test_match_q.rb
-- spec/grammar/test_compile_rule.rb
-- spec/grammar/test_root.rb
-- spec/grammar/test_fetch.rb
-- spec/grammar/test_compile_rule_defn.rb
-- spec/grammar/test_parse.rb
-- spec/test_bool_expr.rb
 - spec/test_readme_examples.rb
-- spec/terminal/test_eat.rb
-- spec/terminal/test_terminal_match.rb
-- spec/terminal/test_match_q.rb
-- spec/alternative/test_eat.rb
-- spec/alternative/test_match_q.rb
+- spec/test_sexpr.rb
 - tasks/debug_mail.rake
-- tasks/yard.rake
+- tasks/debug_mail.txt
 - tasks/gem.rake
 - tasks/spec_test.rake
 - tasks/unit_test.rake
-- tasks/debug_mail.txt
+- tasks/yard.rake
 homepage: https://github.com/blambeau/sexp
 licenses: []
 post_install_message: 
@@ -131,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 972369935
+      hash: -235845001447098495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,34 +176,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A compilation framework around s-expressions
 test_files:
-- spec/spec_helper.rb
-- spec/bool_expr.yml
-- spec/reference/test_eat.rb
-- spec/reference/test_match_q.rb
+- 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/rule/test_eat.rb
-- spec/rule/test_match_q.rb
-- spec/many/test_eat.rb
-- spec/many/test_initialize.rb
-- spec/many/test_match_q.rb
-- spec/test_sexpr.rb
+- 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/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/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/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_to_sexpr.rb
+- spec/parser/test_factor.rb
+- spec/parser/test_input_text.rb
+- spec/spec_helper.rb
 - spec/test_load.rb
-- spec/sequence/test_eat.rb
-- spec/sequence/test_match_q.rb
-- spec/grammar/test_compile_rule.rb
-- spec/grammar/test_root.rb
-- spec/grammar/test_fetch.rb
-- spec/grammar/test_compile_rule_defn.rb
-- spec/grammar/test_parse.rb
-- spec/test_bool_expr.rb
 - spec/test_readme_examples.rb
-- spec/terminal/test_eat.rb
-- spec/terminal/test_terminal_match.rb
-- spec/terminal/test_match_q.rb
-- spec/alternative/test_eat.rb
-- spec/alternative/test_match_q.rb
+- spec/test_sexpr.rb

data/lib/sexpr/alternative.rb

@@ -1,28 +0,0 @@
-module Sexpr
-  class Alternative
-    include Element
-
-    attr_reader :terms
-
-    def initialize(terms)
-      @terms = terms
-    end
-
-    def match?(sexp)
-      terms.any?{|t| t.match?(sexp)}
-    end
-
-    def eat(sexp)
-      @terms.each do |alt|
-        res = alt.eat(sexp)
-        return res if res
-      end
-      nil
-    end
-
-    def inspect
-      "(alt #{terms.inspect})"
-    end
-
-  end # class Alternative
-end # module Sexpr

data/lib/sexpr/element.rb

@@ -1,9 +0,0 @@
-module Sexpr
-  module Element
-
-    def ===(sexp)
-      match?(sexp)
-    end
-
-  end # module Sexpr
-end # module Sexpr

data/lib/sexpr/many.rb

@@ -1,52 +0,0 @@
-module Sexpr
-  class Many
-    include Element
-
-    attr_reader :term, :min, :max
-
-    def initialize(term, min, max = nil)
-      @term       = term
-      @min, @max  = minmax(min, max)
-    end
-
-    def match?(sexp)
-      return nil unless sexp.is_a?(Array)
-      eat = eat(sexp)
-      eat && eat.empty?
-    end
-
-    def eat(sexp)
-      i, last = 0, sexp
-      while sexp && (@max.nil? || i < @max)
-        if res = @term.eat(sexp)
-          last = res
-          i += 1
-        end
-        sexp = res
-      end
-      i >= @min ? last : nil
-    end
-
-    def inspect
-      "(many #{term.inspect}, #{min}, #{max})"
-    end
-
-    private
-
-    def minmax(min, max)
-      case min
-      when Integer
-        [min, max]
-      when '?'
-        [0, 1]
-      when '+'
-        [1, nil]
-      when '*'
-        [0, nil]
-      else
-        raise ArgumentError, "Invalid multiplicity: #{min}"
-      end
-    end
-
-  end # class Sequence
-end # module Sexpr