regexp_parser 1.0.0 → 1.2.0

data/test/parser/test_groups.rb

@@ -19,6 +19,9 @@ class TestParserGroups < Test::Unit::TestCase
     assert_equal true,  t.expressions[0].m?
     assert_equal false, t.expressions[0].i?
     assert_equal false, t.expressions[0].x?
+
+    assert_equal true,  t.expressions[0].option_changes[:m]
+    assert_equal nil,   t.expressions[0].option_changes[:i]
   end
 
   def test_parse_self_defeating_option_group
@@ -27,6 +30,9 @@ class TestParserGroups < Test::Unit::TestCase
     assert_equal false, t.expressions[0].m?
     assert_equal false, t.expressions[0].i?
     assert_equal false, t.expressions[0].x?
+
+    assert_equal false, t.expressions[0].option_changes[:m]
+    assert_equal nil,   t.expressions[0].option_changes[:i]
   end
 
   def test_parse_nested_options_activate_one
@@ -39,6 +45,10 @@ class TestParserGroups < Test::Unit::TestCase
     assert_equal true,  t.expressions[0].expressions[1].m?
     assert_equal false, t.expressions[0].expressions[1].i?
     assert_equal true,  t.expressions[0].expressions[1].x?
+
+    assert_equal true,  t.expressions[0].expressions[1].option_changes[:m]
+    assert_equal nil,   t.expressions[0].expressions[1].option_changes[:i]
+    assert_equal nil,   t.expressions[0].expressions[1].option_changes[:x]
   end
 
   def test_parse_nested_options_deactivate_one
@@ -51,6 +61,10 @@ class TestParserGroups < Test::Unit::TestCase
     assert_equal false, t.expressions[0].expressions[1].m?
     assert_equal false, t.expressions[0].expressions[1].i?
     assert_equal true,  t.expressions[0].expressions[1].x?
+
+    assert_equal false, t.expressions[0].expressions[1].option_changes[:i]
+    assert_equal nil,   t.expressions[0].expressions[1].option_changes[:m]
+    assert_equal nil,   t.expressions[0].expressions[1].option_changes[:x]
   end
 
   def test_parse_nested_options_invert_all
@@ -63,6 +77,10 @@ class TestParserGroups < Test::Unit::TestCase
     assert_equal true,  t.expressions[0].expressions[1].m?
     assert_equal false, t.expressions[0].expressions[1].i?
     assert_equal false, t.expressions[0].expressions[1].x?
+
+    assert_equal true,  t.expressions[0].expressions[1].option_changes[:m]
+    assert_equal false, t.expressions[0].expressions[1].option_changes[:i]
+    assert_equal false, t.expressions[0].expressions[1].option_changes[:x]
   end
 
   def test_parse_nested_options_affect_literal_subexpressions
@@ -88,6 +106,10 @@ class TestParserGroups < Test::Unit::TestCase
     assert_equal false, t.expressions[1].m?
     assert_equal true,  t.expressions[1].i?
     assert_equal false, t.expressions[1].x?
+
+    assert_equal true,  t.expressions[1].option_changes[:i]
+    assert_equal false, t.expressions[1].option_changes[:m]
+    assert_equal nil,   t.expressions[1].option_changes[:x]
   end
 
   def test_parse_option_switch_affects_following_expressions

data/test/parser/test_quantifiers.rb

@@ -12,6 +12,13 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,             exp.quantifier.min
     assert_equal 1,             exp.quantifier.max
     assert_equal :greedy,       exp.quantifier.mode
+    assert_equal true,          exp.quantifier.greedy?
+    assert_equal true,          exp.greedy?
+
+    assert_equal false,         exp.quantifier.reluctant?
+    assert_equal false,         exp.reluctant?
+    assert_equal false,         exp.quantifier.possessive?
+    assert_equal false,         exp.possessive?
   end
 
   def test_parse_zero_or_one_reluctant
@@ -23,7 +30,13 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,             exp.quantifier.min
     assert_equal 1,             exp.quantifier.max
     assert_equal :reluctant,    exp.quantifier.mode
+    assert_equal true,          exp.quantifier.reluctant?
     assert_equal true,          exp.reluctant?
+
+    assert_equal false,         exp.quantifier.greedy?
+    assert_equal false,         exp.greedy?
+    assert_equal false,         exp.quantifier.possessive?
+    assert_equal false,         exp.possessive?
   end
 
   def test_parse_zero_or_one_possessive
@@ -35,7 +48,13 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,             exp.quantifier.min
     assert_equal 1,             exp.quantifier.max
     assert_equal :possessive,   exp.quantifier.mode
+    assert_equal true,          exp.quantifier.possessive?
     assert_equal true,          exp.possessive?
+
+    assert_equal false,         exp.quantifier.greedy?
+    assert_equal false,         exp.greedy?
+    assert_equal false,         exp.quantifier.reluctant?
+    assert_equal false,         exp.reluctant?
   end
 
   # *: zero-or-more
@@ -48,6 +67,8 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,             exp.quantifier.min
     assert_equal(-1,            exp.quantifier.max)
     assert_equal :greedy,       exp.quantifier.mode
+    assert_equal true,          exp.quantifier.greedy?
+    assert_equal true,          exp.greedy?
   end
 
   def test_parse_zero_or_more_reluctant
@@ -59,6 +80,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,             exp.quantifier.min
     assert_equal(-1,            exp.quantifier.max)
     assert_equal :reluctant,    exp.quantifier.mode
+    assert_equal true,          exp.quantifier.reluctant?
     assert_equal true,          exp.reluctant?
   end
 
@@ -71,6 +93,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,             exp.quantifier.min
     assert_equal(-1,            exp.quantifier.max)
     assert_equal :possessive,   exp.quantifier.mode
+    assert_equal true,          exp.quantifier.possessive?
     assert_equal true,          exp.possessive?
   end
 
@@ -84,6 +107,8 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 1,             exp.quantifier.min
     assert_equal(-1,            exp.quantifier.max)
     assert_equal :greedy,       exp.quantifier.mode
+    assert_equal true,          exp.quantifier.greedy?
+    assert_equal true,          exp.greedy?
   end
 
   def test_parse_one_or_more_reluctant
@@ -95,6 +120,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 1,             exp.quantifier.min
     assert_equal(-1,            exp.quantifier.max)
     assert_equal :reluctant,    exp.quantifier.mode
+    assert_equal true,          exp.quantifier.reluctant?
     assert_equal true,          exp.reluctant?
   end
 
@@ -107,6 +133,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 1,             exp.quantifier.min
     assert_equal(-1,            exp.quantifier.max)
     assert_equal :possessive,   exp.quantifier.mode
+    assert_equal true,          exp.quantifier.possessive?
     assert_equal true,          exp.possessive?
   end
 
@@ -120,6 +147,8 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 2,         exp.quantifier.min
     assert_equal 4,         exp.quantifier.max
     assert_equal :greedy,   exp.quantifier.mode
+    assert_equal true,      exp.quantifier.greedy?
+    assert_equal true,      exp.greedy?
   end
 
   def test_parse_intervals_min_max_reluctant
@@ -131,6 +160,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 3,           exp.quantifier.min
     assert_equal 5,           exp.quantifier.max
     assert_equal :reluctant,  exp.quantifier.mode
+    assert_equal true,        exp.quantifier.reluctant?
     assert_equal true,        exp.reluctant?
   end
 
@@ -143,6 +173,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 2,           exp.quantifier.min
     assert_equal 4,           exp.quantifier.max
     assert_equal :possessive, exp.quantifier.mode
+    assert_equal true,        exp.quantifier.possessive?
     assert_equal true,        exp.possessive?
   end
 
@@ -156,6 +187,8 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 2,         exp.quantifier.min
     assert_equal(-1,        exp.quantifier.max)
     assert_equal :greedy,   exp.quantifier.mode
+    assert_equal true,      exp.quantifier.greedy?
+    assert_equal true,      exp.greedy?
   end
 
   def test_parse_intervals_min_only_reluctant
@@ -168,6 +201,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 2,           exp.quantifier.min
     assert_equal(-1,          exp.quantifier.max)
     assert_equal :reluctant,  exp.quantifier.mode
+    assert_equal true,        exp.quantifier.reluctant?
     assert_equal true,        exp.reluctant?
   end
 
@@ -181,6 +215,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 3,           exp.quantifier.min
     assert_equal(-1,          exp.quantifier.max)
     assert_equal :possessive, exp.quantifier.mode
+    assert_equal true,        exp.quantifier.possessive?
     assert_equal true,        exp.possessive?
   end
 
@@ -194,6 +229,8 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,         exp.quantifier.min
     assert_equal 2,         exp.quantifier.max
     assert_equal :greedy,   exp.quantifier.mode
+    assert_equal true,      exp.quantifier.greedy?
+    assert_equal true,      exp.greedy?
   end
 
   def test_parse_intervals_max_only_reluctant
@@ -205,6 +242,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,           exp.quantifier.min
     assert_equal 4,           exp.quantifier.max
     assert_equal :reluctant,  exp.quantifier.mode
+    assert_equal true,        exp.quantifier.reluctant?
     assert_equal true,        exp.reluctant?
   end
 
@@ -217,6 +255,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 0,           exp.quantifier.min
     assert_equal 3,           exp.quantifier.max
     assert_equal :possessive, exp.quantifier.mode
+    assert_equal true,        exp.quantifier.possessive?
     assert_equal true,        exp.possessive?
   end
 
@@ -230,6 +269,8 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 2,         exp.quantifier.min
     assert_equal 2,         exp.quantifier.max
     assert_equal :greedy,   exp.quantifier.mode
+    assert_equal true,      exp.quantifier.greedy?
+    assert_equal true,      exp.greedy?
   end
 
   def test_parse_intervals_exact_reluctant
@@ -241,6 +282,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 3,           exp.quantifier.min
     assert_equal 3,           exp.quantifier.max
     assert_equal :reluctant,  exp.quantifier.mode
+    assert_equal true,        exp.quantifier.reluctant?
     assert_equal true,        exp.reluctant?
   end
 
@@ -253,7 +295,7 @@ class TestRegexpParserQuantifiers < Test::Unit::TestCase
     assert_equal 3,           exp.quantifier.min
     assert_equal 3,           exp.quantifier.max
     assert_equal :possessive, exp.quantifier.mode
+    assert_equal true,        exp.quantifier.possessive?
     assert_equal true,        exp.possessive?
   end
-
 end

data/test/parser/test_refcalls.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../helpers", __FILE__)
 class TestParserRefcalls < Test::Unit::TestCase
   def test_parse_traditional_number_backref
     root = RP.parse('(abc)\1', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::Number, exp
     assert_equal 1,    exp.number
@@ -11,7 +11,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_named_ab
     root = RP.parse('(?<X>abc)\k<X>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::Name, exp
     assert_equal 'X',  exp.name
@@ -19,7 +19,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_named_sq
     root = RP.parse("(?<X>abc)\\k'X'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::Name, exp
     assert_equal 'X',  exp.name
@@ -27,7 +27,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_ab
     root = RP.parse('(abc)\k<1>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::Number, exp
     assert_equal 1,    exp.number
@@ -35,7 +35,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_sq
     root = RP.parse("(abc)\\k'1'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::Number, exp
     assert_equal 1,    exp.number
@@ -43,7 +43,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_relative_ab
     root = RP.parse('(abc)\k<-1>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRelative, exp
     assert_equal(-1,   exp.number)
@@ -51,7 +51,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_relative_sq
     root = RP.parse("(abc)\\k'-1'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRelative, exp
     assert_equal(-1,   exp.number)
@@ -59,7 +59,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_name_call_ab
     root = RP.parse('(?<X>abc)\g<X>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NameCall, exp
     assert_equal 'X',  exp.name
@@ -67,7 +67,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_name_call_sq
     root = RP.parse("(?<X>abc)\\g'X'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NameCall, exp
     assert_equal 'X',  exp.name
@@ -75,7 +75,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_call_ab
     root = RP.parse('(abc)\g<1>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberCall, exp
     assert_equal 1,    exp.number
@@ -83,7 +83,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_call_sq
     root = RP.parse("(abc)\\g'1'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberCall, exp
     assert_equal 1,    exp.number
@@ -91,7 +91,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_relative_call_ab
     root = RP.parse('(abc)\g<-1>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberCallRelative, exp
     assert_equal(-1,   exp.number)
@@ -99,15 +99,31 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_relative_call_sq
     root = RP.parse("(abc)\\g'-1'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberCallRelative, exp
     assert_equal(-1,   exp.number)
   end
 
+  def test_parse_backref_number_relative_forward_call_ab
+    root = RP.parse('\g<+1>(abc)', 'ruby/1.9')
+    exp  = root[0]
+
+    assert_instance_of Backreference::NumberCallRelative, exp
+    assert_equal 1,    exp.number
+  end
+
+  def test_parse_backref_number_relative_forward_call_sq
+    root = RP.parse("\\g'+1'(abc)", 'ruby/1.9')
+    exp  = root[0]
+
+    assert_instance_of Backreference::NumberCallRelative, exp
+    assert_equal 1,    exp.number
+  end
+
   def test_parse_backref_name_recursion_level_ab
     root = RP.parse('(?<X>abc)\k<X-0>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NameRecursionLevel, exp
     assert_equal 'X',  exp.name
@@ -116,7 +132,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_name_recursion_level_sq
     root = RP.parse("(?<X>abc)\\k'X-0'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NameRecursionLevel, exp
     assert_equal 'X',  exp.name
@@ -125,7 +141,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_recursion_level_ab
     root = RP.parse('(abc)\k<1-0>', 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRecursionLevel, exp
     assert_equal 1,    exp.number
@@ -134,7 +150,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_recursion_level_sq
     root = RP.parse("(abc)\\k'1-0'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRecursionLevel, exp
     assert_equal 1,    exp.number
@@ -143,7 +159,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_negative_number_recursion_level
     root = RP.parse("(abc)\\k'-1+0'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRecursionLevel, exp
     assert_equal(-1,   exp.number)
@@ -152,7 +168,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_positive_recursion_level
     root = RP.parse("(abc)\\k'1+1'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRecursionLevel, exp
     assert_equal 1,    exp.number
@@ -161,7 +177,7 @@ class TestParserRefcalls < Test::Unit::TestCase
 
   def test_parse_backref_number_negative_recursion_level
     root = RP.parse("(abc)\\k'1-1'", 'ruby/1.9')
-    exp  = root.expressions.at(1)
+    exp  = root[1]
 
     assert_instance_of Backreference::NumberRecursionLevel, exp
     assert_equal 1,    exp.number

data/test/scanner/test_all.rb

@@ -1,9 +1,9 @@
 require File.expand_path("../../helpers", __FILE__)
 
-%w{
-  anchors errors escapes free_space groups literals
-  meta properties quantifiers scripts sets types unicode_blocks
-}.each do|tc|
+%w[
+  anchors errors escapes free_space groups literals meta
+  properties quantifiers refcalls scripts sets types unicode_blocks
+].each do |tc|
   require File.expand_path("../test_#{tc}", __FILE__)
 end
 

data/test/scanner/test_refcalls.rb

@@ -1,7 +1,6 @@
 require File.expand_path("../../helpers", __FILE__)
 
 class ScannerRefCalls < Test::Unit::TestCase
-
   tests = {
     # Traditional numerical group back-reference
     '(abc)\1'           => [3, :backref, :number,                  '\1',         5, 7],
@@ -26,6 +25,9 @@ class ScannerRefCalls < Test::Unit::TestCase
     '(abc)\g<-1>'       => [3, :backref, :number_rel_call_ab,      '\g<-1>',     5, 11],
     "(abc)\\g'-1'"      => [3, :backref, :number_rel_call_sq,      "\\g'-1'",    5, 11],
 
+    '\g<+1>(abc)'       => [0, :backref, :number_rel_call_ab,      '\g<+1>',     0, 6],
+    "\\g'+1'(abc)"      => [0, :backref, :number_rel_call_sq,      "\\g'+1'",    0, 6],
+
     # Group back-references, with recursion level
     '(?<X>abc)\k<X-0>'  => [3, :backref, :name_recursion_ref_ab,   '\k<X-0>',    9, 16],
     "(?<X>abc)\\k'X-0'" => [3, :backref, :name_recursion_ref_sq,   "\\k'X-0'",   9, 16],
@@ -47,5 +49,4 @@ class ScannerRefCalls < Test::Unit::TestCase
       assert_equal text,  pattern[ts, te]
     end
   end
-
 end