regexp_parser 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cfa8eca93da452bed80baa13cb98349eca9dcf
-  data.tar.gz: 8a60f4b22945ab450723a9aac0443a9d2ae9bb3d
+  metadata.gz: ed3e75e40ac66c7485636e6fe3b0c63b8d3d3aa5
+  data.tar.gz: d72567776c9934caa47fe2ecb503855e3c45b70d
 SHA512:
-  metadata.gz: ad557e665cf6bfa3a5adb025c1fd44756213579427f99e2c47e38ca2de95edc1c068ef5d0328c3c7d6522f8f0a268a85cd5348884f7f6652c3db4e580c31f4a7
-  data.tar.gz: 2eed59b10fd17a36d41cf3ae702b5fcb54303c050c46884dc2a4bda3a745531fc4870a9afd254dfc69aaab48cf36683797dcaa550426b464ccb3cd705f4da965
+  metadata.gz: 624065b3e707c4869ed67012bde66544d6682b577f826f7089090a070c46bc4e7f4895efabb665cd8b797f5616dc2151c7a820a5b84ae3a88ac242a3737f846f
+  data.tar.gz: 6b745fc5a79f260879e4415077e9754f19cb8db608132a5892833dfe5ba85f56c15b5ba3c33cc7c203ff6277cc8ded82beded0996b6376a065a210a593082583

data/ChangeLog

@@ -1,3 +1,9 @@
+Mon May 30 2016 Ammar Ali <ammarabuali@gmail.com>
+
+	* Thanks to John Backus (https://github.com/backus):
+	  -  Fix parsing of /\xFF/n (hex:escape) (PR #24)
+	* Bumped version to 0.3.5
+
 Wed May 25 2016 Ammar Ali <ammarabuali@gmail.com>
 
 	* Thanks to John Backus (https://github.com/backus):

data/lib/regexp_parser/syntax/ruby/1.9.1.rb

@@ -15,7 +15,7 @@ module Regexp::Syntax
         implements :backref, Backreference::All +
           SubexpressionCall::All
 
-        implements :escape, Escape::Unicode
+        implements :escape, Escape::Unicode + Escape::Hex
 
         implements :type, CharacterType::Hex
 

data/lib/regexp_parser/syntax/tokens/escape.rb

@@ -21,6 +21,8 @@ module Regexp::Syntax
                :set_open, :set_close,
                :baclslash]
 
+      Hex   = [:hex]
+
       All   = Basic + Backreference + ASCII + Meta
       Type  = :escape
     end

data/lib/regexp_parser/version.rb

@@ -1,5 +1,5 @@
 class Regexp
   module Parser
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
   end
 end

data/test/expression/test_base.rb

@@ -7,10 +7,10 @@ class ExpressionBase < Test::Unit::TestCase
 
     re = RP.parse(re_text).to_re
 
-    assert( re.is_a?(::Regexp),
-          'Not a Regexp, but should be')
+    assert re.is_a?(::Regexp),
+           'Not a Regexp, but should be'
 
-    assert_equal( re.source, re_text )
+    assert_equal re.source, re_text
   end
 
   def test_expression_level
@@ -18,51 +18,51 @@ class ExpressionBase < Test::Unit::TestCase
     root = RP.parse(regexp)
 
     %w{^ a (b(c(d))) e $}.each_with_index do |t, i|
-      assert_equal( t, root[i].to_s )
-      assert_equal( 0, root[i].level )
+      assert_equal t, root[i].to_s
+      assert_equal 0, root[i].level
     end
 
-    assert_equal( 'b', root[2][0].to_s )
-    assert_equal( 1,   root[2][0].level )
+    assert_equal 'b', root[2][0].to_s
+    assert_equal 1,   root[2][0].level
 
-    assert_equal( 'c', root[2][1][0].to_s )
-    assert_equal( 2,   root[2][1][0].level )
+    assert_equal 'c', root[2][1][0].to_s
+    assert_equal 2,   root[2][1][0].level
 
-    assert_equal( 'd', root[2][1][1][0].to_s )
-    assert_equal( 3,   root[2][1][1][0].level )
+    assert_equal 'd', root[2][1][1][0].to_s
+    assert_equal 3,   root[2][1][1][0].level
   end
 
   def test_expression_terminal?
     root = RP.parse('^a([b]+)c$')
 
-    assert_equal( false, root.terminal? )
+    assert_equal false, root.terminal?
 
-    assert_equal( true,  root[0].terminal? )
-    assert_equal( true,  root[1].terminal? )
-    assert_equal( false, root[2].terminal? )
-    assert_equal( true,  root[2][0].terminal? )
-    assert_equal( true,  root[3].terminal? )
-    assert_equal( true,  root[4].terminal? )
+    assert_equal true,  root[0].terminal?
+    assert_equal true,  root[1].terminal?
+    assert_equal false, root[2].terminal?
+    assert_equal true,  root[2][0].terminal?
+    assert_equal true,  root[3].terminal?
+    assert_equal true,  root[4].terminal?
   end
 
   def test_expression_alt_terminal?
     root = RP.parse('^(ab|cd)$')
 
-    assert_equal( false, root.terminal? )
+    assert_equal false, root.terminal?
 
-    assert_equal( true,  root[0].terminal? )
-    assert_equal( false, root[1].terminal? )
-    assert_equal( false,  root[1][0].terminal? )
-    assert_equal( false, root[1][0][0].terminal? )
-    assert_equal( true,  root[1][0][0][0].terminal? )
-    assert_equal( false, root[1][0][1].terminal? )
-    assert_equal( true,  root[1][0][1][0].terminal? )
+    assert_equal true,  root[0].terminal?
+    assert_equal false, root[1].terminal?
+    assert_equal false, root[1][0].terminal?
+    assert_equal false, root[1][0][0].terminal?
+    assert_equal true,  root[1][0][0][0].terminal?
+    assert_equal false, root[1][0][1].terminal?
+    assert_equal true,  root[1][0][1][0].terminal?
   end
 
   def test_expression_coded_offset
     root = RP.parse('^a*(b+(c?))$')
 
-    assert_equal( '@0+12', root.coded_offset )
+    assert_equal '@0+12', root.coded_offset
 
     # All top level offsets
     checks = [
@@ -72,20 +72,18 @@ class ExpressionBase < Test::Unit::TestCase
       ['@11+1', '$'         ],
     ].each_with_index do |check, i|
       against = [ root[i].coded_offset, root[i].to_s ]
-      assert_equal( check, against )
+
+      assert_equal check, against
     end
 
     # Nested expression
-    assert_equal(['@4+2', 'b+'],
-      [root[2][0].coded_offset, root[2][0].to_s])
+    assert_equal ['@4+2', 'b+'], [root[2][0].coded_offset, root[2][0].to_s]
 
     # Nested subexpression
-    assert_equal(['@6+4', '(c?)'],
-      [root[2][1].coded_offset, root[2][1].to_s])
+    assert_equal ['@6+4', '(c?)'], [root[2][1].coded_offset, root[2][1].to_s]
 
     # Nested subexpression expression
-    assert_equal(['@7+2', 'c?'],
-      [root[2][1][0].coded_offset, root[2][1][0].to_s])
+    assert_equal ['@7+2', 'c?'], [root[2][1][0].coded_offset, root[2][1][0].to_s]
   end
 
 end

data/test/expression/test_clone.rb

@@ -6,57 +6,57 @@ class ExpressionClone < Test::Unit::TestCase
     root = RP.parse(/^(?i:a)b+$/i)
     copy = root.clone
 
-    assert_not_equal(copy.object_id, root.object_id)
+    refute_equal copy.object_id, root.object_id
 
     # The text content is equal but the objects are not.
-    assert_equal(copy.text, root.text)
-    assert_not_equal(copy.text.object_id, root.text.object_id)
+    assert_equal copy.text,           root.text
+    refute_equal copy.text.object_id, root.text.object_id
 
     root_1 = root.expressions[1]
     copy_1 = copy.expressions[1]
 
     # The options hash contents are equal but the objects are not.
-    assert_equal(copy_1.options, root_1.options)
-    assert_not_equal(copy_1.options.object_id,
-                     root_1.options.object_id)
+    assert_equal copy_1.options,           root_1.options
+    refute_equal copy_1.options.object_id, root_1.options.object_id
 
     root_2 = root.expressions[2]
     copy_2 = copy.expressions[2]
 
-    assert( root_2.quantified? )
-    assert( copy_2.quantified? )
+    assert root_2.quantified?
+    assert copy_2.quantified?
 
     # The quantifier contents are equal but the objects are not.
-    assert_equal(copy_2.quantifier.text, root_2.quantifier.text)
+    assert_equal copy_2.quantifier.text,
+                 root_2.quantifier.text
 
-    assert_not_equal(copy_2.quantifier.text.object_id,
-                     root_2.quantifier.text.object_id)
+    refute_equal copy_2.quantifier.text.object_id,
+                 root_2.quantifier.text.object_id
 
-    assert_not_equal(copy_2.quantifier.object_id,
-                     root_2.quantifier.object_id)
+    refute_equal copy_2.quantifier.object_id,
+                 root_2.quantifier.object_id
   end
 
   def test_expression_clone_subexpression
     root = RP.parse(/^a(b([cde])f)g$/)
     copy = root.clone
 
-    assert( root.respond_to?(:expressions) )
-    assert( copy.respond_to?(:expressions) )
+    assert root.respond_to?(:expressions)
+    assert copy.respond_to?(:expressions)
 
     # The expressions arrays are not equal.
-    assert_not_equal(copy.expressions.object_id,
-                     root.expressions.object_id)
+    refute_equal copy.expressions.object_id,
+                 root.expressions.object_id
 
     # The expressions in the arrays are not equal.
-    copy.expressions.each_with_index do |e, ei|
-      assert_not_equal(e.object_id,
-                       root.expressions[ei].object_id)
+    copy.expressions.each_with_index do |exp, index|
+      refute_equal exp.object_id,
+                   root.expressions[index].object_id
     end
 
     # The expressions in nested expressions are not equal.
-    copy.expressions[2].each_with_index do |e, ei|
-      assert_not_equal(e.object_id,
-                       root.expressions[2][ei].object_id)
+    copy.expressions[2].each_with_index do |exp, index|
+      refute_equal exp.object_id,
+                   root.expressions[2][index].object_id
     end
   end
 
@@ -69,21 +69,20 @@ class ExpressionClone < Test::Unit::TestCase
     copy_1 = copy.expressions[1]
 
     # The names are equal but their objects are not.
-    assert_equal(copy_1.name, root_1.name)
-    assert_not_equal(copy_1.name.object_id,
-                     root_1.name.object_id)
+    assert_equal copy_1.name,           root_1.name
+    refute_equal copy_1.name.object_id, root_1.name.object_id
 
     # Verify super: text objects should be different.
-    assert_equal(copy_1.text, root_1.text)
+    assert_equal copy_1.text, root_1.text
 
     # Verify super: expressions arrays are not equal.
-    assert_not_equal(copy_1.expressions.object_id,
-                     root_1.expressions.object_id)
+    refute_equal copy_1.expressions.object_id,
+                 root_1.expressions.object_id
 
     # Verify super: expressions in the arrays are not equal.
-    copy_1.expressions.each_with_index do |e, ei|
-      assert_not_equal(e.object_id,
-                       root_1.expressions[ei].object_id)
+    copy_1.expressions.each_with_index do |exp, index|
+      refute_equal exp.object_id,
+                   root_1.expressions[index].object_id
     end
   end
 
@@ -93,15 +92,17 @@ class ExpressionClone < Test::Unit::TestCase
 
     root_2_1 = root.expressions[2][1]
 
-    copy.expressions[2][1].each_with_index do |e, ei|
-      assert( e.respond_to?(:members) )
+    copy.expressions[2][1].each_with_index do |exp, index|
+      assert exp.respond_to?(:members)
 
       # The members arrays are not equal.
-      assert_not_equal( e.members.object_id, root_2_1[ei].members.object_id )
+      refute_equal exp.members.object_id,
+                   root_2_1[index].members.object_id
 
       # The members in the arrays are not equal.
-      e.members.each_with_index do |m, mi|
-        assert_not_equal( m.object_id, root_2_1[ei].members[mi].object_id )
+      exp.members.each_with_index do |member, member_index|
+        refute_equal member.object_id,
+                     root_2_1[index].members[member_index].object_id
       end
     end
   end
@@ -119,25 +120,26 @@ class ExpressionClone < Test::Unit::TestCase
     copy_subset = copy_set.members[1]
 
     # Sanity checks
-    assert( root_set.respond_to?(:members) )
-    assert( copy_set.respond_to?(:members) )
+    assert root_set.respond_to?(:members)
+    assert copy_set.respond_to?(:members)
 
-    assert( root_subset.respond_to?(:members) )
-    assert( copy_subset.respond_to?(:members) )
+    assert root_subset.respond_to?(:members)
+    assert copy_subset.respond_to?(:members)
 
     # The sets are not equal
-    assert_not_equal(copy_set.object_id, root_set.object_id)
+    refute_equal copy_set.object_id, root_set.object_id
 
     # The subsets are not equal
-    assert_not_equal(copy_subset.object_id, root_subset.object_id)
+    refute_equal copy_subset.object_id, root_subset.object_id
 
     # The subsets' members arrays are not equal.
-    assert_not_equal( copy_subset.members.object_id,
-                      root_subset.members.object_id )
+    refute_equal copy_subset.members.object_id,
+                 root_subset.members.object_id
 
     # The subsets' members are not equal
-    copy_subset.members.each_with_index do |m, mi|
-      assert_not_equal(m.object_id, root_subset.members[mi].object_id)
+    copy_subset.members.each_with_index do |member, member_index|
+      refute_equal member.object_id,
+                   root_subset.members[member_index].object_id
     end
   end
 

data/test/expression/test_conditionals.rb

@@ -20,13 +20,13 @@ class ExpressionConditionals < Test::Unit::TestCase
 
   def test_expression_conditional_root_level
     %w{^ a (b(?(1)c|(?(2)d|(?(3)e|f)))g) $}.each_with_index do |t, i|
-      assert_equal( 0, @root[i].conditional_level )
-      assert_equal( t, @root[i].to_s )
+      assert_equal 0, @root[i].conditional_level
+      assert_equal t, @root[i].to_s
     end
 
     # First capture group
-    assert_equal( 'b',    @root[2][0].text )
-    assert_equal( 0,      @root[2][0].conditional_level )
+    assert_equal 'b', @root[2][0].text
+    assert_equal 0,   @root[2][0].conditional_level
   end
 
   def test_expression_conditional_level_one
@@ -35,18 +35,18 @@ class ExpressionConditionals < Test::Unit::TestCase
     branch_2  = @cond_1.branches.last
 
     # Condition
-    assert_equal( true,   is_conditional_condition?(condition) )
-    assert_equal( '(1)',  condition.text )
-    assert_equal( 1,      condition.conditional_level )
+    assert_equal true,  is_conditional_condition?(condition)
+    assert_equal '(1)', condition.text
+    assert_equal 1,     condition.conditional_level
 
     # Branch 1
-    assert_equal( true,   is_conditional_branch?(branch_1) )
-    assert_equal( 'c',    branch_1.text )
-    assert_equal( 1,      branch_1.conditional_level )
+    assert_equal true,  is_conditional_branch?(branch_1)
+    assert_equal 'c',   branch_1.text
+    assert_equal 1,     branch_1.conditional_level
 
     # Literal
-    assert_equal( 'c',    branch_1.first.text )
-    assert_equal( 1,      branch_1.first.conditional_level )
+    assert_equal 'c',   branch_1.first.text
+    assert_equal 1,     branch_1.first.conditional_level
 
   end
 
@@ -55,26 +55,26 @@ class ExpressionConditionals < Test::Unit::TestCase
     branch_1  = @cond_2.branches.first
     branch_2  = @cond_2.branches.last
 
-    assert_equal( '(?',   @cond_2.text )
-    assert_equal( 1,      @cond_2.conditional_level )
+    assert_equal '(?',   @cond_2.text
+    assert_equal 1,      @cond_2.conditional_level
 
     # Condition
-    assert_equal( true,   is_conditional_condition?(condition) )
-    assert_equal( '(2)',  condition.text )
-    assert_equal( 2,      condition.conditional_level )
+    assert_equal true,   is_conditional_condition?(condition)
+    assert_equal '(2)',  condition.text
+    assert_equal 2,      condition.conditional_level
 
     # Branch 1
-    assert_equal( true,   is_conditional_branch?(branch_1) )
-    assert_equal( 'd',    branch_1.text )
-    assert_equal( 2,      branch_1.conditional_level )
+    assert_equal true,   is_conditional_branch?(branch_1)
+    assert_equal 'd',    branch_1.text
+    assert_equal 2,      branch_1.conditional_level
 
     # Literal
-    assert_equal( 'd',    branch_1.first.text )
-    assert_equal( 2,      branch_1.first.conditional_level )
+    assert_equal 'd',    branch_1.first.text
+    assert_equal 2,      branch_1.first.conditional_level
 
     # Branch 2
-    assert_equal( '(?',   branch_2.first.text )
-    assert_equal( 2,      branch_2.first.conditional_level )
+    assert_equal '(?',   branch_2.first.text
+    assert_equal 2,      branch_2.first.conditional_level
   end
 
   def test_expression_conditional_level_three
@@ -83,32 +83,32 @@ class ExpressionConditionals < Test::Unit::TestCase
     branch_2  = @cond_3.branches.last
 
     # Condition
-    assert_equal( true,   is_conditional_condition?(condition) )
-    assert_equal( '(3)',  condition.text )
-    assert_equal( 3,      condition.conditional_level )
+    assert_equal true,   is_conditional_condition?(condition)
+    assert_equal '(3)',  condition.text
+    assert_equal 3,      condition.conditional_level
 
     # Same as branch 2 in level two
-    assert_equal( '(?',         @cond_3.text )
-    assert_equal( '(?(3)e|f)',  @cond_3.to_s )
-    assert_equal( 2,            @cond_3.conditional_level )
+    assert_equal '(?',         @cond_3.text
+    assert_equal '(?(3)e|f)',  @cond_3.to_s
+    assert_equal 2,            @cond_3.conditional_level
 
     # Branch 1
-    assert_equal( true,   is_conditional_branch?(branch_1) )
-    assert_equal( 'e',    branch_1.text )
-    assert_equal( 3,      branch_1.conditional_level )
+    assert_equal true,   is_conditional_branch?(branch_1)
+    assert_equal 'e',    branch_1.text
+    assert_equal 3,      branch_1.conditional_level
 
     # Literal
-    assert_equal( 'e',    branch_1.first.text )
-    assert_equal( 3,      branch_1.first.conditional_level )
+    assert_equal 'e',    branch_1.first.text
+    assert_equal 3,      branch_1.first.conditional_level
 
     # Branch 2
-    assert_equal( true,   is_conditional_branch?(branch_2) )
-    assert_equal( 'f',    branch_2.text )
-    assert_equal( 3,      branch_2.conditional_level )
+    assert_equal true,   is_conditional_branch?(branch_2)
+    assert_equal 'f',    branch_2.text
+    assert_equal 3,      branch_2.conditional_level
 
     # Literal
-    assert_equal( 'f',    branch_2.first.text )
-    assert_equal( 3,      branch_2.first.conditional_level )
+    assert_equal 'f',    branch_2.first.text
+    assert_equal 3,      branch_2.first.conditional_level
   end
 
 end