citrus 2.2.0 → 2.2.1

data/lib/citrus.rb

@@ -8,7 +8,7 @@ require 'strscan'
 module Citrus
   autoload :File, 'citrus/file'
 
-  VERSION = [2, 2, 0]
+  VERSION = [2, 2, 1]
 
   # Returns the current version of Citrus as a string.
   def self.version
@@ -551,7 +551,6 @@ module Citrus
       input.memoize! if opts[:memoize]
       input.pos = opts[:offset] if opts[:offset] > 0
 
-      start = input.pos
       events = input.exec(self)
       length = events[-1]
 
@@ -559,7 +558,7 @@ module Citrus
         raise ParseError.new(input)
       end
 
-      Match.new(string.slice(start, length), events)
+      Match.new(string.slice(opts[:offset], length), events)
     end
 
     # The default set of options to use when parsing.
@@ -720,7 +719,18 @@ module Citrus
 
     # Returns an array of events for this rule on the given +input+.
     def exec(input, events=[])
-      input.exec(rule, events)
+      events << id
+
+      index = events.size
+      start = index - 1
+      if input.exec(rule, events).size > index
+        events << CLOSE
+        events << events[-2]
+      else
+        events.slice!(start, events.size)
+      end
+
+      events
     end
   end
 
@@ -916,7 +926,18 @@ module Citrus
 
     # Returns an array of events for this rule on the given +input+.
     def exec(input, events=[])
-      input.exec(rule, events)
+      events << id
+
+      index = events.size
+      start = index - 1
+      if input.exec(rule, events).size > index
+        events << CLOSE
+        events << events[-2]
+      else
+        events.slice!(start, events.size)
+      end
+
+      events
     end
 
     # Returns the Citrus notation of this rule as a string.
@@ -1135,11 +1156,6 @@ module Citrus
       end
     end
 
-    # Returns a reference to the Rule object that first created this match.
-    def creator
-      extenders.first
-    end
-
     # Returns an array of Match objects that are submatches of this match in the
     # order they appeared in the input.
     def matches
@@ -1187,6 +1203,11 @@ module Citrus
       name ? find(name, false).first : matches.first
     end
 
+    # The default value for a match is its string value. This method is
+    # overridden in most cases to be more meaningful according to the desired
+    # interpretation.
+    alias value to_s
+
     # Allows sub-matches of this match to be retrieved by name as instance
     # methods.
     def method_missing(sym, *args)

data/test/alias_test.rb

@@ -11,10 +11,10 @@ class AliasTest < Test::Unit::TestCase
       rule :a, :b
       rule :b, 'abc'
     }
-    rule = grammar.rule(:a)
+    rule_a = grammar.rule(:a)
     rule_b = grammar.rule(:b)
-    events = rule.exec(Input.new('abc'))
-    assert_equal([rule_b.id, CLOSE, 3], events)
+    events = rule_a.exec(Input.new('abc'))
+    assert_equal([rule_a.id, rule_b.id, CLOSE, 3, CLOSE, 3], events)
   end
 
   def test_exec_miss
@@ -35,10 +35,10 @@ class AliasTest < Test::Unit::TestCase
       include grammar1
       rule :b, :a
     }
-    rule = grammar2.rule(:b)
-    rule_a = grammar1.rule(:a)
-    events = rule.exec(Input.new('abc'))
-    assert_equal([rule_a.id, CLOSE, 3], events)
+    rule_b2 = grammar2.rule(:b)
+    rule_a1 = grammar1.rule(:a)
+    events = rule_b2.exec(Input.new('abc'))
+    assert_equal([rule_b2.id, rule_a1.id, CLOSE, 3, CLOSE, 3], events)
   end
 
   def test_to_s

data/test/super_test.rb

@@ -16,10 +16,17 @@ class SuperTest < Test::Unit::TestCase
       rule :a, any(ghi, sup)
     }
     rule_2a = grammar2.rule(:a)
+    rule_2a_sup = rule_2a.rules[1]
     rule_1a = grammar1.rule(:a)
 
     events = rule_2a.exec(Input.new('abc'))
-    assert_equal([rule_2a.id, rule_1a.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([
+      rule_2a.id,
+        rule_2a_sup.id,
+          rule_1a.id, CLOSE, 3,
+        CLOSE, 3,
+      CLOSE, 3
+    ], events)
 
     events = rule_2a.exec(Input.new('ghi'))
     assert_equal([rule_2a.id, ghi.id, CLOSE, 3, CLOSE, 3], events)
@@ -48,15 +55,32 @@ class SuperTest < Test::Unit::TestCase
       rule :a, any(sup, :b)
       rule :b, sup
     }
-    rule_2a = grammar2.rule(:a)
     rule_1a = grammar1.rule(:a)
     rule_1b = grammar1.rule(:b)
+    rule_2a = grammar2.rule(:a)
+    rule_2a_sup = rule_2a.rules[0]
+    rule_2a_als = rule_2a.rules[1]
+    rule_2b = grammar2.rule(:b)
 
     events = rule_2a.exec(Input.new('abc'))
-    assert_equal([rule_2a.id, rule_1a.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([
+      rule_2a.id,
+        rule_2a_sup.id,
+          rule_1a.id, CLOSE, 3,
+        CLOSE, 3,
+      CLOSE, 3
+    ], events)
 
     events = rule_2a.exec(Input.new('def'))
-    assert_equal([rule_2a.id, rule_1b.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([
+      rule_2a.id,
+        rule_2a_als.id,
+          rule_2b.id,
+            rule_1b.id, CLOSE, 3,
+          CLOSE, 3,
+        CLOSE, 3,
+      CLOSE, 3
+    ], events)
   end
 
   def test_to_s

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrus
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Michael Jackson
@@ -14,22 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -06:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+    version: 
 description: Parsing Expressions for Ruby
 email: mjijackson@gmail.com
 executables: []
@@ -106,25 +98,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Parsing Expressions for Ruby