citrus 2.2.2 → 2.3.0

data/test/sequence_test.rb

@@ -7,19 +7,19 @@ class SequenceTest < Test::Unit::TestCase
   end
 
   def test_exec
-    a = Rule.new('a')
-    b = Rule.new('b')
-    c = Rule.new('c')
+    a = Rule.for('a')
+    b = Rule.for('b')
+    c = Rule.for('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,
+      rule,
+        a, CLOSE, 1,
+        b, CLOSE, 1,
+        c, CLOSE, 1,
       CLOSE, 3
     ]
 
@@ -32,10 +32,24 @@ class SequenceTest < Test::Unit::TestCase
     assert_equal('"a" "b"', rule.to_s)
   end
 
-  def test_to_s_embed
+  def test_to_s_with_label
+    rule = Sequence.new(%w<a b>)
+    rule.label = 'a_label'
+    assert_equal('a_label:("a" "b")', rule.to_s)
+  end
+
+  def test_to_embedded_s
     rule1 = Sequence.new(%w<a b>)
     rule2 = Sequence.new(%w<c d>)
     rule = Sequence.new([rule1, rule2])
     assert_equal('("a" "b") ("c" "d")', rule.to_s)
   end
+
+  def test_to_embedded_s_with_label
+    rule1 = Sequence.new(%w<a b>)
+    rule2 = Sequence.new(%w<c d>)
+    rule2.label = 'a_label'
+    rule = Sequence.new([rule1, rule2])
+    assert_equal('("a" "b") a_label:("c" "d")', rule.to_s)
+  end
 end

data/test/string_terminal_test.rb

@@ -6,10 +6,15 @@ class StringTerminalTest < Test::Unit::TestCase
     assert(rule.terminal?)
   end
 
+  def test_eql?
+    rule = StringTerminal.new('abc')
+    assert_equal('abc', rule)
+  end
+
   def test_exec
     rule = StringTerminal.new('abc')
     events = rule.exec(Input.new('abc'))
-    assert_equal([rule.id, CLOSE, 3], events)
+    assert_equal([rule, CLOSE, 3], events)
   end
 
   def test_exec_miss
@@ -27,20 +32,20 @@ class StringTerminalTest < Test::Unit::TestCase
   def test_exec_long
     rule = StringTerminal.new('abc')
     events = rule.exec(Input.new('abcd'))
-    assert_equal([rule.id, CLOSE, 3], events)
+    assert_equal([rule, 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)
+    assert_equal([rule, CLOSE, 3], events)
 
     events = rule.exec(Input.new('ABC'))
-    assert_equal([rule.id, CLOSE, 3], events)
+    assert_equal([rule, CLOSE, 3], events)
 
     events = rule.exec(Input.new('Abc'))
-    assert_equal([rule.id, CLOSE, 3], events)
+    assert_equal([rule, CLOSE, 3], events)
   end
 
   def test_to_s

data/test/super_test.rb

@@ -7,7 +7,7 @@ class SuperTest < Test::Unit::TestCase
   end
 
   def test_exec
-    ghi = Rule.new('ghi')
+    ghi = Rule.for('ghi')
     grammar1 = Grammar.new {
       rule :a, 'abc'
     }
@@ -16,20 +16,23 @@ class SuperTest < Test::Unit::TestCase
       rule :a, any(ghi, sup)
     }
     rule_2a = grammar2.rule(:a)
+    rule_2a_als = rule_2a.rules[0]
     rule_2a_sup = rule_2a.rules[1]
     rule_1a = grammar1.rule(:a)
 
     events = rule_2a.exec(Input.new('abc'))
     assert_equal([
-      rule_2a.id,
-        rule_2a_sup.id,
-          rule_1a.id, CLOSE, 3,
-        CLOSE, 3,
+      rule_2a,
+        rule_2a_sup, CLOSE, 3,
       CLOSE, 3
     ], events)
 
     events = rule_2a.exec(Input.new('ghi'))
-    assert_equal([rule_2a.id, ghi.id, CLOSE, 3, CLOSE, 3], events)
+    assert_equal([
+      rule_2a,
+        rule_2a_als, CLOSE, 3,
+      CLOSE, 3
+    ], events)
   end
 
   def test_exec_miss
@@ -64,21 +67,15 @@ class SuperTest < Test::Unit::TestCase
 
     events = rule_2a.exec(Input.new('abc'))
     assert_equal([
-      rule_2a.id,
-        rule_2a_sup.id,
-          rule_1a.id, CLOSE, 3,
-        CLOSE, 3,
+      rule_2a,
+        rule_2a_sup, CLOSE, 3,
       CLOSE, 3
     ], events)
 
     events = rule_2a.exec(Input.new('def'))
     assert_equal([
-      rule_2a.id,
-        rule_2a_als.id,
-          rule_2b.id,
-            rule_1b.id, CLOSE, 3,
-          CLOSE, 3,
-        CLOSE, 3,
+      rule_2a,
+        rule_2a_als, CLOSE, 3,
       CLOSE, 3
     ], events)
   end
@@ -87,4 +84,10 @@ class SuperTest < Test::Unit::TestCase
     rule = Super.new
     assert_equal('super', rule.to_s)
   end
+
+  def test_to_s_with_label
+    rule = Super.new
+    rule.label = 'a_label'
+    assert_equal('a_label:super', rule.to_s)
+  end
 end

data/test/terminal_test.rb

@@ -6,16 +6,21 @@ class TerminalTest < Test::Unit::TestCase
     assert(rule.terminal?)
   end
 
+  def test_eql?
+    rule = Terminal.new(/abc/i)
+    assert_equal(rule, /abc/i)
+  end
+
   def test_exec
     rule = Terminal.new(/\d+/)
     events = rule.exec(Input.new('123'))
-    assert_equal([rule.id, CLOSE, 3], events)
+    assert_equal([rule, CLOSE, 3], events)
   end
 
   def test_exec_long
     rule = Terminal.new(/\d+/)
     events = rule.exec(Input.new('123 456'))
-    assert_equal([rule.id, CLOSE, 3], events)
+    assert_equal([rule, CLOSE, 3], events)
   end
 
   def test_exec_miss

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: citrus
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Michael Jackson
@@ -9,19 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Parsing Expressions for Ruby
 email: mjijackson@gmail.com
 executables: []
@@ -31,8 +39,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- benchmark/after.dat
-- benchmark/before.dat
 - benchmark/seqpar.citrus
 - benchmark/seqpar.gnuplot
 - benchmark/seqpar.rb
@@ -53,7 +59,6 @@ files:
 - 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
@@ -98,21 +103,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Parsing Expressions for Ruby

data/benchmark/after.dat

@@ -1,192 +0,0 @@
-12 0
-30 0
-35 0
-1749 19
-1962 9
-2383 20
-3728 29
-3919 30
-3952 30
-3995 30
-4063 30
-4325 40
-4527 39
-4570 39
-4607 50
-4654 40
-4679 39
-4774 40
-4968 40
-5059 50
-5383 39
-5915 49
-6109 50
-6122 49
-6218 50
-6332 50
-6681 59
-7440 60
-7530 60
-7605 70
-8155 60
-8402 69
-8420 70
-8617 80
-8635 70
-8841 79
-8843 79
-8852 69
-9151 80
-9271 80
-9521 80
-9525 80
-9566 80
-9584 80
-9642 70
-10138 89
-10181 80
-10225 80
-10338 80
-10449 89
-10629 90
-10763 89
-10817 89
-11059 90
-11062 90
-11215 89
-11698 99
-11891 99
-11945 100
-11956 100
-12018 100
-12053 100
-12178 99
-12283 100
-12326 109
-12430 99
-12438 99
-12572 99
-12638 99
-12687 99
-12703 109
-12896 109
-12922 109
-12996 99
-13137 110
-13211 129
-13462 109
-13477 109
-13576 109
-13577 120
-13584 110
-13605 109
-13631 109
-14216 120
-14237 120
-14260 130
-14367 119
-14371 120
-14741 120
-14893 120
-14910 120
-14917 129
-14977 130
-15049 119
-15191 130
-15382 129
-15618 129
-15623 130
-15629 129
-15856 129
-16496 130
-16512 159
-16956 129
-17074 140
-17237 139
-17371 150
-17568 149
-17945 140
-18147 149
-18343 150
-18417 160
-18823 159
-18970 149
-19285 170
-19333 160
-19500 160
-19548 150
-19634 160
-19673 160
-19689 179
-19909 169
-20054 160
-20107 169
-20248 169
-20580 169
-20744 169
-20806 189
-20954 169
-21034 179
-21187 179
-21303 189
-21450 169
-21626 179
-21931 179
-21950 169
-22359 189
-22626 190
-22638 180
-22772 189
-22885 190
-22897 190
-23114 190
-23242 189
-23428 189
-23452 209
-23495 199
-23499 189
-23558 190
-23744 190
-23881 219
-23945 189
-24361 210
-24501 210
-24642 199
-24672 200
-24694 210
-24706 210
-24931 210
-25065 210
-25140 199
-25402 210
-25702 209
-25743 209
-27139 230
-27316 240
-27333 229
-27414 220
-27771 230
-27798 229
-28583 240
-28906 239
-29025 240
-29209 240
-29272 239
-29273 250
-29359 240
-29577 240
-30886 259
-31170 250
-31593 259
-32460 269
-32486 259
-32630 269
-33010 269
-33137 289
-33142 280
-33739 280
-39880 319
-39940 339
-42952 350
-43227 350
-52855 439