regexp_parser 1.8.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c8e3ba5269d32f57fdcad4ba98f16bc88b74713106a23f63ba2728fa89cf802
-  data.tar.gz: bbb1fe8c3f72b750a707a9f6c237c752455b4cd34d2bc8b0f255284fd32d4ed3
+  metadata.gz: a3d9161fb969c7c5aac0798a31054ed4f0d5da8992b8167afa7025492d1042c9
+  data.tar.gz: 8321d42545c5dbfc810ad3f32fb03677e95d1dba3f3145f20af2e655f1ca45c3
 SHA512:
-  metadata.gz: 93f94773ee6cb173771608ecdaf67e9e444e1ba7922cd97b8124a6ec90868e94b484ad6bdd0599d9ae9c2247e2a1627cdb03c620ce85f62d320ba8b1fdbb63bb
-  data.tar.gz: 9e1927e7c10d182bce099f24964f8c7e88ac76d479d22c632ab09406bc37711c9cc78af53892d46b009d0f12c8c3ffcd2221b2a1b2ca5365b3d3c1797448f3f2
+  metadata.gz: def5d282e5720c260bcb581e666704d04579534f8e04986867382836e58f4949d1eea0d3f7b3b2efdb71c5796b3bc6e5c4f92594aab9c9cd61985de18627c026
+  data.tar.gz: 3e2671325e18a6b4d61b5cd9da410f21a3cdc24382f415b9517498437d2c5e8e473ebe481aeb610667f33aa9d538d05d43b3fae5565b1fb856690e81377e82e5

data/CHANGELOG.md

@@ -1,5 +1,75 @@
 ## [Unreleased]
 
+## [2.0.2] - 2020-12-25 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Fixed
+
+- fixed `FrozenError` when calling `#to_s` on a frozen `Group::Passive`
+  * thanks to [Daniel Gollahon](https://github.com/dgollahon)
+
+## [2.0.1] - 2020-12-20 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Fixed
+
+- fixed error when scanning some group names
+  * this affected names containing hyphens, digits or multibyte chars, e.g. `/(?<a1>a)/`
+  * thanks to [Daniel Gollahon](https://github.com/dgollahon) for the report
+- fixed error when scanning hex escapes with just one hex digit
+  * e.g. `/\x0A/` was scanned correctly, but the equivalent `/\xA/` was not
+  * thanks to [Daniel Gollahon](https://github.com/dgollahon) for the report
+
+## [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
+
+- fix `FrozenError` in `Expression::Base#repetitions` on Ruby 3.0
+  * thanks to [Thomas Walpole](https://github.com/twalpole)
+- removed "unknown future version" warning on Ruby 3.0
+
+### [1.8.1] - 2020-09-28 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Fixed
+
+- fixed scanning of comment-like text in normal mode
+  * this was an old bug, but had become more prevalent in v1.8.0
+  * thanks to [Tietew](https://github.com/Tietew) for the report
+- specified correct minimum Ruby version in gemspec
+  * it said 1.9 but really required 2.0 as of v1.8.0
+
 ### [1.8.0] - 2020-09-20 - [Janosch Müller](mailto:janosch84@gmail.com)
 
 ### Changed

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'ice_nine', '~> 0.11.2'
   gem 'rake', '~> 13.0'
   gem 'regexp_property_values', '~> 1.0'
   gem 'rspec', '~> 3.8'

data/README.md

@@ -1,6 +1,6 @@
 # Regexp::Parser
 
-[![Gem Version](https://badge.fury.io/rb/regexp_parser.svg)](http://badge.fury.io/rb/regexp_parser) [![Build Status](https://secure.travis-ci.org/ammar/regexp_parser.svg?branch=master)](http://travis-ci.org/ammar/regexp_parser) [![Code Climate](https://codeclimate.com/github/ammar/regexp_parser.svg)](https://codeclimate.com/github/ammar/regexp_parser/badges)
+[![Gem Version](https://badge.fury.io/rb/regexp_parser.svg)](http://badge.fury.io/rb/regexp_parser) [![Build Status](https://github.com/ammar/regexp_parser/workflows/tests/badge.svg)](https://github.com/ammar/regexp_parser/actions) [![Code Climate](https://codeclimate.com/github/ammar/regexp_parser.svg)](https://codeclimate.com/github/ammar/regexp_parser/badges)
 
 A Ruby gem for tokenizing, parsing, and transforming regular expressions.
 
@@ -8,8 +8,8 @@ A Ruby gem for tokenizing, parsing, and transforming regular expressions.
   * A scanner/tokenizer based on [Ragel](http://www.colm.net/open-source/ragel/)
   * A lexer that produces a "stream" of token objects.
   * A parser that produces a "tree" of Expression objects (OO API)
-* Runs on Ruby 2.x and JRuby runtimes
-* Recognizes Ruby 1.8, 1.9, and 2.x regular expressions [See Supported Syntax](#supported-syntax)
+* Runs on Ruby 2.x, 3.x and JRuby runtimes
+* Recognizes Ruby 1.8, 1.9, 2.x and 3.x regular expressions [See Supported Syntax](#supported-syntax)
 
 
 _For examples of regexp_parser in use, see [Example Projects](#example-projects)._
@@ -18,13 +18,10 @@ _For examples of regexp_parser in use, see [Example Projects](#example-projects)
 ---
 ## Requirements
 
-* Ruby >= 1.9
+* Ruby >= 2.0
 * Ragel >= 6.0, but only if you want to build the gem or work on the scanner.
 
 
-_Note: See the .travis.yml file for covered versions._
-
-
 ---
 ## Install
 
@@ -317,7 +314,7 @@ Expression class. See the next section for details._
 
 ## Supported Syntax
 The three modules support all the regular expression syntax features of Ruby 1.8,
-1.9, and 2.x:
+1.9, 2.x and 3.x:
 
 _Note that not all of these are available in all versions of Ruby_
 
@@ -440,13 +437,17 @@ rake install
 ## Example Projects
 Projects using regexp_parser.
 
+- [capybara](https://github.com/teamcapybara/capybara) is an integration testing tool that uses regexp_parser to convert Regexps to css/xpath selectors.
+
+- [js_regex](https://github.com/janosch-x/js_regex) converts Ruby regular expressions to JavaScript-compatible regular expressions.
+
 - [meta_re](https://github.com/ammar/meta_re) is a regular expression preprocessor with alias support.
 
 - [mutant](https://github.com/mbj/mutant) (before v0.9.0) manipulates your regular expressions (amongst others) to see if your tests cover their behavior.
 
-- [twitter-cldr-rb](https://github.com/twitter/twitter-cldr-rb) uses regexp_parser to generate examples of postal codes.
+- [rubocop](https://github.com/rubocop-hq/rubocop) is a linter for Ruby that uses regexp_parser to lint Regexps.
 
-- [js_regex](https://github.com/janosch-x/js_regex) converts Ruby regular expressions to JavaScript-compatible regular expressions.
+- [twitter-cldr-rb](https://github.com/twitter/twitter-cldr-rb) is a localization helper that uses regexp_parser to generate examples of postal codes.
 
 
 ## References
@@ -475,4 +476,4 @@ Documentation and books used while working on this project.
 
 ---
 ##### Copyright
-_Copyright (c) 2010-2019 Ammar Ali. See LICENSE file for details._
+_Copyright (c) 2010-2020 Ammar Ali. See LICENSE file for details._

data/Rakefile

@@ -25,7 +25,7 @@ end
 
 namespace :ragel do
   desc "Process the ragel source files and output ruby code"
-  task :rb do |t|
+  task :rb do
     RAGEL_SOURCE_FILES.each do |file|
       output_file = "#{RAGEL_OUTPUT_DIR}/#{file}.rb"
       # using faster flat table driven FSM, about 25% larger code, but about 30% faster
@@ -42,7 +42,7 @@ namespace :ragel do
   end
 
   desc "Delete the ragel generated source file(s)"
-  task :clean do |t|
+  task :clean do
     RAGEL_SOURCE_FILES.each do |file|
       sh "rm -f #{RAGEL_OUTPUT_DIR}/#{file}.rb"
     end

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
@@ -80,8 +84,12 @@ module Regexp::Expression
       return 1..1 unless quantified?
       min = quantifier.min
       max = quantifier.max < 0 ? Float::INFINITY : quantifier.max
-      # fix Range#minmax - https://bugs.ruby-lang.org/issues/15807
-      (min..max).tap { |r| r.define_singleton_method(:minmax) { [min, max] } }
+      range = min..max
+      # fix Range#minmax on old Rubies - https://bugs.ruby-lang.org/issues/15807
+      if RUBY_VERSION.to_f < 2.7
+        range.define_singleton_method(:minmax) { [min, max] }
+      end
+      range
     end
 
     def greedy?
@@ -114,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/free_space.rb

@@ -1,7 +1,7 @@
 module Regexp::Expression
 
   class FreeSpace < Regexp::Expression::Base
-    def quantify(token, text, min = nil, max = nil, mode = :greedy)
+    def quantify(_token, _text, _min = nil, _max = nil, _mode = :greedy)
       raise "Can not quantify a free space object"
     end
   end

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

@@ -10,9 +10,29 @@ 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 initialize(*)
+        @implicit = false
+        super
+      end
+
+      def to_s(format = :full)
+        if implicit?
+          "#{expressions.join}#{quantifier_affix(format)}"
+        else
+          super
+        end
+      end
+
+      def implicit?
+        @implicit
+      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/methods/match_length.rb

@@ -10,7 +10,7 @@ class Regexp::MatchLength
     self.exp_class = exp.class
     self.min_rep = exp.repetitions.min
     self.max_rep = exp.repetitions.max
-    if base = opts[:base]
+    if (base = opts[:base])
       self.base_min = base
       self.base_max = base
       self.reify = ->{ '.' * base }
@@ -32,7 +32,7 @@ class Regexp::MatchLength
     end
   end
 
-  def endless_each(&block)
+  def endless_each
     return enum_for(__method__) unless block_given?
     (min..max).each { |num| yield(num) if include?(num) }
   end

data/lib/regexp_parser/expression/methods/traverse.rb

@@ -36,7 +36,7 @@ module Regexp::Expression
 
     # Iterates over the expressions of this expression as an array, passing
     # the expression and its index within its parent to the given block.
-    def each_expression(include_self = false, &block)
+    def each_expression(include_self = false)
       return enum_for(__method__, include_self) unless block_given?
 
       traverse(include_self) do |event, exp, index|
@@ -47,7 +47,7 @@ module Regexp::Expression
     # Returns a new array with the results of calling the given block once
     # for every expression. If a block is not given, returns an array with
     # each expression and its level index as an array.
-    def flat_map(include_self = false, &block)
+    def flat_map(include_self = false)
       result = []
 
       each_expression(include_self) do |exp, index|

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 676 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 673 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
 
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
@@ -88,72 +88,74 @@ 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=
 end
 self._re_scanner_trans_keys = [
 	0, 0, -128, -65, -128, -65, 
-	-128, -65, -128, -65, -128, 
-	-65, -128, -65, 41, 41, 
-	39, 122, 33, 122, 48, 122, 
-	39, 60, 39, 122, 48, 
+	-128, -65, 41, 41, 39, 
+	57, 39, 39, 33, 62, 
+	62, 62, 39, 60, 39, 57, 
+	39, 39, 48, 57, 39, 
 	57, 39, 57, 48, 57, 
-	39, 57, 39, 122, 43, 122, 
-	48, 57, 48, 62, 48, 
-	57, 43, 62, 43, 122, 
-	48, 57, 48, 125, 44, 125, 
-	123, 123, 9, 122, 9, 
-	125, 9, 122, -128, -65, 
-	-128, -65, 38, 38, 45, 122, 
-	45, 122, 93, 93, 94, 
-	120, 97, 120, 108, 115, 
-	110, 112, 117, 117, 109, 109, 
-	58, 58, 93, 93, 104, 
-	104, 97, 97, 99, 99, 
-	105, 105, 105, 105, 108, 108, 
-	97, 97, 110, 110, 107, 
-	107, 110, 110, 116, 116, 
-	114, 114, 108, 108, 105, 105, 
-	103, 103, 105, 105, 116, 
-	116, 114, 114, 97, 97, 
-	112, 112, 104, 104, 111, 111, 
-	119, 119, 101, 101, 114, 
-	114, 114, 117, 105, 105, 
-	110, 110, 110, 110, 99, 99, 
-	112, 112, 97, 97, 99, 
-	99, 101, 101, 112, 112, 
-	112, 112, 111, 111, 114, 114, 
-	100, 100, 100, 100, 65, 
-	122, 61, 61, 93, 93, 
+	45, 62, 62, 62, 48, 57, 
+	48, 62, 43, 62, 48, 
+	57, 48, 57, 48, 125, 
+	44, 125, 123, 123, 9, 122, 
+	9, 125, 9, 122, -128, 
+	-65, -128, -65, 38, 38, 
+	45, 122, 45, 122, 93, 93, 
+	94, 120, 97, 120, 108, 
+	115, 110, 112, 117, 117, 
+	109, 109, 58, 58, 93, 93, 
+	104, 104, 97, 97, 99, 
+	99, 105, 105, 105, 105, 
+	108, 108, 97, 97, 110, 110, 
+	107, 107, 110, 110, 116, 
+	116, 114, 114, 108, 108, 
+	105, 105, 103, 103, 105, 105, 
+	116, 116, 114, 114, 97, 
+	97, 112, 112, 104, 104, 
+	111, 111, 119, 119, 101, 101, 
+	114, 114, 114, 117, 105, 
+	105, 110, 110, 110, 110, 
+	99, 99, 112, 112, 97, 97, 
+	99, 99, 101, 101, 112, 
+	112, 112, 112, 111, 111, 
+	114, 114, 100, 100, 100, 100, 
+	65, 122, 61, 61, 93, 
+	93, -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, 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, 48, 123, 39, 39, 
+	41, 41, 41, 57, 62, 
+	62, -128, 127, -62, -12, 
+	1, 127, 1, 127, 9, 32, 
+	33, 126, 10, 10, 63, 
+	63, 33, 126, 33, 126, 
+	62, 62, 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, 57, 49, 57, 41, 57, 
+	45, 62, 0
 ]
 
 class << self
@@ -161,26 +163,26 @@ class << self
 	private :_re_scanner_key_spans, :_re_scanner_key_spans=
 end
 self._re_scanner_key_spans = [
-	0, 64, 64, 64, 64, 64, 64, 1, 
-	84, 90, 75, 22, 84, 10, 19, 10, 
-	19, 84, 80, 10, 15, 10, 20, 80, 
-	10, 78, 82, 1, 114, 117, 114, 64, 
-	64, 1, 78, 78, 1, 27, 24, 8, 
-	3, 1, 1, 1, 1, 1, 1, 1, 
+	0, 64, 64, 64, 1, 19, 1, 30, 
+	1, 22, 19, 1, 10, 19, 19, 10, 
+	18, 1, 10, 15, 20, 10, 10, 78, 
+	82, 1, 114, 117, 114, 64, 64, 1, 
+	78, 78, 1, 27, 24, 8, 3, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	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, 4, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 58, 1, 1, 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, 90, 8, 8, 1, 1, 0, 
-	33, 1, 0, 1, 55, 22, 84, 9, 
-	17, 75
+	117, 76, 1, 1, 17, 1, 256, 51, 
+	127, 127, 24, 94, 1, 1, 94, 94, 
+	1, 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, 
+	19, 9, 17, 18
 ]
 
 class << self
@@ -188,26 +190,26 @@ class << self
 	private :_re_scanner_index_offsets, :_re_scanner_index_offsets=
 end
 self._re_scanner_index_offsets = [
-	0, 0, 65, 130, 195, 260, 325, 390, 
-	392, 477, 568, 644, 667, 752, 763, 783, 
-	794, 814, 899, 980, 991, 1007, 1018, 1039, 
-	1120, 1131, 1210, 1293, 1295, 1410, 1528, 1643, 
-	1708, 1773, 1775, 1854, 1933, 1935, 1963, 1988, 
-	1997, 2001, 2003, 2005, 2007, 2009, 2011, 2013, 
-	2015, 2017, 2019, 2021, 2023, 2025, 2027, 2029, 
-	2031, 2033, 2035, 2037, 2039, 2041, 2043, 2045, 
-	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
+	0, 0, 65, 130, 195, 197, 217, 219, 
+	250, 252, 275, 295, 297, 308, 328, 348, 
+	359, 378, 380, 391, 407, 428, 439, 450, 
+	529, 612, 614, 729, 847, 962, 1027, 1092, 
+	1094, 1173, 1252, 1254, 1282, 1307, 1316, 1320, 
+	1322, 1324, 1326, 1328, 1330, 1332, 1334, 1336, 
+	1338, 1340, 1342, 1344, 1346, 1348, 1350, 1352, 
+	1354, 1356, 1358, 1360, 1362, 1364, 1366, 1368, 
+	1370, 1372, 1374, 1376, 1378, 1383, 1385, 1387, 
+	1389, 1391, 1393, 1395, 1397, 1399, 1401, 1403, 
+	1405, 1407, 1409, 1411, 1470, 1472, 1474, 1539, 
+	1604, 1606, 1608, 1610, 1612, 1614, 1616, 1693, 
+	1749, 1805, 1861, 1917, 2035, 2153, 2271, 2389, 
+	2507, 2625, 2702, 2704, 2706, 2724, 2726, 2983, 
+	3035, 3163, 3291, 3316, 3411, 3413, 3415, 3510, 
+	3605, 3607, 3629, 3651, 3673, 3732, 3747, 3769, 
+	3822, 3856, 4045, 4110, 4175, 4240, 4242, 4299, 
+	4316, 4392, 4581, 4646, 4711, 4776, 4785, 4794, 
+	4796, 4798, 4799, 4833, 4835, 4836, 4838, 4894, 
+	4917, 4937, 4947, 4965
 ]
 
 class << self
@@ -239,673 +241,606 @@ self._re_scanner_indicies = [
 	3, 3, 3, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
-	3, 3, 0, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
+	3, 3, 0, 6, 5, 8, 7, 7, 
+	7, 7, 7, 4, 7, 7, 4, 4, 
 	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 0, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 5, 5, 0, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 6, 6, 0, 9, 8, 
-	10, 7, 7, 7, 7, 7, 7, 7, 
-	7, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 7, 7, 7, 7, 7, 
-	7, 7, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
+	7, 8, 7, 10, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 4, 
+	9, 9, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 9, 9, 9, 10, 
+	8, 9, 8, 9, 12, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 7, 7, 7, 7, 
-	11, 7, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 7, 12, 7, 7, 
-	7, 7, 7, 7, 7, 7, 7, 7, 
-	7, 7, 7, 7, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 7, 7, 
-	7, 12, 10, 7, 7, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 7, 
-	7, 7, 7, 13, 7, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 7, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 7, 7, 7, 7, 10, 7, 
-	7, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 7, 7, 7, 7, 13, 
-	7, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 7, 15, 14, 14, 14, 
-	14, 14, 14, 14, 14, 14, 14, 14, 
-	14, 14, 14, 14, 14, 14, 14, 14, 
-	14, 16, 14, 17, 14, 14, 14, 18, 
-	14, 19, 14, 14, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 14, 14, 
-	14, 14, 14, 14, 14, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 14, 
-	14, 14, 14, 20, 14, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 14, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 14, 17, 14, 14, 14, 14, 
-	14, 14, 14, 14, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 14, 21, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 14, 17, 14, 14, 14, 18, 14, 
-	18, 14, 14, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 14, 17, 14, 
-	14, 14, 18, 14, 18, 14, 14, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 14, 14, 14, 14, 14, 14, 14, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 14, 14, 14, 14, 20, 14, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 14, 23, 14, 24, 14, 14, 
+	11, 13, 11, 15, 14, 14, 14, 14, 
+	14, 16, 14, 14, 11, 17, 17, 17, 
+	17, 17, 17, 17, 17, 17, 14, 15, 
+	14, 18, 17, 17, 17, 17, 17, 17, 
+	17, 17, 17, 11, 15, 11, 11, 11, 
+	11, 11, 11, 11, 11, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 11, 
+	15, 11, 11, 11, 19, 11, 19, 11, 
+	11, 17, 17, 17, 17, 17, 17, 17, 
+	17, 17, 17, 11, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 11, 21, 
+	20, 20, 11, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 20, 20, 20, 20, 
+	15, 20, 15, 20, 23, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 11, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 11, 11, 11, 11, 15, 11, 24, 
+	11, 24, 11, 11, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 11, 11, 
+	11, 11, 15, 11, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 11, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 25, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 14, 14, 14, 14, 17, 14, 
-	14, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 14, 14, 14, 14, 25, 
-	14, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 14, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 14, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 14, 14, 14, 14, 17, 14, 26, 
-	27, 27, 27, 27, 27, 27, 27, 27, 
-	27, 14, 23, 14, 23, 14, 14, 27, 
-	27, 27, 27, 27, 27, 27, 27, 27, 
-	27, 14, 14, 14, 14, 17, 14, 23, 
-	14, 23, 14, 14, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 14, 14, 
-	14, 14, 17, 14, 14, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 14, 
-	14, 14, 14, 25, 14, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 27, 
+	25, 26, 25, 25, 25, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 14, 
-	29, 29, 29, 29, 29, 29, 29, 29, 
-	29, 29, 28, 29, 29, 29, 29, 29, 
-	29, 29, 29, 29, 29, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	30, 28, 29, 28, 28, 28, 31, 31, 
+	25, 25, 25, 25, 25, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 25, 
+	25, 25, 27, 25, 29, 30, 31, 31, 
+	31, 31, 31, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 31, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 31, 31, 30, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 30, 
+	30, 30, 31, 30, 30, 30, 31, 31, 
 	31, 31, 31, 31, 31, 31, 31, 31, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 30, 28, 32, 33, 34, 
-	34, 34, 34, 34, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 34, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 34, 34, 33, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	33, 33, 33, 34, 33, 33, 33, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 33, 33, 33, 35, 34, 33, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 33, 34, 34, 34, 34, 34, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 34, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 34, 34, 
-	33, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 33, 33, 33, 34, 33, 
-	33, 33, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 33, 33, 33, 33, 
-	34, 33, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 33, 33, 36, 33, 
-	34, 34, 34, 34, 34, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 33, 33, 33, 34, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 33, 33, 34, 34, 33, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 33, 33, 33, 34, 33, 33, 33, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 33, 33, 33, 33, 34, 33, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 33, 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, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 37, 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, 
-	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, 39, 39, 39, 39, 
-	39, 39, 39, 39, 37, 41, 40, 44, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 43, 43, 43, 
-	43, 43, 43, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 43, 44, 45, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 43, 43, 43, 43, 
-	43, 43, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 43, 46, 43, 47, 
-	43, 43, 48, 49, 50, 51, 43, 43, 
-	52, 43, 43, 43, 43, 53, 43, 43, 
-	43, 54, 43, 43, 55, 43, 56, 43, 
-	57, 58, 43, 48, 49, 50, 51, 43, 
-	43, 52, 43, 43, 43, 43, 53, 43, 
-	43, 43, 54, 43, 43, 55, 43, 56, 
-	43, 57, 58, 43, 59, 43, 43, 43, 
-	43, 43, 43, 60, 43, 61, 43, 62, 
-	43, 63, 43, 64, 43, 65, 43, 66, 
-	43, 67, 43, 64, 43, 68, 43, 69, 
-	43, 64, 43, 70, 43, 71, 43, 72, 
-	43, 64, 43, 73, 43, 74, 43, 75, 
-	43, 64, 43, 76, 43, 77, 43, 78, 
-	43, 64, 43, 79, 43, 80, 43, 81, 
-	43, 64, 43, 82, 43, 83, 43, 84, 
-	43, 64, 43, 85, 43, 43, 86, 43, 
-	87, 43, 78, 43, 88, 43, 78, 43, 
-	89, 43, 90, 43, 91, 43, 64, 43, 
-	92, 43, 83, 43, 93, 43, 94, 43, 
-	64, 43, 51, 43, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 43, 43, 
-	43, 43, 43, 43, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 43, 96, 
-	43, 97, 43, 98, 33, 100, 99, 102, 
-	99, 103, 33, 105, 104, 107, 104, 108, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	30, 30, 30, 32, 31, 30, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	30, 31, 31, 31, 31, 31, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	31, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 31, 31, 30, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 30, 30, 30, 31, 30, 30, 
+	30, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 30, 30, 30, 30, 31, 
+	30, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 30, 30, 33, 30, 31, 
+	31, 31, 31, 31, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 31, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 31, 31, 30, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	30, 30, 30, 31, 30, 30, 30, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 30, 30, 30, 30, 31, 30, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 30, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 34, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 34, 38, 37, 41, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 40, 40, 40, 40, 
+	40, 40, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 40, 41, 42, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 40, 40, 40, 40, 40, 
+	40, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 40, 43, 40, 44, 40, 
+	40, 45, 46, 47, 48, 40, 40, 49, 
+	40, 40, 40, 40, 50, 40, 40, 40, 
+	51, 40, 40, 52, 40, 53, 40, 54, 
+	55, 40, 45, 46, 47, 48, 40, 40, 
+	49, 40, 40, 40, 40, 50, 40, 40, 
+	40, 51, 40, 40, 52, 40, 53, 40, 
+	54, 55, 40, 56, 40, 40, 40, 40, 
+	40, 40, 57, 40, 58, 40, 59, 40, 
+	60, 40, 61, 40, 62, 40, 63, 40, 
+	64, 40, 61, 40, 65, 40, 66, 40, 
+	61, 40, 67, 40, 68, 40, 69, 40, 
+	61, 40, 70, 40, 71, 40, 72, 40, 
+	61, 40, 73, 40, 74, 40, 75, 40, 
+	61, 40, 76, 40, 77, 40, 78, 40, 
+	61, 40, 79, 40, 80, 40, 81, 40, 
+	61, 40, 82, 40, 40, 83, 40, 84, 
+	40, 75, 40, 85, 40, 75, 40, 86, 
+	40, 87, 40, 88, 40, 61, 40, 89, 
+	40, 80, 40, 90, 40, 91, 40, 61, 
+	40, 48, 40, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 40, 40, 40, 
+	40, 40, 40, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 40, 93, 40, 
+	94, 40, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 95, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 95, 98, 30, 100, 99, 
+	102, 99, 103, 30, 105, 104, 107, 104, 
 	108, 108, 108, 108, 108, 108, 108, 108, 
-	108, 33, 33, 33, 33, 33, 33, 33, 
-	108, 108, 108, 108, 108, 108, 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, 
-	108, 108, 108, 108, 108, 108, 33, 33, 
-	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, 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, 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, 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, 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, 33, 
-	33, 33, 33, 109, 33, 33, 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, 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, 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, 33, 33, 33, 33, 33, 
-	33, 109, 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, 33, 33, 33, 33, 
-	33, 33, 33, 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, 112, 33, 
-	109, 109, 109, 109, 109, 33, 33, 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, 33, 33, 33, 33, 33, 33, 116, 
+	108, 108, 30, 30, 30, 30, 30, 30, 
+	30, 108, 108, 108, 108, 108, 108, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 108, 108, 108, 108, 108, 108, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 109, 30, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 30, 
+	30, 30, 30, 30, 30, 30, 110, 110, 
+	110, 110, 110, 110, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 110, 110, 
+	110, 110, 110, 110, 30, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 30, 
+	30, 30, 30, 30, 30, 30, 111, 111, 
+	111, 111, 111, 111, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 111, 111, 
+	111, 111, 111, 111, 30, 112, 112, 112, 
+	112, 112, 112, 112, 112, 112, 112, 30, 
+	30, 30, 30, 30, 30, 30, 112, 112, 
+	112, 112, 112, 112, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 112, 112, 
+	112, 112, 112, 112, 30, 113, 113, 113, 
+	113, 113, 113, 113, 113, 113, 113, 30, 
+	30, 30, 30, 30, 30, 30, 113, 113, 
+	113, 113, 113, 113, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 113, 113, 
+	113, 113, 113, 113, 30, 109, 109, 109, 
+	109, 109, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 109, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 114, 114, 114, 114, 
+	114, 114, 114, 114, 114, 114, 30, 30, 
+	30, 30, 30, 30, 30, 114, 114, 114, 
+	114, 114, 114, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 114, 114, 114, 
+	114, 114, 114, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 112, 30, 109, 109, 109, 109, 109, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 109, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 115, 115, 115, 115, 115, 115, 
+	115, 115, 115, 115, 30, 30, 30, 30, 
+	30, 30, 30, 115, 115, 115, 115, 115, 
+	115, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 115, 115, 115, 115, 115, 
+	115, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 112, 
+	30, 109, 109, 109, 109, 109, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	109, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
 	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, 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, 112, 33, 109, 109, 
-	109, 109, 109, 33, 33, 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, 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, 
-	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, 33, 33, 33, 33, 
-	33, 33, 33, 109, 33, 33, 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, 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, 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, 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, 
-	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, 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, 
+	116, 116, 30, 30, 30, 30, 30, 30, 
+	30, 116, 116, 116, 116, 116, 116, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 116, 116, 116, 116, 116, 116, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 112, 30, 109, 
+	109, 109, 109, 109, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 109, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	30, 30, 30, 30, 30, 30, 30, 117, 
+	117, 117, 117, 117, 117, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 117, 
+	117, 117, 117, 117, 117, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 112, 30, 109, 109, 109, 
+	109, 109, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 109, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 30, 30, 
+	30, 30, 30, 30, 30, 118, 118, 118, 
+	118, 118, 118, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 118, 118, 118, 
+	118, 118, 118, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 112, 30, 109, 109, 109, 109, 109, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 109, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 112, 
+	30, 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, 120, 120, 120, 120, 120, 120, 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, 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, 
-	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, 128, 128, 128, 128, 128, 128, 
+	119, 119, 119, 119, 30, 119, 123, 122, 
+	124, 121, 124, 121, 121, 121, 121, 121, 
+	121, 125, 125, 125, 125, 125, 125, 125, 
+	125, 125, 125, 121, 123, 126, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 127, 127, 
+	127, 127, 127, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 128, 
+	128, 128, 128, 128, 128, 128, 128, 129, 
+	129, 129, 129, 129, 128, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 130, 131, 
+	131, 132, 133, 131, 131, 131, 134, 135, 
+	136, 137, 131, 131, 138, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 139, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 140, 141, 142, 143, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 144, 145, 142, 131, 128, 131, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 127, 127, 127, 
+	127, 127, 146, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 128, 128, 
 	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 129, 129, 129, 129, 129, 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, 
-	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, 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, 
-	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, 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, 
+	128, 128, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 128, 146, 128, 128, 128, 128, 128, 
+	128, 128, 128, 129, 129, 129, 129, 129, 
+	128, 128, 128, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 128, 128, 
+	128, 128, 130, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 128, 147, 130, 130, 130, 130, 130, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 147, 147, 147, 147, 147, 147, 
+	147, 147, 130, 147, 131, 131, 146, 146, 
+	131, 131, 131, 146, 146, 146, 146, 131, 
+	131, 146, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 146, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 146, 146, 
+	146, 146, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 146, 146, 
+	146, 131, 146, 149, 132, 151, 150, 154, 
+	153, 5, 153, 153, 153, 155, 156, 152, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	8, 153, 157, 154, 8, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 8, 153, 152, 153, 
+	152, 153, 153, 153, 152, 152, 152, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 158, 
+	153, 152, 152, 152, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 153, 153, 153, 153, 153, 
+	153, 153, 153, 152, 153, 8, 9, 161, 
+	160, 160, 160, 160, 160, 160, 160, 160, 
+	160, 160, 160, 160, 160, 160, 160, 160, 
+	160, 160, 160, 161, 160, 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, 167, 166, 166, 166, 166, 167, 
+	166, 166, 166, 168, 166, 166, 166, 166, 
+	166, 166, 166, 166, 166, 166, 166, 166, 
+	166, 166, 167, 166, 166, 166, 166, 166, 
+	166, 166, 167, 166, 166, 166, 166, 169, 
+	166, 166, 166, 169, 166, 166, 166, 166, 
+	166, 166, 166, 166, 166, 166, 166, 166, 
+	166, 166, 167, 166, 171, 170, 170, 170, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 170, 173, 172, 172, 172, 172, 
+	172, 172, 172, 172, 172, 172, 172, 172, 
+	172, 172, 172, 172, 172, 172, 172, 173, 
+	172, 174, 30, 30, 30, 174, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 174, 
+	174, 30, 30, 30, 174, 174, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 174, 30, 30, 30, 174, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	174, 30, 30, 30, 174, 30, 175, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 175, 30, 
+	176, 176, 176, 176, 176, 176, 176, 176, 
+	176, 176, 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, 
-	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, 
-	38, 38, 38, 38, 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, 38, 
-	38, 38, 38, 38, 38, 178, 178, 178, 
-	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, 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, 
-	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, 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, 
-	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, 
+	176, 176, 176, 176, 176, 176, 177, 177, 
+	177, 177, 177, 177, 177, 177, 177, 177, 
+	177, 177, 177, 177, 177, 177, 178, 178, 
+	178, 178, 178, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 179, 35, 180, 35, 179, 179, 
+	179, 179, 35, 181, 179, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 179, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 182, 183, 184, 185, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 179, 179, 179, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 35, 35, 35, 
+	35, 35, 35, 35, 35, 186, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 186, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 187, 
+	187, 187, 187, 187, 187, 187, 187, 186, 
+	188, 186, 190, 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, 191, 189, 194, 193, 193, 193, 193, 
+	193, 193, 193, 193, 193, 193, 193, 195, 
+	193, 193, 196, 193, 198, 198, 198, 198, 
+	198, 198, 198, 198, 198, 198, 197, 197, 
+	197, 197, 197, 197, 197, 198, 198, 198, 
+	197, 197, 197, 198, 197, 197, 197, 198, 
+	197, 198, 197, 197, 197, 197, 198, 197, 
+	197, 197, 197, 197, 198, 197, 198, 197, 
+	197, 197, 197, 197, 197, 197, 197, 198, 
+	197, 197, 197, 198, 197, 197, 197, 198, 
 	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, 
+	197, 197, 197, 197, 197, 197, 198, 197, 
+	199, 199, 199, 199, 199, 199, 199, 199, 
+	199, 199, 199, 199, 199, 199, 199, 199, 
+	199, 199, 199, 199, 199, 199, 199, 199, 
+	199, 199, 199, 199, 199, 199, 200, 200, 
+	200, 200, 200, 200, 200, 200, 200, 200, 
+	200, 200, 200, 200, 200, 200, 201, 201, 
+	201, 201, 201, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 202, 96, 96, 96, 202, 202, 
+	202, 202, 96, 96, 202, 96, 203, 204, 
+	204, 204, 204, 204, 204, 204, 205, 205, 
+	96, 96, 96, 96, 96, 202, 96, 30, 
+	30, 206, 207, 96, 96, 30, 207, 96, 
+	96, 30, 96, 208, 96, 96, 209, 96, 
+	207, 207, 96, 96, 96, 207, 207, 96, 
+	30, 202, 202, 202, 202, 96, 96, 210, 
+	210, 98, 207, 210, 210, 96, 207, 96, 
+	96, 96, 96, 96, 210, 96, 209, 96, 
+	210, 207, 210, 211, 210, 207, 212, 96, 
+	30, 202, 202, 202, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 213, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 97, 97, 
+	97, 97, 97, 97, 97, 97, 213, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 214, 
+	214, 214, 214, 214, 214, 214, 214, 213, 
+	216, 216, 216, 216, 216, 216, 216, 216, 
+	215, 218, 218, 218, 218, 218, 218, 218, 
+	218, 217, 220, 99, 222, 221, 99, 224, 
 	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, 
+	104, 104, 104, 104, 104, 104, 104, 225, 
+	104, 227, 226, 104, 107, 104, 229, 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
+	228, 228, 228, 228, 228, 228, 228, 229, 
+	229, 229, 229, 229, 229, 228, 228, 228, 
+	228, 228, 228, 228, 228, 228, 228, 228, 
+	228, 228, 228, 228, 228, 228, 228, 228, 
+	228, 228, 228, 228, 228, 228, 228, 229, 
+	229, 229, 229, 229, 229, 228, 231, 230, 
+	230, 230, 230, 230, 232, 230, 230, 230, 
+	233, 233, 233, 233, 233, 233, 233, 233, 
+	233, 230, 230, 234, 230, 123, 122, 122, 
+	122, 122, 122, 235, 122, 122, 235, 235, 
+	235, 235, 235, 235, 235, 235, 235, 235, 
+	122, 125, 125, 125, 125, 125, 125, 125, 
+	125, 125, 235, 124, 235, 235, 235, 235, 
+	235, 235, 125, 125, 125, 125, 125, 125, 
+	125, 125, 125, 125, 235, 235, 126, 126, 
+	235, 235, 235, 235, 235, 235, 235, 235, 
+	235, 235, 126, 126, 126, 126, 123, 126, 
+	0
 ]
 
 class << self
@@ -913,35 +848,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, 
-	39, 50, 54, 58, 62, 66, 70, 75, 
-	79, 81, 84, 40, 47, 41, 45, 42, 
-	43, 44, 130, 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, 111, 1, 2, 110, 4, 110, 6, 
+	110, 8, 120, 110, 10, 16, 11, 110, 
+	12, 14, 13, 15, 17, 18, 20, 19, 
+	21, 110, 23, 126, 24, 26, 0, 27, 
+	28, 128, 129, 129, 29, 129, 129, 129, 
+	129, 33, 34, 129, 36, 37, 48, 52, 
+	56, 60, 64, 68, 73, 77, 79, 82, 
+	38, 45, 39, 43, 40, 41, 42, 129, 
+	44, 46, 47, 49, 50, 51, 53, 54, 
+	55, 57, 58, 59, 61, 62, 63, 65, 
+	66, 67, 69, 71, 70, 72, 74, 75, 
+	76, 78, 80, 81, 84, 85, 129, 137, 
+	137, 86, 89, 137, 143, 137, 145, 92, 
+	137, 146, 137, 148, 95, 98, 96, 97, 
+	137, 99, 100, 101, 102, 103, 104, 137, 
+	150, 151, 106, 107, 151, 108, 109, 3, 
+	112, 113, 114, 115, 116, 110, 117, 110, 
+	121, 122, 110, 123, 110, 124, 110, 110, 
+	125, 110, 110, 110, 110, 110, 110, 118, 
+	110, 119, 110, 5, 110, 7, 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
+	110, 9, 110, 22, 110, 110, 127, 25, 
+	130, 131, 132, 129, 133, 134, 135, 129, 
+	129, 129, 129, 30, 129, 129, 31, 129, 
+	129, 129, 32, 35, 83, 136, 136, 138, 
+	139, 140, 137, 141, 141, 137, 88, 137, 
+	91, 137, 137, 94, 105, 137, 87, 137, 
+	142, 137, 137, 137, 144, 137, 90, 137, 
+	147, 149, 137, 93, 137, 137, 151, 152, 
+	153, 154, 155, 151
 ]
 
 class << self
@@ -949,35 +885,36 @@ class << self
 	private :_re_scanner_trans_actions, :_re_scanner_trans_actions=
 end
 self._re_scanner_trans_actions = [
-	1, 2, 0, 2, 0, 0, 2, 3, 
-	4, 5, 6, 0, 7, 0, 8, 0, 
-	0, 9, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 10, 0, 0, 0, 
-	0, 0, 0, 0, 12, 13, 14, 0, 
-	15, 16, 17, 18, 0, 0, 19, 0, 
+	1, 2, 0, 0, 3, 4, 5, 0, 
+	6, 0, 7, 8, 0, 0, 0, 9, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 10, 0, 0, 0, 0, 0, 0, 
+	0, 12, 13, 14, 0, 15, 16, 17, 
+	18, 0, 0, 19, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 20, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 20, 
 	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, 0, 0, 0, 0, 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, 0, 0, 32, 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, 0, 53, 54, 
+	55, 56, 57, 58, 59, 60, 61, 62, 
+	63, 0, 64, 0, 65, 66, 68, 0, 
+	0, 40, 40, 69, 0, 40, 70, 71, 
+	72, 73, 74, 0, 75, 76, 0, 77, 
+	78, 79, 0, 0, 0, 80, 81, 0, 
+	40, 40, 82, 83, 84, 85, 0, 86, 
+	0, 87, 88, 0, 0, 89, 0, 90, 
+	0, 91, 92, 93, 40, 94, 0, 95, 
+	40, 0, 96, 0, 97, 98, 99, 40, 
+	40, 40, 40, 100
 ]
 
 class << self
@@ -998,13 +935,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, 33, 0, 
 	0, 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, 0, 0, 0, 0, 0, 67, 
+	67, 67, 0, 0, 0, 0, 0, 0, 
+	67, 67, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 67, 
+	0, 0, 0, 0
 ]
 
 class << self
@@ -1025,13 +962,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, 
+	0, 0, 0, 0, 0, 0, 34, 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, 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, 0, 0, 34, 
+	0, 0, 0, 0
 ]
 
 class << self
@@ -1042,7 +979,7 @@ 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, 
-	0, 0, 0, 11, 11, 11, 11, 0, 
+	0, 11, 11, 11, 11, 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, 
@@ -1050,15 +987,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, 
+	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, 
-	0, 0, 22, 0, 0, 0, 0, 0, 
-	0, 0, 22, 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
@@ -1066,26 +1003,26 @@ class << self
 	private :_re_scanner_eof_trans, :_re_scanner_eof_trans=
 end
 self._re_scanner_eof_trans = [
-	0, 1, 1, 1, 1, 1, 1, 8, 
-	8, 8, 8, 15, 15, 15, 15, 15, 
-	15, 15, 15, 15, 15, 15, 15, 15, 
-	29, 29, 29, 0, 0, 0, 0, 38, 
-	38, 41, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
+	0, 1, 1, 1, 5, 5, 5, 5, 
+	1, 12, 12, 12, 12, 12, 12, 12, 
+	12, 12, 12, 12, 12, 12, 26, 26, 
+	26, 0, 0, 0, 0, 35, 35, 38, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 96, 96, 
 	0, 0, 102, 0, 0, 107, 0, 0, 
 	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, 122, 122, 122, 122, 0, 147, 
+	147, 148, 148, 147, 149, 151, 153, 153, 
+	160, 161, 163, 165, 167, 171, 173, 0, 
+	0, 0, 187, 187, 187, 187, 190, 193, 
+	0, 0, 214, 214, 214, 216, 218, 220, 
+	220, 220, 224, 224, 224, 224, 229, 0, 
+	236, 236, 236, 236
 ]
 
 class << self
@@ -1104,36 +1041,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 = 127;
 class << self
 	attr_accessor :re_scanner_en_unicode_property
 end
-self.re_scanner_en_unicode_property = 129;
+self.re_scanner_en_unicode_property = 128;
 class << self
 	attr_accessor :re_scanner_en_character_set
 end
-self.re_scanner_en_character_set = 130;
+self.re_scanner_en_character_set = 129;
 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 = 136;
 class << self
 	attr_accessor :re_scanner_en_escape_sequence
 end
-self.re_scanner_en_escape_sequence = 138;
+self.re_scanner_en_escape_sequence = 137;
 class << self
 	attr_accessor :re_scanner_en_conditional_expression
 end
-self.re_scanner_en_conditional_expression = 149;
+self.re_scanner_en_conditional_expression = 151;
 class << self
 	attr_accessor :re_scanner_en_main
 end
 self.re_scanner_en_main = 110;
 
 
-# line 763 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 761 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1136 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1073 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -1144,9 +1081,9 @@ begin
 	act = 0
 end
 
-# line 764 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 762 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1086 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -1169,12 +1106,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 1114 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 	_keys = cs << 1
 	_inds = _re_scanner_index_offsets[cs]
@@ -1193,35 +1130,35 @@ ts = p
 	cs = _re_scanner_trans_targs[_trans]
 	if _re_scanner_trans_actions[_trans] != 0
 	case _re_scanner_trans_actions[_trans]
-	when 34 then
-# line 149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 36 then
+# line 151 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth + 1 		end
 	when 4 then
-# line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 152 "/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 68 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 +1174,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 +1182,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
@@ -1257,132 +1194,130 @@ te = p+1
      end
 		end
 	when 16 then
-# line 177 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 179 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		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
-# line 182 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 73 then
+# line 184 "/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
-# line 203 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 75 then
+# line 205 "/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
-# line 207 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 71 then
+# line 209 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 137
+		cs = 136
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 65 then
-# line 237 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 69 then
+# line 239 "/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
-# line 245 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 243 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		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
-# line 191 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 76 then
+# line 193 "/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
-# line 211 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 79 then
+# line 213 "/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 = 129
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 70 then
-# line 245 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 74 then
+# line 243 "/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
-# line 191 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 193 "/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)
       # 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 18 then
-# line 211 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 213 "/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 = 129
 		_goto_level = _again
 		next
 	end
@@ -1390,21 +1325,20 @@ p = p - 1; begin
      end
 		end
 	when 13 then
-# line 245 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 243 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		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 81 then
+# line 252 "/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 +1348,30 @@ te = p+1
 
      end
 		end
-	when 76 then
-# line 260 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 80 then
+# line 257 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = 130;
+      cs = 129;
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 137
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 82 then
-# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 85 then
+# line 268 "/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 +1381,12 @@ te = p+1
 
      end
 		end
-	when 88 then
-# line 277 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 92 then
+# line 274 "/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 +1396,27 @@ te = p+1
 
      end
 		end
-	when 79 then
-# line 282 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 82 then
+# line 279 "/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 +1427,22 @@ te = p+1
 
      end
 		end
-	when 85 then
-# line 303 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 88 then
+# line 300 "/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 +1453,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 316 "/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 +1473,12 @@ te = p+1
 
      end
 		end
-	when 95 then
-# line 329 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 98 then
+# line 326 "/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 +1488,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 335 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1569,8 +1503,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 340 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1584,46 +1518,46 @@ te = p+1
 
      end
 		end
-	when 83 then
-# line 348 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 86 then
+# line 345 "/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? ? 129 : 110));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 128
+		cs = 127
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 84 then
-# line 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 87 then
+# line 351 "/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? ? 129 : 110));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 129
+		cs = 128
 		_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 357 "/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 +1567,12 @@ te = p+1
 
      end
 		end
-	when 87 then
-# line 277 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 91 then
+# line 274 "/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 +1582,12 @@ p = p - 1; begin
 
      end
 		end
-	when 94 then
-# line 329 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 97 then
+# line 326 "/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 +1597,8 @@ p = p - 1; begin
 
      end
 		end
-	when 90 then
-# line 338 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 94 then
+# line 335 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1678,8 +1612,8 @@ p = p - 1; begin
 
      end
 		end
-	when 92 then
-# line 343 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 96 then
+# line 340 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1693,15 +1627,45 @@ p = p - 1; begin
 
      end
 		end
-	when 86 then
+	when 89 then
+# line 357 "/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 357 "/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 90 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 +1677,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 +1688,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 367 "/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 99 then
+# line 373 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1750,8 +1714,8 @@ te = p+1
 
      end
 		end
-	when 97 then
-# line 376 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 100 then
+# line 373 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1766,8 +1730,8 @@ p = p - 1; begin
 
      end
 		end
-	when 29 then
-# line 376 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 31 then
+# line 373 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1782,377 +1746,398 @@ p = p - 1; begin
 
      end
 		end
-	when 36 then
-# line 389 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 38 then
+# line 386 "/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 390 "/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 400 "/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 404 "/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 63 then
+# line 408 "/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 62 then
+# line 412 "/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 423 "/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 52 then
+# line 438 "/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 = 151
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 50 then
-# line 472 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 53 then
+# line 469 "/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"
+	when 51 then
+# line 483 "/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 500 "/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)
+      when /^\(\?<[^>]+>/
+        emit(:group, :named_ab,  text)
 
-      when /^\(\?'\w*'/
-        emit(:group, :named_sq,  text, ts, te)
+      when /^\(\?'[^']+'/
+        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 541 "/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
+      # TODO: finer quirks of choosing recursive or non-recursive refs/calls.
+      # e.g.: `a-1` is a valid group id: 'aa'[/(?<a-1>a)\g<a-1>/] # => 'aa'
+      when /^\\([gk])<[^\p{digit}+\->][^>+\-]*>/ # 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
+      when /^\\([gk])'[^\p{digit}+\-'][^'+\-]*'/ # 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)
+      when /^\\k<[^\p{digit}+\->][^>]*[+\-]\d+>/ # angle-brackets
+        emit(:backref, :name_recursion_ref_ab, text)
 
-      when /^\\k'[^\d+\-]\w*[+\-]\d+'/ # single-quotes
-        emit(:backref, :name_recursion_ref_sq, text, ts, te)
+      when /^\\k'[^\p{digit}+\-'][^']*[+\-]\d+'/ # single-quotes
+        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 60 then
+# line 608 "/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 56 then
+# line 616 "/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 58 then
+# line 624 "/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 66 then
+# line 632 "/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 647 "/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
-        append_literal(data, ts, te)
+        # consume only the pound sign (#) and backtrack to do regular scanning
+        append_literal(data, ts, ts + 1)
+         begin p = (( ts + 1))-1; end
+
       end
      end
 		end
-	when 48 then
-# line 472 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 50 then
+# line 469 "/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 54 then
+# line 483 "/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)
+      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 55 then
-# line 609 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 48 then
+# line 518 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p
+p = p - 1; begin 
+      text = copy(data, ts, te)
+      emit(:group, :capture, text)
+     end
+		end
+	when 59 then
+# line 608 "/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 55 then
+# line 616 "/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 57 then
+# line 624 "/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 65 then
+# line 632 "/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 64 then
+# line 637 "/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 61 then
+# line 643 "/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 = 137
 		_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 647 "/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
-        append_literal(data, ts, te)
+        # consume only the pound sign (#) and backtrack to do regular scanning
+        append_literal(data, ts, ts + 1)
+         begin p = (( ts + 1))-1; end
+
       end
      end
 		end
-	when 43 then
-# line 656 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 45 then
+# line 657 "/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 671 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 44 then
+# line 668 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2160,19 +2145,19 @@ p = p - 1; begin
      end
 		end
 	when 3 then
-# line 472 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 469 "/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 637 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2180,14 +2165,14 @@ p = p - 1; begin
      end
 		end
 	when 8 then
-# line 644 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 643 "/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 = 137
 		_goto_level = _again
 		next
 	end
@@ -2205,6 +2190,25 @@ p = p - 1; begin
 		next
 	end
 end
+	when 42 then
+	begin begin p = ((te))-1; end
+
+      text = copy(data, ts, te)
+      if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
+        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+      end
+      emit_options(text)
+    end
+	when 43 then
+	begin begin p = ((te))-1; end
+
+      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
 	when 56 then
 	begin begin p = ((te))-1; end
 
@@ -2212,22 +2216,22 @@ end
     end
 end 
 			end
-	when 74 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 78 then
+# line 139 "/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"
+# line 213 "/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 = 129
 		_goto_level = _again
 		next
 	end
@@ -2235,21 +2239,21 @@ p = p - 1; begin
      end
 		end
 	when 17 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 139 "/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"
+# line 213 "/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 = 129
 		_goto_level = _again
 		next
 	end
@@ -2257,34 +2261,13 @@ p = p - 1; begin
      end
 		end
 	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*')
-    raise PrematureEndError.new( text )
-  		end
-# line 329 "/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))
-      	begin
-		top -= 1
-		cs = stack[top]
-		_goto_level = _again
-		next
-	end
-
-     end
-		end
-	when 89 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 139 "/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 335 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2298,14 +2281,14 @@ p = p - 1; begin
 
      end
 		end
-	when 91 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 95 then
+# line 139 "/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 340 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2319,14 +2302,14 @@ p = p - 1; begin
 
      end
 		end
-	when 24 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 26 then
+# line 139 "/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 335 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2340,14 +2323,14 @@ p = p - 1; begin
 
      end
 		end
-	when 26 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 28 then
+# line 139 "/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 340 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2361,14 +2344,14 @@ p = p - 1; begin
 
      end
 		end
-	when 28 then
-# line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 30 then
+# line 145 "/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 331 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2382,27 +2365,27 @@ te = p+1
      end
 		end
 	when 5 then
-# line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 152 "/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 454 "/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
-# line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 37 then
+# line 152 "/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 523 "/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
@@ -2410,38 +2393,38 @@ 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
-# line 151 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 39 then
+# line 153 "/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 429 "/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 = 129
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 68 then
-# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 72 then
+# line 154 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 158 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 160 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		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
@@ -2460,16 +2443,16 @@ te = p+1
       end
      end
 		end
-	when 73 then
-# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 77 then
+# line 154 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 167 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 169 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		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
@@ -2489,14 +2472,14 @@ te = p+1
      end
 		end
 	when 20 then
-# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 154 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 216 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 218 "/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)
 
       type = :posixclass
       class_name = text[2..-3]
@@ -2505,85 +2488,96 @@ 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
-# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 154 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 229 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 231 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      emit(:set, :collation, *text(data, ts, te))
+      emit(:set, :collation, copy(data, ts, te))
      end
 		end
 	when 21 then
-# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 154 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 233 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 235 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		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 70 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 151 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 153 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   + 1 		end
-	when 81 then
+	when 84 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 268 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 18;		end
-	when 80 then
+	when 83 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 277 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 274 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 19;		end
+	when 7 then
+# line 1 "NONE"
+		begin
+te = p+1
+		end
+# line 483 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+act = 43;		end
 	when 2 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 671 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 668 "/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
 		end
-# line 150 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-# line 149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 151 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth + 1 		end
-# line 2576 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 469 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+act = 42;		end
+# line 2570 "/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 67 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-	when 31 then
+	when 33 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
@@ -2591,7 +2585,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 2594 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2588 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 
 	if cs == 0
@@ -2618,14 +2612,14 @@ act = 0
 
     raise PrematureEndError.new('unicode property')
   		end
-	when 22 then
-# line 137 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 24 then
+# line 139 "/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 2628 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2622 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	  end
 	end
 
@@ -2636,13 +2630,13 @@ act = 0
 end
 	end
 
-# line 765 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 763 "/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
 
@@ -2670,22 +2664,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)
@@ -2708,36 +2709,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)'.
@@ -2763,14 +2753,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