regexp_parser 0.4.1 → 0.4.2

data/lib/regexp_parser/scanner/scanner.rl

@@ -53,7 +53,7 @@
   wide_hex_seq_empty    = 'x' . '{' . (space+)? . '}';
 
   codepoint_single      = 'u' . xdigit{4};
-  codepoint_list        = 'u{' . (xdigit{4} . space?)+'}';
+  codepoint_list        = 'u{' . xdigit{1,5} . (space . xdigit{1,5})* . '}';
   codepoint_sequence    = codepoint_single | codepoint_list;
 
   control_sequence      = ('c' | 'C-');

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

@@ -0,0 +1,13 @@
+require File.expand_path('../2.3', __FILE__)
+
+module Regexp::Syntax
+  module Ruby
+
+    class V240 < Regexp::Syntax::Ruby::V23
+      def initialize
+        super
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,8 @@
+require File.expand_path('../2.4.0', __FILE__)
+
+module Regexp::Syntax
+  module Ruby
+    # uses the latest 2.4 release
+    class V24 < Regexp::Syntax::Ruby::V240; end
+  end
+end

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

@@ -11,7 +11,7 @@ module Regexp::Syntax
       ASCII = [:bell, :backspace, :escape, :form_feed, :newline, :carriage,
                :space, :tab, :vertical_tab]
 
-      Unicode = [:codepoint_list]
+      Unicode = [:codepoint, :codepoint_list]
 
       Meta  = [:dot, :alternation,
                :zero_or_one, :zero_or_more, :one_or_more,

data/lib/regexp_parser/syntax/versions.rb

@@ -58,6 +58,12 @@ module Regexp::Syntax
 
     # alias for the latest 2.3 implementation
     'ruby/2.3',
+
+    # Ruby 2.4.x
+    'ruby/2.4.0',
+
+    # alias for the latest 2.4 implementation
+    'ruby/2.4',
   ]
 
 end

data/lib/regexp_parser/version.rb

@@ -1,5 +1,5 @@
 class Regexp
   module Parser
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/regexp_parser.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |gem|
 
   gem.platform      = Gem::Platform::RUBY
 
-  gem.required_ruby_version = '>= 1.8.7'
+  gem.required_ruby_version = '>= 1.9.1'
 end

data/test/expression/test_conditionals.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../helpers", __FILE__)
 class ExpressionConditionals < Test::Unit::TestCase
 
   def setup
-    @root = RP.parse(/^a(b(?(1)c|(?(2)d|(?(3)e|f)))g)$/)
+    @root = RP.parse(/^(a(b))(b(?(1)c|(?(2)d|(?(3)e|f)))g)$/)
 
     @cond_1 = @root[2][1]
     @cond_2 = @root[2][1][2][0]
@@ -19,7 +19,7 @@ class ExpressionConditionals < Test::Unit::TestCase
   end
 
   def test_expression_conditional_root_level
-    %w{^ a (b(?(1)c|(?(2)d|(?(3)e|f)))g) $}.each_with_index do |t, i|
+    %w{^ (a(b)) (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
     end

data/test/expression/test_traverse.rb

@@ -98,7 +98,7 @@ class SubexpressionTraverse < Test::Unit::TestCase
       assert_equal Array, item.class
       assert_equal 2,     item.length
       assert_equal true,  item.first.is_a?(Regexp::Expression::Base)
-      assert_equal true,  item.last.is_a?(Fixnum)
+      assert_equal true,  item.last.is_a?(Integer)
     end
   end
 

data/test/parser/test_conditionals.rb

@@ -71,7 +71,7 @@ class TestParserConditionals < Test::Unit::TestCase
   end
 
   def test_parse_conditional_nested
-    regexp = /(a(b(c)))(?(1)(?(2)d|(?(3)e|f))|(?(4)(?(5)g|h)))/
+    regexp = /(a(b(c(d)(e))))(?(1)(?(2)d|(?(3)e|f))|(?(4)(?(5)g|h)))/
 
     root = RP.parse(regexp, 'ruby/2.0')
 

data/test/parser/test_escapes.rb

@@ -27,7 +27,8 @@ class TestParserEscapes < Test::Unit::TestCase
     /a\}c/    => [1, :escape,   :interval_close,    EscapeSequence::Literal],
 
     # unicode escapes
-    /a\u{9879}/ => [1, :escape, :codepoint_list,    EscapeSequence::Literal],
+    /a\u0640/       => [1, :escape, :codepoint,      EscapeSequence::Literal],
+    /a\u{41 1F60D}/ => [1, :escape, :codepoint_list, EscapeSequence::Literal],
 
      # hex escapes
     /a\xFF/n =>  [1, :escape, :hex,                 EscapeSequence::Literal],

data/test/scanner/test_conditionals.rb

@@ -4,22 +4,22 @@ class ScannerConditionals < Test::Unit::TestCase
 
   # Basic conditional scan token tests
   tests = {
-    /(?(1)T|F)/           => [0, :conditional,  :open,              '(?',   0,  2],
-    /(?(2)T|F)/           => [1, :conditional,  :condition_open,    '(',    2,  3],
-    /(?(3)T|F)/           => [2, :conditional,  :condition,         '3',    3,  4],
-    /(?(4)T|F)/           => [3, :conditional,  :condition_close,   ')',    4,  5],
-    /(?(5)T|F)/           => [4, :literal,      :literal,           'T',    5,  6],
-    /(?(6)T|F)/           => [5, :conditional,  :separator,         '|',    6,  7],
-    /(?(7)T|F)/           => [6, :literal,      :literal,           'F',    7,  8],
-    /(?(8)T|F)/           => [7, :conditional,  :close,             ')',    8,  9],
-
-    /(?(1)TRUE)/          => [5, :conditional,  :close,             ')',    9, 10],
-
-    /(?(1)TRUE|)/         => [5, :conditional,  :separator,         '|',    9, 10],
-    /(?(2)TRUE|)/         => [6, :conditional,  :close,             ')',   10, 11],
-
-    /(?<N>A)(?(<N>)T|F)/  => [5, :conditional,  :condition,         '<N>', 10, 13],
-    /(?'N'A)(?('N')T|F)/  => [5, :conditional,  :condition,         "'N'", 10, 13],
+    /(a)(?(1)T|F)/        => [3,  :conditional,  :open,              '(?',   3,  5],
+    /(a)(?(1)T|F)/        => [4,  :conditional,  :condition_open,    '(',    5,  6],
+    /(a)(?(1)T|F)/        => [5,  :conditional,  :condition,         '3',    6,  7],
+    /(a)(?(1)T|F)/        => [6,  :conditional,  :condition_close,   ')',    7,  8],
+    /(a)(?(1)T|F)/        => [7,  :literal,      :literal,           'T',    8,  9],
+    /(a)(?(1)T|F)/        => [8,  :conditional,  :separator,         '|',    9,  10],
+    /(a)(?(1)T|F)/        => [9,  :literal,      :literal,           'F',    10, 11],
+    /(a)(?(1)T|F)/        => [10, :conditional,  :close,             ')',    11, 12],
+
+    /(a)(?(1)TRUE)/       => [8,  :conditional,  :close,             ')',    12, 13],
+
+    /(a)(?(1)TRUE|)/      => [8,  :conditional,  :separator,         '|',    12, 13],
+    /(a)(?(1)TRUE|)/      => [9,  :conditional,  :close,             ')',    13, 14],
+
+    /(?<N>A)(?(<N>)T|F)/  => [5,  :conditional,  :condition,         '<N>',  10, 13],
+    /(?'N'A)(?('N')T|F)/  => [5,  :conditional,  :condition,         "'N'",  10, 13],
   }
 
   tests.each_with_index do |(pattern, (index, type, token, text, ts, te)), count|

data/test/scanner/test_escapes.rb

@@ -25,7 +25,7 @@ class ScannerEscapes < Test::Unit::TestCase
     'a\x{0640}c'      => [1, :escape,  :hex_wide,         '\x{0640}',       1,  9],
 
     'a\u0640c'        => [1, :escape,  :codepoint,        '\u0640',         1,  7],
-    'a\u{0640 0641}c' => [1, :escape,  :codepoint_list,   '\u{0640 0641}',  1,  14],
+    'a\u{640 0641}c'  => [1, :escape,  :codepoint_list,   '\u{640 0641}',   1,  13],
 
     /a\cBc/           => [1, :escape,  :control,          '\cB',            1,  4],
     /a\C-bc/          => [1, :escape,  :control,          '\C-b',           1,  5],

data/test/syntax/ruby/test_files.rb

@@ -217,4 +217,18 @@ class TestSyntaxFiles < Test::Unit::TestCase
 
     assert syntax.kind_of?(Regexp::Syntax::Ruby::V233)
   end
+
+  # 2.4 syntax files
+  def test_syntax_file_2_4_0
+    syntax = Regexp::Syntax.new 'ruby/2.4.0'
+
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V23)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V240)
+  end
+
+  def test_syntax_file_2_4_alias
+    syntax = Regexp::Syntax.new 'ruby/2.4'
+
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V240)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ammar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -84,6 +84,8 @@ files:
 - lib/regexp_parser/syntax/ruby/2.3.2.rb
 - lib/regexp_parser/syntax/ruby/2.3.3.rb
 - lib/regexp_parser/syntax/ruby/2.3.rb
+- lib/regexp_parser/syntax/ruby/2.4.0.rb
+- lib/regexp_parser/syntax/ruby/2.4.rb
 - lib/regexp_parser/syntax/tokens.rb
 - lib/regexp_parser/syntax/tokens/anchor.rb
 - lib/regexp_parser/syntax/tokens/assertion.rb
@@ -181,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Scanner, lexer, parser for ruby's regular expressions