js_regex 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb9a34e224340fb10bcaac25b7adee037279a2e
-  data.tar.gz: a50cc191b462e501e194308f9eb06c893b177657
+  metadata.gz: 1383333a8a9683ea2e63c0871c90006fcd9c6be3
+  data.tar.gz: 3da33cae25a5f9fa0012f94f36b21031577b8922
 SHA512:
-  metadata.gz: d7156fa441d772630f4d1f947e029f11355c74c85a563cf8b5ed09f977930e238c0e7951856da0163d8c255620ae3a64f225d50b5d77f77fbe60025052929f46
-  data.tar.gz: 72bb8e367bc70bef958957ecc8444af459e26e4aa4111fcae10d6bd80fb863120161c13a5beedb9210a700fcfa0896004b4f06605a54bebe96dd32a4831ab7f6
+  metadata.gz: 25707387666a8aaef307676e48aa75098e875e5808e58e3dbe00e8bd3b43caaed4f1ce37260ac1a8f6a39e32e02cfde09dc6d4d418329048e457f900f520ddaf
+  data.tar.gz: ddf9bb15777c6bef8e620840160296dedd05d160bfec8e1f1ea457936e5632448628fc3e5c2197361e319a464481dfe88fcf877206cf583417b398d549095892

data/lib/js_regex/converter/base.rb

@@ -31,8 +31,9 @@ class JsRegex
       alias pass_through data
 
       def warn_of_unsupported_feature(description = nil)
-        description ||= "#{subtype} #{token_class} '#{data}'".tr('_', ' ')
-        target.warnings << "Dropped unsupported #{description} "\
+        description ||= "#{subtype} #{token_class}".tr('_', ' ')
+        full_description = "#{description} '#{data}'"
+        target.warnings << "Dropped unsupported #{full_description} "\
                            "at index #{start_index}...#{end_index}"
         ''
       end

data/lib/js_regex/converter/conditional_converter.rb

@@ -13,7 +13,7 @@ class JsRegex
       def convert_data
         case subtype
         when :open
-          warn_of_unsupported_feature("conditional '(?('")
+          warn_of_unsupported_feature('conditional')
           '('
         when :separator, :close
           pass_through

data/lib/js_regex/converter/context.rb

@@ -8,8 +8,6 @@ class JsRegex
     # The Converters themselves are stateless.
     #
     class Context
-      attr_accessor :previous_quantifier_end # , :previous_quantifier_type
-
       attr_reader :buffered_set_extractions,
                   :buffered_set_members,
                   :captured_group_count,
@@ -30,6 +28,12 @@ class JsRegex
         !negative_lookbehind
       end
 
+      def stacked_quantifier?(quantifier_start_index, quantifier_end_index)
+        is_stacked = last_quantifier_end_index.equal?(quantifier_start_index)
+        self.last_quantifier_end_index = quantifier_end_index
+        is_stacked
+      end
+
       # set context
 
       def open_set
@@ -113,7 +117,10 @@ class JsRegex
 
       private
 
-      attr_accessor :group_level, :negative_set_levels, :set_level
+      attr_accessor :group_level,
+                    :last_quantifier_end_index,
+                    :negative_set_levels,
+                    :set_level
 
       attr_writer :buffered_set_extractions,
                   :buffered_set_members,

data/lib/js_regex/converter/escape_converter.rb

@@ -11,30 +11,34 @@ class JsRegex
     class EscapeConverter < JsRegex::Converter::Base
       private
 
+      ESCAPES_SHARED_BY_RUBY_AND_JS = [
+        :backslash,
+        :bol,
+        :carriage,
+        :codepoint,
+        :dot,
+        :eol,
+        :form_feed,
+        :hex,
+        :interval_close,
+        :interval_open,
+        :newline,
+        :octal,
+        :one_or_more,
+        :set_close,
+        :set_open,
+        :tab,
+        :vertical_tab,
+        :zero_or_more,
+        :zero_or_one
+      ].freeze
+
       def convert_data
         case subtype
-        when :backslash,
-             :bol,
-             :carriage,
-             :codepoint,
-             :dot,
-             :eol,
-             :form_feed,
-             :hex,
-             :interval_close,
-             :interval_open,
-             :newline,
-             :octal,
-             :one_or_more,
-             :set_close,
-             :set_open,
-             :tab,
-             :vertical_tab,
-             :zero_or_more,
-             :zero_or_one
-          pass_through
         when :literal
           LiteralConverter.convert_data(data)
+        when *ESCAPES_SHARED_BY_RUBY_AND_JS
+          pass_through
         else
           # Bell, Escape, HexWide, Control, Meta, MetaControl, ...
           warn_of_unsupported_feature

data/lib/js_regex/converter/quantifier_converter.rb

@@ -11,11 +11,9 @@ class JsRegex
       private
 
       def convert_data
-        if multiplicative_interval?
+        if context.stacked_quantifier?(start_index, end_index)
           warn_of_unsupported_feature('adjacent quantifiers')
         else
-          # context.previous_quantifier_type = subtype
-          context.previous_quantifier_end = end_index
           convert_quantifier
         end
       end
@@ -28,12 +26,6 @@ class JsRegex
           pass_through
         end
       end
-
-      def multiplicative_interval?
-        # subtype == :interval &&
-        #  context.previous_quantifier_type == :interval &&
-        context.previous_quantifier_end.equal?(start_index)
-      end
     end
   end
 end

data/lib/js_regex/converter/set_converter.rb

@@ -25,18 +25,13 @@ class JsRegex
         when :open then convert_open_subtype
         when :negate then convert_negate_subtype
         when :close then convert_close_subtype
-        when :member, :range, :escape then convert_member_subtype
+        when :member, :member_hex, :range, :range_hex, :escape
+          convert_member_subtype
         when /\Aclass_/ then convert_class_subtype
         when /\Atype_/ then convert_type_subtype
         when :backspace then convert_backspace_subtype
-        when :intersection
-          warn_of_unsupported_feature("set intersection '&&'")
-        else
-          # Note that, within sets, Regexp::Scanner returns
-          # - positive property tokens in the \p{-style with class :set
-          # - negative property tokens in the \P{-style with class :set
-          # - negative property tokens in the \p{^-style with class :nonproperty
-          try_replacing_potential_property_subtype
+        when :intersection then warn_of_unsupported_feature('set intersection')
+        else try_replacing_potential_property_subtype
         end
       end
 
@@ -80,11 +75,10 @@ class JsRegex
       end
 
       def try_replacing_property(name, negated)
-        replacement = PropertyConverter.property_replacement(name, negated)
-        if replacement
+        if (replacement = PropertyConverter.property_replacement(name, negated))
           buffer_set_extraction(replacement)
         else
-          warn_of_unsupported_feature
+          warn_of_unsupported_feature('property')
         end
       end
 

data/lib/js_regex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class JsRegex
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp_parser