citrus 1.5.2 → 1.6.0

data/benchmark/seqpar.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+
 # Benchmarking written by Bernard Lambeau and Jason Garber of the Treetop
 # project.
 #
@@ -7,8 +9,7 @@
 #   3. Make your modifications to the Citrus code
 #   4. Run ruby seqpar.rb
 #   5. Run gnuplot seqpar.gnuplot
-#
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'citrus'
 require 'benchmark'
 

data/lib/citrus.rb

@@ -4,7 +4,7 @@
 #
 # http://mjijackson.com/citrus
 module Citrus
-  VERSION = [1, 5, 2]
+  VERSION = [1, 6, 0]
 
   Infinity = 1.0 / 0
 
@@ -166,7 +166,7 @@ module Citrus
 
       rules[sym] || super_rule(sym)
     rescue => e
-      raise "Cannot create rule \"#{name}\": " + e.message
+      raise 'Cannot create rule "%s": %s' % [name, e.message]
     end
 
     # Gets/sets the +name+ of the root rule of this grammar. If no root rule is
@@ -250,40 +250,30 @@ module Citrus
     # description of available parse options.
     def parse(string, options={})
       opts = default_parse_options.merge(options)
-
-      raise "No root rule specified" unless opts[:root]
+      raise 'No root rule specified' unless opts[:root]
 
       root_rule = rule(opts[:root])
-      raise "No rule named \"#{root}\"" unless root_rule
-
-      input = Input.new(string, opts[:enable_memo])
-      match = input.match(root_rule, opts[:offset])
+      raise 'No rule named "%s"' % root unless root_rule
 
-      if !match || (opts[:consume_all] && match.length != string.length)
-        raise ParseError.new(input)
-      end
-
-      match
+      input = Input.new(string, opts[:memoize])
+      input.match(root_rule, opts[:offset]) or raise ParseError.new(input)
     end
 
     # The default set of options that is used in #parse. The options hash may
     # have any of the following keys:
     #
-    # offset::        The offset at which the parse should start. Defaults to 0.
-    # root::          The name of the root rule to use for the parse. Defaults
-    #                 to the name supplied by calling #root.
-    # consume_all::   If this is +true+ and the entire input string cannot be
-    #                 consumed, a ParseError will be raised. Defaults to +true+.
-    # enable_memo::   If this is +true+ the matches generated during a parse are
-    #                 memoized. This technique (also known as Packrat parsing)
-    #                 guarantees parsers will operate in linear time but costs
-    #                 significantly more in terms of time and memory required.
-    #                 Defaults to +false+.
+    # offset::    The offset at which the parse should start. Defaults to 0.
+    # root::      The name of the root rule to use for the parse. Defaults
+    #             to the name supplied by calling #root.
+    # memoize::   If this is +true+ the matches generated during a parse are
+    #             memoized. This technique (also known as Packrat parsing)
+    #             guarantees parsers will operate in linear time but costs
+    #             significantly more in terms of time and memory required.
+    #             Defaults to +false+.
     def default_parse_options
-      { :offset => 0,
-        :root => root,
-        :consume_all => true,
-        :enable_memo => false
+      { :offset   => 0,
+        :root     => root,
+        :memoize  => false
       }
     end
   end
@@ -291,12 +281,12 @@ module Citrus
   # This class represents the core of the parsing algorithm. It wraps the input
   # string and serves matches to all nonterminals.
   class Input
-    # Takes the input +string+ that is to be parsed. If +enable_memo+ is +true+
+    # Takes the input +string+ that is to be parsed. If +memoize+ is +true+
     # a cache is created that holds references to already generated matches.
-    def initialize(string, enable_memo=false)
+    def initialize(string, memoize=false)
       @string = string
       @max_offset = 0
-      if enable_memo
+      if memoize
         @cache = {}
         @cache_hits = 0
       end

data/test/file_test.rb

@@ -347,10 +347,6 @@ class CitrusFileTest < Test::Unit::TestCase
     match = grammar.parse('some_rule ')
     assert(match)
     assert('some_rule', match.value)
-
-    assert_raise ParseError do
-      match = grammar.parse('some_rule1')
-    end
   end
 
   def test_terminal
@@ -674,10 +670,6 @@ class CitrusFileTest < Test::Unit::TestCase
     match = grammar.parse('# A comment.')
     assert(match)
     assert_equal('# A comment.', match.text)
-
-    assert_raise ParseError do
-      match = grammar.parse("# A comment.\n")
-    end
   end
 
 end

data/test/grammar_test.rb

@@ -70,9 +70,8 @@ class GrammarTest < Test::Unit::TestCase
     grammar = Grammar.new {
       rule(:num) { all(1, 2, 3) }
     }
-    assert_raise ParseError do
-      match = grammar.parse('1234')
-    end
+    match = grammar.parse('1234')
+    assert(match)
   end
 
   def test_parse_sequence_short

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
-  - 2
-  version: 1.5.2
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Michael Jackson