regexp_parser 2.10.0 → 2.11.0

data/lib/regexp_parser/scanner.rb

@@ -3,7 +3,7 @@
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
 #
 # This file was generated from scanner.rl
-# by running `bundle exec rake ragel:rb`
+# by running `bundle exec rake `
 
 
 require_relative 'scanner/errors/scanner_error'
@@ -28,6 +28,7 @@ class Regexp::Scanner
 
     input = input_object.is_a?(Regexp) ? input_object.source : input_object
     self.free_spacing = free_spacing?(input_object, options)
+    self.regexp_encoding = input_object.encoding if input_object.is_a?(::Regexp)
     self.spacing_stack = [{:free_spacing => free_spacing, :depth => 0}]
 
     data  = input.unpack("c*")
@@ -38,6 +39,7 @@ class Regexp::Scanner
 
     self.set_depth = 0
     self.group_depth = 0
+    self.capturing_group_count = 0
     self.conditional_stack = []
     self.char_pos = 0
 
@@ -70,25 +72,28 @@ self._re_scanner_trans_keys = [
 48,102,48,102,48,102,
 48,102,9,125,9,
 125,9,125,9,125,
-9,125,9,125,48,123,
-39,39,41,41,41,
-57,62,62,-128,127,
--62,-12,1,127,1,127,
-9,32,33,126,10,
-10,63,63,33,126,
-33,126,43,63,43,63,
-43,63,65,122,44,
-57,68,119,80,112,
--62,125,-128,-65,-128,-65,
--128,-65,38,38,38,
-93,58,58,48,120,
-48,55,48,55,-62,125,
--128,-65,-128,-65,-128,
--65,48,55,48,55,
-48,57,77,77,45,45,
-0,0,67,99,45,
-45,0,0,92,92,
-48,102,39,60,39,57,
+9,125,9,125,48,102,
+120,120,56,102,48,
+102,39,39,41,41,
+41,57,62,62,-128,127,
+-62,-12,1,127,1,
+127,9,32,33,126,
+10,10,63,63,33,126,
+33,126,43,63,43,
+63,43,63,65,122,
+44,57,68,119,80,112,
+-62,125,-128,-65,-128,
+-65,-128,-65,38,38,
+38,93,58,58,48,120,
+48,55,48,55,-62,
+125,-128,-65,-128,-65,
+-128,-65,48,55,48,55,
+48,57,48,57,48,
+57,48,57,77,77,
+45,45,0,0,67,99,
+45,45,0,0,92,
+92,48,102,48,102,
+92,92,39,60,39,57,
 48,57,41,57,33,
 62,0
 ]
@@ -106,13 +111,14 @@ self._re_scanner_key_spans = [
 117,114,64,64,1,36,36,64,
 64,1,1,1,1,1,1,76,
 55,55,55,55,117,117,117,117,
-117,117,76,1,1,17,1,256,
-51,127,127,24,94,1,1,94,
-94,21,21,21,58,14,52,33,
-188,64,64,64,1,56,1,73,
-8,8,188,64,64,64,8,8,
-10,1,1,0,33,1,0,1,
-55,22,19,10,17,30
+117,117,55,1,47,55,1,1,
+17,1,256,51,127,127,24,94,
+1,1,94,94,21,21,21,58,
+14,52,33,188,64,64,64,1,
+56,1,73,8,8,188,64,64,
+64,8,8,10,10,10,10,1,
+1,0,33,1,0,1,55,55,
+1,22,19,10,17,30
 ]
 
 class << self
@@ -128,13 +134,14 @@ self._re_scanner_index_offsets = [
 940,1058,1173,1238,1303,1305,1342,1379,
 1444,1509,1511,1513,1515,1517,1519,1521,
 1598,1654,1710,1766,1822,1940,2058,2176,
-2294,2412,2530,2607,2609,2611,2629,2631,
-2888,2940,3068,3196,3221,3316,3318,3320,
-3415,3510,3532,3554,3576,3635,3650,3703,
-3737,3926,3991,4056,4121,4123,4180,4182,
-4256,4265,4274,4463,4528,4593,4658,4667,
-4676,4687,4689,4691,4692,4726,4728,4729,
-4731,4787,4810,4830,4841,4859
+2294,2412,2530,2586,2588,2636,2692,2694,
+2696,2714,2716,2973,3025,3153,3281,3306,
+3401,3403,3405,3500,3595,3617,3639,3661,
+3720,3735,3788,3822,4011,4076,4141,4206,
+4208,4265,4267,4341,4350,4359,4548,4613,
+4678,4743,4752,4761,4772,4783,4794,4805,
+4807,4809,4810,4844,4846,4847,4849,4905,
+4961,4963,4986,5006,5017,5035
 ]
 
 class << self
@@ -459,19 +466,29 @@ self._re_scanner_indicies = [
 43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,
 74,43,82,82,82,82,82,82,
-82,82,82,82,81,81,81,81,
-81,81,81,82,82,82,82,82,
-82,81,81,81,81,81,81,81,
+82,82,83,83,81,81,81,81,
+81,81,81,83,83,83,83,83,
+83,81,81,81,81,81,81,81,
 81,81,81,81,81,81,81,81,
 81,81,81,81,81,81,81,81,
-81,81,81,82,82,82,82,82,
-82,81,81,81,81,81,81,81,
-81,81,81,81,81,81,81,81,
-81,81,81,81,81,43,81,85,
-84,86,83,86,83,83,83,83,
-83,83,87,87,87,87,87,87,
-87,87,87,87,83,85,88,43,
-43,43,43,43,43,43,43,43,
+81,81,81,83,83,83,83,83,
+83,81,85,84,86,86,84,84,
+84,84,84,84,84,86,86,86,
+86,86,86,84,84,84,84,84,
+84,84,84,84,84,84,84,84,
+84,84,84,84,84,84,84,84,
+84,84,84,84,84,86,86,86,
+86,86,86,84,87,87,87,87,
+87,87,87,87,87,87,84,84,
+84,84,84,84,84,87,87,87,
+87,87,87,84,84,84,84,84,
+84,84,84,84,84,84,84,84,
+84,84,84,84,84,84,84,84,
+84,84,84,84,84,87,87,87,
+87,87,87,84,90,89,91,88,
+91,88,88,88,88,88,88,92,
+92,92,92,92,92,92,92,92,
+92,88,90,93,43,43,43,43,
 43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,
@@ -479,160 +496,161 @@ self._re_scanner_indicies = [
 43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,
-43,2,2,2,2,2,2,2,
+43,43,43,43,43,43,2,2,
 2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,3,
+2,2,2,2,2,2,2,2,
+2,2,2,2,3,3,3,3,
 3,3,3,3,3,3,3,3,
-3,3,3,3,3,3,3,89,
-89,89,89,89,43,43,43,43,
-43,43,43,43,43,43,43,43,
-90,90,90,90,90,90,90,90,
-91,91,91,91,91,90,90,90,
-90,90,90,90,90,90,90,90,
-90,90,90,90,90,90,90,92,
-93,93,94,95,93,93,93,96,
-97,98,99,93,93,100,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,101,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,102,103,104,105,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,106,107,104,93,90,93,
+3,3,3,3,94,94,94,94,
+94,43,43,43,43,43,43,43,
+43,43,43,43,43,95,95,95,
+95,95,95,95,95,96,96,96,
+96,96,95,95,95,95,95,95,
+95,95,95,95,95,95,95,95,
+95,95,95,95,97,98,98,99,
+100,98,98,98,101,102,103,104,
+98,98,105,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,106,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,107,
+108,109,110,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,111,
+112,109,98,95,98,2,2,2,
 2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,3,3,
+2,2,2,3,3,3,3,3,
 3,3,3,3,3,3,3,3,
-3,3,3,3,3,3,89,89,
-89,89,89,108,90,90,90,90,
-90,90,90,90,90,90,90,90,
-90,90,90,90,90,90,90,90,
-90,90,90,90,90,90,90,90,
-90,90,90,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,108,108,108,108,108,108,
-108,108,90,108,90,90,90,90,
-90,90,90,90,91,91,91,91,
-91,90,90,90,90,90,90,90,
-90,90,90,90,90,90,90,90,
-90,90,90,92,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,90,109,92,92,92,92,
-92,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,
-109,109,109,92,109,93,93,108,
-108,93,93,93,108,108,108,108,
-93,93,108,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,108,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,108,
-108,108,108,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,93,
-93,93,93,93,93,93,93,108,
-108,108,93,108,111,94,113,112,
-10,115,5,115,115,115,116,117,
-114,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,8,115,118,10,8,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,8,115,114,
-115,114,115,115,115,114,114,114,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-119,115,114,114,114,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,115,115,115,115,
-115,115,115,115,114,115,121,120,
+3,3,3,94,94,94,94,94,
+113,95,95,95,95,95,95,95,
+95,95,95,95,95,95,95,95,
+95,95,95,95,95,95,95,95,
+95,95,95,95,95,95,95,95,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,113,
+113,113,113,113,113,113,113,95,
+113,95,95,95,95,95,95,95,
+95,96,96,96,96,96,95,95,
+95,95,95,95,95,95,95,95,
+95,95,95,95,95,95,95,95,
+97,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,95,
+114,97,97,97,97,97,114,114,
+114,114,114,114,114,114,114,114,
+114,114,114,114,114,114,114,114,
+97,114,98,98,113,113,98,98,
+98,113,113,113,113,98,98,113,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+113,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,113,113,113,113,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,98,98,98,98,
+98,98,98,98,113,113,113,98,
+113,116,99,118,117,10,120,5,
+120,120,120,121,122,119,120,120,
 120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,8,120,
+123,10,8,120,120,120,120,120,
 120,120,120,120,120,120,120,120,
-120,120,121,120,123,122,122,122,
-122,122,122,122,122,122,122,122,
-122,122,122,122,122,122,122,122,
-123,122,125,124,124,124,124,124,
-124,124,124,124,124,124,124,124,
-124,124,124,124,124,124,125,124,
-127,127,126,126,126,126,127,126,
-126,126,128,126,126,126,126,126,
-126,126,126,126,126,126,126,126,
-126,127,126,126,126,126,126,126,
-126,127,126,126,126,126,129,126,
-126,126,130,126,126,126,126,126,
-126,126,126,126,126,126,126,126,
-126,127,126,132,131,131,131,41,
-41,41,41,41,41,41,41,41,
-41,131,133,43,43,43,133,43,
-43,43,43,43,43,43,43,43,
-133,133,43,43,43,133,133,43,
-43,43,43,43,43,43,43,43,
-43,43,133,43,43,43,133,43,
-43,43,43,43,43,43,43,43,
-43,133,43,43,43,133,43,134,
-43,43,43,43,43,43,43,43,
-43,43,43,43,43,43,43,43,
-43,43,43,43,43,43,43,43,
-43,43,43,43,43,43,43,134,
-43,135,135,135,135,135,135,135,
-135,135,135,135,135,135,135,135,
-135,135,135,135,135,135,135,135,
-135,135,135,135,135,135,135,136,
-136,136,136,136,136,136,136,136,
-136,136,136,136,136,136,136,137,
-137,137,137,137,48,48,48,48,
-48,48,48,48,48,48,48,48,
-48,48,48,48,48,48,48,48,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,8,120,119,120,119,120,
+120,120,119,119,119,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,124,120,119,
+119,119,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,
+120,119,120,126,125,125,125,125,
+125,125,125,125,125,125,125,125,
+125,125,125,125,125,125,125,126,
+125,128,127,127,127,127,127,127,
+127,127,127,127,127,127,127,127,
+127,127,127,127,127,128,127,130,
+129,129,129,129,129,129,129,129,
+129,129,129,129,129,129,129,129,
+129,129,129,130,129,132,132,131,
+131,131,131,132,131,131,131,133,
+131,131,131,131,131,131,131,131,
+131,131,131,131,131,131,132,131,
+131,131,131,131,131,131,132,131,
+131,131,131,134,131,131,131,135,
+131,131,131,131,131,131,131,131,
+131,131,131,131,131,131,132,131,
+137,136,136,136,41,41,41,41,
+41,41,41,41,41,41,136,138,
+43,43,43,138,43,43,43,43,
+43,43,43,43,43,138,138,43,
+43,43,138,138,43,43,43,43,
+43,43,43,43,43,43,43,138,
+43,43,43,138,43,43,43,43,
+43,43,43,43,43,43,138,43,
+43,43,138,43,139,43,43,43,
+43,43,43,43,43,43,43,43,
+43,43,43,43,43,43,43,43,
+43,43,43,43,43,43,43,43,
+43,43,43,43,139,43,140,140,
+140,140,140,140,140,140,140,140,
+140,140,140,140,140,140,140,140,
+140,140,140,140,140,140,140,140,
+140,140,140,140,141,141,141,141,
+141,141,141,141,141,141,141,141,
+141,141,141,141,142,142,142,142,
+142,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
-48,48,48,138,48,139,48,138,
-138,138,138,48,140,138,48,48,
 48,48,48,48,48,48,48,48,
-48,48,48,48,48,48,138,48,
 48,48,48,48,48,48,48,48,
+143,48,144,48,143,143,143,143,
+48,145,143,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
+48,48,48,143,48,48,48,48,
 48,48,48,48,48,48,48,48,
-48,48,141,142,143,144,48,48,
 48,48,48,48,48,48,48,48,
+48,48,48,48,48,48,48,146,
+147,148,149,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
-48,48,138,138,138,48,48,48,
+48,48,48,48,48,48,48,143,
+143,143,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
@@ -640,7 +658,7 @@ self._re_scanner_indicies = [
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
 48,48,48,48,48,48,48,48,
-48,48,48,48,48,48,145,49,
+48,48,48,150,49,49,49,49,
 49,49,49,49,49,49,49,49,
 49,49,49,49,49,49,49,49,
 49,49,49,49,49,49,49,49,
@@ -648,58 +666,58 @@ self._re_scanner_indicies = [
 49,49,49,49,49,49,49,49,
 49,49,49,49,49,49,49,49,
 49,49,49,49,49,49,49,49,
-49,49,49,49,49,49,49,145,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-146,146,146,146,146,146,146,146,
-145,147,145,149,148,148,148,148,
-148,148,148,148,148,148,148,148,
-148,148,148,148,148,148,148,148,
-148,148,148,148,148,148,148,148,
-148,148,148,148,148,148,148,148,
-148,148,148,148,148,148,148,148,
-148,148,148,148,148,148,148,148,
-148,148,150,148,53,152,154,154,
-154,154,154,154,154,154,153,153,
+49,49,49,49,150,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,
+151,151,151,151,151,150,152,150,
+154,153,153,153,153,153,153,153,
+153,153,153,153,153,153,153,153,
+153,153,153,153,153,153,153,153,
+153,153,153,153,153,153,153,153,
+153,153,153,153,153,153,153,153,
 153,153,153,153,153,153,153,153,
-153,155,155,153,153,153,155,153,
-153,153,153,155,153,153,155,153,
-153,155,153,153,153,155,153,153,
-153,155,155,155,153,153,153,155,
-155,155,155,155,155,153,155,153,
-153,153,153,153,155,153,155,153,
-155,155,155,155,155,155,155,153,
-157,157,157,157,157,157,157,157,
-156,158,158,158,158,158,158,158,
-158,156,159,159,159,159,159,159,
-159,159,159,159,159,159,159,159,
-159,159,159,159,159,159,159,159,
-159,159,159,159,159,159,159,159,
-160,160,160,160,160,160,160,160,
-160,160,160,160,160,160,160,160,
-161,161,161,161,161,58,58,58,
+153,153,153,153,153,153,153,155,
+153,53,157,159,159,159,159,159,
+159,159,159,158,158,158,158,158,
+158,158,158,158,158,158,160,160,
+158,158,158,160,158,158,158,158,
+160,158,158,160,158,158,160,158,
+158,158,160,158,158,158,160,160,
+160,158,158,158,160,160,160,160,
+160,160,158,160,158,158,158,158,
+158,160,158,160,158,160,160,160,
+160,160,160,160,158,162,162,162,
+162,162,162,162,162,161,163,163,
+163,163,163,163,163,163,161,164,
+164,164,164,164,164,164,164,164,
+164,164,164,164,164,164,164,164,
+164,164,164,164,164,164,164,164,
+164,164,164,164,164,165,165,165,
+165,165,165,165,165,165,165,165,
+165,165,165,165,165,166,166,166,
+166,166,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
-58,58,58,58,162,58,58,58,
-162,162,162,162,58,58,162,58,
-163,164,164,164,164,164,164,164,
-165,165,58,58,58,58,58,162,
-58,43,43,166,167,58,58,43,
-167,58,58,43,58,168,58,58,
-169,58,167,167,58,58,58,167,
-167,58,43,162,162,162,162,58,
-58,170,170,60,167,170,170,58,
-167,58,58,58,58,58,170,58,
-169,58,170,167,170,171,170,167,
-172,58,43,162,162,162,58,58,
+58,167,58,58,58,167,167,167,
+167,58,58,167,58,168,169,169,
+169,169,169,169,169,170,170,58,
+58,58,58,58,167,58,43,43,
+171,172,58,58,43,172,58,58,
+43,58,173,58,58,174,58,172,
+172,58,58,58,172,172,58,43,
+167,167,167,167,58,58,175,175,
+60,172,175,175,58,172,58,58,
+58,58,58,175,58,174,58,175,
+172,175,176,175,172,177,58,43,
+167,167,167,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
@@ -707,7 +725,7 @@ self._re_scanner_indicies = [
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,
-58,58,58,58,58,58,58,173,
+58,58,58,58,178,59,59,59,
 59,59,59,59,59,59,59,59,
 59,59,59,59,59,59,59,59,
 59,59,59,59,59,59,59,59,
@@ -715,45 +733,56 @@ self._re_scanner_indicies = [
 59,59,59,59,59,59,59,59,
 59,59,59,59,59,59,59,59,
 59,59,59,59,59,59,59,59,
-59,59,59,59,59,59,59,59,
-173,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,174,174,174,174,174,174,174,
-174,173,176,176,176,176,176,176,
-176,176,175,178,178,178,178,178,
-178,178,178,177,180,180,180,180,
-180,180,180,180,180,180,179,182,
-61,184,183,61,186,66,66,66,
+59,59,59,59,59,178,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,178,181,
+181,181,181,181,181,181,181,180,
+182,182,182,182,182,182,182,182,
+180,184,184,184,184,184,184,184,
+184,185,185,183,185,185,185,185,
+185,185,185,185,185,185,183,185,
+185,185,185,185,185,185,185,185,
+185,183,185,185,185,185,185,185,
+185,185,185,185,183,187,61,189,
+188,61,191,66,66,66,66,66,
 66,66,66,66,66,66,66,66,
 66,66,66,66,66,66,66,66,
 66,66,66,66,66,66,66,66,
-66,66,66,66,187,66,189,188,
-66,69,66,191,191,191,191,191,
-191,191,191,191,191,190,190,190,
-190,190,190,190,191,191,191,191,
-191,191,190,190,190,190,190,190,
-190,190,190,190,190,190,190,190,
-190,190,190,190,190,190,190,190,
-190,190,190,190,191,191,191,191,
-191,191,190,193,192,192,192,192,
-192,194,192,192,195,195,195,195,
-195,195,195,195,195,195,192,192,
-196,192,85,84,84,84,84,84,
-197,84,84,197,197,197,197,197,
-197,197,197,197,197,84,87,87,
-87,87,87,87,87,87,87,87,
-197,86,197,197,197,197,197,197,
-87,87,87,87,87,87,87,87,
-87,87,197,197,88,88,88,88,
-88,88,88,88,88,88,88,197,
-88,88,197,197,197,197,197,197,
-197,197,197,197,88,88,88,197,
-85,88,0
+66,66,192,66,194,193,66,69,
+66,196,196,196,196,196,196,196,
+196,196,196,195,195,195,195,195,
+195,195,196,196,196,196,196,196,
+195,195,195,195,195,195,195,195,
+195,195,195,195,195,195,195,195,
+195,195,195,195,195,195,195,195,
+195,195,196,196,196,196,196,196,
+195,87,87,87,87,87,87,87,
+87,87,87,195,195,195,195,195,
+195,195,87,87,87,87,87,87,
+195,195,195,195,195,195,195,195,
+195,195,195,195,195,195,195,195,
+195,195,195,195,195,195,195,195,
+195,195,87,87,87,87,87,87,
+195,198,197,200,199,199,199,199,
+199,201,199,199,202,202,202,202,
+202,202,202,202,202,202,199,199,
+203,199,90,89,89,89,89,89,
+204,89,89,204,204,204,204,204,
+204,204,204,204,204,89,92,92,
+92,92,92,92,92,92,92,92,
+204,91,204,204,204,204,204,204,
+92,92,92,92,92,92,92,92,
+92,92,204,204,93,93,93,93,
+93,93,93,93,93,93,93,204,
+93,93,204,204,204,204,204,204,
+204,204,204,204,93,93,93,204,
+90,93,0
 ]
 
 class << self
@@ -761,31 +790,32 @@ class << self
 	private :_re_scanner_trans_targs, :_re_scanner_trans_targs=
 end
 self._re_scanner_trans_targs = [
-71,72,1,2,71,4,71,6,
-71,8,71,71,10,16,11,71,
+74,75,1,2,74,4,74,6,
+74,8,74,74,10,16,11,74,
 12,13,14,15,17,18,19,20,
-21,23,29,24,71,25,26,27,
-28,30,31,32,33,34,71,36,
-71,37,39,0,40,41,87,88,
-88,42,88,88,88,45,46,88,
-88,98,98,47,50,98,105,98,
-107,53,98,108,98,110,56,59,
-57,58,98,60,61,62,63,64,
-65,98,112,113,67,68,113,69,
-70,3,73,74,75,76,77,71,
-78,71,81,82,71,83,71,84,
-71,71,85,71,71,71,71,71,
-71,79,71,80,5,71,7,71,
-71,71,71,71,71,71,71,71,
-71,9,22,71,35,86,38,89,
-90,91,88,92,93,94,88,88,
-88,88,43,88,88,44,88,88,
-88,95,96,95,95,97,95,99,
-100,101,98,102,102,104,49,98,
-52,98,98,55,66,98,48,98,
-103,98,98,98,98,98,106,98,
-51,98,109,111,98,54,98,98,
-113,114,115,116,117,113
+21,23,29,24,74,25,26,27,
+28,30,31,32,33,34,74,36,
+74,37,39,0,40,41,90,91,
+91,42,91,91,91,45,46,91,
+91,101,101,47,50,101,111,101,
+113,53,101,114,101,116,56,59,
+57,58,101,60,61,62,63,64,
+65,101,118,119,101,68,69,120,
+121,70,71,121,72,73,3,76,
+77,78,79,80,74,81,74,84,
+85,74,86,74,87,74,74,88,
+74,74,74,74,74,74,82,74,
+83,5,74,7,74,74,74,74,
+74,74,74,74,74,74,9,22,
+74,35,89,38,92,93,94,91,
+95,96,97,91,91,91,91,43,
+91,91,44,91,91,91,98,99,
+98,98,100,98,102,103,104,101,
+105,107,110,49,101,52,101,101,
+55,66,101,48,101,106,101,101,
+108,109,101,112,101,51,101,115,
+117,101,54,101,101,101,67,121,
+122,123,124,125,121
 ]
 
 class << self
@@ -803,21 +833,22 @@ self._re_scanner_trans_actions = [
 20,21,22,0,0,24,0,25,
 0,0,26,0,27,0,0,0,
 0,0,28,0,0,0,0,0,
-0,29,0,30,0,0,31,0,
-0,0,0,0,0,0,0,34,
-35,36,0,0,37,0,38,39,
-40,41,39,42,43,44,45,46,
-47,39,48,0,0,49,0,50,
-51,52,53,54,55,56,57,58,
-59,0,0,60,0,62,0,0,
-39,39,63,0,39,64,65,66,
-67,68,0,69,70,0,71,72,
-73,74,0,75,76,0,77,0,
-39,39,78,79,80,0,0,81,
-0,82,83,0,0,84,0,85,
-0,86,87,88,89,90,39,91,
-0,92,39,0,93,0,94,95,
-96,39,39,39,39,97
+0,29,0,0,30,0,0,31,
+32,0,0,33,0,0,0,0,
+0,0,0,0,36,37,38,0,
+0,39,0,40,31,41,42,31,
+43,44,45,46,47,48,31,49,
+0,0,50,0,51,52,53,54,
+55,56,57,58,59,60,0,0,
+61,0,63,0,0,31,31,64,
+0,31,65,66,67,68,69,0,
+70,71,0,72,73,74,75,0,
+76,77,0,78,0,31,31,79,
+0,0,0,0,80,0,81,82,
+0,0,83,0,84,0,85,86,
+0,0,87,31,88,0,89,31,
+0,90,0,91,92,93,0,94,
+31,31,31,31,95
 ]
 
 class << self
@@ -833,13 +864,14 @@ self._re_scanner_to_state_actions = [
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,32,
 0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,61,61,
-61,0,0,0,0,0,0,61,
-0,0,61,0,0,0,0,0,
+0,0,34,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,62,62,62,0,0,0,0,
+0,0,62,0,0,62,0,0,
 0,0,0,0,0,0,0,0,
-0,61,0,0,0,0
+0,0,0,0,0,0,0,0,
+0,62,0,0,0,0
 ]
 
 class << self
@@ -855,13 +887,14 @@ self._re_scanner_from_state_actions = [
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,33,
 0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,33,33,
-33,0,0,0,0,0,0,33,
-0,0,33,0,0,0,0,0,
+0,0,35,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,35,35,35,0,0,0,0,
+0,0,35,0,0,35,0,0,
 0,0,0,0,0,0,0,0,
-0,33,0,0,0,0
+0,0,0,0,0,0,0,0,
+0,35,0,0,0,0
 ]
 
 class << self
@@ -880,8 +913,9 @@ self._re_scanner_eof_actions = [
 23,23,23,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
-23,0,0,0,0,0,0,0,
-0,0,23,0,0,0,0,0,
+0,0,0,23,0,0,0,0,
+0,0,0,0,0,23,0,0,
+0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0
 ]
@@ -899,23 +933,24 @@ self._re_scanner_eof_trans = [
 0,0,48,48,51,53,53,58,
 58,0,0,64,0,0,69,0,
 0,0,0,0,0,0,0,0,
-0,0,0,84,84,84,84,0,
-109,109,110,110,109,111,113,115,
-115,121,123,125,127,132,0,0,
-0,146,146,146,146,149,152,0,
-157,157,0,174,174,174,176,178,
-180,182,182,182,186,186,186,186,
-191,0,198,198,198,198
+0,0,0,85,85,85,89,89,
+89,89,0,114,114,115,115,114,
+116,118,120,120,126,128,130,132,
+137,0,0,0,151,151,151,151,
+154,157,0,162,162,0,179,179,
+179,181,181,184,184,184,184,187,
+187,187,191,191,191,191,196,196,
+198,0,205,205,205,205
 ]
 
 class << self
 	attr_accessor :re_scanner_start
 end
-self.re_scanner_start = 71;
+self.re_scanner_start = 74;
 class << self
 	attr_accessor :re_scanner_first_final
 end
-self.re_scanner_first_final = 71;
+self.re_scanner_first_final = 74;
 class << self
 	attr_accessor :re_scanner_error
 end
@@ -924,31 +959,31 @@ self.re_scanner_error = 0;
 class << self
 	attr_accessor :re_scanner_en_char_type
 end
-self.re_scanner_en_char_type = 86;
+self.re_scanner_en_char_type = 89;
 class << self
 	attr_accessor :re_scanner_en_unicode_property
 end
-self.re_scanner_en_unicode_property = 87;
+self.re_scanner_en_unicode_property = 90;
 class << self
 	attr_accessor :re_scanner_en_character_set
 end
-self.re_scanner_en_character_set = 88;
+self.re_scanner_en_character_set = 91;
 class << self
 	attr_accessor :re_scanner_en_set_escape_sequence
 end
-self.re_scanner_en_set_escape_sequence = 95;
+self.re_scanner_en_set_escape_sequence = 98;
 class << self
 	attr_accessor :re_scanner_en_escape_sequence
 end
-self.re_scanner_en_escape_sequence = 98;
+self.re_scanner_en_escape_sequence = 101;
 class << self
 	attr_accessor :re_scanner_en_conditional_expression
 end
-self.re_scanner_en_conditional_expression = 113;
+self.re_scanner_en_conditional_expression = 121;
 class << self
 	attr_accessor :re_scanner_en_main
 end
-self.re_scanner_en_main = 71;
+self.re_scanner_en_main = 74;
 
 begin
 	p ||= 0
@@ -982,7 +1017,7 @@ begin
 	end
 	if _goto_level <= _resume
 	case _re_scanner_from_state_actions[cs]
-	when 33 then
+	when 35 then
 		begin
 ts = p
 		end
@@ -1004,14 +1039,14 @@ ts = p
 	cs = _re_scanner_trans_targs[_trans]
 	if _re_scanner_trans_actions[_trans] != 0
 	case _re_scanner_trans_actions[_trans]
-	when 35 then
+	when 37 then
 		begin
  self.group_depth = group_depth + 1 		end
-	when 39 then
+	when 31 then
 		begin
 te = p+1
 		end
-	when 62 then
+	when 63 then
 		begin
 te = p+1
  begin
@@ -1067,7 +1102,7 @@ te = p+1
       emit(:set, :intersection, '&&')
      end
 		end
-	when 67 then
+	when 68 then
 		begin
 te = p+1
  begin
@@ -1078,28 +1113,28 @@ te = p+1
       end
      end
 		end
-	when 69 then
+	when 70 then
 		begin
 te = p+1
  begin
       emit(:set, :intersection, '&&')
      end
 		end
-	when 65 then
+	when 66 then
 		begin
 te = p+1
  begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 95
+		cs = 98
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 63 then
+	when 64 then
 		begin
 te = p+1
  begin
@@ -1114,7 +1149,7 @@ te = p+1
       emit(:literal, :literal, text)
      end
 		end
-	when 70 then
+	when 71 then
 		begin
 te = p
 p = p - 1; begin
@@ -1127,7 +1162,7 @@ p = p - 1; begin
       end
      end
 		end
-	when 73 then
+	when 74 then
 		begin
 te = p
 p = p - 1; begin
@@ -1135,14 +1170,14 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 88
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 68 then
+	when 69 then
 		begin
 te = p
 p = p - 1; begin
@@ -1171,7 +1206,7 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 88
+		cs = 91
 		_goto_level = _again
 		next
 	end
@@ -1186,7 +1221,7 @@ p = p - 1; begin
       emit(:literal, :literal, text)
      end
 		end
-	when 77 then
+	when 78 then
 		begin
 te = p+1
  begin
@@ -1200,23 +1235,23 @@ te = p+1
 
      end
 		end
-	when 75 then
+	when 76 then
 		begin
 te = p+1
  begin
       p = p - 1;
-      cs = 88;
+      cs = 91;
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 98
+		cs = 101
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 74 then
+	when 75 then
 		begin
 te = p+1
  begin
@@ -1230,7 +1265,7 @@ te = p+1
 
      end
 		end
-	when 76 then
+	when 77 then
 		begin
 te = p
 p = p - 1; begin
@@ -1244,7 +1279,7 @@ p = p - 1; begin
 
      end
 		end
-	when 87 then
+	when 85 then
 		begin
 te = p+1
  begin
@@ -1258,23 +1293,7 @@ te = p+1
 
      end
 		end
-	when 89 then
-		begin
-te = p+1
- begin  # special case, emits two tokens
-      text = copy(data, ts-1,te)
-      emit(:escape, :literal, text[0,2])
-      emit(:literal, :literal, text[2])
-      	begin
-		top -= 1
-		cs = stack[top]
-		_goto_level = _again
-		next
-	end
-
-     end
-		end
-	when 78 then
+	when 79 then
 		begin
 te = p+1
  begin
@@ -1304,7 +1323,7 @@ te = p+1
 
      end
 		end
-	when 83 then
+	when 82 then
 		begin
 te = p+1
  begin
@@ -1348,7 +1367,7 @@ te = p+1
 
      end
 		end
-	when 95 then
+	when 92 then
 		begin
 te = p+1
  begin
@@ -1390,32 +1409,32 @@ te = p+1
 
      end
 		end
-	when 81 then
+	when 80 then
 		begin
 te = p+1
  begin
       p = p - 1;
-      cs = ((in_set? ? 88 : 71));
+      cs = ((in_set? ? 91 : 74));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 86
+		cs = 89
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 82 then
+	when 81 then
 		begin
 te = p+1
  begin
       p = p - 1;
-      cs = ((in_set? ? 88 : 71));
+      cs = ((in_set? ? 91 : 74));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 87
+		cs = 90
 		_goto_level = _again
 		next
 	end
@@ -1436,12 +1455,24 @@ te = p+1
 
      end
 		end
-	when 88 then
+	when 86 then
 		begin
 te = p
 p = p - 1; begin
       text = copy(data, ts-1,te)
-      emit(:backref, :number, text)
+
+      # If not enough groups have been opened, there is a fallback to either an
+      # octal or literal interpretation for 2+ digit numerical escapes.
+      digits = text[1..-1]
+      if digits.size == 1 || digits.to_i <= self.capturing_group_count
+        emit(:backref, :number, text)
+      elsif digits =~ /\A[0-7]{2,}\z/
+        emit(:escape, :octal, text)
+      else
+        emit(:escape, :literal, text[0..1])
+        emit(:literal, :literal, text[2..-1])
+      end
+
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1451,7 +1482,7 @@ p = p - 1; begin
 
      end
 		end
-	when 86 then
+	when 84 then
 		begin
 te = p
 p = p - 1; begin
@@ -1465,11 +1496,16 @@ p = p - 1; begin
 
      end
 		end
-	when 94 then
+	when 93 then
 		begin
 te = p
 p = p - 1; begin
-      emit(:escape, :hex, copy(data, ts-1,te))
+      text = copy(data, ts-1,te)
+      if regexp_encoding == Encoding::BINARY
+        text.split(/(?=\\)/).each { |part| emit(:escape, :hex, part) }
+      else
+        emit(:escape, :utf8_hex, text)
+      end
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1483,7 +1519,7 @@ p = p - 1; begin
 		begin
 te = p
 p = p - 1; begin
-      emit_meta_control_sequence(data, ts, te, :control)
+      emit(:escape, :hex, copy(data, ts-1,te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1493,11 +1529,11 @@ p = p - 1; begin
 
      end
 		end
-	when 93 then
+	when 88 then
 		begin
 te = p
 p = p - 1; begin
-      emit_meta_control_sequence(data, ts, te, :meta_sequence)
+      emit_meta_control_sequence(data, ts, te, :control)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1507,11 +1543,11 @@ p = p - 1; begin
 
      end
 		end
-	when 84 then
+	when 90 then
 		begin
 te = p
 p = p - 1; begin
-      emit(:escape, :literal, copy(data, ts-1,te))
+      emit_meta_control_sequence(data, ts, te, :meta_sequence)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1521,10 +1557,10 @@ p = p - 1; begin
 
      end
 		end
-	when 21 then
+	when 83 then
 		begin
- begin p = ((te))-1; end
- begin
+te = p
+p = p - 1; begin
       emit(:escape, :literal, copy(data, ts-1,te))
       	begin
 		top -= 1
@@ -1535,14 +1571,16 @@ p = p - 1; begin
 
      end
 		end
-	when 85 then
+	when 30 then
 		begin
-	case act
-	when 17 then
-	begin begin p = ((te))-1; end
-
+ begin p = ((te))-1; end
+ begin
       text = copy(data, ts-1,te)
-      emit(:backref, :number, text)
+      if regexp_encoding == Encoding::BINARY
+        text.split(/(?=\\)/).each { |part| emit(:escape, :hex, part) }
+      else
+        emit(:escape, :utf8_hex, text)
+      end
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1550,11 +1588,13 @@ p = p - 1; begin
 		next
 	end
 
-    end
-	when 18 then
-	begin begin p = ((te))-1; end
-
-      emit(:escape, :octal, copy(data, ts-1,te))
+     end
+		end
+	when 21 then
+		begin
+ begin p = ((te))-1; end
+ begin
+      emit(:escape, :literal, copy(data, ts-1,te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1562,10 +1602,9 @@ p = p - 1; begin
 		next
 	end
 
-    end
-end
-			end
-	when 31 then
+     end
+		end
+	when 33 then
 		begin
 te = p+1
  begin
@@ -1575,7 +1614,7 @@ te = p+1
       emit(:conditional, :condition_close, ')')
      end
 		end
-	when 96 then
+	when 94 then
 		begin
 te = p+1
  begin
@@ -1583,14 +1622,14 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 71
+		cs = 74
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 97 then
+	when 95 then
 		begin
 te = p
 p = p - 1; begin
@@ -1598,14 +1637,14 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 71
+		cs = 74
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 30 then
+	when 32 then
 		begin
  begin p = ((te))-1; end
  begin
@@ -1613,21 +1652,21 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 71
+		cs = 74
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 37 then
+	when 39 then
 		begin
 te = p+1
  begin
       emit(:meta, :dot, copy(data, ts, te))
      end
 		end
-	when 42 then
+	when 43 then
 		begin
 te = p+1
  begin
@@ -1638,28 +1677,28 @@ te = p+1
       end
      end
 		end
-	when 41 then
+	when 42 then
 		begin
 te = p+1
  begin
       emit(:anchor, :bol, copy(data, ts, te))
      end
 		end
-	when 34 then
+	when 36 then
 		begin
 te = p+1
  begin
       emit(:anchor, :eol, copy(data, ts, te))
      end
 		end
-	when 59 then
+	when 60 then
 		begin
 te = p+1
  begin
       emit(:keep, :mark, copy(data, ts, te))
      end
 		end
-	when 58 then
+	when 59 then
 		begin
 te = p+1
  begin
@@ -1673,14 +1712,14 @@ te = p+1
       end
      end
 		end
-	when 40 then
+	when 41 then
 		begin
 te = p+1
  begin
       append_literal(data, ts, te)
      end
 		end
-	when 49 then
+	when 50 then
 		begin
 te = p+1
  begin
@@ -1693,14 +1732,14 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 113
+		cs = 121
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 50 then
+	when 51 then
 		begin
 te = p+1
  begin
@@ -1780,7 +1819,7 @@ te = p+1
       end
      end
 		end
-	when 56 then
+	when 57 then
 		begin
 te = p+1
  begin
@@ -1791,7 +1830,7 @@ te = p+1
       end
      end
 		end
-	when 52 then
+	when 53 then
 		begin
 te = p+1
  begin
@@ -1802,7 +1841,7 @@ te = p+1
       end
      end
 		end
-	when 54 then
+	when 55 then
 		begin
 te = p+1
  begin
@@ -1820,7 +1859,7 @@ te = p+1
       emit(:quantifier, :interval, copy(data, ts, te))
      end
 		end
-	when 46 then
+	when 47 then
 		begin
 te = p+1
  begin
@@ -1834,7 +1873,7 @@ te = p+1
       end
      end
 		end
-	when 48 then
+	when 49 then
 		begin
 te = p
 p = p - 1; begin
@@ -1845,15 +1884,16 @@ p = p - 1; begin
       emit_options(text)
      end
 		end
-	when 47 then
+	when 48 then
 		begin
 te = p
 p = p - 1; begin
+      self.capturing_group_count += 1
       text = copy(data, ts, te)
       emit(:group, :capture, text)
      end
 		end
-	when 55 then
+	when 56 then
 		begin
 te = p
 p = p - 1; begin
@@ -1864,7 +1904,7 @@ p = p - 1; begin
       end
      end
 		end
-	when 51 then
+	when 52 then
 		begin
 te = p
 p = p - 1; begin
@@ -1875,7 +1915,7 @@ p = p - 1; begin
       end
      end
 		end
-	when 53 then
+	when 54 then
 		begin
 te = p
 p = p - 1; begin
@@ -1886,28 +1926,28 @@ p = p - 1; begin
       end
      end
 		end
-	when 60 then
+	when 61 then
 		begin
 te = p
 p = p - 1; begin
       append_literal(data, ts, te)
      end
 		end
-	when 57 then
+	when 58 then
 		begin
 te = p
 p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 98
+		cs = 101
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 45 then
+	when 46 then
 		begin
 te = p
 p = p - 1; begin
@@ -1921,7 +1961,7 @@ p = p - 1; begin
       end
      end
 		end
-	when 44 then
+	when 45 then
 		begin
 te = p
 p = p - 1; begin
@@ -1932,7 +1972,7 @@ p = p - 1; begin
       end
      end
 		end
-	when 43 then
+	when 44 then
 		begin
 te = p
 p = p - 1; begin
@@ -1964,7 +2004,7 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 98
+		cs = 101
 		_goto_level = _again
 		next
 	end
@@ -1981,14 +2021,14 @@ p = p - 1; begin
 		next
 	end
 end
-	when 57 then
+	when 58 then
 	begin begin p = ((te))-1; end
 
       append_literal(data, ts, te)
     end
 end
 			end
-	when 72 then
+	when 73 then
 		begin
 
     text = copy(data, ts ? ts-1 : 0,-1)
@@ -2001,7 +2041,7 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 88
+		cs = 91
 		_goto_level = _again
 		next
 	end
@@ -2021,14 +2061,14 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 88
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 90 then
+	when 87 then
 		begin
 
     text = copy(data, ts ? ts-1 : 0,-1)
@@ -2047,7 +2087,7 @@ p = p - 1; begin
 
      end
 		end
-	when 92 then
+	when 89 then
 		begin
 
     text = copy(data, ts ? ts-1 : 0,-1)
@@ -2131,7 +2171,7 @@ te = p+1
       emit(:group, :comment, copy(data, ts, te))
      end
 		end
-	when 36 then
+	when 38 then
 		begin
  self.group_depth = group_depth - 1 		end
 		begin
@@ -2153,7 +2193,7 @@ te = p+1
       end
      end
 		end
-	when 38 then
+	when 40 then
 		begin
  self.set_depth   = set_depth   + 1 		end
 		begin
@@ -2163,14 +2203,14 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 88
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 66 then
+	when 67 then
 		begin
  self.set_depth   = set_depth   - 1 		end
 		begin
@@ -2187,7 +2227,7 @@ te = p+1
 
       else
         	begin
-		cs = 71
+		cs = 74
 		_goto_level = _again
 		next
 	end
@@ -2195,7 +2235,7 @@ te = p+1
       end
      end
 		end
-	when 71 then
+	when 72 then
 		begin
  self.set_depth   = set_depth   - 1 		end
 		begin
@@ -2213,7 +2253,7 @@ te = p+1
 
       else
         	begin
-		cs = 71
+		cs = 74
 		_goto_level = _again
 		next
 	end
@@ -2236,46 +2276,34 @@ te = p+1
         type = :nonposixclass
       end
 
-      unless self.class.posix_classes.include?(class_name)
+      unless POSIX_CLASSES[class_name]
         raise ValidationError.for(:posix_class, text)
       end
 
       emit(type, class_name.to_sym, text)
      end
 		end
-	when 64 then
+	when 65 then
 		begin
 te = p+1
 		end
 		begin
  self.set_depth   = set_depth   + 1 		end
-	when 80 then
-		begin
-te = p+1
-		end
-		begin
-act = 17;		end
-	when 79 then
-		begin
-te = p+1
-		end
-		begin
-act = 18;		end
 	when 2 then
 		begin
 te = p+1
 		end
 		begin
-act = 57;		end
+act = 58;		end
 	end
 	end
 	end
 	if _goto_level <= _again
 	case _re_scanner_to_state_actions[cs]
-	when 61 then
+	when 62 then
 		begin
 ts = nil;		end
-	when 32 then
+	when 34 then
 		begin
 ts = nil;		end
 		begin
@@ -2354,10 +2382,9 @@ end
     File.read("#{__dir__}/scanner/properties/#{name}.csv").scan(/(.+),(.+)/).to_h
   end
 
-  def self.posix_classes
+  POSIX_CLASSES =
     %w[alnum alpha ascii blank cntrl digit graph
-       lower print punct space upper word xdigit]
-  end
+       lower print punct space upper word xdigit].to_h { |c| [c, true] }.freeze
 
   # Emits an array with the details of the scanned pattern
   def emit(type, token, text)
@@ -2392,7 +2419,9 @@ end
   attr_accessor :block,
                 :collect_tokens, :tokens, :prev_token,
                 :free_spacing, :spacing_stack,
+                :regexp_encoding,
                 :group_depth, :set_depth, :conditional_stack,
+                :capturing_group_count,
                 :char_pos
 
   def free_spacing?(input_object, options)