regexp_parser 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea0d8b4e867d39d8f87f15f51607ac74551945d
-  data.tar.gz: af634117db3e8ab2e73f627f13bc5685686f0d56
+  metadata.gz: e3cfa8eca93da452bed80baa13cb98349eca9dcf
+  data.tar.gz: 8a60f4b22945ab450723a9aac0443a9d2ae9bb3d
 SHA512:
-  metadata.gz: b83a24999e481fc9fdbbbf311e042411756671a8da98e5dddb4dc254cf1bd3d4b898d946763ecbb4ef150f42884a9b1cf6232b49c4c3c26620f38260ab4348db
-  data.tar.gz: 1d0e39de0e83780ccb52d95a522887d7de8f6fbf8c9a37f24c88c9becc4bbb3b993cb1e55fe3b253ec9fb34d98a5db5676ff7c89f81a5c3ab9578f6eaa0eb481
+  metadata.gz: ad557e665cf6bfa3a5adb025c1fd44756213579427f99e2c47e38ca2de95edc1c068ef5d0328c3c7d6522f8f0a268a85cd5348884f7f6652c3db4e580c31f4a7
+  data.tar.gz: 2eed59b10fd17a36d41cf3ae702b5fcb54303c050c46884dc2a4bda3a745531fc4870a9afd254dfc69aaab48cf36683797dcaa550426b464ccb3cd705f4da965

data/ChangeLog

@@ -1,3 +1,13 @@
+Wed May 25 2016 Ammar Ali <ammarabuali@gmail.com>
+
+	* Thanks to John Backus (https://github.com/backus):
+	  - Fix warnings (PR #19)
+	* Thanks to Dana Scheider (https://github.com/danascheider):
+	  - Correct error in README (PR #20)
+	* Fixed mistyped \h and \H character types (issue #21)
+	* Added ancestry syntax files for latest rubies (issue #22)
+	* Bumped version to 0.3.4
+
 Tue Apr 26 2016 Ammar Ali <ammarabuali@gmail.com>
 
 	* Thanks to John Backus (https://github.com/backus):

data/README.md

@@ -201,7 +201,7 @@ syntax, and prints the token objects' text indented to their level.
 ```ruby
 require 'regexp_parser'
 
-Regexp::Lexer.scan /a?(b(c))*[d]+/, 'ruby/1.9' do |token|
+Regexp::Lexer.lex /a?(b(c))*[d]+/, 'ruby/1.9' do |token|
   puts "#{'  ' * token.level}#{token.text}"
 end
 

data/Rakefile

@@ -53,8 +53,17 @@ namespace :ragel do
   desc "Process the ragel source files and output ruby code"
   task :rb do |t|
     RAGEL_SOURCE_FILES.each do |file|
+      output_file = "#{RAGEL_OUTPUT_DIR}/#{file}.rb"
       # using faster flat table driven FSM, about 25% larger code, but about 30% faster
-      sh "ragel -F1 -R #{RAGEL_SOURCE_DIR}/#{file}.rl -o #{RAGEL_OUTPUT_DIR}/#{file}.rb"
+      sh "ragel -F1 -R #{RAGEL_SOURCE_DIR}/#{file}.rl -o #{output_file}"
+
+      contents = File.read(output_file)
+
+      File.open(output_file, 'r+') do |file|
+        contents = "# -*- warn-indent:false;  -*-\n" + contents
+
+        file.write(contents)
+      end
     end
   end
 

data/lib/regexp_parser/expression.rb

@@ -16,6 +16,7 @@ module Regexp::Expression
       @level              = token.level
       @set_level          = token.set_level
       @conditional_level  = token.conditional_level
+      @quantifier         = nil
       @options            = nil
     end
 

data/lib/regexp_parser/scanner.rb

@@ -1,3 +1,4 @@
+# -*- warn-indent:false;  -*-
 
 # line 1 "/Users/ammar/src/code/ruby/projects/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 

data/lib/regexp_parser/syntax.rb

@@ -72,6 +72,7 @@ module Regexp::Syntax
       when 'ruby/2.1.6';  syntax = Regexp::Syntax::Ruby::V216.new
       when 'ruby/2.1.7';  syntax = Regexp::Syntax::Ruby::V217.new
       when 'ruby/2.1.8';  syntax = Regexp::Syntax::Ruby::V218.new
+      when 'ruby/2.1.9';  syntax = Regexp::Syntax::Ruby::V219.new
 
       # aliases for the latest 2.1 implementations
       when 'ruby/2.1';    syntax = Regexp::Syntax::Ruby::V21.new
@@ -82,12 +83,14 @@ module Regexp::Syntax
       when 'ruby/2.2.2';  syntax = Regexp::Syntax::Ruby::V222.new
       when 'ruby/2.2.3';  syntax = Regexp::Syntax::Ruby::V223.new
       when 'ruby/2.2.4';  syntax = Regexp::Syntax::Ruby::V224.new
+      when 'ruby/2.2.5';  syntax = Regexp::Syntax::Ruby::V225.new
 
       # aliases for the latest 2.2 implementations
       when 'ruby/2.2';    syntax = Regexp::Syntax::Ruby::V22.new
 
       # Ruby 2.3.x
       when 'ruby/2.3.0';  syntax = Regexp::Syntax::Ruby::V230.new
+      when 'ruby/2.3.1';  syntax = Regexp::Syntax::Ruby::V231.new
 
       # alias for the latest 2.3 implementation
       when 'ruby/2.3';    syntax = Regexp::Syntax::Ruby::V23.new

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

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

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

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

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

@@ -1,8 +1,8 @@
-require File.expand_path('../2.1.8', __FILE__)
+require File.expand_path('../2.1.9', __FILE__)
 
 module Regexp::Syntax
   module Ruby
     # uses the latest 2.1 release
-    class V21 < Regexp::Syntax::Ruby::V218; end
+    class V21 < Regexp::Syntax::Ruby::V219; end
   end
 end

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

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

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

@@ -1,8 +1,8 @@
-require File.expand_path('../2.2.4', __FILE__)
+require File.expand_path('../2.2.5', __FILE__)
 
 module Regexp::Syntax
   module Ruby
     # uses the latest 2.2 release
-    class V22 < Regexp::Syntax::Ruby::V224; end
+    class V22 < Regexp::Syntax::Ruby::V225; end
   end
 end

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

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

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

@@ -1,8 +1,8 @@
-require File.expand_path('../2.3.0', __FILE__)
+require File.expand_path('../2.3.1', __FILE__)
 
 module Regexp::Syntax
   module Ruby
     # uses the latest 2.3 release
-    class V23 < Regexp::Syntax::Ruby::V230; end
+    class V23 < Regexp::Syntax::Ruby::V231; end
   end
 end

data/lib/regexp_parser/version.rb

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

data/test/parser/test_all.rb

@@ -2,7 +2,7 @@ require File.expand_path("../../helpers", __FILE__)
 
 %w{
   alternation anchors errors escapes free_space groups
-  properties quantifiers refcalls sets
+  properties quantifiers refcalls sets types
 }.each do|tc|
   require File.expand_path("../test_#{tc}", __FILE__)
 end

data/test/parser/test_types.rb

@@ -0,0 +1,33 @@
+require File.expand_path("../../helpers", __FILE__)
+
+class TestParserTypes < Test::Unit::TestCase
+
+  tests = {
+    /a\dc/    => [1, :type,   :digit,     CharacterType::Digit],
+    /a\Dc/    => [1, :type,   :nondigit,  CharacterType::NonDigit],
+
+    /a\sc/    => [1, :type,   :space,     CharacterType::Space],
+    /a\Sc/    => [1, :type,   :nonspace,  CharacterType::NonSpace],
+
+    /a\hc/    => [1, :type,   :hex,       CharacterType::Hex],
+    /a\Hc/    => [1, :type,   :nonhex,    CharacterType::NonHex],
+
+    /a\wc/    => [1, :type,   :word,      CharacterType::Word],
+    /a\Wc/    => [1, :type,   :nonword,   CharacterType::NonWord],
+  }
+
+  count = 0
+  tests.each do |pattern, test|
+    define_method "test_parse_type_#{test[2]}_#{count+=1}" do
+      root = RP.parse(pattern, 'ruby/1.9')
+      exp  = root.expressions[test[0]]
+
+      assert( exp.is_a?( test[3] ),
+             "Expected #{test[3]}, but got #{exp.class.name}")
+
+      assert_equal( test[1], exp.type )
+      assert_equal( test[2], exp.token )
+    end
+  end
+
+end

data/test/syntax/ruby/test_1.9.1.rb

@@ -13,6 +13,10 @@ class TestSyntaxRuby_V191 < Test::Unit::TestCase
         Escape::Backreference + Escape::ASCII + Escape::Meta + Escape::Unicode
       ].flatten,
 
+      :type => [
+        CharacterType::Hex
+      ].flatten,
+
       :quantifier => [
         Quantifier::Greedy + Quantifier::Reluctant +
         Quantifier::Possessive

data/test/syntax/ruby/test_files.rb

@@ -111,10 +111,17 @@ class TestSyntaxFiles < Test::Unit::TestCase
     assert syntax.kind_of?(Regexp::Syntax::Ruby::V217)
   end
 
+  def test_syntax_file_2_1_9
+    syntax = Regexp::Syntax.new 'ruby/2.1.9'
+
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V218)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V219)
+  end
+
   def test_syntax_file_2_1_alias
     syntax = Regexp::Syntax.new 'ruby/2.1'
 
-    assert syntax.kind_of?(Regexp::Syntax::Ruby::V218)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V219)
   end
 
 
@@ -149,10 +156,17 @@ class TestSyntaxFiles < Test::Unit::TestCase
     assert syntax.kind_of?(Regexp::Syntax::Ruby::V224)
   end
 
+  def test_syntax_file_2_2_5
+    syntax = Regexp::Syntax.new 'ruby/2.2.5'
+
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V224)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V225)
+  end
+
   def test_syntax_file_2_2_alias
     syntax = Regexp::Syntax.new 'ruby/2.2'
 
-    assert syntax.kind_of?(Regexp::Syntax::Ruby::V224)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V225)
   end
 
   # 2.3 syntax files
@@ -160,11 +174,19 @@ class TestSyntaxFiles < Test::Unit::TestCase
     syntax = Regexp::Syntax.new 'ruby/2.3.0'
 
     assert syntax.kind_of?(Regexp::Syntax::Ruby::V22)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V230)
+  end
+
+  def test_syntax_file_2_3_1
+    syntax = Regexp::Syntax.new 'ruby/2.3.1'
+
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V230)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V231)
   end
 
   def test_syntax_file_2_3_alias
     syntax = Regexp::Syntax.new 'ruby/2.3'
 
-    assert syntax.kind_of?(Regexp::Syntax::Ruby::V230)
+    assert syntax.kind_of?(Regexp::Syntax::Ruby::V231)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ammar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -66,14 +66,17 @@ files:
 - lib/regexp_parser/syntax/ruby/2.1.6.rb
 - lib/regexp_parser/syntax/ruby/2.1.7.rb
 - lib/regexp_parser/syntax/ruby/2.1.8.rb
+- lib/regexp_parser/syntax/ruby/2.1.9.rb
 - lib/regexp_parser/syntax/ruby/2.1.rb
 - lib/regexp_parser/syntax/ruby/2.2.0.rb
 - lib/regexp_parser/syntax/ruby/2.2.1.rb
 - lib/regexp_parser/syntax/ruby/2.2.2.rb
 - lib/regexp_parser/syntax/ruby/2.2.3.rb
 - lib/regexp_parser/syntax/ruby/2.2.4.rb
+- lib/regexp_parser/syntax/ruby/2.2.5.rb
 - lib/regexp_parser/syntax/ruby/2.2.rb
 - lib/regexp_parser/syntax/ruby/2.3.0.rb
+- lib/regexp_parser/syntax/ruby/2.3.1.rb
 - lib/regexp_parser/syntax/ruby/2.3.rb
 - lib/regexp_parser/syntax/tokens.rb
 - lib/regexp_parser/syntax/tokens/anchor.rb
@@ -123,6 +126,7 @@ files:
 - test/parser/test_quantifiers.rb
 - test/parser/test_refcalls.rb
 - test/parser/test_sets.rb
+- test/parser/test_types.rb
 - test/scanner/test_all.rb
 - test/scanner/test_anchors.rb
 - test/scanner/test_conditionals.rb
@@ -211,6 +215,7 @@ test_files:
 - test/parser/test_quantifiers.rb
 - test/parser/test_refcalls.rb
 - test/parser/test_sets.rb
+- test/parser/test_types.rb
 - test/scanner/test_all.rb
 - test/scanner/test_anchors.rb
 - test/scanner/test_conditionals.rb