js_regex 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 618111f397f9ea7eaedc926f1fc7fec5853ba2f4
-  data.tar.gz: 93c341b5952e85fdf01350289a7090e3504bb107
+  metadata.gz: 9c4a6863b83e153ca634f1bacc95617a69714079
+  data.tar.gz: 167deca0ba9f16ee72ebcb515c96a6633c2e37f1
 SHA512:
-  metadata.gz: 14b09a4a7f04c78faca5c700c80207b21787741ce4c9540a9db69861f30e90476cc04b9026111cafd8d9c97f5ac392289e30f38db1ce3c4ddf112680c55d3a69
-  data.tar.gz: b0280df75ee2d1ab152ba34b425b6be744f8eb6e347a2ffe01e1eefa60e266cd86e008dd4ef25791a1f6addf2da81adcc233b9d999d556967e15da02608dd7c0
+  metadata.gz: 2c75ae7b1fdb1efb48fa59a12cfe5f17d1475a8a2087f6f73b062dec88b7cb5b87e4d42ad8786d77d4bfae3f8c00d53bdf8496f34e935ae61876c000b6901476
+  data.tar.gz: bcd94e25831bb768e86c51cdd2aabf3952ec84580b76495a70710a58a2d926aa97443112df05730b3a5101fec7560da36c3236e30d1391261ce4ef8401b2f540

data/lib/js_regex/converter/backref_converter.rb

@@ -0,0 +1,30 @@
+class JsRegex
+  #
+  module Converter
+    require_relative 'base'
+    #
+    # Template class implementation.
+    #
+    class BackrefConverter < JsRegex::Converter::Base
+      private
+
+      def convert_data
+        case subtype
+        when :number
+          convert_number_backref
+        else
+          warn_of_unsupported_feature
+        end
+      end
+
+      def convert_number_backref
+        if context.group_count_changed
+          warn_of_unsupported_feature('number backreference following a '\
+            'feature that changes the group count (such as an atomic group)')
+        else
+          pass_through
+        end
+      end
+    end
+  end
+end

data/lib/js_regex/converter/context.rb

@@ -8,12 +8,13 @@ class JsRegex
     class Context
       attr_accessor :buffered_set_members,
                     :buffered_set_extractions,
+                    :captured_groups,
+                    :group_count_changed,
                     :group_level,
                     :group_level_for_backreference,
                     :group_number_for_backreference,
                     :negative_lookbehind,
                     :negative_set_levels,
-                    :opened_groups,
                     :previous_quantifier_subtype,
                     :previous_quantifier_end,
                     :set_level
@@ -21,10 +22,11 @@ class JsRegex
       def initialize
         self.buffered_set_members = []
         self.buffered_set_extractions = []
+        self.captured_groups = 0
+        self.group_count_changed = false
         self.group_level = 0
         self.negative_lookbehind = false
         self.negative_set_levels = []
-        self.opened_groups = 0
         self.set_level = 0
       end
 

data/lib/js_regex/converter/group_converter.rb

@@ -11,11 +11,12 @@ class JsRegex
       def convert_data
         case subtype
         when :atomic then open_atomic_group
-        when :capture, :passive then open_group
+        when :capture then open_group
         when :close then close_group
         when :comment then '' # drop whole group w/o warning
         when :named_ab, :named_sq then open_group('(') # drop name w/o warning
         when :options then open_options_group
+        when :passive then open_group('(?:', false)
         else
           warn_of_unsupported_feature
           open_group('(')
@@ -27,7 +28,7 @@ class JsRegex
         # http://instanceof.me/post/52245507631
         # regex-emulate-atomic-grouping-with-lookahead
         context.group_level_for_backreference = context.group_level
-        context.group_number_for_backreference = context.opened_groups + 1
+        context.group_number_for_backreference = context.captured_groups + 1
         open_assertion('(?=(')
       end
 
@@ -36,9 +37,9 @@ class JsRegex
         open_group('(')
       end
 
-      def open_group(group_head = pass_through)
+      def open_group(group_head = pass_through, capturing = true)
         context.group_level += 1
-        context.opened_groups += 1
+        context.captured_groups += 1 if capturing
         group_head
       end
 
@@ -71,6 +72,7 @@ class JsRegex
 
       def close_atomic_group
         context.group_level_for_backreference = nil
+        context.group_count_changed = true
         # the empty passive group (?:) is appended in case literal digits follow
         "))\\#{context.group_number_for_backreference}(?:)"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp_parser
@@ -92,6 +92,7 @@ files:
 - lib/js_regex/conversion.rb
 - lib/js_regex/converter/anchor_converter.rb
 - lib/js_regex/converter/assertion_converter.rb
+- lib/js_regex/converter/backref_converter.rb
 - lib/js_regex/converter/base.rb
 - lib/js_regex/converter/conditional_converter.rb
 - lib/js_regex/converter/context.rb