regexp_parser 1.8.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1c795eb67eee01aa7976a672349b9a0c7f6364262ffb8f53488f6d9949db07
-  data.tar.gz: a38fddc769f16841e54f5dde90535e31ef7145e5bd41560ccf70443968495493
+  metadata.gz: dcf56dd42e703e7f1f846762c418e83792d46f2c7d9efffc1fb1612b4325e076
+  data.tar.gz: a6197d98af2325a93ed60a102f09bc98e2163dec0d2b57fbede82dbf0479ea8b
 SHA512:
-  metadata.gz: 8dfcd3ba9f2a09370142e892184ccb9a1a973e24dea691582ca43cc670589dd7050eb30dbd924ae9e0584d124183dc2f62adca475628a726ecffaa22fcfb8903
-  data.tar.gz: cd23a308e4d62af9a07bbec164c96ca3213de5a4f686c450fc90bca56387faa88febb8a3387e810d0fd8b78e06b191bd76777fe8b3f3cda9da5582b9009d1144
+  metadata.gz: 8b9db6543c87b63c49e24666e06bc012ea9a6e330711c9fbd35961c70d1222988bf2403927fdbe2f8797176d674b83c7c3f2d1215c5f92b0d6f00c6ab7fe37af
+  data.tar.gz: 6cf07796d7c6ab1520a63b0f3b65d2e513caccf0b81306321376473fc438c7573bcf867e74ea8465122e12a47fe2e7e09652473f83e26f1038e112c2d66b3d2c

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 ## [Unreleased]
 
+## [2.0.0] - 2020-11-25 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Changed
+
+- some methods that used to return byte-based indices now return char-based indices
+  * the returned values have only changed for Regexps that contain multibyte chars
+  * this is only a breaking change if you used such methods directly AND relied on them pointing to bytes
+  * affected methods:
+  * `Regexp::Token` `#length`, `#offset`, `#te`, `#ts`
+  * `Regexp::Expression::Base` `#full_length`, `#offset`, `#starts_at`, `#te`, `#ts`
+  * thanks to [Akinori MUSHA](https://github.com/knu) for the report
+- removed some deprecated methods/signatures
+  * these are rarely used and have been showing deprecation warnings for a long time
+  * `Regexp::Expression::Subexpression.new` with 3 arguments
+  * `Regexp::Expression::Root.new` without a token argument
+  * `Regexp::Expression.parsed`
+
+### Added
+
+- `Regexp::Expression::Base#base_length`
+  * returns the character count of an expression body, ignoring any quantifier
+- pragmatic, experimental support for chained quantifiers
+  * e.g.: `/^a{10}{4,6}$/` matches exactly 40, 50 or 60 `a`s
+  * successive quantifiers used to be silently dropped by the parser
+  * they are now wrapped with passive groups as if they were written `(?:a{10}){4,6}`
+  * thanks to [calfeld](https://github.com/calfeld) for reporting this a while back
+
+### Fixed
+
+- incorrect encoding output for non-ascii comments
+  * this led to a crash when calling `#to_s` on parse results containing such comments
+  * thanks to [Michael Glass](https://github.com/michaelglass) for the report
+- some crashes when scanning contrived patterns such as `'\😋'`
+
 ### [1.8.2] - 2020-10-11 - [Janosch Müller](mailto:janosch84@gmail.com)
 
 ### Fixed

data/lib/regexp_parser/expression.rb

@@ -34,6 +34,10 @@ module Regexp::Expression
 
     alias :starts_at :ts
 
+    def base_length
+      to_s(:base).length
+    end
+
     def full_length
       to_s.length
     end
@@ -118,23 +122,6 @@ module Regexp::Expression
     alias :to_h :attributes
   end
 
-  def self.parsed(exp)
-    warn('WARNING: Regexp::Expression::Base.parsed is buggy and '\
-         'will be removed in 2.0.0. Use Regexp::Parser.parse instead.')
-    case exp
-    when String
-      Regexp::Parser.parse(exp)
-    when Regexp
-      Regexp::Parser.parse(exp.source) # <- causes loss of root options
-    when Regexp::Expression            # <- never triggers
-      exp
-    else
-      raise ArgumentError, 'Expression.parsed accepts a String, Regexp, or '\
-                           'a Regexp::Expression as a value for exp, but it '\
-                           "was given #{exp.class.name}."
-    end
-  end
-
 end # module Regexp::Expression
 
 require 'regexp_parser/expression/quantifier'

data/lib/regexp_parser/expression/classes/group.rb

@@ -10,9 +10,24 @@ module Regexp::Expression
       def comment?; false end
     end
 
-    class Atomic  < Group::Base; end
-    class Passive < Group::Base; end
+    class Passive < Group::Base
+      attr_writer :implicit
+
+      def to_s(format = :full)
+        if implicit?
+          "#{expressions.join}#{quantifier_affix(format)}"
+        else
+          super
+        end
+      end
+
+      def implicit?
+        @implicit ||= false
+      end
+    end
+
     class Absence < Group::Base; end
+    class Atomic  < Group::Base; end
     class Options < Group::Base
       attr_accessor :option_changes
     end

data/lib/regexp_parser/expression/classes/root.rb

@@ -1,24 +1,12 @@
 module Regexp::Expression
 
   class Root < Regexp::Expression::Subexpression
-    # TODO: this override is here for backwards compatibility, remove in 2.0.0
-    def initialize(*args)
-      unless args.first.is_a?(Regexp::Token)
-        warn('WARNING: Root.new without a Token argument is deprecated and '\
-             'will be removed in 2.0.0. Use Root.build for the old behavior.')
-        return super(self.class.build_token, *args)
-      end
-      super
+    def self.build(options = {})
+      new(build_token, options)
     end
 
-    class << self
-      def build(options = {})
-        new(build_token, options)
-      end
-
-      def build_token
-        Regexp::Token.new(:expression, :root, '', 0)
-      end
+    def self.build_token
+      Regexp::Token.new(:expression, :root, '', 0)
     end
   end
 end

data/lib/regexp_parser/expression/quantifier.rb

@@ -40,5 +40,14 @@ module Regexp::Expression
       RUBY
     end
     alias :lazy? :reluctant?
+
+    def ==(other)
+      other.class == self.class &&
+        other.token == token &&
+        other.mode == mode &&
+        other.min == min &&
+        other.max == max
+    end
+    alias :eq :==
   end
 end

data/lib/regexp_parser/expression/sequence.rb

@@ -7,16 +7,6 @@ module Regexp::Expression
   # Used as the base class for the Alternation alternatives, Conditional
   # branches, and CharacterSet::Intersection intersected sequences.
   class Sequence < Regexp::Expression::Subexpression
-    # TODO: this override is here for backwards compatibility, remove in 2.0.0
-    def initialize(*args)
-      if args.count == 3
-        warn('WARNING: Sequence.new without a Regexp::Token argument is '\
-             'deprecated and will be removed in 2.0.0.')
-        return self.class.at_levels(*args)
-      end
-      super
-    end
-
     class << self
       def add_to(subexpression, params = {}, active_opts = {})
         sequence = at_levels(

data/lib/regexp_parser/lexer.rb

@@ -96,10 +96,10 @@ class Regexp::Lexer
 
     tokens.pop
     tokens << Regexp::Token.new(:literal, :literal, lead,
-              token.ts, (token.te - last.bytesize),
+              token.ts, (token.te - last.length),
               nesting, set_nesting, conditional_nesting)
     tokens << Regexp::Token.new(:literal, :literal, last,
-              (token.ts + lead.bytesize), token.te,
+              (token.ts + lead.length), token.te,
               nesting, set_nesting, conditional_nesting)
   end
 

data/lib/regexp_parser/parser.rb

@@ -438,6 +438,28 @@ class Regexp::Parser
     target_node || raise(ArgumentError, 'No valid target found for '\
                                         "'#{token.text}' ")
 
+    # in case of chained quantifiers, wrap target in an implicit passive group
+    # description of the problem: https://github.com/ammar/regexp_parser/issues/3
+    # rationale for this solution: https://github.com/ammar/regexp_parser/pull/69
+    if target_node.quantified?
+      new_token = Regexp::Token.new(
+        :group,
+        :passive,
+        '', # text
+        target_node.ts,
+        nil, # te (unused)
+        target_node.level,
+        target_node.set_level,
+        target_node.conditional_level
+      )
+      new_group = Group::Passive.new(new_token, active_opts)
+      new_group.implicit = true
+      new_group << target_node
+      increase_level(target_node)
+      node.expressions[offset] = new_group
+      target_node = new_group
+    end
+
     case token.token
     when :zero_or_one
       target_node.quantify(:zero_or_one, token.text, 0, 1, :greedy)
@@ -468,6 +490,11 @@ class Regexp::Parser
     end
   end
 
+  def increase_level(exp)
+    exp.level += 1
+    exp.respond_to?(:each) && exp.each { |subexp| increase_level(subexp) }
+  end
+
   def interval(target_node, token)
     text = token.text
     mchr = text[text.length-1].chr =~ /[?+]/ ? text[text.length-1].chr : nil

data/lib/regexp_parser/scanner.rb

@@ -2,7 +2,7 @@
 
 # line 1 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
-# line 678 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 680 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
 
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
@@ -88,9 +88,10 @@ class Regexp::Scanner
     self.set_depth = 0
     self.group_depth = 0
     self.conditional_stack = []
+    self.char_pos = 0
 
     
-# line 93 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 94 "/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=
@@ -129,31 +130,33 @@ self._re_scanner_trans_keys = [
 	112, 112, 111, 111, 114, 114, 
 	100, 100, 100, 100, 65, 
 	122, 61, 61, 93, 93, 
-	45, 45, 92, 92, 92, 92, 
-	45, 45, 92, 92, 92, 
-	92, 48, 123, 48, 102, 
-	48, 102, 48, 102, 48, 102, 
-	9, 125, 9, 125, 9, 
+	-128, -65, -128, -65, 45, 45, 
+	92, 92, 92, 92, 45, 
+	45, 92, 92, 92, 92, 
+	48, 123, 48, 102, 48, 102, 
+	48, 102, 48, 102, 9, 
 	125, 9, 125, 9, 125, 
-	9, 125, 48, 123, 41, 41, 
-	39, 122, 41, 57, 48, 
-	122, -128, 127, -62, -33, 
-	-32, -17, -16, -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, 43, 63, 
-	68, 119, 80, 112, -62, 125, 
-	-128, -65, -128, -65, -128, 
-	-65, 38, 38, 38, 93, 
-	46, 61, 48, 122, 36, 125, 
-	48, 55, 48, 55, 77, 
-	77, 45, 45, 0, 0, 
-	67, 99, 45, 45, 0, 0, 
-	92, 92, 48, 102, 39, 
-	60, 39, 122, 49, 57, 
-	41, 57, 48, 122, 0
+	9, 125, 9, 125, 9, 125, 
+	48, 123, 41, 41, 39, 
+	122, 41, 57, 48, 122, 
+	-128, 127, -62, -33, -32, -17, 
+	-16, -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, 43, 63, 68, 119, 
+	80, 112, -62, 125, -128, 
+	-65, -128, -65, -128, -65, 
+	38, 38, 38, 93, 46, 61, 
+	48, 122, -62, 125, -128, 
+	-65, -128, -65, -128, -65, 
+	48, 55, 48, 55, 77, 77, 
+	45, 45, 0, 0, 67, 
+	99, 45, 45, 0, 0, 
+	92, 92, 48, 102, 39, 60, 
+	39, 122, 49, 57, 41, 
+	57, 48, 122, 0
 ]
 
 class << self
@@ -172,15 +175,15 @@ self._re_scanner_key_spans = [
 	1, 1, 1, 1, 1, 1, 4, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 58, 1, 1, 
-	1, 1, 1, 1, 1, 1, 76, 55, 
-	55, 55, 55, 117, 117, 117, 117, 117, 
-	117, 76, 1, 84, 17, 75, 256, 30, 
-	16, 5, 127, 127, 24, 94, 1, 1, 
-	94, 94, 21, 21, 21, 58, 14, 21, 
-	52, 33, 188, 64, 64, 64, 1, 56, 
-	16, 75, 90, 8, 8, 1, 1, 0, 
-	33, 1, 0, 1, 55, 22, 84, 9, 
-	17, 75
+	64, 64, 1, 1, 1, 1, 1, 1, 
+	76, 55, 55, 55, 55, 117, 117, 117, 
+	117, 117, 117, 76, 1, 84, 17, 75, 
+	256, 30, 16, 5, 127, 127, 24, 94, 
+	1, 1, 94, 94, 21, 21, 21, 58, 
+	14, 21, 52, 33, 188, 64, 64, 64, 
+	1, 56, 16, 75, 188, 64, 64, 64, 
+	8, 8, 1, 1, 0, 33, 1, 0, 
+	1, 55, 22, 84, 9, 17, 75
 ]
 
 class << self
@@ -199,15 +202,15 @@ self._re_scanner_index_offsets = [
 	2047, 2049, 2051, 2053, 2055, 2057, 2059, 2064, 
 	2066, 2068, 2070, 2072, 2074, 2076, 2078, 2080, 
 	2082, 2084, 2086, 2088, 2090, 2092, 2151, 2153, 
-	2155, 2157, 2159, 2161, 2163, 2165, 2167, 2244, 
-	2300, 2356, 2412, 2468, 2586, 2704, 2822, 2940, 
-	3058, 3176, 3253, 3255, 3340, 3358, 3434, 3691, 
-	3722, 3739, 3745, 3873, 4001, 4026, 4121, 4123, 
-	4125, 4220, 4315, 4337, 4359, 4381, 4440, 4455, 
-	4477, 4530, 4564, 4753, 4818, 4883, 4948, 4950, 
-	5007, 5024, 5100, 5191, 5200, 5209, 5211, 5213, 
-	5214, 5248, 5250, 5251, 5253, 5309, 5332, 5417, 
-	5427, 5445
+	2155, 2220, 2285, 2287, 2289, 2291, 2293, 2295, 
+	2297, 2374, 2430, 2486, 2542, 2598, 2716, 2834, 
+	2952, 3070, 3188, 3306, 3383, 3385, 3470, 3488, 
+	3564, 3821, 3852, 3869, 3875, 4003, 4131, 4156, 
+	4251, 4253, 4255, 4350, 4445, 4467, 4489, 4511, 
+	4570, 4585, 4607, 4660, 4694, 4883, 4948, 5013, 
+	5078, 5080, 5137, 5154, 5230, 5419, 5484, 5549, 
+	5614, 5623, 5632, 5634, 5636, 5637, 5671, 5673, 
+	5674, 5676, 5732, 5755, 5840, 5850, 5868
 ]
 
 class << self
@@ -484,123 +487,140 @@ self._re_scanner_indicies = [
 	95, 95, 95, 95, 95, 95, 95, 95, 
 	95, 95, 95, 95, 95, 95, 95, 95, 
 	95, 95, 95, 95, 95, 95, 43, 96, 
-	43, 97, 43, 98, 33, 100, 99, 102, 
-	99, 103, 33, 105, 104, 107, 104, 108, 
-	108, 108, 108, 108, 108, 108, 108, 108, 
-	108, 33, 33, 33, 33, 33, 33, 33, 
-	108, 108, 108, 108, 108, 108, 33, 33, 
+	43, 97, 43, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 98, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 98, 101, 33, 103, 
+	102, 105, 102, 106, 33, 108, 107, 110, 
+	107, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 33, 33, 33, 33, 33, 
+	33, 33, 111, 111, 111, 111, 111, 111, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	108, 108, 108, 108, 108, 108, 33, 33, 
+	33, 33, 111, 111, 111, 111, 111, 111, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 109, 33, 110, 110, 110, 110, 
-	110, 110, 110, 110, 110, 110, 33, 33, 
-	33, 33, 33, 33, 33, 110, 110, 110, 
-	110, 110, 110, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 112, 33, 113, 113, 
+	113, 113, 113, 113, 113, 113, 113, 113, 
+	33, 33, 33, 33, 33, 33, 33, 113, 
+	113, 113, 113, 113, 113, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 110, 110, 110, 
-	110, 110, 110, 33, 111, 111, 111, 111, 
-	111, 111, 111, 111, 111, 111, 33, 33, 
-	33, 33, 33, 33, 33, 111, 111, 111, 
-	111, 111, 111, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 113, 
+	113, 113, 113, 113, 113, 33, 114, 114, 
+	114, 114, 114, 114, 114, 114, 114, 114, 
+	33, 33, 33, 33, 33, 33, 33, 114, 
+	114, 114, 114, 114, 114, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 111, 111, 111, 
-	111, 111, 111, 33, 112, 112, 112, 112, 
-	112, 112, 112, 112, 112, 112, 33, 33, 
-	33, 33, 33, 33, 33, 112, 112, 112, 
-	112, 112, 112, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 114, 
+	114, 114, 114, 114, 114, 33, 115, 115, 
+	115, 115, 115, 115, 115, 115, 115, 115, 
+	33, 33, 33, 33, 33, 33, 33, 115, 
+	115, 115, 115, 115, 115, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 112, 112, 112, 
-	112, 112, 112, 33, 113, 113, 113, 113, 
-	113, 113, 113, 113, 113, 113, 33, 33, 
-	33, 33, 33, 33, 33, 113, 113, 113, 
-	113, 113, 113, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 115, 
+	115, 115, 115, 115, 115, 33, 116, 116, 
+	116, 116, 116, 116, 116, 116, 116, 116, 
+	33, 33, 33, 33, 33, 33, 33, 116, 
+	116, 116, 116, 116, 116, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 113, 113, 113, 
-	113, 113, 113, 33, 109, 109, 109, 109, 
-	109, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 116, 
+	116, 116, 116, 116, 116, 33, 112, 112, 
+	112, 112, 112, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 109, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 112, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 114, 114, 114, 114, 114, 
-	114, 114, 114, 114, 114, 33, 33, 33, 
-	33, 33, 33, 33, 114, 114, 114, 114, 
-	114, 114, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 33, 
+	33, 33, 33, 33, 33, 33, 117, 117, 
+	117, 117, 117, 117, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 114, 114, 114, 114, 
-	114, 114, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 117, 117, 
+	117, 117, 117, 117, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	112, 33, 109, 109, 109, 109, 109, 33, 
+	33, 33, 115, 33, 112, 112, 112, 112, 
+	112, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 112, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 109, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 33, 33, 33, 
+	33, 33, 33, 33, 118, 118, 118, 118, 
+	118, 118, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 115, 115, 115, 115, 115, 115, 115, 
-	115, 115, 115, 33, 33, 33, 33, 33, 
-	33, 33, 115, 115, 115, 115, 115, 115, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 118, 118, 118, 118, 
+	118, 118, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 115, 115, 115, 115, 115, 115, 
+	115, 33, 112, 112, 112, 112, 112, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 112, 33, 
-	109, 109, 109, 109, 109, 33, 33, 33, 
+	33, 112, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 109, 
+	33, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 33, 33, 33, 33, 33, 
+	33, 33, 119, 119, 119, 119, 119, 119, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 116, 
-	116, 116, 116, 116, 116, 116, 116, 116, 
-	116, 33, 33, 33, 33, 33, 33, 33, 
-	116, 116, 116, 116, 116, 116, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 119, 119, 119, 119, 119, 119, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	116, 116, 116, 116, 116, 116, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 115, 33, 
+	112, 112, 112, 112, 112, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 112, 33, 109, 109, 
-	109, 109, 109, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 112, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 109, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 120, 
+	120, 120, 120, 120, 120, 120, 120, 120, 
+	120, 33, 33, 33, 33, 33, 33, 33, 
+	120, 120, 120, 120, 120, 120, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 117, 117, 117, 
-	117, 117, 117, 117, 117, 117, 117, 33, 
-	33, 33, 33, 33, 33, 33, 117, 117, 
-	117, 117, 117, 117, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 117, 117, 
-	117, 117, 117, 117, 33, 33, 33, 33, 
+	120, 120, 120, 120, 120, 120, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 112, 33, 109, 109, 109, 109, 
-	109, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 115, 33, 112, 112, 
+	112, 112, 112, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 109, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 112, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 118, 118, 118, 118, 118, 
-	118, 118, 118, 118, 118, 33, 33, 33, 
-	33, 33, 33, 33, 118, 118, 118, 118, 
-	118, 118, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 33, 
+	33, 33, 33, 33, 33, 33, 121, 121, 
+	121, 121, 121, 121, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 118, 118, 118, 118, 
-	118, 118, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 121, 121, 
+	121, 121, 121, 121, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	112, 33, 109, 109, 109, 109, 109, 33, 
+	33, 33, 115, 33, 112, 112, 112, 112, 
+	112, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 112, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 109, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
@@ -611,205 +631,204 @@ self._re_scanner_indicies = [
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 112, 33, 
-	120, 120, 120, 120, 120, 120, 120, 120, 
-	120, 120, 119, 119, 119, 119, 119, 119, 
-	119, 120, 120, 120, 120, 120, 120, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 120, 120, 120, 120, 120, 120, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 119, 33, 119, 122, 121, 123, 
-	121, 121, 121, 121, 121, 121, 121, 121, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 121, 121, 121, 121, 121, 121, 
-	121, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 121, 121, 121, 121, 124, 
-	121, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 121, 122, 121, 121, 121, 
-	121, 121, 121, 125, 125, 125, 125, 125, 
-	125, 125, 125, 125, 125, 121, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	121, 121, 121, 121, 123, 121, 121, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 121, 121, 121, 121, 126, 121, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 121, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 127, 127, 127, 127, 
+	115, 33, 123, 123, 123, 123, 123, 123, 
+	123, 123, 123, 123, 122, 122, 122, 122, 
+	122, 122, 122, 123, 123, 123, 123, 123, 
+	123, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 123, 123, 123, 123, 123, 
+	123, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 33, 122, 125, 
+	124, 126, 124, 124, 124, 124, 124, 124, 
+	124, 124, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 124, 124, 124, 124, 
+	124, 124, 124, 127, 127, 127, 127, 127, 
 	127, 127, 127, 127, 127, 127, 127, 127, 
 	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 124, 124, 124, 
+	124, 127, 124, 127, 127, 127, 127, 127, 
 	127, 127, 127, 127, 127, 127, 127, 127, 
-	127, 127, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 129, 129, 129, 129, 129, 33, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 124, 125, 124, 
+	124, 124, 124, 124, 124, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 128, 124, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 124, 124, 124, 124, 126, 124, 
+	124, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 124, 124, 124, 124, 129, 
+	124, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 124, 33, 33, 33, 33, 
 	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 130, 130, 130, 130, 130, 
-	130, 130, 130, 131, 131, 131, 131, 131, 
-	130, 130, 130, 130, 130, 130, 130, 130, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 130, 130, 
 	130, 130, 130, 130, 130, 130, 130, 130, 
-	130, 130, 132, 133, 133, 134, 135, 133, 
-	133, 133, 136, 137, 138, 139, 133, 133, 
-	140, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 141, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 142, 143, 144, 
-	145, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 146, 147, 144, 
-	133, 130, 133, 127, 127, 127, 127, 127, 
-	127, 127, 127, 127, 127, 127, 127, 127, 
-	127, 127, 127, 127, 127, 127, 127, 127, 
-	127, 127, 127, 127, 127, 127, 127, 127, 
-	127, 148, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 148, 129, 129, 129, 129, 129, 
-	148, 130, 130, 130, 130, 130, 130, 130, 
 	130, 130, 130, 130, 130, 130, 130, 130, 
 	130, 130, 130, 130, 130, 130, 130, 130, 
+	130, 130, 130, 130, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 132, 132, 132, 132, 
+	132, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 133, 133, 133, 
+	133, 133, 133, 133, 133, 134, 134, 134, 
+	134, 134, 133, 133, 133, 133, 133, 133, 
+	133, 133, 133, 133, 133, 133, 133, 133, 
+	133, 133, 133, 133, 135, 136, 136, 137, 
+	138, 136, 136, 136, 139, 140, 141, 142, 
+	136, 136, 143, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 144, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 145, 
+	146, 147, 148, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 149, 
+	150, 147, 136, 133, 136, 130, 130, 130, 
 	130, 130, 130, 130, 130, 130, 130, 130, 
-	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, 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, 130, 
-	148, 130, 130, 130, 130, 130, 130, 130, 
-	130, 131, 131, 131, 131, 131, 130, 130, 
 	130, 130, 130, 130, 130, 130, 130, 130, 
 	130, 130, 130, 130, 130, 130, 130, 130, 
-	132, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 130, 
-	149, 132, 132, 132, 132, 132, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	149, 149, 149, 149, 149, 149, 149, 149, 
-	132, 149, 133, 133, 148, 148, 133, 133, 
-	133, 148, 148, 148, 148, 133, 133, 148, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
+	130, 130, 130, 151, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 151, 132, 132, 132, 
+	132, 132, 151, 133, 133, 133, 133, 133, 
 	133, 133, 133, 133, 133, 133, 133, 133, 
-	148, 133, 133, 133, 133, 133, 133, 133, 
 	133, 133, 133, 133, 133, 133, 133, 133, 
 	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 148, 148, 148, 148, 
+	133, 133, 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, 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, 133, 151, 133, 133, 133, 133, 133, 
+	133, 133, 133, 134, 134, 134, 134, 134, 
 	133, 133, 133, 133, 133, 133, 133, 133, 
 	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 148, 148, 148, 133, 
-	148, 151, 134, 153, 152, 12, 155, 8, 
-	155, 155, 155, 11, 156, 154, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 10, 155, 
-	157, 12, 10, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 10, 155, 154, 155, 154, 155, 
-	155, 155, 154, 154, 154, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 158, 155, 154, 
-	154, 154, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 154, 155, 160, 159, 159, 159, 159, 
-	159, 159, 159, 159, 159, 159, 159, 159, 
-	159, 159, 159, 159, 159, 159, 159, 160, 
-	159, 162, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 162, 161, 164, 
-	163, 163, 163, 163, 163, 163, 163, 163, 
-	163, 163, 163, 163, 163, 163, 163, 163, 
-	163, 163, 163, 164, 163, 166, 166, 165, 
-	165, 165, 165, 166, 165, 165, 165, 167, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 165, 165, 165, 166, 165, 
-	165, 165, 165, 165, 165, 165, 166, 165, 
-	165, 165, 165, 168, 165, 165, 165, 168, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 165, 165, 165, 166, 165, 
-	170, 169, 169, 169, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 169, 172, 
-	171, 171, 171, 171, 171, 171, 171, 171, 
-	171, 171, 171, 171, 171, 171, 171, 171, 
-	171, 171, 171, 172, 171, 173, 33, 33, 
-	33, 173, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 173, 173, 33, 33, 33, 
-	173, 173, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 173, 33, 33, 
-	33, 173, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 173, 33, 33, 33, 
-	173, 33, 174, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 174, 33, 175, 175, 175, 175, 
-	175, 175, 175, 175, 175, 175, 175, 175, 
-	175, 175, 175, 175, 175, 175, 175, 175, 
-	175, 175, 175, 175, 175, 175, 175, 175, 
-	175, 175, 176, 176, 176, 176, 176, 176, 
-	176, 176, 176, 176, 176, 176, 176, 176, 
-	176, 176, 177, 177, 177, 177, 177, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
+	133, 133, 135, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 133, 152, 135, 135, 135, 135, 135, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 135, 152, 136, 136, 151, 151, 
+	136, 136, 136, 151, 151, 151, 151, 136, 
+	136, 151, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 151, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 151, 151, 
+	151, 151, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 151, 151, 
+	151, 136, 151, 154, 137, 156, 155, 12, 
+	158, 8, 158, 158, 158, 11, 159, 157, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	10, 158, 160, 12, 10, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 10, 158, 157, 158, 
+	157, 158, 158, 158, 157, 157, 157, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 161, 
+	158, 157, 157, 157, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	158, 158, 158, 157, 158, 163, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 163, 162, 165, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 165, 
+	164, 167, 166, 166, 166, 166, 166, 166, 
+	166, 166, 166, 166, 166, 166, 166, 166, 
+	166, 166, 166, 166, 166, 167, 166, 169, 
+	169, 168, 168, 168, 168, 169, 168, 168, 
+	168, 170, 168, 168, 168, 168, 168, 168, 
+	168, 168, 168, 168, 168, 168, 168, 168, 
+	169, 168, 168, 168, 168, 168, 168, 168, 
+	169, 168, 168, 168, 168, 171, 168, 168, 
+	168, 171, 168, 168, 168, 168, 168, 168, 
+	168, 168, 168, 168, 168, 168, 168, 168, 
+	169, 168, 173, 172, 172, 172, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	172, 175, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 175, 174, 176, 
+	33, 33, 33, 176, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 176, 176, 33, 
+	33, 33, 176, 176, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 176, 
+	33, 33, 33, 176, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 176, 33, 
+	33, 33, 176, 33, 177, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 177, 33, 178, 178, 
+	178, 178, 178, 178, 178, 178, 178, 178, 
+	178, 178, 178, 178, 178, 178, 178, 178, 
+	178, 178, 178, 178, 178, 178, 178, 178, 
+	178, 178, 178, 178, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 180, 180, 180, 180, 
+	180, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 178, 38, 
-	179, 38, 178, 178, 178, 178, 38, 180, 
-	178, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 178, 38, 38, 38, 38, 38, 38, 
+	181, 38, 182, 38, 181, 181, 181, 181, 
+	38, 183, 181, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 181, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 181, 182, 183, 
-	184, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 184, 
+	185, 186, 187, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 178, 178, 178, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 181, 
+	181, 181, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
@@ -817,7 +836,7 @@ self._re_scanner_indicies = [
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
 	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 185, 39, 39, 39, 39, 39, 39, 
+	38, 38, 38, 188, 39, 39, 39, 39, 
 	39, 39, 39, 39, 39, 39, 39, 39, 
 	39, 39, 39, 39, 39, 39, 39, 39, 
 	39, 39, 39, 39, 39, 39, 39, 39, 
@@ -825,87 +844,124 @@ self._re_scanner_indicies = [
 	39, 39, 39, 39, 39, 39, 39, 39, 
 	39, 39, 39, 39, 39, 39, 39, 39, 
 	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 185, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 185, 187, 185, 189, 188, 
-	188, 188, 188, 188, 188, 188, 188, 188, 
-	188, 188, 188, 188, 188, 188, 188, 188, 
-	188, 188, 188, 188, 188, 188, 188, 188, 
-	188, 188, 188, 188, 188, 188, 188, 188, 
-	188, 188, 188, 188, 188, 188, 188, 188, 
-	188, 188, 188, 188, 188, 188, 188, 188, 
-	188, 188, 188, 188, 188, 190, 188, 193, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 194, 192, 192, 195, 192, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 196, 196, 196, 196, 196, 196, 
-	196, 197, 197, 197, 196, 196, 196, 197, 
-	196, 196, 196, 197, 196, 197, 196, 196, 
-	196, 196, 197, 196, 196, 196, 196, 196, 
-	197, 196, 197, 196, 196, 196, 196, 196, 
-	196, 196, 196, 197, 196, 196, 196, 197, 
-	196, 196, 196, 197, 196, 196, 196, 196, 
-	196, 196, 196, 196, 196, 196, 196, 196, 
-	196, 196, 197, 196, 199, 198, 198, 198, 
-	199, 199, 199, 199, 198, 198, 199, 198, 
-	200, 201, 201, 201, 201, 201, 201, 201, 
-	202, 202, 198, 198, 198, 198, 198, 199, 
-	198, 33, 33, 203, 204, 198, 198, 33, 
-	204, 198, 198, 33, 198, 205, 198, 198, 
-	206, 198, 204, 204, 198, 198, 198, 204, 
-	204, 198, 33, 199, 199, 199, 199, 198, 
-	198, 207, 207, 98, 204, 207, 207, 198, 
-	204, 198, 198, 198, 198, 198, 207, 198, 
-	206, 198, 207, 204, 207, 208, 207, 204, 
-	209, 198, 33, 199, 199, 199, 198, 211, 
-	211, 211, 211, 211, 211, 211, 211, 210, 
-	213, 213, 213, 213, 213, 213, 213, 213, 
-	212, 215, 99, 217, 216, 99, 219, 104, 
-	104, 104, 104, 104, 104, 104, 104, 104, 
-	104, 104, 104, 104, 104, 104, 104, 104, 
-	104, 104, 104, 104, 104, 104, 104, 104, 
-	104, 104, 104, 104, 104, 104, 220, 104, 
-	222, 221, 104, 107, 104, 225, 225, 225, 
-	225, 225, 225, 225, 225, 225, 225, 224, 
-	224, 224, 224, 224, 224, 224, 225, 225, 
-	225, 225, 225, 225, 224, 224, 224, 224, 
-	224, 224, 224, 224, 224, 224, 224, 224, 
-	224, 224, 224, 224, 224, 224, 224, 224, 
-	224, 224, 224, 224, 224, 224, 225, 225, 
-	225, 225, 225, 225, 224, 227, 226, 226, 
-	226, 226, 226, 228, 226, 226, 226, 229, 
-	229, 229, 229, 229, 229, 229, 229, 229, 
-	226, 226, 230, 226, 123, 231, 231, 231, 
-	231, 231, 231, 231, 231, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 231, 
-	231, 231, 231, 231, 231, 231, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	231, 231, 231, 231, 124, 231, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 124, 124, 124, 124, 
-	231, 125, 125, 125, 125, 125, 125, 125, 
-	125, 125, 231, 122, 231, 231, 231, 231, 
-	231, 231, 125, 125, 125, 125, 125, 125, 
-	125, 125, 125, 125, 231, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 231, 
-	231, 231, 231, 123, 231, 231, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	231, 231, 231, 231, 126, 231, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	231, 0
+	39, 39, 39, 39, 188, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 188, 190, 188, 
+	192, 191, 191, 191, 191, 191, 191, 191, 
+	191, 191, 191, 191, 191, 191, 191, 191, 
+	191, 191, 191, 191, 191, 191, 191, 191, 
+	191, 191, 191, 191, 191, 191, 191, 191, 
+	191, 191, 191, 191, 191, 191, 191, 191, 
+	191, 191, 191, 191, 191, 191, 191, 191, 
+	191, 191, 191, 191, 191, 191, 191, 193, 
+	191, 196, 195, 195, 195, 195, 195, 195, 
+	195, 195, 195, 195, 195, 197, 195, 195, 
+	198, 195, 200, 200, 200, 200, 200, 200, 
+	200, 200, 200, 200, 199, 199, 199, 199, 
+	199, 199, 199, 200, 200, 200, 199, 199, 
+	199, 200, 199, 199, 199, 200, 199, 200, 
+	199, 199, 199, 199, 200, 199, 199, 199, 
+	199, 199, 200, 199, 200, 199, 199, 199, 
+	199, 199, 199, 199, 199, 200, 199, 199, 
+	199, 200, 199, 199, 199, 200, 199, 199, 
+	199, 199, 199, 199, 199, 199, 199, 199, 
+	199, 199, 199, 199, 200, 199, 201, 201, 
+	201, 201, 201, 201, 201, 201, 201, 201, 
+	201, 201, 201, 201, 201, 201, 201, 201, 
+	201, 201, 201, 201, 201, 201, 201, 201, 
+	201, 201, 201, 201, 202, 202, 202, 202, 
+	202, 202, 202, 202, 202, 202, 202, 202, 
+	202, 202, 202, 202, 203, 203, 203, 203, 
+	203, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	204, 99, 99, 99, 204, 204, 204, 204, 
+	99, 99, 204, 99, 205, 206, 206, 206, 
+	206, 206, 206, 206, 207, 207, 99, 99, 
+	99, 99, 99, 204, 99, 33, 33, 208, 
+	209, 99, 99, 33, 209, 99, 99, 33, 
+	99, 210, 99, 99, 211, 99, 209, 209, 
+	99, 99, 99, 209, 209, 99, 33, 204, 
+	204, 204, 204, 99, 99, 212, 212, 101, 
+	209, 212, 212, 99, 209, 99, 99, 99, 
+	99, 99, 212, 99, 211, 99, 212, 209, 
+	212, 213, 212, 209, 214, 99, 33, 204, 
+	204, 204, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 99, 99, 99, 99, 99, 
+	99, 99, 99, 215, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 215, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	216, 216, 216, 216, 216, 215, 218, 218, 
+	218, 218, 218, 218, 218, 218, 217, 220, 
+	220, 220, 220, 220, 220, 220, 220, 219, 
+	222, 102, 224, 223, 102, 226, 107, 107, 
+	107, 107, 107, 107, 107, 107, 107, 107, 
+	107, 107, 107, 107, 107, 107, 107, 107, 
+	107, 107, 107, 107, 107, 107, 107, 107, 
+	107, 107, 107, 107, 107, 227, 107, 229, 
+	228, 107, 110, 107, 232, 232, 232, 232, 
+	232, 232, 232, 232, 232, 232, 231, 231, 
+	231, 231, 231, 231, 231, 232, 232, 232, 
+	232, 232, 232, 231, 231, 231, 231, 231, 
+	231, 231, 231, 231, 231, 231, 231, 231, 
+	231, 231, 231, 231, 231, 231, 231, 231, 
+	231, 231, 231, 231, 231, 232, 232, 232, 
+	232, 232, 232, 231, 234, 233, 233, 233, 
+	233, 233, 235, 233, 233, 233, 236, 236, 
+	236, 236, 236, 236, 236, 236, 236, 233, 
+	233, 237, 233, 126, 238, 238, 238, 238, 
+	238, 238, 238, 238, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 238, 238, 
+	238, 238, 238, 238, 238, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 238, 
+	238, 238, 238, 127, 238, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 238, 
+	128, 128, 128, 128, 128, 128, 128, 128, 
+	128, 238, 125, 238, 238, 238, 238, 238, 
+	238, 128, 128, 128, 128, 128, 128, 128, 
+	128, 128, 128, 238, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 238, 238, 
+	238, 238, 126, 238, 238, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 238, 
+	238, 238, 238, 129, 238, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 238, 
+	0
 ]
 
 class << self
@@ -913,35 +969,36 @@ class << self
 	private :_re_scanner_trans_targs, :_re_scanner_trans_targs=
 end
 self._re_scanner_trans_targs = [
-	110, 111, 3, 112, 5, 6, 113, 110, 
-	7, 110, 110, 8, 110, 10, 110, 12, 
-	18, 110, 13, 15, 17, 14, 16, 19, 
-	21, 23, 20, 22, 110, 25, 127, 26, 
-	28, 0, 29, 30, 129, 130, 130, 31, 
-	130, 130, 130, 130, 35, 36, 130, 38, 
+	112, 113, 3, 114, 5, 6, 115, 112, 
+	7, 112, 112, 8, 112, 10, 112, 12, 
+	18, 112, 13, 15, 17, 14, 16, 19, 
+	21, 23, 20, 22, 112, 25, 129, 26, 
+	28, 0, 29, 30, 131, 132, 132, 31, 
+	132, 132, 132, 132, 35, 36, 132, 38, 
 	39, 50, 54, 58, 62, 66, 70, 75, 
 	79, 81, 84, 40, 47, 41, 45, 42, 
-	43, 44, 130, 46, 48, 49, 51, 52, 
+	43, 44, 132, 46, 48, 49, 51, 52, 
 	53, 55, 56, 57, 59, 60, 61, 63, 
 	64, 65, 67, 68, 69, 71, 73, 72, 
 	74, 76, 77, 78, 80, 82, 83, 86, 
-	87, 130, 89, 138, 141, 138, 143, 92, 
-	138, 144, 138, 146, 95, 98, 96, 97, 
-	138, 99, 100, 101, 102, 103, 104, 138, 
-	148, 149, 149, 106, 107, 108, 109, 1, 
-	2, 4, 114, 115, 116, 117, 118, 110, 
-	119, 110, 122, 123, 110, 124, 110, 125, 
-	110, 110, 126, 110, 110, 110, 110, 110, 
-	110, 120, 110, 121, 110, 9, 110, 110, 
-	110, 110, 110, 110, 110, 110, 110, 110, 
-	11, 110, 24, 110, 110, 128, 27, 131, 
-	132, 133, 130, 134, 135, 136, 130, 130, 
-	130, 130, 32, 130, 130, 33, 130, 130, 
-	130, 34, 37, 85, 137, 137, 138, 138, 
-	139, 139, 138, 88, 138, 91, 138, 138, 
-	94, 105, 138, 140, 138, 138, 138, 142, 
-	138, 90, 138, 145, 147, 138, 93, 138, 
-	138, 138, 149, 150, 151, 152, 153, 149
+	87, 132, 140, 140, 88, 91, 140, 146, 
+	140, 148, 94, 140, 149, 140, 151, 97, 
+	100, 98, 99, 140, 101, 102, 103, 104, 
+	105, 106, 140, 153, 154, 154, 108, 109, 
+	110, 111, 1, 2, 4, 116, 117, 118, 
+	119, 120, 112, 121, 112, 124, 125, 112, 
+	126, 112, 127, 112, 112, 128, 112, 112, 
+	112, 112, 112, 112, 122, 112, 123, 112, 
+	9, 112, 112, 112, 112, 112, 112, 112, 
+	112, 112, 112, 11, 112, 24, 112, 112, 
+	130, 27, 133, 134, 135, 132, 136, 137, 
+	138, 132, 132, 132, 132, 32, 132, 132, 
+	33, 132, 132, 132, 34, 37, 85, 139, 
+	139, 141, 142, 143, 140, 144, 144, 140, 
+	90, 140, 93, 140, 140, 96, 107, 140, 
+	89, 140, 145, 140, 140, 140, 147, 140, 
+	92, 140, 150, 152, 140, 95, 140, 140, 
+	140, 154, 155, 156, 157, 158, 154
 ]
 
 class << self
@@ -961,23 +1018,24 @@ self._re_scanner_trans_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, 21, 0, 23, 0, 24, 0, 0, 
-	25, 0, 26, 0, 0, 0, 0, 0, 
-	27, 0, 0, 0, 0, 0, 0, 28, 
-	0, 29, 30, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 33, 
-	34, 35, 0, 0, 36, 0, 37, 38, 
-	39, 40, 38, 41, 42, 43, 44, 45, 
-	46, 47, 48, 0, 49, 0, 50, 51, 
-	52, 53, 54, 55, 56, 57, 58, 59, 
-	0, 60, 0, 61, 62, 64, 0, 0, 
-	38, 38, 65, 0, 38, 66, 67, 68, 
-	69, 70, 0, 71, 72, 0, 73, 74, 
-	75, 0, 0, 0, 76, 77, 78, 79, 
-	80, 81, 82, 0, 83, 0, 84, 85, 
-	0, 0, 86, 0, 87, 88, 89, 38, 
-	90, 0, 91, 38, 0, 92, 0, 93, 
-	94, 95, 96, 38, 38, 38, 38, 97
+	0, 21, 22, 23, 0, 0, 25, 0, 
+	26, 0, 0, 27, 0, 28, 0, 0, 
+	0, 0, 0, 29, 0, 0, 0, 0, 
+	0, 0, 30, 0, 31, 32, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 35, 36, 37, 0, 0, 38, 
+	0, 39, 40, 41, 42, 40, 43, 44, 
+	45, 46, 47, 48, 49, 50, 0, 51, 
+	0, 52, 53, 54, 55, 56, 57, 58, 
+	59, 60, 61, 0, 62, 0, 63, 64, 
+	66, 0, 0, 40, 40, 67, 0, 40, 
+	68, 69, 70, 71, 72, 0, 73, 74, 
+	0, 75, 76, 77, 0, 0, 0, 78, 
+	79, 0, 40, 40, 80, 81, 82, 83, 
+	0, 84, 0, 85, 86, 0, 0, 87, 
+	0, 88, 0, 89, 90, 91, 40, 92, 
+	0, 93, 40, 0, 94, 0, 95, 96, 
+	97, 98, 40, 40, 40, 40, 99
 ]
 
 class << self
@@ -998,13 +1056,13 @@ 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, 31, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	33, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	63, 63, 63, 0, 0, 0, 0, 0, 
-	0, 63, 63, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 63, 0, 0, 
-	0, 0
+	0, 0, 65, 65, 65, 0, 0, 0, 
+	0, 0, 0, 65, 65, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 65, 0, 0, 0, 0
 ]
 
 class << self
@@ -1025,13 +1083,13 @@ 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, 32, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	34, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 34, 34, 34, 0, 0, 0, 
+	0, 0, 0, 34, 34, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	32, 32, 32, 0, 0, 0, 0, 0, 
-	0, 32, 32, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 32, 0, 0, 
-	0, 0
+	0, 0, 34, 0, 0, 0, 0
 ]
 
 class << self
@@ -1050,15 +1108,15 @@ self._re_scanner_eof_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, 
-	22, 22, 0, 22, 22, 0, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 0, 0, 0, 0, 0, 0, 
+	0, 0, 24, 24, 0, 24, 24, 0, 
+	24, 24, 24, 24, 24, 24, 24, 24, 
+	24, 24, 24, 24, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 22, 0, 0, 0, 0, 0, 
-	0, 0, 22, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 24, 0, 0, 0, 
+	0, 0, 0, 0, 24, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0
+	0, 0, 0, 0, 0, 0, 0
 ]
 
 class << self
@@ -1077,25 +1135,25 @@ self._re_scanner_eof_trans = [
 	43, 43, 43, 43, 43, 43, 43, 43, 
 	43, 43, 43, 43, 43, 43, 43, 43, 
 	43, 43, 43, 43, 43, 43, 43, 43, 
-	0, 0, 102, 0, 0, 107, 0, 0, 
+	99, 99, 0, 0, 105, 0, 0, 110, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 122, 122, 122, 122, 0, 149, 
-	149, 149, 149, 150, 150, 149, 151, 153, 
-	155, 155, 160, 162, 164, 166, 170, 172, 
-	0, 0, 0, 186, 186, 186, 186, 189, 
-	192, 0, 0, 211, 213, 215, 215, 215, 
-	219, 219, 219, 219, 224, 0, 232, 232, 
-	232, 232
+	0, 0, 0, 0, 125, 125, 125, 125, 
+	0, 152, 152, 152, 152, 153, 153, 152, 
+	154, 156, 158, 158, 163, 165, 167, 169, 
+	173, 175, 0, 0, 0, 189, 189, 189, 
+	189, 192, 195, 0, 0, 216, 216, 216, 
+	218, 220, 222, 222, 222, 226, 226, 226, 
+	226, 231, 0, 239, 239, 239, 239
 ]
 
 class << self
 	attr_accessor :re_scanner_start
 end
-self.re_scanner_start = 110;
+self.re_scanner_start = 112;
 class << self
 	attr_accessor :re_scanner_first_final
 end
-self.re_scanner_first_final = 110;
+self.re_scanner_first_final = 112;
 class << self
 	attr_accessor :re_scanner_error
 end
@@ -1104,36 +1162,36 @@ self.re_scanner_error = 0;
 class << self
 	attr_accessor :re_scanner_en_char_type
 end
-self.re_scanner_en_char_type = 128;
+self.re_scanner_en_char_type = 130;
 class << self
 	attr_accessor :re_scanner_en_unicode_property
 end
-self.re_scanner_en_unicode_property = 129;
+self.re_scanner_en_unicode_property = 131;
 class << self
 	attr_accessor :re_scanner_en_character_set
 end
-self.re_scanner_en_character_set = 130;
+self.re_scanner_en_character_set = 132;
 class << self
 	attr_accessor :re_scanner_en_set_escape_sequence
 end
-self.re_scanner_en_set_escape_sequence = 137;
+self.re_scanner_en_set_escape_sequence = 139;
 class << self
 	attr_accessor :re_scanner_en_escape_sequence
 end
-self.re_scanner_en_escape_sequence = 138;
+self.re_scanner_en_escape_sequence = 140;
 class << self
 	attr_accessor :re_scanner_en_conditional_expression
 end
-self.re_scanner_en_conditional_expression = 149;
+self.re_scanner_en_conditional_expression = 154;
 class << self
 	attr_accessor :re_scanner_en_main
 end
-self.re_scanner_en_main = 110;
+self.re_scanner_en_main = 112;
 
 
-# line 765 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 768 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1136 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1194 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -1144,9 +1202,9 @@ begin
 	act = 0
 end
 
-# line 766 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 769 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1207 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -1169,12 +1227,12 @@ begin
 	end
 	if _goto_level <= _resume
 	case _re_scanner_from_state_actions[cs] 
-	when 32 then
+	when 34 then
 # line 1 "NONE"
 		begin
 ts = p
 		end
-# line 1177 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1235 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 	_keys = cs << 1
 	_inds = _re_scanner_index_offsets[cs]
@@ -1193,7 +1251,7 @@ ts = p
 	cs = _re_scanner_trans_targs[_trans]
 	if _re_scanner_trans_actions[_trans] != 0
 	case _re_scanner_trans_actions[_trans]
-	when 34 then
+	when 36 then
 # line 149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth + 1 		end
@@ -1201,27 +1259,27 @@ ts = p
 # line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-	when 38 then
+	when 40 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-	when 64 then
+	when 66 then
 # line 12 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/char_type.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te, 1).first
-      when '\d'; emit(:type, :digit,      text, ts - 1, te)
-      when '\D'; emit(:type, :nondigit,   text, ts - 1, te)
-      when '\h'; emit(:type, :hex,        text, ts - 1, te)
-      when '\H'; emit(:type, :nonhex,     text, ts - 1, te)
-      when '\s'; emit(:type, :space,      text, ts - 1, te)
-      when '\S'; emit(:type, :nonspace,   text, ts - 1, te)
-      when '\w'; emit(:type, :word,       text, ts - 1, te)
-      when '\W'; emit(:type, :nonword,    text, ts - 1, te)
-      when '\R'; emit(:type, :linebreak,  text, ts - 1, te)
-      when '\X'; emit(:type, :xgrapheme,  text, ts - 1, te)
+      case text = copy(data, ts-1, te)
+      when '\d'; emit(:type, :digit,      text)
+      when '\D'; emit(:type, :nondigit,   text)
+      when '\h'; emit(:type, :hex,        text)
+      when '\H'; emit(:type, :nonhex,     text)
+      when '\s'; emit(:type, :space,      text)
+      when '\S'; emit(:type, :nonspace,   text)
+      when '\w'; emit(:type, :word,       text)
+      when '\W'; emit(:type, :nonword,    text)
+      when '\R'; emit(:type, :linebreak,  text)
+      when '\X'; emit(:type, :xgrapheme,  text)
       end
       	begin
 		top -= 1
@@ -1237,7 +1295,7 @@ te = p+1
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te, 1).first
+      text = copy(data, ts-1, te)
       type = (text[1] == 'P') ^ (text[3] == '^') ? :nonproperty : :property
 
       name = data[ts+2..te-2].pack('c*').gsub(/[\^\s_\-]/, '').downcase
@@ -1245,7 +1303,7 @@ te = p+1
       token = self.class.short_prop_map[name] || self.class.long_prop_map[name]
       raise UnknownUnicodePropertyError.new(name) unless token
 
-      self.emit(type, token.to_sym, text, ts-1, te)
+      self.emit(type, token.to_sym, text)
 
       	begin
 		top -= 1
@@ -1261,32 +1319,32 @@ te = p+1
 		begin
 te = p+1
  begin  # special case, emits two tokens
-      emit(:literal, :literal, '-', ts, te)
-      emit(:set, :intersection, '&&', ts, te)
+      emit(:literal, :literal, '-')
+      emit(:set, :intersection, '&&')
      end
 		end
-	when 69 then
+	when 71 then
 # line 182 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
       if tokens.last[1] == :open
-        emit(:set, :negate, text, ts, te)
+        emit(:set, :negate, text)
       else
-        emit(:literal, :literal, text, ts, te)
+        emit(:literal, :literal, text)
       end
      end
 		end
-	when 71 then
+	when 73 then
 # line 203 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:set, :intersection, *text(data, ts, te))
+      emit(:set, :intersection, copy(data, ts, te))
      end
 		end
-	when 67 then
+	when 69 then
 # line 207 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
@@ -1294,19 +1352,19 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 137
+		cs = 139
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 65 then
+	when 67 then
 # line 237 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:literal, :literal, *text(data, ts, te))
+      emit(:literal, :literal, copy(data, ts, te))
      end
 		end
 	when 14 then
@@ -1314,49 +1372,47 @@ te = p+1
 		begin
 te = p+1
  begin 
-      char, *rest = *text(data, ts, te)
-      char.force_encoding('utf-8') if char.respond_to?(:force_encoding)
-      emit(:literal, :literal, char, *rest)
+      text = copy(data, ts, te)
+      emit(:literal, :literal, text)
      end
 		end
-	when 72 then
+	when 74 then
 # line 191 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
       # ranges cant start with a subset or intersection/negation/range operator
       if tokens.last[0] == :set
-        emit(:literal, :literal, text, ts, te)
+        emit(:literal, :literal, text)
       else
-        emit(:set, :range, text, ts, te)
+        emit(:set, :range, text)
       end
      end
 		end
-	when 75 then
+	when 77 then
 # line 211 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      emit(:set, :open, *text(data, ts, te))
+      emit(:set, :open, copy(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 132
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 70 then
+	when 72 then
 # line 245 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      char, *rest = *text(data, ts, te)
-      char.force_encoding('utf-8') if char.respond_to?(:force_encoding)
-      emit(:literal, :literal, char, *rest)
+      text = copy(data, ts, te)
+      emit(:literal, :literal, text)
      end
 		end
 	when 15 then
@@ -1364,12 +1420,12 @@ p = p - 1; begin
 		begin
  begin p = ((te))-1; end
  begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
       # ranges cant start with a subset or intersection/negation/range operator
       if tokens.last[0] == :set
-        emit(:literal, :literal, text, ts, te)
+        emit(:literal, :literal, text)
       else
-        emit(:set, :range, text, ts, te)
+        emit(:set, :range, text)
       end
      end
 		end
@@ -1378,11 +1434,11 @@ p = p - 1; begin
 		begin
  begin p = ((te))-1; end
  begin 
-      emit(:set, :open, *text(data, ts, te))
+      emit(:set, :open, copy(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 132
 		_goto_level = _again
 		next
 	end
@@ -1394,17 +1450,16 @@ p = p - 1; begin
 		begin
  begin p = ((te))-1; end
  begin 
-      char, *rest = *text(data, ts, te)
-      char.force_encoding('utf-8') if char.respond_to?(:force_encoding)
-      emit(:literal, :literal, char, *rest)
+      text = copy(data, ts, te)
+      emit(:literal, :literal, text)
      end
 		end
-	when 77 then
-# line 255 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 79 then
+# line 254 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:escape, :literal, *text(data, ts, te, 1))
+      emit(:escape, :literal, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1414,30 +1469,30 @@ te = p+1
 
      end
 		end
-	when 76 then
-# line 260 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 78 then
+# line 259 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = 130;
+      cs = 132;
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 140
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 82 then
-# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 83 then
+# line 270 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te, 1).first
-      emit(:backref, :number, text, ts-1, te)
+      text = copy(data, ts-1, te)
+      emit(:backref, :number, text)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1447,12 +1502,12 @@ te = p+1
 
      end
 		end
-	when 88 then
-# line 277 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 90 then
+# line 276 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:escape, :octal, *text(data, ts, te, 1))
+      emit(:escape, :octal, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1462,27 +1517,27 @@ te = p+1
 
      end
 		end
-	when 79 then
-# line 282 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 80 then
+# line 281 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te, 1).first
-      when '\.';  emit(:escape, :dot,               text, ts-1, te)
-      when '\|';  emit(:escape, :alternation,       text, ts-1, te)
-      when '\^';  emit(:escape, :bol,               text, ts-1, te)
-      when '\$';  emit(:escape, :eol,               text, ts-1, te)
-      when '\?';  emit(:escape, :zero_or_one,       text, ts-1, te)
-      when '\*';  emit(:escape, :zero_or_more,      text, ts-1, te)
-      when '\+';  emit(:escape, :one_or_more,       text, ts-1, te)
-      when '\(';  emit(:escape, :group_open,        text, ts-1, te)
-      when '\)';  emit(:escape, :group_close,       text, ts-1, te)
-      when '\{';  emit(:escape, :interval_open,     text, ts-1, te)
-      when '\}';  emit(:escape, :interval_close,    text, ts-1, te)
-      when '\[';  emit(:escape, :set_open,          text, ts-1, te)
-      when '\]';  emit(:escape, :set_close,         text, ts-1, te)
+      case text = copy(data, ts-1, te)
+      when '\.';  emit(:escape, :dot,               text)
+      when '\|';  emit(:escape, :alternation,       text)
+      when '\^';  emit(:escape, :bol,               text)
+      when '\$';  emit(:escape, :eol,               text)
+      when '\?';  emit(:escape, :zero_or_one,       text)
+      when '\*';  emit(:escape, :zero_or_more,      text)
+      when '\+';  emit(:escape, :one_or_more,       text)
+      when '\(';  emit(:escape, :group_open,        text)
+      when '\)';  emit(:escape, :group_close,       text)
+      when '\{';  emit(:escape, :interval_open,     text)
+      when '\}';  emit(:escape, :interval_close,    text)
+      when '\[';  emit(:escape, :set_open,          text)
+      when '\]';  emit(:escape, :set_close,         text)
       when "\\\\";
-        emit(:escape, :backslash, text, ts-1, te)
+        emit(:escape, :backslash, text)
       end
       	begin
 		top -= 1
@@ -1493,22 +1548,22 @@ te = p+1
 
      end
 		end
-	when 85 then
-# line 303 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 86 then
+# line 302 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       # \b is emitted as backspace only when inside a character set, otherwise
       # it is a word boundary anchor. A syntax might "normalize" it if needed.
-      case text = text(data, ts, te, 1).first
-      when '\a'; emit(:escape, :bell,           text, ts-1, te)
-      when '\b'; emit(:escape, :backspace,      text, ts-1, te)
-      when '\e'; emit(:escape, :escape,         text, ts-1, te)
-      when '\f'; emit(:escape, :form_feed,      text, ts-1, te)
-      when '\n'; emit(:escape, :newline,        text, ts-1, te)
-      when '\r'; emit(:escape, :carriage,       text, ts-1, te)
-      when '\t'; emit(:escape, :tab,            text, ts-1, te)
-      when '\v'; emit(:escape, :vertical_tab,   text, ts-1, te)
+      case text = copy(data, ts-1, te)
+      when '\a'; emit(:escape, :bell,           text)
+      when '\b'; emit(:escape, :backspace,      text)
+      when '\e'; emit(:escape, :escape,         text)
+      when '\f'; emit(:escape, :form_feed,      text)
+      when '\n'; emit(:escape, :newline,        text)
+      when '\r'; emit(:escape, :carriage,       text)
+      when '\t'; emit(:escape, :tab,            text)
+      when '\v'; emit(:escape, :vertical_tab,   text)
       end
       	begin
 		top -= 1
@@ -1519,16 +1574,16 @@ te = p+1
 
      end
 		end
-	when 27 then
-# line 319 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 29 then
+# line 318 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te, 1).first
+      text = copy(data, ts-1, te)
       if text[2].chr == '{'
-        emit(:escape, :codepoint_list, text, ts-1, te)
+        emit(:escape, :codepoint_list, text)
       else
-        emit(:escape, :codepoint,      text, ts-1, te)
+        emit(:escape, :codepoint,      text)
       end
       	begin
 		top -= 1
@@ -1539,12 +1594,12 @@ te = p+1
 
      end
 		end
-	when 95 then
-# line 329 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 97 then
+# line 328 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:escape, :hex, *text(data, ts, te, 1))
+      emit(:escape, :hex, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1554,8 +1609,8 @@ te = p+1
 
      end
 		end
-	when 23 then
-# line 338 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 25 then
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1569,8 +1624,8 @@ te = p+1
 
      end
 		end
-	when 25 then
-# line 343 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 27 then
+# line 342 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1584,46 +1639,46 @@ te = p+1
 
      end
 		end
-	when 83 then
-# line 348 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 84 then
+# line 347 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = ((in_set? ? 130 : 110));
+      cs = ((in_set? ? 132 : 112));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 128
+		cs = 130
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 84 then
-# line 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 85 then
+# line 353 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = ((in_set? ? 130 : 110));
+      cs = ((in_set? ? 132 : 112));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 129
+		cs = 131
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 78 then
-# line 360 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 23 then
+# line 362 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:escape, :literal, *text(data, ts, te, 1))
+      emit(:escape, :literal, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1633,12 +1688,12 @@ te = p+1
 
      end
 		end
-	when 87 then
-# line 277 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 89 then
+# line 276 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      emit(:escape, :octal, *text(data, ts, te, 1))
+      emit(:escape, :octal, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1648,12 +1703,12 @@ p = p - 1; begin
 
      end
 		end
-	when 94 then
-# line 329 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 96 then
+# line 328 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      emit(:escape, :hex, *text(data, ts, te, 1))
+      emit(:escape, :hex, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1663,8 +1718,8 @@ p = p - 1; begin
 
      end
 		end
-	when 90 then
-# line 338 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 92 then
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1678,8 +1733,8 @@ p = p - 1; begin
 
      end
 		end
-	when 92 then
-# line 343 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 94 then
+# line 342 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1693,15 +1748,45 @@ p = p - 1; begin
 
      end
 		end
-	when 86 then
+	when 87 then
+# line 362 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p
+p = p - 1; begin 
+      emit(:escape, :literal, copy(data, ts-1, te))
+      	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+
+     end
+		end
+	when 22 then
+# line 362 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ begin p = ((te))-1; end
+ begin 
+      emit(:escape, :literal, copy(data, ts-1, te))
+      	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+
+     end
+		end
+	when 88 then
 # line 1 "NONE"
 		begin
 	case act
 	when 18 then
 	begin begin p = ((te))-1; end
 
-      text = text(data, ts, te, 1).first
-      emit(:backref, :number, text, ts-1, te)
+      text = copy(data, ts-1, te)
+      emit(:backref, :number, text)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1713,7 +1798,7 @@ p = p - 1; begin
 	when 19 then
 	begin begin p = ((te))-1; end
 
-      emit(:escape, :octal, *text(data, ts, te, 1))
+      emit(:escape, :octal, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1724,18 +1809,18 @@ p = p - 1; begin
     end
 end 
 			end
-	when 30 then
-# line 370 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 32 then
+# line 372 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te-1).first
-      emit(:conditional, :condition, text, ts, te-1)
-      emit(:conditional, :condition_close, ')', te-1, te)
+      text = copy(data, ts, te-1)
+      emit(:conditional, :condition, text)
+      emit(:conditional, :condition_close, ')')
      end
 		end
-	when 96 then
-# line 376 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 98 then
+# line 378 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1743,15 +1828,15 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 110
+		cs = 112
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 97 then
-# line 376 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 99 then
+# line 378 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1759,15 +1844,15 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 110
+		cs = 112
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 29 then
-# line 376 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 31 then
+# line 378 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1775,265 +1860,265 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 110
+		cs = 112
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 36 then
-# line 389 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 38 then
+# line 391 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:meta, :dot, *text(data, ts, te))
+      emit(:meta, :dot, copy(data, ts, te))
      end
 		end
-	when 41 then
-# line 393 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 43 then
+# line 395 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       if conditional_stack.last == group_depth
-        emit(:conditional, :separator, *text(data, ts, te))
+        emit(:conditional, :separator, copy(data, ts, te))
       else
-        emit(:meta, :alternation, *text(data, ts, te))
+        emit(:meta, :alternation, copy(data, ts, te))
       end
      end
 		end
-	when 40 then
-# line 403 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 42 then
+# line 405 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:anchor, :bol, *text(data, ts, te))
+      emit(:anchor, :bol, copy(data, ts, te))
      end
 		end
-	when 33 then
-# line 407 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 35 then
+# line 409 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:anchor, :eol, *text(data, ts, te))
+      emit(:anchor, :eol, copy(data, ts, te))
      end
 		end
-	when 59 then
-# line 411 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 61 then
+# line 413 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:keep, :mark, *text(data, ts, te))
+      emit(:keep, :mark, copy(data, ts, te))
      end
 		end
-	when 58 then
-# line 415 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 60 then
+# line 417 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
-      when '\\A'; emit(:anchor, :bos,                text, ts, te)
-      when '\\z'; emit(:anchor, :eos,                text, ts, te)
-      when '\\Z'; emit(:anchor, :eos_ob_eol,         text, ts, te)
-      when '\\b'; emit(:anchor, :word_boundary,      text, ts, te)
-      when '\\B'; emit(:anchor, :nonword_boundary,   text, ts, te)
-      when '\\G'; emit(:anchor, :match_start,        text, ts, te)
+      case text = copy(data, ts, te)
+      when '\\A'; emit(:anchor, :bos,                text)
+      when '\\z'; emit(:anchor, :eos,                text)
+      when '\\Z'; emit(:anchor, :eos_ob_eol,         text)
+      when '\\b'; emit(:anchor, :word_boundary,      text)
+      when '\\B'; emit(:anchor, :nonword_boundary,   text)
+      when '\\G'; emit(:anchor, :match_start,        text)
       end
      end
 		end
-	when 39 then
-# line 426 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 41 then
+# line 428 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       append_literal(data, ts, te)
      end
 		end
-	when 49 then
-# line 441 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 51 then
+# line 443 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
 
       conditional_stack << group_depth
 
-      emit(:conditional, :open, text[0..-2], ts, te-1)
-      emit(:conditional, :condition_open, '(', te-1, te)
+      emit(:conditional, :open, text[0..-2])
+      emit(:conditional, :condition_open, '(')
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 149
+		cs = 154
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 50 then
-# line 472 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 52 then
+# line 474 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
         raise InvalidGroupOption.new($1 || "-#{$2}", text)
       end
-      emit_options(text, ts, te)
+      emit_options(text)
      end
 		end
 	when 7 then
-# line 486 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 488 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
-      when '(?=';  emit(:assertion, :lookahead,    text, ts, te)
-      when '(?!';  emit(:assertion, :nlookahead,   text, ts, te)
-      when '(?<='; emit(:assertion, :lookbehind,   text, ts, te)
-      when '(?<!'; emit(:assertion, :nlookbehind,  text, ts, te)
+      case text = copy(data, ts, te)
+      when '(?=';  emit(:assertion, :lookahead,    text)
+      when '(?!';  emit(:assertion, :nlookahead,   text)
+      when '(?<='; emit(:assertion, :lookbehind,   text)
+      when '(?<!'; emit(:assertion, :nlookbehind,  text)
       end
      end
 		end
 	when 6 then
-# line 503 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 505 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
-      when '(?:';  emit(:group, :passive,      text, ts, te)
-      when '(?>';  emit(:group, :atomic,       text, ts, te)
-      when '(?~';  emit(:group, :absence,      text, ts, te)
+      case text = copy(data, ts, te)
+      when '(?:';  emit(:group, :passive,      text)
+      when '(?>';  emit(:group, :atomic,       text)
+      when '(?~';  emit(:group, :absence,      text)
 
       when /^\(\?(?:<>|'')/
         validation_error(:group, 'named group', 'name is empty')
 
       when /^\(\?<\w*>/
-        emit(:group, :named_ab,  text, ts, te)
+        emit(:group, :named_ab,  text)
 
       when /^\(\?'\w*'/
-        emit(:group, :named_sq,  text, ts, te)
+        emit(:group, :named_sq,  text)
 
       end
      end
 		end
 	when 9 then
-# line 544 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 546 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
+      case text = copy(data, ts, te)
       when /^\\([gk])(<>|'')/ # angle brackets
         validation_error(:backref, 'ref/call', 'ref ID is empty')
 
       when /^\\([gk])<[^\d+-]\w*>/ # angle-brackets
         if $1 == 'k'
-          emit(:backref, :name_ref_ab, text, ts, te)
+          emit(:backref, :name_ref_ab, text)
         else
-          emit(:backref, :name_call_ab, text, ts, te)
+          emit(:backref, :name_call_ab, text)
         end
 
       when /^\\([gk])'[^\d+-]\w*'/ #single quotes
         if $1 == 'k'
-          emit(:backref, :name_ref_sq, text, ts, te)
+          emit(:backref, :name_ref_sq, text)
         else
-          emit(:backref, :name_call_sq, text, ts, te)
+          emit(:backref, :name_call_sq, text)
         end
 
       when /^\\([gk])<\d+>/ # angle-brackets
         if $1 == 'k'
-          emit(:backref, :number_ref_ab, text, ts, te)
+          emit(:backref, :number_ref_ab, text)
         else
-          emit(:backref, :number_call_ab, text, ts, te)
+          emit(:backref, :number_call_ab, text)
         end
 
       when /^\\([gk])'\d+'/ # single quotes
         if $1 == 'k'
-          emit(:backref, :number_ref_sq, text, ts, te)
+          emit(:backref, :number_ref_sq, text)
         else
-          emit(:backref, :number_call_sq, text, ts, te)
+          emit(:backref, :number_call_sq, text)
         end
 
       when /^\\(?:g<\+|g<-|(k)<-)\d+>/ # angle-brackets
         if $1 == 'k'
-          emit(:backref, :number_rel_ref_ab, text, ts, te)
+          emit(:backref, :number_rel_ref_ab, text)
         else
-          emit(:backref, :number_rel_call_ab, text, ts, te)
+          emit(:backref, :number_rel_call_ab, text)
         end
 
       when /^\\(?:g'\+|g'-|(k)'-)\d+'/ # single quotes
         if $1 == 'k'
-          emit(:backref, :number_rel_ref_sq, text, ts, te)
+          emit(:backref, :number_rel_ref_sq, text)
         else
-          emit(:backref, :number_rel_call_sq, text, ts, te)
+          emit(:backref, :number_rel_call_sq, text)
         end
 
       when /^\\k<[^\d+\-]\w*[+\-]\d+>/ # angle-brackets
-        emit(:backref, :name_recursion_ref_ab, text, ts, te)
+        emit(:backref, :name_recursion_ref_ab, text)
 
       when /^\\k'[^\d+\-]\w*[+\-]\d+'/ # single-quotes
-        emit(:backref, :name_recursion_ref_sq, text, ts, te)
+        emit(:backref, :name_recursion_ref_sq, text)
 
       when /^\\([gk])<[+\-]?\d+[+\-]\d+>/ # angle-brackets
-        emit(:backref, :number_recursion_ref_ab, text, ts, te)
+        emit(:backref, :number_recursion_ref_ab, text)
 
       when /^\\([gk])'[+\-]?\d+[+\-]\d+'/ # single-quotes
-        emit(:backref, :number_recursion_ref_sq, text, ts, te)
+        emit(:backref, :number_recursion_ref_sq, text)
 
       end
      end
 		end
-	when 56 then
-# line 609 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 58 then
+# line 611 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
-      when '?' ;  emit(:quantifier, :zero_or_one,            text, ts, te)
-      when '??';  emit(:quantifier, :zero_or_one_reluctant,  text, ts, te)
-      when '?+';  emit(:quantifier, :zero_or_one_possessive, text, ts, te)
+      case text = copy(data, ts, te)
+      when '?' ;  emit(:quantifier, :zero_or_one,            text)
+      when '??';  emit(:quantifier, :zero_or_one_reluctant,  text)
+      when '?+';  emit(:quantifier, :zero_or_one_possessive, text)
       end
      end
 		end
-	when 52 then
-# line 617 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 54 then
+# line 619 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
-      when '*' ;  emit(:quantifier, :zero_or_more,            text, ts, te)
-      when '*?';  emit(:quantifier, :zero_or_more_reluctant,  text, ts, te)
-      when '*+';  emit(:quantifier, :zero_or_more_possessive, text, ts, te)
+      case text = copy(data, ts, te)
+      when '*' ;  emit(:quantifier, :zero_or_more,            text)
+      when '*?';  emit(:quantifier, :zero_or_more_reluctant,  text)
+      when '*+';  emit(:quantifier, :zero_or_more_possessive, text)
       end
      end
 		end
-	when 54 then
-# line 625 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 56 then
+# line 627 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      case text = text(data, ts, te).first
-      when '+' ;  emit(:quantifier, :one_or_more,            text, ts, te)
-      when '+?';  emit(:quantifier, :one_or_more_reluctant,  text, ts, te)
-      when '++';  emit(:quantifier, :one_or_more_possessive, text, ts, te)
+      case text = copy(data, ts, te)
+      when '+' ;  emit(:quantifier, :one_or_more,            text)
+      when '+?';  emit(:quantifier, :one_or_more_reluctant,  text)
+      when '++';  emit(:quantifier, :one_or_more_possessive, text)
       end
      end
 		end
-	when 62 then
-# line 633 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 64 then
+# line 635 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:quantifier, :interval, *text(data, ts, te))
+      emit(:quantifier, :interval, copy(data, ts, te))
      end
 		end
-	when 45 then
-# line 648 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 47 then
+# line 650 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       if free_spacing
-        emit(:free_space, :comment, *text(data, ts, te))
+        emit(:free_space, :comment, copy(data, ts, te))
       else
         # consume only the pound sign (#) and backtrack to do regular scanning
         append_literal(data, ts, ts + 1)
@@ -2042,101 +2127,101 @@ te = p+1
       end
      end
 		end
-	when 48 then
-# line 472 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 50 then
+# line 474 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
         raise InvalidGroupOption.new($1 || "-#{$2}", text)
       end
-      emit_options(text, ts, te)
+      emit_options(text)
      end
 		end
-	when 46 then
-# line 521 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 48 then
+# line 523 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      text = text(data, ts, te).first
-      emit(:group, :capture, text, ts, te)
+      text = copy(data, ts, te)
+      emit(:group, :capture, text)
      end
 		end
-	when 55 then
-# line 609 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 57 then
+# line 611 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      case text = text(data, ts, te).first
-      when '?' ;  emit(:quantifier, :zero_or_one,            text, ts, te)
-      when '??';  emit(:quantifier, :zero_or_one_reluctant,  text, ts, te)
-      when '?+';  emit(:quantifier, :zero_or_one_possessive, text, ts, te)
+      case text = copy(data, ts, te)
+      when '?' ;  emit(:quantifier, :zero_or_one,            text)
+      when '??';  emit(:quantifier, :zero_or_one_reluctant,  text)
+      when '?+';  emit(:quantifier, :zero_or_one_possessive, text)
       end
      end
 		end
-	when 51 then
-# line 617 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 53 then
+# line 619 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      case text = text(data, ts, te).first
-      when '*' ;  emit(:quantifier, :zero_or_more,            text, ts, te)
-      when '*?';  emit(:quantifier, :zero_or_more_reluctant,  text, ts, te)
-      when '*+';  emit(:quantifier, :zero_or_more_possessive, text, ts, te)
+      case text = copy(data, ts, te)
+      when '*' ;  emit(:quantifier, :zero_or_more,            text)
+      when '*?';  emit(:quantifier, :zero_or_more_reluctant,  text)
+      when '*+';  emit(:quantifier, :zero_or_more_possessive, text)
       end
      end
 		end
-	when 53 then
-# line 625 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 55 then
+# line 627 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      case text = text(data, ts, te).first
-      when '+' ;  emit(:quantifier, :one_or_more,            text, ts, te)
-      when '+?';  emit(:quantifier, :one_or_more_reluctant,  text, ts, te)
-      when '++';  emit(:quantifier, :one_or_more_possessive, text, ts, te)
+      case text = copy(data, ts, te)
+      when '+' ;  emit(:quantifier, :one_or_more,            text)
+      when '+?';  emit(:quantifier, :one_or_more_reluctant,  text)
+      when '++';  emit(:quantifier, :one_or_more_possessive, text)
       end
      end
 		end
-	when 61 then
-# line 633 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 63 then
+# line 635 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      emit(:quantifier, :interval, *text(data, ts, te))
+      emit(:quantifier, :interval, copy(data, ts, te))
      end
 		end
-	when 60 then
-# line 638 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 62 then
+# line 640 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       append_literal(data, ts, te)
      end
 		end
-	when 57 then
-# line 644 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 59 then
+# line 646 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 140
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 44 then
-# line 648 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 46 then
+# line 650 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       if free_spacing
-        emit(:free_space, :comment, *text(data, ts, te))
+        emit(:free_space, :comment, copy(data, ts, te))
       else
         # consume only the pound sign (#) and backtrack to do regular scanning
         append_literal(data, ts, ts + 1)
@@ -2145,20 +2230,20 @@ p = p - 1; begin
       end
      end
 		end
-	when 43 then
-# line 658 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 45 then
+# line 660 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       if free_spacing
-        emit(:free_space, :whitespace, *text(data, ts, te))
+        emit(:free_space, :whitespace, copy(data, ts, te))
       else
         append_literal(data, ts, te)
       end
      end
 		end
-	when 42 then
-# line 673 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 44 then
+# line 675 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2166,19 +2251,19 @@ p = p - 1; begin
      end
 		end
 	when 3 then
-# line 472 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 474 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
         raise InvalidGroupOption.new($1 || "-#{$2}", text)
       end
-      emit_options(text, ts, te)
+      emit_options(text)
      end
 		end
 	when 10 then
-# line 638 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 640 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2186,14 +2271,14 @@ p = p - 1; begin
      end
 		end
 	when 8 then
-# line 644 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 646 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 140
 		_goto_level = _again
 		next
 	end
@@ -2218,22 +2303,22 @@ end
     end
 end 
 			end
-	when 74 then
+	when 76 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
 # line 211 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      emit(:set, :open, *text(data, ts, te))
+      emit(:set, :open, copy(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 132
 		_goto_level = _again
 		next
 	end
@@ -2244,36 +2329,36 @@ p = p - 1; begin
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
 # line 211 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
-      emit(:set, :open, *text(data, ts, te))
+      emit(:set, :open, copy(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 132
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 93 then
+	when 95 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 329 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 328 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      emit(:escape, :hex, *text(data, ts, te, 1))
+      emit(:escape, :hex, copy(data, ts-1, te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -2283,14 +2368,14 @@ p = p - 1; begin
 
      end
 		end
-	when 89 then
+	when 91 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 338 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2304,14 +2389,14 @@ p = p - 1; begin
 
      end
 		end
-	when 91 then
+	when 93 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 343 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 342 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2325,14 +2410,14 @@ p = p - 1; begin
 
      end
 		end
-	when 24 then
+	when 26 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 338 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2346,14 +2431,14 @@ p = p - 1; begin
 
      end
 		end
-	when 26 then
+	when 28 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 343 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 342 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2367,14 +2452,14 @@ p = p - 1; begin
 
      end
 		end
-	when 28 then
+	when 30 then
 # line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     validation_error(:sequence, 'sequence', text)
   		end
-# line 334 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 333 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2391,24 +2476,24 @@ te = p+1
 # line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-# line 457 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 459 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:group, :comment, *text(data, ts, te))
+      emit(:group, :comment, copy(data, ts, te))
      end
 		end
-	when 35 then
+	when 37 then
 # line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-# line 526 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 528 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       if conditional_stack.last == group_depth + 1
         conditional_stack.pop
-        emit(:conditional, :close, *text(data, ts, te))
+        emit(:conditional, :close, copy(data, ts, te))
       else
         if spacing_stack.length > 1 &&
            spacing_stack.last[:depth] == group_depth + 1
@@ -2416,30 +2501,30 @@ te = p+1
           self.free_spacing = spacing_stack.last[:free_spacing]
         end
 
-        emit(:group, :close, *text(data, ts, te))
+        emit(:group, :close, copy(data, ts, te))
       end
      end
 		end
-	when 37 then
+	when 39 then
 # line 151 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   + 1 		end
-# line 432 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 434 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:set, :open, *text(data, ts, te))
+      emit(:set, :open, copy(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 132
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 68 then
+	when 70 then
 # line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
@@ -2447,7 +2532,7 @@ te = p+1
 		begin
 te = p+1
  begin 
-      emit(:set, :close, *text(data, ts, te))
+      emit(:set, :close, copy(data, ts, te))
       if in_set?
         	begin
 		top -= 1
@@ -2458,7 +2543,7 @@ te = p+1
 
       else
         	begin
-		cs = 110
+		cs = 112
 		_goto_level = _again
 		next
 	end
@@ -2466,7 +2551,7 @@ te = p+1
       end
      end
 		end
-	when 73 then
+	when 75 then
 # line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
@@ -2474,8 +2559,8 @@ te = p+1
 		begin
 te = p+1
  begin  # special case, emits two tokens
-      emit(:literal, :literal, copy(data, ts..te-2), ts, te - 1)
-      emit(:set, :close, copy(data, ts+1..te-1), ts + 1, te)
+      emit(:literal, :literal, copy(data, ts, te-1))
+      emit(:set, :close, copy(data, ts+1, te))
       if in_set?
         	begin
 		top -= 1
@@ -2486,7 +2571,7 @@ te = p+1
 
       else
         	begin
-		cs = 110
+		cs = 112
 		_goto_level = _again
 		next
 	end
@@ -2502,7 +2587,7 @@ te = p+1
 		begin
 te = p+1
  begin 
-      text = text(data, ts, te).first
+      text = copy(data, ts, te)
 
       type = :posixclass
       class_name = text[2..-3]
@@ -2511,7 +2596,7 @@ te = p+1
         type = :nonposixclass
       end
 
-      emit(type, class_name.to_sym, text, ts, te)
+      emit(type, class_name.to_sym, text)
      end
 		end
 	when 19 then
@@ -2522,7 +2607,7 @@ te = p+1
 		begin
 te = p+1
  begin 
-      emit(:set, :collation, *text(data, ts, te))
+      emit(:set, :collation, copy(data, ts, te))
      end
 		end
 	when 21 then
@@ -2533,10 +2618,10 @@ te = p+1
 		begin
 te = p+1
  begin 
-      emit(:set, :equivalent, *text(data, ts, te))
+      emit(:set, :equivalent, copy(data, ts, te))
      end
 		end
-	when 66 then
+	when 68 then
 # line 1 "NONE"
 		begin
 te = p+1
@@ -2544,20 +2629,20 @@ te = p+1
 # line 151 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   + 1 		end
-	when 81 then
+	when 82 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 270 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 18;		end
-	when 80 then
+	when 81 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 277 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 276 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 19;		end
 	when 2 then
@@ -2565,10 +2650,10 @@ act = 19;		end
 		begin
 te = p+1
 		end
-# line 673 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 675 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 56;		end
-	when 47 then
+	when 49 then
 # line 1 "NONE"
 		begin
 te = p+1
@@ -2579,17 +2664,17 @@ te = p+1
 # line 149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth + 1 		end
-# line 2582 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2667 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 	end
 	end
 	if _goto_level <= _again
 	case _re_scanner_to_state_actions[cs] 
-	when 63 then
+	when 65 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-	when 31 then
+	when 33 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
@@ -2597,7 +2682,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 2600 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2685 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 
 	if cs == 0
@@ -2624,14 +2709,14 @@ act = 0
 
     raise PrematureEndError.new('unicode property')
   		end
-	when 22 then
+	when 24 then
 # line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 
-    text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+    text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 2634 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2719 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	  end
 	end
 
@@ -2642,13 +2727,13 @@ act = 0
 end
 	end
 
-# line 767 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 770 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
     # to avoid "warning: assigned but unused variable - testEof"
     testEof = testEof
 
     if cs == re_scanner_error
-      text = ts ? copy(data, ts-1..-1) : data.pack('c*')
+      text = copy(data, ts ? ts-1 : 0, -1)
       raise ScannerError.new("Scan error at '#{text}'")
     end
 
@@ -2676,22 +2761,29 @@ end
   end
 
   # Emits an array with the details of the scanned pattern
-  def emit(type, token, text, ts, te)
+  def emit(type, token, text)
     #puts "EMIT: type: #{type}, token: #{token}, text: #{text}, ts: #{ts}, te: #{te}"
 
     emit_literal if literal
 
+    # Ragel runs with byte-based indices (ts, te). These are of little value to
+    # end-users, so we keep track of char-based indices and emit those instead.
+    ts_char_pos = char_pos
+    te_char_pos = char_pos + text.length
+
     if block
-      block.call type, token, text, ts, te
+      block.call type, token, text, ts_char_pos, te_char_pos
     end
 
-    tokens << [type, token, text, ts, te]
+    tokens << [type, token, text, ts_char_pos, te_char_pos]
+
+    self.char_pos = te_char_pos
   end
 
   private
 
   attr_accessor :tokens, :literal, :block, :free_spacing, :spacing_stack,
-                :group_depth, :set_depth, :conditional_stack
+                :group_depth, :set_depth, :conditional_stack, :char_pos
 
   def free_spacing?(input_object, options)
     if options && !input_object.is_a?(String)
@@ -2714,36 +2806,25 @@ end
   end
 
   # Copy from ts to te from data as text
-  def copy(data, range)
-    data[range].pack('c*')
-  end
-
-  # Copy from ts to te from data as text, returning an array with the text
-  #  and the offsets used to copy it.
-  def text(data, ts, te, soff = 0)
-    [copy(data, ts-soff..te-1), ts-soff, te]
+  def copy(data, ts, te)
+    data[ts...te].pack('c*').force_encoding('utf-8')
   end
 
   # Appends one or more characters to the literal buffer, to be emitted later
-  # by a call to emit_literal. Contents can be a mix of ASCII and UTF-8.
+  # by a call to emit_literal.
   def append_literal(data, ts, te)
     self.literal = literal || []
-    literal << text(data, ts, te)
+    literal << copy(data, ts, te)
   end
 
-  # Emits the literal run collected by calls to the append_literal method,
-  # using the total start (ts) and end (te) offsets of the run.
+  # Emits the literal run collected by calls to the append_literal method.
   def emit_literal
-    ts, te = literal.first[1], literal.last[2]
-    text = literal.map {|t| t[0]}.join
-
-    text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
-
+    text = literal.join
     self.literal = nil
-    emit(:literal, :literal, text, ts, te)
+    emit(:literal, :literal, text)
   end
 
-  def emit_options(text, ts, te)
+  def emit_options(text)
     token = nil
 
     # Ruby allows things like '(?-xxxx)' or '(?xx-xx--xx-:abc)'.
@@ -2769,14 +2850,14 @@ end
       token = :options_switch
     end
 
-    emit(:group, token, text, ts, te)
+    emit(:group, token, text)
   end
 
   def emit_meta_control_sequence(data, ts, te, token)
     if data.last < 0x00 || data.last > 0x7F
       validation_error(:sequence, 'escape', token.to_s)
     end
-    emit(:escape, token, *text(data, ts, te, 1))
+    emit(:escape, token, copy(data, ts-1, te))
   end
 
   # Centralizes and unifies the handling of validation related