citrus 2.2.2 → 2.3.0

data/test/grammar_test.rb

@@ -63,7 +63,7 @@ class GrammarTest < Test::Unit::TestCase
     grammar = Grammar.new {
       rule(:num) { all(1, 2, 3) }
     }
-    match = grammar.parse('1234')
+    match = grammar.parse('1234', :consume => false)
     assert(match)
     assert_equal('123', match)
     assert_equal(3, match.length)

data/test/helper.rb

@@ -48,8 +48,8 @@ class Test::Unit::TestCase
   module CalcTestMethods
     # A helper method that tests the successful parsing and evaluation of the
     # given mathematical expression.
-    def do_test(expr)
-      match = Calc.parse(expr)
+    def do_test(expr, grammar)
+      match = grammar.parse(expr)
       assert(match)
       assert_equal(expr, match)
       assert_equal(expr.length, match.length)

data/test/input_test.rb

@@ -2,9 +2,8 @@ require File.expand_path('../helper', __FILE__)
 
 class InputTest < Test::Unit::TestCase
   def test_memoized?
-    input = Input.new('')
-    input.memoize!
-    assert(input.memoized?)
+    assert !Input.new('').memoized?
+    assert MemoizingInput.new('').memoized?
   end
 
   def test_offsets_new
@@ -25,31 +24,31 @@ class InputTest < Test::Unit::TestCase
   end
 
   def test_events
-    a = Rule.new('a')
-    b = Rule.new('b')
-    c = Rule.new('c')
-    s = Rule.new([ a, b, c ])
+    a = Rule.for('a')
+    b = Rule.for('b')
+    c = Rule.for('c')
+    s = Rule.for([ a, b, c ])
     r = Repeat.new(s, 0, Infinity)
 
     input = Input.new("abcabcabc")
     events = input.exec(r)
 
     expected_events = [
-      r.id,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
+      r,
+        s,
+          a, CLOSE, 1,
+          b, CLOSE, 1,
+          c, CLOSE, 1,
         CLOSE, 3,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
+        s,
+          a, CLOSE, 1,
+          b, CLOSE, 1,
+          c, CLOSE, 1,
         CLOSE, 3,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
+        s,
+          a, CLOSE, 1,
+          b, CLOSE, 1,
+          c, CLOSE, 1,
         CLOSE, 3,
       CLOSE, 9
     ]
@@ -58,42 +57,42 @@ class InputTest < Test::Unit::TestCase
   end
 
   def test_events2
-    a = Rule.new('a')
-    b = Rule.new('b')
+    a = Rule.for('a')
+    b = Rule.for('b')
     c = Choice.new([ a, b ])
     r = Repeat.new(c, 0, Infinity)
-    s = Rule.new([ a, r ])
+    s = Rule.for([ a, r ])
 
     input = Input.new('abbababba')
     events = input.exec(s)
 
     expected_events = [
-      s.id,
-        a.id, CLOSE, 1,
-        r.id,
-          c.id,
-            b.id, CLOSE, 1,
+      s,
+        a, CLOSE, 1,
+        r,
+          c,
+            b, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            b.id, CLOSE, 1,
+          c,
+            b, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            a.id, CLOSE, 1,
+          c,
+            a, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            b.id, CLOSE, 1,
+          c,
+            b, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            a.id, CLOSE, 1,
+          c,
+            a, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            b.id, CLOSE, 1,
+          c,
+            b, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            b.id, CLOSE, 1,
+          c,
+            b, CLOSE, 1,
           CLOSE, 1,
-          c.id,
-            a.id, CLOSE, 1,
+          c,
+            a, CLOSE, 1,
           CLOSE, 1,
         CLOSE, 8,
       CLOSE, 9
@@ -121,22 +120,19 @@ class InputTest < Test::Unit::TestCase
   end
 
   def test_cache_hits1
-    input = Input.new('a')
-    input.memoize!
+    input = MemoizingInput.new('a')
     input.exec(LetterA.rule(:top))
     assert_equal(3, input.cache_hits)
   end
 
   def test_cache_hits2
-    input = Input.new('aa')
-    input.memoize!
+    input = MemoizingInput.new('aa')
     input.exec(LetterA.rule(:top))
     assert_equal(2, input.cache_hits)
   end
 
   def test_cache_hits3
-    input = Input.new('aaa')
-    input.memoize!
+    input = MemoizingInput.new('aaa')
     input.exec(LetterA.rule(:top))
     assert_equal(0, input.cache_hits)
   end

data/test/label_test.rb

@@ -1,26 +1,23 @@
 require File.expand_path('../helper', __FILE__)
 
 class LabelTest < Test::Unit::TestCase
-  def test_terminal?
-    rule = Label.new
-    assert_equal(false, rule.terminal?)
+  def test_to_s
+    rule = Rule.for('a')
+    rule.label = 'a_label'
+    assert_equal('a_label:"a"', rule.to_s)
   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)
+  def test_to_s_sequence
+    rule = Sequence.new(%w< a b >)
+    rule.label = 's_label'
+    assert_equal('s_label:("a" "b")', rule.to_s)
   end
 
-  def test_to_s
-    rule = Label.new('a', 'label')
-    assert_equal('label:"a"', rule.to_s)
-
-    rule = Label.new(Sequence.new(%w< a b >), 'label')
-    assert_equal('label:("a" "b")', rule.to_s)
+  def test_to_s_embedded
+    a = Rule.for('a')
+    a.label = 'a_label'
+    rule = Sequence.new([ a, 'b' ])
+    rule.label = 's_label'
+    assert_equal('s_label:(a_label:"a" "b")', rule.to_s)
   end
 end

data/test/match_test.rb

@@ -20,71 +20,30 @@ class MatchTest < Test::Unit::TestCase
     assert_equal(false, match2 == match1)
   end
 
-  def test_names
-    a = Rule.new('a')
-    a.name = 'a'
-    b = Rule.new('b')
-    b.name = 'b'
-    c = Rule.new('c')
-    c.name = 'c'
-    s = Rule.new([ a, b, c ])
-    s.name = 's'
-    r = Repeat.new(s, 0, Infinity)
-    r.name = 'r'
-
-    events = [
-      r.id,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
-        CLOSE, 3,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
-        CLOSE, 3,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
-        CLOSE, 3,
-      CLOSE, 9
-    ]
-
-    match = Match.new("abcabcabc", events)
-    assert(match.names)
-    assert_equal([:r], match.names)
-
-    match.matches.each do |m|
-      assert_equal([:s], m.names)
-    end
-  end
-
   def test_matches
-    a = Rule.new('a')
-    b = Rule.new('b')
-    c = Rule.new('c')
-    s = Rule.new([ a, b, c ])
+    a = Rule.for('a')
+    b = Rule.for('b')
+    c = Rule.for('c')
+    s = Rule.for([ a, b, c ])
     s.name = 's'
     r = Repeat.new(s, 0, Infinity)
 
     events = [
-      r.id,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
+      r,
+        s,
+          a, CLOSE, 1,
+          b, CLOSE, 1,
+          c, CLOSE, 1,
         CLOSE, 3,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
+        s,
+          a, CLOSE, 1,
+          b, CLOSE, 1,
+          c, CLOSE, 1,
         CLOSE, 3,
-        s.id,
-          a.id, CLOSE, 1,
-          b.id, CLOSE, 1,
-          c.id, CLOSE, 1,
+        s,
+          a, CLOSE, 1,
+          b, CLOSE, 1,
+          c, CLOSE, 1,
         CLOSE, 3,
       CLOSE, 9
     ]
@@ -94,16 +53,15 @@ class MatchTest < Test::Unit::TestCase
     assert_equal(3, match.matches.length)
 
     sub_events = [
-      s.id,
-        a.id, CLOSE, 1,
-        b.id, CLOSE, 1,
-        c.id, CLOSE, 1,
+      s,
+        a, CLOSE, 1,
+        b, CLOSE, 1,
+        c, CLOSE, 1,
       CLOSE, 3
     ]
 
     match.matches.each do |m|
       assert_equal(sub_events, m.events)
-      assert_equal(:s, m.name)
       assert_equal("abc", m)
       assert(m.matches)
       assert_equal(3, m.matches.length)

data/test/not_predicate_test.rb

@@ -9,7 +9,7 @@ class NotPredicateTest < Test::Unit::TestCase
   def test_exec
     rule = NotPredicate.new('abc')
     events = rule.exec(Input.new('def'))
-    assert_equal([rule.id, CLOSE, 0], events)
+    assert_equal([rule, CLOSE, 0], events)
   end
 
   def test_exec_miss
@@ -19,7 +19,12 @@ class NotPredicateTest < Test::Unit::TestCase
   end
 
   def test_consumption
-    rule = NotPredicate.new('abc')
+    rule = NotPredicate.new(Sequence.new(['a', 'b', 'c']))
+
+    input = Input.new('abc')
+    events = rule.exec(input)
+    assert_equal(0, input.pos)
+
     input = Input.new('def')
     events = rule.exec(input)
     assert_equal(0, input.pos)
@@ -29,4 +34,10 @@ class NotPredicateTest < Test::Unit::TestCase
     rule = NotPredicate.new('a')
     assert_equal('!"a"', rule.to_s)
   end
+
+  def test_to_s_with_label
+    rule = NotPredicate.new('a')
+    rule.label = 'a_label'
+    assert_equal('a_label:!"a"', rule.to_s)
+  end
 end

data/test/repeat_test.rb

@@ -7,34 +7,34 @@ class RepeatTest < Test::Unit::TestCase
   end
 
   def test_exec_zero_or_one
-    abc = Rule.new('abc')
+    abc = Rule.for('abc')
     rule = Repeat.new(abc, 0, 1)
 
     events = rule.exec(Input.new(''))
-    assert_equal([rule.id, CLOSE, 0], events)
+    assert_equal([rule, CLOSE, 0], events)
 
     events = rule.exec(Input.new('abc'))
-    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([rule, abc, CLOSE, 3, CLOSE, 3], events)
 
     events = rule.exec(Input.new('abc' * 3))
-    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([rule, abc, CLOSE, 3, CLOSE, 3], events)
   end
 
   def test_exec_zero_or_more
-    abc = Rule.new('abc')
+    abc = Rule.for('abc')
     rule = Repeat.new(abc, 0, Infinity)
 
     events = rule.exec(Input.new(''))
-    assert_equal([rule.id, CLOSE, 0], events)
+    assert_equal([rule, CLOSE, 0], events)
 
     events = rule.exec(Input.new('abc'))
-    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([rule, abc, CLOSE, 3, CLOSE, 3], events)
 
     expected_events = [
-      rule.id,
-        abc.id, CLOSE, 3,
-        abc.id, CLOSE, 3,
-        abc.id, CLOSE, 3,
+      rule,
+        abc, CLOSE, 3,
+        abc, CLOSE, 3,
+        abc, CLOSE, 3,
       CLOSE, 9
     ]
 
@@ -43,20 +43,20 @@ class RepeatTest < Test::Unit::TestCase
   end
 
   def test_exec_one_or_more
-    abc = Rule.new('abc')
+    abc = Rule.for('abc')
     rule = Repeat.new(abc, 1, Infinity)
 
     events = rule.exec(Input.new(''))
     assert_equal([], events)
 
     events = rule.exec(Input.new('abc'))
-    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([rule, abc, CLOSE, 3, CLOSE, 3], events)
 
     expected_events = [
-      rule.id,
-        abc.id, CLOSE, 3,
-        abc.id, CLOSE, 3,
-        abc.id, CLOSE, 3,
+      rule,
+        abc, CLOSE, 3,
+        abc, CLOSE, 3,
+        abc, CLOSE, 3,
       CLOSE, 9
     ]
 
@@ -65,17 +65,17 @@ class RepeatTest < Test::Unit::TestCase
   end
 
   def test_exec_one
-    abc = Rule.new('abc')
+    abc = Rule.for('abc')
     rule = Repeat.new(abc, 1, 1)
 
     events = rule.exec(Input.new(''))
     assert_equal([], events)
 
     events = rule.exec(Input.new('abc'))
-    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([rule, abc, CLOSE, 3, CLOSE, 3], events)
 
     events = rule.exec(Input.new('abc' * 3))
-    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([rule, abc, CLOSE, 3, CLOSE, 3], events)
   end
 
   def test_operator