citrus 2.3.5 → 2.3.6

data/lib/citrus.rb

@@ -308,7 +308,11 @@ module Citrus
 
       if memo[position]
         @cache_hits += 1
-        events.concat(memo[position])
+        c = memo[position]
+        unless c.empty?
+          events.concat(c)
+          self.pos += events[-1]
+        end
       else
         index = events.size
         rule.exec(self, events)

data/lib/citrus/version.rb

@@ -1,6 +1,6 @@
 module Citrus
   # The current version of Citrus as [major, minor, patch].
-  VERSION = [2, 3, 5]
+  VERSION = [2, 3, 6]
 
   # Returns the current version of Citrus as a string.
   def self.version

data/test/memoized_input_test.rb

@@ -26,7 +26,7 @@ class MemoizedInputTest < Test::Unit::TestCase
   def test_cache_hits1
     input = MemoizedInput.new('a')
     input.exec(LetterA.rule(:top))
-    assert_equal(2, input.cache_hits)
+    assert_equal(3, input.cache_hits)
   end
 
   def test_cache_hits2
@@ -40,4 +40,25 @@ class MemoizedInputTest < Test::Unit::TestCase
     input.exec(LetterA.rule(:top))
     assert_equal(0, input.cache_hits)
   end
+  
+  grammar :LettersABC do
+    rule :top do
+      any(all(:a,:b,:c), all(:b,:a,:c), all(:b,:c,:a))
+    end
+    rule :a do
+      "a"
+    end
+    rule :b do
+      "b"
+    end
+    rule :c do
+      "c"
+    end
+  end
+
+  def test_memoization
+    match = LettersABC.parse('bca',{:memoize=>true})
+    assert_equal('bca',match)
+  end 
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrus
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - Michael Jackson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -08:00
+date: 2011-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency