citrus 1.7.0 → 1.8.0

data/test/choice_test.rb

@@ -15,7 +15,7 @@ class ChoiceTest < Test::Unit::TestCase
 
     match = rule.match(input('a'))
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
   end
 
@@ -24,12 +24,12 @@ class ChoiceTest < Test::Unit::TestCase
 
     match = rule.match(input('ab'))
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
 
     match = rule.match(input('ba'))
     assert(match)
-    assert_equal('b', match.text)
+    assert_equal('b', match)
     assert_equal(1, match.length)
   end
 
@@ -38,12 +38,12 @@ class ChoiceTest < Test::Unit::TestCase
 
     match = rule.match(input('1+'))
     assert(match)
-    assert_equal('1', match.text)
+    assert_equal('1', match)
     assert_equal(1, match.length)
 
     match = rule.match(input('+1'))
     assert(match)
-    assert_equal('+', match.text)
+    assert_equal('+', match)
     assert_equal(1, match.length)
   end
 

data/test/expression_test.rb

@@ -11,7 +11,7 @@ class ExpressionTest < Test::Unit::TestCase
     rule = Expression.new(/\d+/)
     match = rule.match(input('123 456'))
     assert(match)
-    assert_equal('123', match.text)
+    assert_equal('123', match)
     assert_equal(3, match.length)
   end
 

data/test/file_test.rb

@@ -93,7 +93,7 @@ class CitrusFileTest < Test::Unit::TestCase
     assert_instance_of(Choice, match.value)
     assert_equal(1, match.find(:bar).length)
     assert_equal(2, match.find(:regular_expression).length)
-    assert_equal(0, match.find(:anything_symbol).length)
+    assert_equal(0, match.find(:dot).length)
 
     match = grammar.parse('"" {}')
     assert(match)
@@ -444,12 +444,12 @@ class CitrusFileTest < Test::Unit::TestCase
     assert_equal(/\A[\x26-\x29]/, match.value)
   end
 
-  def test_anything_symbol
-    grammar = file(:anything_symbol)
+  def test_dot
+    grammar = file(:dot)
 
     match = grammar.parse('.')
     assert(match)
-    assert_equal(/./m, match.value)
+    assert_equal(DOT, match.value)
   end
 
   def test_regular_expression
@@ -481,11 +481,11 @@ class CitrusFileTest < Test::Unit::TestCase
 
     match = grammar.parse('&')
     assert(match)
-    assert_kind_of(Rule, match.wrap(''))
+    assert_kind_of(Rule, match.value(''))
 
     match = grammar.parse('!')
     assert(match)
-    assert_kind_of(Rule, match.wrap(''))
+    assert_kind_of(Rule, match.value(''))
   end
 
   def test_and
@@ -493,11 +493,11 @@ class CitrusFileTest < Test::Unit::TestCase
 
     match = grammar.parse('&')
     assert(match)
-    assert_instance_of(AndPredicate, match.wrap(''))
+    assert_instance_of(AndPredicate, match.value(''))
 
     match = grammar.parse('& ')
     assert(match)
-    assert_instance_of(AndPredicate, match.wrap(''))
+    assert_instance_of(AndPredicate, match.value(''))
   end
 
   def test_not
@@ -505,11 +505,11 @@ class CitrusFileTest < Test::Unit::TestCase
 
     match = grammar.parse('!')
     assert(match)
-    assert_instance_of(NotPredicate, match.wrap(''))
+    assert_instance_of(NotPredicate, match.value(''))
 
     match = grammar.parse('! ')
     assert(match)
-    assert_instance_of(NotPredicate, match.wrap(''))
+    assert_instance_of(NotPredicate, match.value(''))
   end
 
   def test_label
@@ -517,13 +517,15 @@ class CitrusFileTest < Test::Unit::TestCase
 
     match = grammar.parse('label:')
     assert(match)
-    assert_equal('label', match.value)
-    assert_instance_of(Label, match.wrap(''))
+    v = match.value('')
+    assert_instance_of(Label, v)
+    assert_equal(:label, v.label)
 
     match = grammar.parse('a_label : ')
     assert(match)
-    assert_equal('a_label', match.value)
-    assert_instance_of(Label, match.wrap(''))
+    v = match.value('')
+    assert_instance_of(Label, v)
+    assert_equal(:a_label, v.label)
   end
 
   def test_tag
@@ -676,7 +678,7 @@ class CitrusFileTest < Test::Unit::TestCase
 
     match = grammar.parse('# A comment.')
     assert(match)
-    assert_equal('# A comment.', match.text)
+    assert_equal('# A comment.', match)
   end
 
 end

data/test/fixed_width_test.rb

@@ -11,7 +11,7 @@ class FixedWidthTest < Test::Unit::TestCase
     rule = FixedWidth.new('abc')
     match = rule.match(input('abc'))
     assert(match)
-    assert_equal('abc', match.text)
+    assert_equal('abc', match)
     assert_equal(3, match.length)
   end
 
@@ -25,7 +25,7 @@ class FixedWidthTest < Test::Unit::TestCase
     rule = FixedWidth.new('abc')
     match = rule.match(input('abcd'))
     assert(match)
-    assert_equal('abc', match.text)
+    assert_equal('abc', match)
     assert_equal(3, match.length)
   end
 

data/test/grammar_test.rb

@@ -42,7 +42,7 @@ class GrammarTest < Test::Unit::TestCase
     }
     match = grammar.parse('abc')
     assert(match)
-    assert_equal('abc', match.text)
+    assert_equal('abc', match)
     assert_equal(3, match.length)
   end
 
@@ -52,7 +52,7 @@ class GrammarTest < Test::Unit::TestCase
     }
     match = grammar.parse('abc')
     assert(match)
-    assert_equal('abc', match.text)
+    assert_equal('abc', match)
     assert_equal(3, match.length)
   end
 
@@ -62,7 +62,7 @@ class GrammarTest < Test::Unit::TestCase
     }
     match = grammar.parse('123')
     assert(match)
-    assert_equal('123', match.text)
+    assert_equal('123', match)
     assert_equal(3, match.length)
   end
 
@@ -90,12 +90,12 @@ class GrammarTest < Test::Unit::TestCase
 
     match = grammar.parse('a')
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
 
     match = grammar.parse('1')
     assert(match)
-    assert_equal('1', match.text)
+    assert_equal('1', match)
     assert_equal(1, match.length)
   end
 
@@ -115,18 +115,18 @@ class GrammarTest < Test::Unit::TestCase
 
     match = grammar.parse('a')
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
 
     match = grammar.parse('((a))')
     assert(match)
-    assert_equal('((a))', match.text)
+    assert_equal('((a))', match)
     assert_equal(5, match.length)
 
     str = ('(' * 200) + 'a' + (')' * 200)
     match = grammar.parse(str)
     assert(match)
-    assert_equal(str, match.text)
+    assert_equal(str, match)
     assert_equal(str.length, match.length)
   end
 

data/test/helper.rb

@@ -19,11 +19,7 @@ class Test::Unit::TestCase
     end
 
     rule :num do
-      ext(/[0-9]/) {
-        def value
-          text.to_i
-        end
-      }
+      ext(/[0-9]/) { to_i }
     end
 
     rule :alphanum do
@@ -49,7 +45,7 @@ class Test::Unit::TestCase
     def do_test(expr)
       match = Calc.parse(expr)
       assert(match)
-      assert_equal(expr, match.text)
+      assert_equal(expr, match)
       assert_equal(expr.length, match.length)
       assert_equal(eval(expr), match.value)
     end
@@ -105,5 +101,57 @@ class Test::Unit::TestCase
     def test_complex_spaced
       do_test('7 * 4 + 3.5 * (4.5 / 3)')
     end
+
+    def test_complex_with_underscores
+      do_test('(12_000 / 3) * 2.5')
+    end
+
+    def test_modulo
+      do_test('3 % 2 + 4')
+    end
+
+    def test_exponent
+      do_test('2**9')
+    end
+
+    def test_exponent_float
+      do_test('2**2.2')
+    end
+
+    def test_negative_exponent
+      do_test('2**-3')
+    end
+
+    def test_exponent_exponent
+      do_test('2**2**2')
+    end
+
+    def test_exponent_group
+      do_test('2**(3+1)')
+    end
+
+    def test_negative
+      do_test('-5')
+    end
+
+    def test_double_negative
+      do_test('--5')
+    end
+
+    def test_complement
+      do_test('~4')
+    end
+
+    def test_double_complement
+      do_test('~~4')
+    end
+
+    def test_mixed_unary
+      do_test('~-4')
+    end
+
+    def test_complex_with_negatives
+      do_test('4 * -7 / (8.0 + 1_2)**2')
+    end
   end
 end

data/test/label_test.rb

@@ -8,7 +8,7 @@ class LabelTest < Test::Unit::TestCase
   end
 
   def test_match
-    rule = Label.new('label', 'a')
+    rule = Label.new('a', 'label')
 
     match = rule.match(input('a'))
     assert(match)
@@ -16,10 +16,10 @@ class LabelTest < Test::Unit::TestCase
   end
 
   def test_to_s
-    rule = Label.new('label', 'a')
+    rule = Label.new('a', 'label')
     assert_equal('label:"a"', rule.to_s)
 
-    rule = Label.new('label', Sequence.new(%w< a b >))
+    rule = Label.new(Sequence.new(%w< a b >), 'label')
     assert_equal('label:("a" "b")', rule.to_s)
   end
 

data/test/match_test.rb

@@ -23,7 +23,7 @@ class MatchTest < Test::Unit::TestCase
 
   def test_string
     match = Match.new('hello')
-    assert_equal('hello', match.text)
+    assert_equal('hello', match)
     assert_equal(5, match.length)
   end
 
@@ -31,13 +31,13 @@ class MatchTest < Test::Unit::TestCase
     match1 = Match.new('a')
     match2 = Match.new('b')
     match = Match.new([match1, match2])
-    assert_equal('ab', match.text)
+    assert_equal('ab', match)
     assert_equal(2, match.length)
   end
 
   def test_match_data
     match = Match.new('hello world'.match(/^(\w+) /))
-    assert_equal('hello ', match.text)
+    assert_equal('hello ', match)
     assert_equal(6, match.length)
   end
 
@@ -45,7 +45,7 @@ class MatchTest < Test::Unit::TestCase
     match1 = Match.new('hello')
     match2 = Match.new(' world'.match(/.+/))
     match = Match.new([match1, match2])
-    assert_equal('hello world', match.text)
+    assert_equal('hello world', match)
     assert_equal(11, match.length)
   end
 
@@ -75,7 +75,7 @@ class MatchTest < Test::Unit::TestCase
 
     num = match.first(:num)
     assert(num)
-    assert_equal('4', num.text)
+    assert_equal('4', num)
     assert_equal(4, num.value)
   end
 

data/test/not_predicate_test.rb

@@ -15,7 +15,7 @@ class NotPredicateTest < Test::Unit::TestCase
 
     match = rule.match(input('b'))
     assert(match)
-    assert_equal('', match.text)
+    assert_equal('', match)
     assert_equal(0, match.length)
   end
 

data/test/repeat_test.rb

@@ -8,90 +8,90 @@ class RepeatTest < Test::Unit::TestCase
   end
 
   def test_match_zero_or_one
-    rule = Repeat.new(0, 1, 'a')
+    rule = Repeat.new('a', 0, 1)
 
     match = rule.match(input(''))
     assert(match)
-    assert_equal('', match.text)
+    assert_equal('', match)
     assert_equal(0, match.length)
 
     match = rule.match(input('a'))
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
   end
 
   def test_match_one_or_more
-    rule = Repeat.new(1, Infinity, 'a')
+    rule = Repeat.new('a', 1, Infinity)
 
     match = rule.match(input(''))
     assert_equal(nil, match)
 
     match = rule.match(input('a'))
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
 
     match = rule.match(input('a' * 200))
     assert(match)
-    assert_equal('a' * 200, match.text)
+    assert_equal('a' * 200, match)
     assert_equal(200, match.length)
   end
 
   def test_match_one
-    rule = Repeat.new(1, 1, 'a')
+    rule = Repeat.new('a', 1, 1)
 
     match = rule.match(input(''))
     assert_equal(nil, match)
 
     match = rule.match(input('a'))
     assert(match)
-    assert_equal('a', match.text)
+    assert_equal('a', match)
     assert_equal(1, match.length)
   end
 
   def test_operator
-    rule = Repeat.new(1, 2)
+    rule = Repeat.new('', 1, 2)
     assert_equal('1*2', rule.operator)
   end
 
   def test_operator_empty
-    rule = Repeat.new(0, 0)
+    rule = Repeat.new('', 0, 0)
     assert_equal('', rule.operator)
   end
 
   def test_operator_asterisk
-    rule = Repeat.new(0, Infinity)
+    rule = Repeat.new('', 0, Infinity)
     assert_equal('*', rule.operator)
   end
 
   def test_operator_question_mark
-    rule = Repeat.new(0, 1)
+    rule = Repeat.new('', 0, 1)
     assert_equal('?', rule.operator)
   end
 
   def test_operator_plus
-    rule = Repeat.new(1, Infinity)
+    rule = Repeat.new('', 1, Infinity)
     assert_equal('+', rule.operator)
   end
 
   def test_to_s
-    rule = Repeat.new(1, 2, /a/)
+    rule = Repeat.new(/a/, 1, 2)
     assert_equal('/a/1*2', rule.to_s)
   end
 
   def test_to_s_asterisk
-    rule = Repeat.new(0, Infinity, 'a')
+    rule = Repeat.new('a', 0, Infinity)
     assert_equal('"a"*', rule.to_s)
   end
 
   def test_to_s_question_mark
-    rule = Repeat.new(0, 1, 'a')
+    rule = Repeat.new('a', 0, 1)
     assert_equal('"a"?', rule.to_s)
   end
 
   def test_to_s_plus
-    rule = Repeat.new(1, Infinity, 'a')
+    rule = Repeat.new('a', 1, Infinity)
     assert_equal('"a"+', rule.to_s)
   end