citrus 2.2.1 → 2.2.2

data/lib/citrus.rb

@@ -8,7 +8,7 @@ require 'strscan'
 module Citrus
   autoload :File, 'citrus/file'
 
-  VERSION = [2, 2, 1]
+  VERSION = [2, 2, 2]
 
   # Returns the current version of Citrus as a string.
   def self.version
@@ -611,6 +611,11 @@ module Citrus
     def inspect # :nodoc:
       to_s
     end
+
+    def extend_match(match) # :nodoc:
+      match.names << name if named?
+      match.extend(extension) if extension
+    end
   end
 
   # A Terminal is a Rule that matches directly on the input stream and may not
@@ -944,6 +949,11 @@ module Citrus
     def to_s
       label.to_s + ':' + rule.embed
     end
+
+    def extend_match(match) # :nodoc:
+      match.names << label
+      super
+    end
   end
 
   # A Repeat is a Predicate that specifies a minimum and maximum number of times
@@ -1237,11 +1247,9 @@ module Citrus
 
   private
 
-    # Extends this match with the extensions provided by its #rules.
     def extend! # :nodoc:
       extenders.each do |rule|
-        self.names << rule.name if rule.named?
-        extend(rule.extension) if rule.extension
+        rule.extend_match(self)
       end
     end
   end

data/test/label_test.rb

@@ -6,6 +6,16 @@ class LabelTest < Test::Unit::TestCase
     assert_equal(false, rule.terminal?)
   end
 
+  def test_match
+    abc = Rule.new('abc')
+    abc.name = 'abc'
+    label = Label.new(abc, 'a_label')
+    label.name = 'label'
+    match = label.parse('abc')
+    assert(match)
+    assert_equal([:abc, :a_label, :label], match.names)
+  end
+
   def test_to_s
     rule = Label.new('a', 'label')
     assert_equal('label:"a"', rule.to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrus
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Michael Jackson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -08:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency