citrus 2.1.2 → 2.2.0

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Michael Jackson
@@ -14,26 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -07:00
+date: 2010-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -42,7 +29,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 description: Parsing Expressions for Ruby
 email: mjijackson@gmail.com
 executables: []
@@ -52,11 +39,14 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- benchmark/after.dat
+- benchmark/before.dat
 - benchmark/seqpar.citrus
 - benchmark/seqpar.gnuplot
 - benchmark/seqpar.rb
 - doc/background.markdown
 - doc/example.markdown
+- doc/extras.markdown
 - doc/index.markdown
 - doc/license.markdown
 - doc/links.markdown
@@ -66,7 +56,6 @@ files:
 - examples/calc.rb
 - examples/ip.citrus
 - examples/ip.rb
-- lib/citrus/debug.rb
 - lib/citrus/file.rb
 - lib/citrus.rb
 - test/_files/alias.citrus
@@ -77,13 +66,14 @@ files:
 - test/_files/rule2.citrus
 - test/_files/rule3.citrus
 - test/_files/super.citrus
+- test/_files/super2.citrus
 - test/alias_test.rb
 - test/and_predicate_test.rb
 - test/but_predicate_test.rb
 - test/calc_file_test.rb
 - test/calc_test.rb
 - test/choice_test.rb
-- test/debug_test.rb
+- test/extension_test.rb
 - test/file_test.rb
 - test/grammar_test.rb
 - test/helper.rb
@@ -94,8 +84,8 @@ files:
 - test/not_predicate_test.rb
 - test/parse_error_test.rb
 - test/repeat_test.rb
-- test/rule_test.rb
 - test/sequence_test.rb
+- test/string_terminal_test.rb
 - test/super_test.rb
 - test/terminal_test.rb
 - citrus.gemspec
@@ -145,7 +135,7 @@ test_files:
 - test/calc_file_test.rb
 - test/calc_test.rb
 - test/choice_test.rb
-- test/debug_test.rb
+- test/extension_test.rb
 - test/file_test.rb
 - test/grammar_test.rb
 - test/input_test.rb
@@ -155,7 +145,7 @@ test_files:
 - test/not_predicate_test.rb
 - test/parse_error_test.rb
 - test/repeat_test.rb
-- test/rule_test.rb
 - test/sequence_test.rb
+- test/string_terminal_test.rb
 - test/super_test.rb
 - test/terminal_test.rb

data/lib/citrus/debug.rb

@@ -1,69 +0,0 @@
-require 'citrus'
-require 'builder'
-
-module Citrus
-  class Match
-    # The offset at which this match was found in the input.
-    attr_accessor :offset
-
-    def debug_attrs
-      { "names"   => names.join(','),
-        "text"    => to_s,
-        "offset"  => offset
-      }
-    end
-
-    # Creates a Builder::XmlMarkup object from this match. Useful when
-    # inspecting a nested match. The +xml+ argument may be a Hash of
-    # Builder::XmlMarkup options.
-    def to_markup(xml={})
-      if Hash === xml
-        opt = { :indent => 2 }.merge(xml)
-        xml = Builder::XmlMarkup.new(opt)
-        xml.instruct!
-      end
-
-      if matches.empty?
-        xml.match(debug_attrs)
-      else
-        xml.match(debug_attrs) do
-          matches.each {|m| m.to_markup(xml) }
-        end
-      end
-
-      xml
-    end
-
-    # Returns the target of #to_markup which is an XML string unless another
-    # target is specified in +opt+.
-    def to_xml(opt={})
-      to_markup(opt).target!
-    end
-
-    def inspect # :nodoc:
-      to_xml
-    end
-  end
-
-  # Hijack all classes that use Rule#create_match to create matches. Now, when
-  # matches are created they will also record their offset to help debugging.
-  # This functionality is included in this file because calculating the offset
-  # of every match as it is created can slow things down quite a bit.
-  [ Terminal,
-    AndPredicate,
-    NotPredicate,
-    ButPredicate,
-    Repeat,
-    Sequence
-  ].each do |rule_class|
-    rule_class.class_eval do
-      alias original_match match
-
-      def match(input)
-        m = original_match(input)
-        m.offset = input.pos - m.length if m
-        m
-      end
-    end
-  end
-end

data/test/debug_test.rb

@@ -1,23 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-# This file tests functionality that is only present when debugging is enabled.
-
-class DebugTest < Test::Unit::TestCase
-
-  def test_offset
-    match = Words.parse('one two')
-    assert(match)
-    assert_equal(0, match.offset)
-
-    words = match.find(:word)
-    assert(match)
-    assert_equal(2, words.length)
-
-    assert_equal('one', words[0])
-    assert_equal(0, words[0].offset)
-
-    assert_equal('two', words[1])
-    assert_equal(4, words[1].offset)
-  end
-
-end