citrus 1.4.0 → 1.5.0

data/citrus.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'citrus'
-  s.version = '1.4.0'
-  s.date = '2010-06-22'
+  s.version = '1.5.0'
+  s.date = '2010-07-24'
 
   s.summary = 'Parsing Expressions for Ruby'
   s.description = 'Parsing Expressions for Ruby'
@@ -11,14 +11,12 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w< lib >
 
-  s.files = Dir['benchmark/*.rb'] +
-    Dir['benchmark/*.citrus'] +
-    Dir['benchmark/*.gnuplot'] +
-    Dir['doc/**/*'] +
-    Dir['examples/**/*'] +
-    Dir['extras/**/*'] +
+  s.files = Dir['benchmark/**'] +
+    Dir['doc/**'] +
+    Dir['examples/**'] +
+    Dir['extras/**'] +
     Dir['lib/**/*.rb'] +
-    Dir['test/*.rb'] +
+    Dir['test/**/*'] +
     %w< citrus.gemspec Rakefile README >
 
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/ }

data/examples/calc.citrus

@@ -7,9 +7,9 @@ grammar Calc
   end
 
   rule additive
-    (factor operator:additive_op term) {
+    (factor operator:(plus | minus) term) {
       def value
-        operator.apply(factor.value, term.value)
+        operator.apply(factor, term)
       end
     }
   end
@@ -19,9 +19,9 @@ grammar Calc
   end
 
   rule multiplicative
-    (primary operator:multiplicative_op factor) {
+    (primary operator:(star | slash) factor) {
       def value
-        operator.apply(primary.value, factor.value)
+        operator.apply(primary, factor)
       end
     }
   end
@@ -38,22 +38,6 @@ grammar Calc
     }
   end
 
-  rule additive_op
-    (plus | minus) {
-      def apply(factor, term)
-        text.strip == '+' ? factor + term : factor - term
-      end
-    }
-  end
-
-  rule multiplicative_op
-    (star | slash) {
-      def apply(primary, factor)
-        text.strip == '*' ? primary * factor : primary / factor
-      end
-    }
-  end
-
   rule number
     float | integer
   end
@@ -74,14 +58,39 @@ grammar Calc
     }
   end
 
-  rule lparen  '(' space  end
-  rule rparen  ')' space  end
-  rule plus    '+' space  end
-  rule minus   '-' space  end
-  rule star    '*' space  end
-  rule slash   '/' space  end
+  rule plus
+    ('+' space) {
+      def apply(factor, term)
+        factor.value + term.value
+      end
+    }
+  end
+
+  rule minus
+    ('-' space) {
+      def apply(factor, term)
+        factor.value - term.value
+      end
+    }
+  end
+
+  rule star
+    ('*' space) {
+      def apply(primary, factor)
+        primary.value * factor.value
+      end
+    }
+  end
 
-  rule space
-    [ \t\n\r]*
+  rule slash
+    ('/' space) {
+      def apply(primary, factor)
+        primary.value / factor.value
+      end
+    }
   end
+
+  rule lparen '(' space  end
+  rule rparen ')' space  end
+  rule space  [ \t\n\r]* end
 end

data/examples/calc.rb

@@ -3,17 +3,15 @@ require 'citrus'
 # A grammar for mathematical formulas that apply the basic four operations to
 # non-negative numbers (integers and floats), respecting operator precedence and
 # ignoring whitespace.
-module Calc
-  include Citrus::Grammar
-
+grammar :Calc do
   rule :term do
     any(:additive, :factor)
   end
 
   rule :additive do
-    all(:factor, label(:additive_op, :operator), :term) {
+    all(:factor, label(any(:plus, :minus), :operator), :term) {
       def value
-        operator.apply(factor.value, term.value)
+        operator.apply(factor, term)
       end
     }
   end
@@ -23,9 +21,9 @@ module Calc
   end
 
   rule :multiplicative do
-    all(:primary, label(:multiplicative_op, :operator), :factor) {
+    all(:primary, label(any(:star, :slash), :operator), :factor) {
       def value
-        operator.apply(primary.value, factor.value)
+        operator.apply(primary, factor)
       end
     }
   end
@@ -42,22 +40,6 @@ module Calc
     }
   end
 
-  rule :additive_op do
-    any(:plus, :minus) {
-      def apply(factor, term)
-        text.strip == '+' ? factor + term : factor - term
-      end
-    }
-  end
-
-  rule :multiplicative_op do
-    any(:star, :slash) {
-      def apply(primary, factor)
-        text.strip == '*' ? primary * factor : primary / factor
-      end
-    }
-  end
-
   rule :number do
     any(:float, :integer)
   end
@@ -78,12 +60,39 @@ module Calc
     }
   end
 
+  rule :plus do
+    all('+', :space) {
+      def apply(factor, term)
+        factor.value + term.value
+      end
+    }
+  end
+
+  rule :minus do
+    all('-', :space) {
+      def apply(factor, term)
+        factor.value - term.value
+      end
+    }
+  end
+
+  rule :star do
+    all('*', :space) {
+      def apply(primary, factor)
+        primary.value * factor.value
+      end
+    }
+  end
+
+  rule :slash do
+    all('/', :space) {
+      def apply(primary, factor)
+        primary.value / factor.value
+      end
+    }
+  end
+
   rule :lparen, ['(', :space]
   rule :rparen, [')', :space]
-  rule :plus,   ['+', :space]
-  rule :minus,  ['-', :space]
-  rule :star,   ['*', :space]
-  rule :slash,  ['/', :space]
-
   rule :space,  /[ \t\n\r]*/
 end

data/lib/citrus.rb

@@ -4,7 +4,7 @@
 #
 # http://mjijackson.com/citrus
 module Citrus
-  VERSION = [1, 4, 0]
+  VERSION = [1, 5, 0]
 
   Infinity = 1.0 / 0
 
@@ -86,6 +86,11 @@ module Citrus
 
   # Contains methods that are available to Grammar modules at the class level.
   module GrammarMethods
+    def self.extend_object(obj)
+      raise ArgumentError, "Grammars must be Ruby modules" unless Module === obj
+      super
+    end
+
     # Returns the name of this grammar as a string.
     def name
       super.to_s
@@ -236,7 +241,7 @@ module Citrus
     def ext(rule, mod=nil)
       rule = Rule.create(rule)
       mod = Proc.new if block_given?
-      rule.ext = mod if mod
+      rule.extension = mod if mod
       rule
     end
 
@@ -387,13 +392,13 @@ module Citrus
     # Specifies a module that will be used to extend all Match objects that
     # result from this rule. If +mod+ is a Proc, it is used to create an
     # anonymous module.
-    def ext=(mod)
+    def extension=(mod)
       mod = Module.new(&mod) if Proc === mod
-      @ext = mod
+      @extension = mod
     end
 
     # The module this rule uses to extend new matches.
-    attr_reader :ext
+    attr_reader :extension
 
     # Returns +true+ if this rule is a Terminal.
     def terminal?
@@ -419,7 +424,7 @@ module Citrus
   private
 
     def extend_match(match, name)
-      match.extensions << ext if ext
+      match.extensions << extension if extension
       match.names << name if name
       match
     end
@@ -931,26 +936,51 @@ module Citrus
 
     alias eql? ==
 
-    # Uses #match to allow sub-matches of this match to be called by name as
-    # instance methods.
-    def method_missing(sym, *args)
-      # Extend this object only when needed and immediately redefine
-      # #method_missing so that the new version is used on all future calls.
-      extensions.each {|e| extend(e) } if @extensions
-      redefine_method_missing!
-      __send__(sym, *args)
-    end
-
   private
 
     def redefine_method_missing! # :nodoc:
       instance_eval(<<-RUBY, __FILE__, __LINE__ + 1)
         def method_missing(sym, *args)
-          m = first(sym)
-          return m if m
-          raise 'No match named "%s" in %s (%s)' % [sym, self, name]
+          if sym == :to_ary
+            original_method_missing(sym, *args)
+          else
+            m = first(sym)
+            return m if m
+            raise 'No match named "%s" in %s (%s)' % [sym, self, name]
+          end
         end
       RUBY
     end
+
+    alias original_method_missing method_missing
+
+  public
+
+    # Allows sub-matches of this match to be retrieved by name as instance
+    # methods.
+    def method_missing(sym, *args)
+      # Extend this object only when needed and immediately redefine
+      # #method_missing so that the new version is used on all future calls.
+      extensions.each {|e| extend(e) } if @extensions
+      redefine_method_missing!
+      __send__(sym, *args)
+    end
+  end
+end
+
+class Object
+  # A sugar method for creating grammars.
+  #
+  #     grammar :Calc do
+  #     end
+  #
+  #     module MyModule
+  #       grammar :Calc do
+  #       end
+  #     end
+  #
+  def grammar(name, &block)
+    obj = respond_to?(:const_set) ? self : Object
+    obj.const_set(name, Citrus::Grammar.new(&block))
   end
 end

data/lib/citrus/file.rb

@@ -1,11 +1,10 @@
 require 'citrus'
 
 module Citrus
-  # A grammar for Citrus grammar files. This module is used in Citrus#eval to
+  # A grammar for Citrus grammar files. This grammar is used in Citrus#eval to
   # parse and evaluate Citrus grammars and serves as a prime example of how to
   # create a complex grammar complete with semantic interpretation in pure Ruby.
-  module File
-    include Grammar
+  File = Grammar.new do
 
     ## Hierarchical syntax
 
@@ -119,7 +118,7 @@ module Citrus
         def value
           rule = suffix.value
           extension = matches[1].first
-          rule = extension.wrap(rule) if extension
+          extension.apply(rule) if extension
           rule
         end
       }
@@ -217,7 +216,7 @@ module Citrus
     rule :character_class do
       all(/\[(?:\\?.)*?\]/, :space) {
         def value
-          Regexp.new(first.text)
+          Regexp.new('\A' + first.text)
         end
       }
     end
@@ -225,7 +224,7 @@ module Citrus
     rule :anything_symbol do
       all('.', :space) {
         def value
-          /./m # The dot matches newlines
+          /./m # Match newlines
         end
       }
     end
@@ -272,9 +271,8 @@ module Citrus
 
     rule :extension do
       any(:tag, :block) {
-        def wrap(rule)
-          rule.ext = value
-          rule
+        def apply(rule)
+          rule.extension = value
         end
       }
     end

data/test/_files/alias.citrus

@@ -0,0 +1,9 @@
+grammar AliasOne
+  rule alias
+    value
+  end
+
+  rule value
+    'a'
+  end
+end

data/test/_files/grammar1.citrus

@@ -0,0 +1 @@
+grammar Calc end

data/test/_files/grammar2.citrus

@@ -0,0 +1,25 @@
+grammar Calc
+  rule number
+    (float | integer) {
+      def value
+        first.value
+      end
+    }
+  end
+
+  rule float
+    (integer '.' integer) {
+      def value
+        text.to_f
+      end
+    }
+  end
+
+  rule integer
+    [0-9]+ {
+      def value
+        text.to_i
+      end
+    }
+  end
+end

data/test/_files/grammar3.citrus

@@ -0,0 +1,112 @@
+grammar Calc
+  # If "additive" were not already the first rule declared in this grammar, we
+  # could use the following line to make it the root rule.
+  #root additive
+
+  rule additive
+    (multitive_additive | multitive) {
+      def value
+        first.value
+      end
+    }
+  end
+
+  rule multitive_additive
+    (multitive additive_op additive) {
+      def value
+        if additive_op == '+'
+          multitive.value + additive.value
+        else
+          multitive.value - additive.value
+        end
+      end
+    }
+  end
+
+  rule multitive
+    (primary_multitive | primary) {
+      def value
+        first.value
+      end
+    }
+  end
+
+  rule primary_multitive
+    (primary multitive_op multitive) {
+      def value
+        if multitive_op == '*'
+          primary.value * multitive.value
+        else
+          primary.value / multitive.value
+        end
+      end
+    }
+  end
+
+  rule primary
+    (additive_paren | number) {
+      def value
+        first.value
+      end
+    }
+  end
+
+  rule additive_paren
+    ('(' additive ')') {
+      def value
+        additive.value
+      end
+    }
+  end
+
+  rule additive_op
+    (plus | minus) {
+      def ==(other)
+        text.strip == other
+      end
+    }
+  end
+
+  rule multitive_op
+    (star | slash) {
+      def ==(other)
+        text.strip == other
+      end
+    }
+  end
+
+  rule number
+    (float | integer) {
+      def value
+        first.value
+      end
+    }
+  end
+
+  rule float
+    (integer '.' integer) {
+      def value
+        text.to_f
+      end
+    }
+  end
+
+  rule integer
+    [0-9]+ {
+      def value
+        text.to_i
+      end
+    }
+  end
+
+  rule lparen  '(' space  end
+  rule rparen  ')' space  end
+  rule plus    '+' space  end
+  rule minus   '-' space  end
+  rule star    '*' space  end
+  rule slash   '/' space  end
+
+  rule space
+    /[ \t\n\r]*/
+  end
+end

data/test/_files/rule1.citrus

@@ -0,0 +1 @@
+rule int '' end

data/test/_files/rule2.citrus

@@ -0,0 +1,3 @@
+rule int
+  [0-9]+
+end

data/test/_files/rule3.citrus

@@ -0,0 +1,7 @@
+rule int
+  [0-9]+ {
+    def value
+      text.to_i
+    end
+  }
+end

data/test/_files/super.citrus

@@ -0,0 +1,13 @@
+grammar SuperOne
+  rule num
+    '1'
+  end
+end
+
+grammar SuperTwo
+  include SuperOne
+
+  rule num
+    '2' | super
+  end
+end

data/test/alias_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 Citrus.load(File.dirname(__FILE__) + '/_files/alias')
 
 class AliasTest < Test::Unit::TestCase
@@ -16,8 +16,8 @@ class AliasTest < Test::Unit::TestCase
 
     match = grammar.parse('b')
     assert(match)
-    assert('b', match.text)
-    assert(1, match.length)
+    assert_equal('b', match.text)
+    assert_equal(1, match.length)
   end
 
   def test_match_renamed

data/test/and_predicate_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class AndPredicateTest < Test::Unit::TestCase
 

data/test/calc_file_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 if defined?(Calc)
   Object.__send__(:remove_const, :Calc)

data/test/calc_test.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 if defined?(Calc)
   Object.__send__(:remove_const, :Calc)
 end
 
-require File.dirname(__FILE__) + '/../examples/calc'
+require File.expand_path('../../examples/calc', __FILE__)
 
 class CalcTest < Test::Unit::TestCase
   include CalcTestMethods

data/test/choice_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class ChoiceTest < Test::Unit::TestCase
 

data/test/expression_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class ExpressionTest < Test::Unit::TestCase
 

data/test/file_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 require 'citrus/file'
 
 class CitrusFileTest < Test::Unit::TestCase
@@ -233,17 +233,17 @@ class CitrusFileTest < Test::Unit::TestCase
     match = grammar.parse('"" <Module>')
     assert(match)
     assert_kind_of(Rule, match.value)
-    assert_kind_of(Module, match.value.ext)
+    assert_kind_of(Module, match.value.extension)
 
     match = grammar.parse('"" {}')
     assert(match)
     assert_kind_of(Rule, match.value)
-    assert_kind_of(Module, match.value.ext)
+    assert_kind_of(Module, match.value.extension)
 
     match = grammar.parse('"" {} ')
     assert(match)
     assert_kind_of(Rule, match.value)
-    assert_kind_of(Module, match.value.ext)
+    assert_kind_of(Module, match.value.extension)
   end
 
   def test_suffix
@@ -408,19 +408,23 @@ class CitrusFileTest < Test::Unit::TestCase
 
     match = grammar.parse('[_]')
     assert(match)
-    assert_equal(/[_]/, match.value)
+    assert_equal(/\A[_]/, match.value)
 
     match = grammar.parse('[a-z]')
     assert(match)
-    assert_equal(/[a-z]/, match.value)
+    assert_equal(/\A[a-z]/, match.value)
 
     match = grammar.parse('[a-z0-9]')
     assert(match)
-    assert_equal(/[a-z0-9]/, match.value)
+    assert_equal(/\A[a-z0-9]/, match.value)
+
+    match = grammar.parse('[\[-\]]')
+    assert(match)
+    assert_equal(/\A[\[-\]]/, match.value)
 
     match = grammar.parse('[\\x26-\\x29]')
     assert(match)
-    assert_equal(/[\x26-\x29]/, match.value)
+    assert_equal(/\A[\x26-\x29]/, match.value)
   end
 
   def test_anything_symbol

data/test/fixed_width_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class FixedWidthTest < Test::Unit::TestCase
 

data/test/grammar_test.rb

@@ -1,11 +1,16 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class GrammarTest < Test::Unit::TestCase
 
   def test_new
-    Grammar.new do
-      assert_kind_of(Module, self)
-      assert(include?(Grammar))
+    g = Grammar.new
+    assert_kind_of(Module, g)
+    assert(g.include?(Grammar))
+  end
+
+  def test_non_module_fail
+    assert_raise ArgumentError do
+      ''.extend(GrammarMethods)
     end
   end
 
@@ -116,14 +121,14 @@ class GrammarTest < Test::Unit::TestCase
 
     match = grammar.parse('((a))')
     assert(match)
-    assert('((a))', match.text)
-    assert(5, match.length)
+    assert_equal('((a))', match.text)
+    assert_equal(5, match.length)
 
     str = ('(' * 200) + 'a' + (')' * 200)
     match = grammar.parse(str)
     assert(match)
-    assert(str, match.text)
-    assert(str.length, match.length)
+    assert_equal(str, match.text)
+    assert_equal(str.length, match.length)
   end
 
 end

data/test/helper.rb

@@ -44,100 +44,66 @@ class Test::Unit::TestCase
   end
 
   module CalcTestMethods
-    def test_int
-      match = Calc.parse('3')
+    # A helper method that tests the successful parsing and evaluation of the
+    # given mathematical expression.
+    def do_test(expr)
+      match = Calc.parse(expr)
       assert(match)
-      assert_equal('3', match.text)
-      assert_equal(1, match.length)
-      assert_equal(3, match.value)
+      assert_equal(expr, match.text)
+      assert_equal(expr.length, match.length)
+      assert_equal(eval(expr), match.value)
+    end
+
+    def test_int
+      do_test('3')
     end
 
     def test_float
-      match = Calc.parse('1.5')
-      assert(match)
-      assert_equal('1.5', match.text)
-      assert_equal(3, match.length)
-      assert_equal(1.5, match.value)
+      do_test('1.5')
     end
 
     def test_addition
-      match = Calc.parse('1+2')
-      assert(match)
-      assert_equal('1+2', match.text)
-      assert_equal(3, match.length)
-      assert_equal(3, match.value)
+      do_test('1+2')
     end
 
     def test_addition_multi
-      match = Calc.parse('1+2+3')
-      assert(match)
-      assert_equal('1+2+3', match.text)
-      assert_equal(5, match.length)
-      assert_equal(6, match.value)
+      do_test('1+2+3')
     end
 
     def test_addition_float
-      match = Calc.parse('1.5+3')
-      assert(match)
-      assert_equal('1.5+3', match.text)
-      assert_equal(5, match.length)
-      assert_equal(4.5, match.value)
+      do_test('1.5+3')
     end
 
     def test_subtraction
-      match = Calc.parse('3-2')
-      assert(match)
-      assert_equal(1, match.value)
+      do_test('3-2')
     end
 
     def test_subtraction_float
-      match = Calc.parse('4.5-3')
-      assert(match)
-      assert_equal('4.5-3', match.text)
-      assert_equal(5, match.length)
-      assert_equal(1.5, match.value)
+      do_test('4.5-3')
     end
 
     def test_multiplication
-      match = Calc.parse('2*5')
-      assert(match)
-      assert_equal(10, match.value)
+      do_test('2*5')
     end
 
     def test_multiplication_float
-      match = Calc.parse('1.5*3')
-      assert(match)
-      assert_equal('1.5*3', match.text)
-      assert_equal(5, match.length)
-      assert_equal(4.5, match.value)
+      do_test('1.5*3')
     end
 
     def test_division
-      match = Calc.parse('20/5')
-      assert(match)
-      assert_equal(4, match.value)
+      do_test('20/5')
     end
 
     def test_division_float
-      match = Calc.parse('4.5/3')
-      assert(match)
-      assert_equal('4.5/3', match.text)
-      assert_equal(5, match.length)
-      assert_equal(1.5, match.value)
+      do_test('4.5/3')
     end
 
     def test_complex
-      match = Calc.parse('7*4+3.5*(4.5/3)')
-      assert(match)
-      assert_equal('7*4+3.5*(4.5/3)', match.text)
-      assert_equal(33.25, match.value)
+      do_test('7*4+3.5*(4.5/3)')
     end
 
     def test_complex_spaced
-      match = Calc.parse('7 * 4 + 3.5 * (4.5 / 3)')
-      assert(match)
-      assert_equal(33.25, match.value)
+      do_test('7 * 4 + 3.5 * (4.5 / 3)')
     end
   end
-
 end

data/test/label_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class LabelTest < Test::Unit::TestCase
 

data/test/match_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class MatchTest < Test::Unit::TestCase
 

data/test/not_predicate_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class NotPredicateTest < Test::Unit::TestCase
 

data/test/repeat_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class RepeatTest < Test::Unit::TestCase
 

data/test/rule_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class RuleTest < Test::Unit::TestCase
 
@@ -22,7 +22,7 @@ class RuleTest < Test::Unit::TestCase
 
   def test_match_module
     rule = EqualRule.new('a')
-    rule.ext = MatchModule
+    rule.extension = MatchModule
     match = rule.match(input('a'))
     assert(match)
     assert_equal(:test, match.a_test)
@@ -30,7 +30,7 @@ class RuleTest < Test::Unit::TestCase
 
   def test_numeric_proc
     rule = EqualRule.new(1)
-    rule.ext = NumericProc
+    rule.extension = NumericProc
     match = rule.match(input('1'))
     assert(match)
     assert_equal(1, match.to_i)
@@ -39,7 +39,7 @@ class RuleTest < Test::Unit::TestCase
 
   def test_numeric_module
     rule = EqualRule.new(1)
-    rule.ext = NumericModule
+    rule.extension = NumericModule
     match = rule.match(input('1'))
     assert(match)
     assert_equal(1, match.to_i)

data/test/sequence_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class SequenceTest < Test::Unit::TestCase
 

data/test/super_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 Citrus.load(File.dirname(__FILE__) + '/_files/super')
 
 class SuperTest < Test::Unit::TestCase
@@ -20,13 +20,13 @@ class SuperTest < Test::Unit::TestCase
 
     match = grammar2.parse('b')
     assert(match)
-    assert('b', match.text)
-    assert(1, match.length)
+    assert_equal('b', match.text)
+    assert_equal(1, match.length)
 
     match = grammar2.parse('a')
     assert(match)
-    assert('a', match.text)
-    assert(1, match.length)
+    assert_equal('a', match.text)
+    assert_equal(1, match.length)
   end
 
   def test_peg

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: citrus
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Michael Jackson
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -06:00
+date: 2010-07-24 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 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,9 +55,9 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- benchmark/seqpar.rb
 - benchmark/seqpar.citrus
 - benchmark/seqpar.gnuplot
+- benchmark/seqpar.rb
 - doc/background.rdoc
 - doc/example.rdoc
 - doc/index.rdoc
@@ -61,16 +66,21 @@ files:
 - doc/syntax.rdoc
 - examples/calc.citrus
 - examples/calc.rb
-- examples/calc_sugar.rb
 - extras/citrus.vim
 - lib/citrus/debug.rb
 - lib/citrus/file.rb
-- lib/citrus/sugar.rb
 - lib/citrus.rb
+- test/_files/alias.citrus
+- test/_files/grammar1.citrus
+- test/_files/grammar2.citrus
+- test/_files/grammar3.citrus
+- test/_files/rule1.citrus
+- test/_files/rule2.citrus
+- test/_files/rule3.citrus
+- test/_files/super.citrus
 - test/alias_test.rb
 - test/and_predicate_test.rb
 - test/calc_file_test.rb
-- test/calc_sugar_test.rb
 - test/calc_test.rb
 - test/choice_test.rb
 - test/expression_test.rb
@@ -103,23 +113,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Parsing Expressions for Ruby
@@ -127,7 +141,6 @@ test_files:
 - test/alias_test.rb
 - test/and_predicate_test.rb
 - test/calc_file_test.rb
-- test/calc_sugar_test.rb
 - test/calc_test.rb
 - test/choice_test.rb
 - test/expression_test.rb

data/examples/calc_sugar.rb

@@ -1,87 +0,0 @@
-require 'citrus/sugar'
-
-# A grammar for mathematical formulas that apply the basic four operations to
-# non-negative numbers (integers and floats), respecting operator precedence and
-# ignoring whitespace.
-Calc = Citrus::Grammar.new {
-  rule term do
-    any(additive, factor)
-  end
-
-  rule additive do
-    all(factor, label(additive_op, operator), term) {
-      def value
-        operator.apply(factor.value, term.value)
-      end
-    }
-  end
-
-  rule factor do
-    any(multiplicative, primary)
-  end
-
-  rule multiplicative do
-    all(primary, label(multiplicative_op, operator), factor) {
-      def value
-        operator.apply(primary.value, factor.value)
-      end
-    }
-  end
-
-  rule primary do
-    any(term_paren, number)
-  end
-
-  rule term_paren do
-    all(lparen, term, rparen) {
-      def value
-        term.value
-      end
-    }
-  end
-
-  rule additive_op do
-    any(plus, minus) {
-      def apply(factor, term)
-        text.strip == '+' ? factor + term : factor - term
-      end
-    }
-  end
-
-  rule multiplicative_op do
-    any(star, slash) {
-      def apply(primary, factor)
-        text.strip == '*' ? primary * factor : primary / factor
-      end
-    }
-  end
-
-  rule number do
-    any(float, integer)
-  end
-
-  rule float do
-    all(/[0-9]+/, '.', /[0-9]+/, space) {
-      def value
-        text.strip.to_f
-      end
-    }
-  end
-
-  rule integer do
-    all(/[0-9]+/, space) {
-      def value
-        text.strip.to_i
-      end
-    }
-  end
-
-  rule lparen, ['(', space]
-  rule rparen, [')', space]
-  rule plus,   ['+', space]
-  rule minus,  ['-', space]
-  rule star,   ['*', space]
-  rule slash,  ['/', space]
-
-  rule space,  /[ \t\n\r]*/
-}

data/lib/citrus/sugar.rb

@@ -1,25 +0,0 @@
-require 'citrus'
-
-module Citrus
-  module GrammarMethods
-    # Permits creation of aliases within rule definitions in Ruby grammars using
-    # the bare name of another rule instead of a Symbol, e.g.:
-    #
-    #     rule :value do
-    #       any(:alpha, :num)
-    #     end
-    #
-    # can now be written as
-    #
-    #     rule value do
-    #       any(alpha, num)
-    #     end
-    #
-    # The only caveat is that since this hack uses +method_missing+ you must
-    # still use symbols for rules that have the same name as any of the methods
-    # in GrammarMethods (root, rule, rules, etc.)
-    def method_missing(sym, *args)
-      sym
-    end
-  end
-end

data/test/calc_sugar_test.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-if defined?(Calc)
-  Object.__send__(:remove_const, :Calc)
-end
-
-require File.dirname(__FILE__) + '/../examples/calc_sugar'
-
-class CalcSugarTest < Test::Unit::TestCase
-  include CalcTestMethods
-end