citrus 2.1.2 → 2.2.0

data/test/not_predicate_test.rb

@@ -1,27 +1,32 @@
 require File.expand_path('../helper', __FILE__)
 
 class NotPredicateTest < Test::Unit::TestCase
-
   def test_terminal?
     rule = NotPredicate.new
     assert_equal(false, rule.terminal?)
   end
 
-  def test_match
-    rule = NotPredicate.new('a')
+  def test_exec
+    rule = NotPredicate.new('abc')
+    events = rule.exec(Input.new('def'))
+    assert_equal([rule.id, CLOSE, 0], events)
+  end
 
-    match = rule.match(input('a'))
-    assert_equal(nil, match)
+  def test_exec_miss
+    rule = NotPredicate.new('abc')
+    events = rule.exec(Input.new('abc'))
+    assert_equal([], events)
+  end
 
-    match = rule.match(input('b'))
-    assert(match)
-    assert_equal('', match)
-    assert_equal(0, match.length)
+  def test_consumption
+    rule = NotPredicate.new('abc')
+    input = Input.new('def')
+    events = rule.exec(input)
+    assert_equal(0, input.pos)
   end
 
   def test_to_s
     rule = NotPredicate.new('a')
     assert_equal('!"a"', rule.to_s)
   end
-
 end

data/test/parse_error_test.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
 class ParseErrorTest < Test::Unit::TestCase
-
   Sentence = Grammar.new do
     include Words
 
@@ -52,5 +51,4 @@ class ParseErrorTest < Test::Unit::TestCase
       assert_equal(3, e.line_offset)
     end
   end
-
-end
+end

data/test/repeat_test.rb

@@ -1,53 +1,81 @@
 require File.expand_path('../helper', __FILE__)
 
 class RepeatTest < Test::Unit::TestCase
-
   def test_terminal?
     rule = Repeat.new
     assert_equal(false, rule.terminal?)
   end
 
-  def test_match_zero_or_one
-    rule = Repeat.new('a', 0, 1)
+  def test_exec_zero_or_one
+    abc = Rule.new('abc')
+    rule = Repeat.new(abc, 0, 1)
 
-    match = rule.match(input(''))
-    assert(match)
-    assert_equal('', match)
-    assert_equal(0, match.length)
+    events = rule.exec(Input.new(''))
+    assert_equal([rule.id, CLOSE, 0], events)
 
-    match = rule.match(input('a'))
-    assert(match)
-    assert_equal('a', match)
-    assert_equal(1, match.length)
+    events = rule.exec(Input.new('abc'))
+    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
+
+    events = rule.exec(Input.new('abc' * 3))
+    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
   end
 
-  def test_match_one_or_more
-    rule = Repeat.new('a', 1, Infinity)
+  def test_exec_zero_or_more
+    abc = Rule.new('abc')
+    rule = Repeat.new(abc, 0, Infinity)
 
-    match = rule.match(input(''))
-    assert_equal(nil, match)
+    events = rule.exec(Input.new(''))
+    assert_equal([rule.id, CLOSE, 0], events)
 
-    match = rule.match(input('a'))
-    assert(match)
-    assert_equal('a', match)
-    assert_equal(1, match.length)
+    events = rule.exec(Input.new('abc'))
+    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
 
-    match = rule.match(input('a' * 200))
-    assert(match)
-    assert_equal('a' * 200, match)
-    assert_equal(200, match.length)
+    expected_events = [
+      rule.id,
+        abc.id, CLOSE, 3,
+        abc.id, CLOSE, 3,
+        abc.id, CLOSE, 3,
+      CLOSE, 9
+    ]
+
+    events = rule.exec(Input.new('abc' * 3))
+    assert_equal(expected_events, events)
   end
 
-  def test_match_one
-    rule = Repeat.new('a', 1, 1)
+  def test_exec_one_or_more
+    abc = Rule.new('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)
 
-    match = rule.match(input(''))
-    assert_equal(nil, match)
+    expected_events = [
+      rule.id,
+        abc.id, CLOSE, 3,
+        abc.id, CLOSE, 3,
+        abc.id, CLOSE, 3,
+      CLOSE, 9
+    ]
 
-    match = rule.match(input('a'))
-    assert(match)
-    assert_equal('a', match)
-    assert_equal(1, match.length)
+    events = rule.exec(Input.new('abc' * 3))
+    assert_equal(expected_events, events)
+  end
+
+  def test_exec_one
+    abc = Rule.new('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)
+
+    events = rule.exec(Input.new('abc' * 3))
+    assert_equal([rule.id, abc.id, CLOSE, 3, CLOSE, 3], events)
   end
 
   def test_operator
@@ -94,5 +122,4 @@ class RepeatTest < Test::Unit::TestCase
     rule = Repeat.new('a', 1, Infinity)
     assert_equal('"a"+', rule.to_s)
   end
-
 end

data/test/sequence_test.rb

@@ -1,41 +1,30 @@
 require File.expand_path('../helper', __FILE__)
 
 class SequenceTest < Test::Unit::TestCase
-
   def test_terminal?
     rule = Sequence.new
     assert_equal(false, rule.terminal?)
   end
 
-  def test_match
-    rule = Sequence.new(%w<a b>)
-
-    match = rule.match(input(''))
-    assert_equal(nil, match)
-
-    match = rule.match(input('a'))
-    assert_equal(nil, match)
-
-    match = rule.match(input('ab'))
-    assert(match)
-    assert_equal('ab', match)
-    assert_equal(2, match.length)
-  end
-
-  def test_match_mixed
-    rule = Sequence.new([/\d+/, '+', /\d+/])
-    match = rule.match(input('1+2'))
-    assert(match)
-    assert_equal('1+2', match)
-    assert_equal(3, match.length)
-  end
-
-  def test_match_embed
-    rule = Sequence.new([/[0-9]+/, Choice.new(%w<+ ->), /\d+/])
-    match = rule.match(input('1+2'))
-    assert(match)
-    assert_equal('1+2', match)
-    assert_equal(3, match.length)
+  def test_exec
+    a = Rule.new('a')
+    b = Rule.new('b')
+    c = Rule.new('c')
+    rule = Sequence.new([ a, b, c ])
+
+    events = rule.exec(Input.new(''))
+    assert_equal([], events)
+
+    expected_events = [
+      rule.id,
+        a.id, CLOSE, 1,
+        b.id, CLOSE, 1,
+        c.id, CLOSE, 1,
+      CLOSE, 3
+    ]
+
+    events = rule.exec(Input.new('abc'))
+    assert_equal(expected_events, events)
   end
 
   def test_to_s
@@ -49,5 +38,4 @@ class SequenceTest < Test::Unit::TestCase
     rule = Sequence.new([rule1, rule2])
     assert_equal('("a" "b") ("c" "d")', rule.to_s)
   end
-
 end

data/test/string_terminal_test.rb

@@ -0,0 +1,55 @@
+require File.expand_path('../helper', __FILE__)
+
+class StringTerminalTest < Test::Unit::TestCase
+  def test_terminal?
+    rule = StringTerminal.new
+    assert(rule.terminal?)
+  end
+
+  def test_exec
+    rule = StringTerminal.new('abc')
+    events = rule.exec(Input.new('abc'))
+    assert_equal([rule.id, CLOSE, 3], events)
+  end
+
+  def test_exec_miss
+    rule = StringTerminal.new('abc')
+    events = rule.exec(Input.new('def'))
+    assert_equal([], events)
+  end
+
+  def test_exec_short
+    rule = StringTerminal.new('abc')
+    events = rule.exec(Input.new('ab'))
+    assert_equal([], events)
+  end
+
+  def test_exec_long
+    rule = StringTerminal.new('abc')
+    events = rule.exec(Input.new('abcd'))
+    assert_equal([rule.id, CLOSE, 3], events)
+  end
+
+  def test_exec_case_insensitive
+    rule = StringTerminal.new('abc', Regexp::IGNORECASE)
+
+    events = rule.exec(Input.new('abc'))
+    assert_equal([rule.id, CLOSE, 3], events)
+
+    events = rule.exec(Input.new('ABC'))
+    assert_equal([rule.id, CLOSE, 3], events)
+
+    events = rule.exec(Input.new('Abc'))
+    assert_equal([rule.id, CLOSE, 3], events)
+  end
+
+  def test_to_s
+    rule = StringTerminal.new('abc')
+    assert_equal('"abc"', rule.to_s)
+  end
+
+  def test_to_s_case_insensitive
+    rule = StringTerminal.new('abc', Regexp::IGNORECASE)
+    assert_equal('`abc`', rule.to_s)
+  end
+end

data/test/super_test.rb

@@ -1,66 +1,66 @@
 require File.expand_path('../helper', __FILE__)
-Citrus.load(File.dirname(__FILE__) + '/_files/super')
 
 class SuperTest < Test::Unit::TestCase
-
   def test_terminal?
     rule = Super.new
     assert_equal(false, rule.terminal?)
   end
 
-  def test_match
+  def test_exec
+    ghi = Rule.new('ghi')
     grammar1 = Grammar.new {
-      rule :a, 'a'
+      rule :a, 'abc'
     }
-
     grammar2 = Grammar.new {
       include grammar1
-      rule :a, any('b', sup)
+      rule :a, any(ghi, sup)
     }
+    rule_2a = grammar2.rule(:a)
+    rule_1a = grammar1.rule(:a)
 
-    match = grammar2.parse('b')
-    assert(match)
-    assert_equal('b', match)
-    assert_equal(1, match.length)
+    events = rule_2a.exec(Input.new('abc'))
+    assert_equal([rule_2a.id, rule_1a.id, CLOSE, 3, CLOSE, 3], events)
 
-    match = grammar2.parse('a')
-    assert(match)
-    assert_equal('a', match)
-    assert_equal(1, match.length)
+    events = rule_2a.exec(Input.new('ghi'))
+    assert_equal([rule_2a.id, ghi.id, CLOSE, 3, CLOSE, 3], events)
   end
 
-  def test_peg
-    match = SuperTwo.parse('2')
-    assert(match)
-
-    match = SuperTwo.parse('1')
-    assert(match)
+  def test_exec_miss
+    grammar1 = Grammar.new {
+      rule :a, 'abc'
+    }
+    grammar2 = Grammar.new {
+      include grammar1
+      rule :a, any('def', sup)
+    }
+    rule_2a = grammar2.rule(:a)
+    events = rule_2a.exec(Input.new('ghi'))
+    assert_equal([], events)
   end
 
-  def test_nested
+  def test_exec_aliased
     grammar1 = Grammar.new {
-      rule :a, 'a'
-      rule :b, 'b'
+      rule :a, 'abc'
+      rule :b, 'def'
     }
-
     grammar2 = Grammar.new {
       include grammar1
       rule :a, any(sup, :b)
       rule :b, sup
     }
+    rule_2a = grammar2.rule(:a)
+    rule_1a = grammar1.rule(:a)
+    rule_1b = grammar1.rule(:b)
 
-    match = grammar2.parse('a')
-    assert(match)
-    assert_equal(:a, match.name)
+    events = rule_2a.exec(Input.new('abc'))
+    assert_equal([rule_2a.id, rule_1a.id, CLOSE, 3, CLOSE, 3], events)
 
-    match = grammar2.parse('b')
-    assert(match)
-    assert_equal(:b, match.name)
+    events = rule_2a.exec(Input.new('def'))
+    assert_equal([rule_2a.id, rule_1b.id, CLOSE, 3, CLOSE, 3], events)
   end
 
   def test_to_s
     rule = Super.new
     assert_equal('super', rule.to_s)
   end
-
 end

data/test/terminal_test.rb

@@ -1,56 +1,31 @@
 require File.expand_path('../helper', __FILE__)
 
 class TerminalTest < Test::Unit::TestCase
-
   def test_terminal?
     rule = Terminal.new
     assert(rule.terminal?)
   end
 
-  def test_regexp_match
+  def test_exec
     rule = Terminal.new(/\d+/)
-    match = rule.match(input('123 456'))
-    assert(match)
-    assert_equal('123', match)
-    assert_equal(3, match.length)
+    events = rule.exec(Input.new('123'))
+    assert_equal([rule.id, CLOSE, 3], events)
   end
 
-  def test_regexp_match_failure
+  def test_exec_long
     rule = Terminal.new(/\d+/)
-    match = rule.match(input(' 456'))
-    assert_equal(nil, match)
+    events = rule.exec(Input.new('123 456'))
+    assert_equal([rule.id, CLOSE, 3], events)
   end
 
-  def test_regexp_to_s
+  def test_exec_miss
     rule = Terminal.new(/\d+/)
-    assert_equal('/\\d+/', rule.to_s)
-  end
-
-  def test_string_match
-    rule = Terminal.new('abc')
-    match = rule.match(input('abc'))
-    assert(match)
-    assert_equal('abc', match)
-    assert_equal(3, match.length)
-  end
-
-  def test_string_match_short
-    rule = Terminal.new('abc')
-    match = rule.match(input('ab'))
-    assert_equal(nil, match)
+    events = rule.exec(Input.new(' 123'))
+    assert_equal([], events)
   end
 
-  def test_string_match_long
-    rule = Terminal.new('abc')
-    match = rule.match(input('abcd'))
-    assert(match)
-    assert_equal('abc', match)
-    assert_equal(3, match.length)
-  end
-
-  def test_string_to_s
-    rule = Terminal.new('abc')
-    assert_equal('"abc"', rule.to_s)
+  def test_to_s
+    rule = Terminal.new(/\d+/)
+    assert_equal('/\\d+/', rule.to_s)
   end
-
 end