regexp_parser 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79c8b7838ef53335c9d0fbd21ffdf6815473ee560380a3687e8fab514d031d53
-  data.tar.gz: 2a91f7c7640fc5f2d304c2cbf240886d8e8642994861a9c092f1d4db2ae6b77a
+  metadata.gz: 077b8a0c90d90cf46e44671ec1335a5373eef72c61a0bcf4de43ba5217a188c3
+  data.tar.gz: b9aed868af73adcdf40c09720c5d10091b25a53b25a792717ceb5591039a2931
 SHA512:
-  metadata.gz: 3559a8c7af9c0087ab7a54862c9913e40a3703ffa23f62e6919eec50042523424c2aa4c99b3de9d28d03fc0edd14af37e0dcd0eab7bf822b9af73113be468b59
-  data.tar.gz: 31ed468565bd41fe2d0bd7b82d53d64e213a15e1ade2108ddf813637c228c18f6f7b456725c7e359a08754188ee19c90d06e013be90775ee6a64723b04fa25f0
+  metadata.gz: 9c04d9a6434c6e3f322e97e8e2a1c86b3ddda88bd8821368a37b92f5836e4c3df1dc27a79165303420c3e8d5eea31bda1483824da01a40ce30961b645ba65ddd
+  data.tar.gz: 01e5c261e9dca0c4df7c696128dbc0520ca40aa6b9393cc8d6c3bdb8386470aeb773566000b811f98c1407038216c8d2c0b444c7955ea5a881ac759796f8a440

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [2.1.1] - 2021-02-23 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Fixed
+
+- fixed `NameError` when requiring only `'regexp_parser/scanner'` in v2.1.0
+  * thanks to [Jared White and Sam Ruby](https://github.com/ruby2js/ruby2js) for the report
+
 ## [2.1.0] - 2021-02-22 - [Janosch Müller](mailto:janosch84@gmail.com)
 
 ### Added

data/lib/regexp_parser.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'regexp_parser/version'
-require 'regexp_parser/error'
 require 'regexp_parser/token'
 require 'regexp_parser/scanner'
 require 'regexp_parser/syntax'

data/lib/regexp_parser/expression.rb

@@ -1,5 +1,6 @@
-module Regexp::Expression
+require 'regexp_parser/error'
 
+module Regexp::Expression
   class Base
     attr_accessor :type, :token
     attr_accessor :text, :ts

data/lib/regexp_parser/parser.rb

@@ -1,3 +1,4 @@
+require 'regexp_parser/error'
 require 'regexp_parser/expression'
 
 class Regexp::Parser

data/lib/regexp_parser/scanner.rb

@@ -8,6 +8,8 @@
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
 # This file was generated from lib/regexp_parser/scanner/scanner.rl
 
+require 'regexp_parser/error'
+
 class Regexp::Scanner
   # General scanner error (catch all)
   class ScannerError < Regexp::Parser::Error; end
@@ -91,7 +93,7 @@ class Regexp::Scanner
     self.char_pos = 0
 
     
-# line 94 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 96 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 class << self
 	attr_accessor :_re_scanner_trans_keys
 	private :_re_scanner_trans_keys, :_re_scanner_trans_keys=
@@ -1070,9 +1072,9 @@ end
 self.re_scanner_en_main = 119;
 
 
-# line 737 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 739 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1075 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1077 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -1083,9 +1085,9 @@ begin
 	act = 0
 end
 
-# line 738 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 740 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1088 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1090 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -1113,7 +1115,7 @@ begin
 		begin
 ts = p
 		end
-# line 1116 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1118 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 	_keys = cs << 1
 	_inds = _re_scanner_index_offsets[cs]
@@ -2517,7 +2519,7 @@ te = p+1
 # line 477 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 40;		end
-# line 2520 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2522 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 	end
 	end
@@ -2535,7 +2537,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 2538 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2540 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 
 	if cs == 0
@@ -2569,7 +2571,7 @@ act = 0
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 2572 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2574 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	  end
 	end
 
@@ -2580,7 +2582,7 @@ act = 0
 end
 	end
 
-# line 739 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 741 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
     # to avoid "warning: assigned but unused variable - testEof"
     testEof = testEof
@@ -2603,14 +2605,13 @@ end
 
   # lazy-load property maps when first needed
   require 'yaml'
-  PROP_MAPS_DIR = File.join(__dir__, 'scanner', 'properties')
 
   def self.short_prop_map
-    @short_prop_map ||= YAML.load_file("#{PROP_MAPS_DIR}/short.yml")
+    @short_prop_map ||= YAML.load_file("#{__dir__}/scanner/properties/short.yml")
   end
 
   def self.long_prop_map
-    @long_prop_map ||= YAML.load_file("#{PROP_MAPS_DIR}/long.yml")
+    @long_prop_map ||= YAML.load_file("#{__dir__}/scanner/properties/long.yml")
   end
 
   # Emits an array with the details of the scanned pattern

data/lib/regexp_parser/scanner/scanner.rl

@@ -651,6 +651,8 @@
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
 # This file was generated from lib/regexp_parser/scanner/scanner.rl
 
+require 'regexp_parser/error'
+
 class Regexp::Scanner
   # General scanner error (catch all)
   class ScannerError < Regexp::Parser::Error; end
@@ -758,14 +760,13 @@ class Regexp::Scanner
 
   # lazy-load property maps when first needed
   require 'yaml'
-  PROP_MAPS_DIR = File.join(__dir__, 'scanner', 'properties')
 
   def self.short_prop_map
-    @short_prop_map ||= YAML.load_file("#{PROP_MAPS_DIR}/short.yml")
+    @short_prop_map ||= YAML.load_file("#{__dir__}/scanner/properties/short.yml")
   end
 
   def self.long_prop_map
-    @long_prop_map ||= YAML.load_file("#{PROP_MAPS_DIR}/long.yml")
+    @long_prop_map ||= YAML.load_file("#{__dir__}/scanner/properties/long.yml")
   end
 
   # Emits an array with the details of the scanned pattern

data/lib/regexp_parser/syntax.rb

@@ -1,3 +1,5 @@
+require 'regexp_parser/error'
+
 module Regexp::Syntax
   class SyntaxError < Regexp::Parser::Error; end
 end

data/lib/regexp_parser/syntax/versions.rb

@@ -3,4 +3,4 @@
 #
 # Aliases for the latest patch version are provided as 'ruby/n.n',
 # e.g. 'ruby/1.9' refers to Ruby v1.9.3.
-Dir[File.join(__dir__, 'versions', '*.rb')].sort.each { |f| require f }
+Dir[File.expand_path('../versions/*.rb', __FILE__)].sort.each { |f| require f }

data/lib/regexp_parser/version.rb

@@ -1,5 +1,5 @@
 class Regexp
   class Parser
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ammar Ali
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email: