regexp_parser 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707834a32bc2295b448953730eabddabb11bafc68fdf3148174f7be61d8b1f30
-  data.tar.gz: 72d199d28c342d6aae178a5876a7df6f59abcdf40c6ac4f05ea9dc40d16d9f3a
+  metadata.gz: 43db9cc4386341a5cf035787960682043390ae0d4c19c7e2a165a6e3a1f58a3e
+  data.tar.gz: c501318f87c285e73ae5374cc7accc9b1822d9c08ac4a6db7e95aa7a031d69bd
 SHA512:
-  metadata.gz: 4c1402afedc1efb79f633ee93065598b64732519ba587ca3f682eb8bbb4aaa264e31dd916b95f9751f7c6e85e867efa260501b40e55409327efa5b769346a183
-  data.tar.gz: 6335cbc411b08adb64bfca9646eebc3a5c39d4651a2495d34f87fca21927da3a363fc320159a3732cdd9e2d8732986190fcd6c9d523b7308531f91848951ccbd
+  metadata.gz: 85e8424ad11e4cb8d50d8900be3bd5fc79755a49561d5ae64e4d0913dccd0473254d2ad78e77a2695013b81dcc70c78c7209049b291d7cab5784c9cc4e6c8043
+  data.tar.gz: de283a627fc5caed42da0c01cab7f9680136c2438536d443c2c3a62d7f8fb1fda86d2a5f7daf2f3d5d3f111d5e23abf3beff55586d7560f76f23b03aa926bbd9

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+### [1.5.1] - 2019-05-23 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Fixed
+
+- Fixed `#options` (and thus `#i?`, `#u?` etc.) not being set for some expressions:
+  * this affected posix classes as well as alternation, conditional, and intersection branches
+  * `#options` was already correct for all child expressions of such branches
+  * this only made an operational difference for posix classes as they respect encoding flags
+- Fixed `#options` not respecting all negative options in weird cases like '(?u-m-x)'
+- Fixed `Group#option_changes` not accounting for indirectly disabled (overridden) encoding flags
+- Fixed `Scanner` allowing negative encoding options if there were no positive options, e.g. '(?-u)'
+- Fixed `ScannerError` for some valid meta/control sequences such as '\\C-\\\\'
+- Fixed `Expression#match` and `#=~` not working with a single argument
+
 ### [1.5.0] - 2019-05-14 - [Janosch Müller](mailto:janosch84@gmail.com)
 
 ### Added

data/lib/regexp_parser/expression.rb

@@ -97,47 +97,6 @@ module Regexp::Expression
       quantified? and quantifier.possessive?
     end
 
-    def multiline?
-      options[:m] == true
-    end
-    alias :m? :multiline?
-
-    def case_insensitive?
-      options[:i] == true
-    end
-    alias :i? :case_insensitive?
-    alias :ignore_case? :case_insensitive?
-
-    def free_spacing?
-      options[:x] == true
-    end
-    alias :x? :free_spacing?
-    alias :extended? :free_spacing?
-
-    def default_classes?
-      options[:d] == true
-    end
-    alias :d? :default_classes?
-
-    def ascii_classes?
-      options[:a] == true
-    end
-    alias :a? :ascii_classes?
-
-    def unicode_classes?
-      options[:u] == true
-    end
-    alias :u? :unicode_classes?
-
-    def matches?(string)
-      Regexp.new(to_s) =~ string ? true : false
-    end
-
-    def match(string, offset)
-      Regexp.new(to_s).match(string, offset)
-    end
-    alias :=~ :match
-
     def attributes
       {
         type:              type,
@@ -156,12 +115,14 @@ module Regexp::Expression
   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)
-    when Regexp::Expression
+      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 '\
@@ -194,7 +155,9 @@ require 'regexp_parser/expression/classes/set/intersection'
 require 'regexp_parser/expression/classes/set/range'
 require 'regexp_parser/expression/classes/type'
 
+require 'regexp_parser/expression/methods/match'
 require 'regexp_parser/expression/methods/match_length'
+require 'regexp_parser/expression/methods/options'
 require 'regexp_parser/expression/methods/strfregexp'
 require 'regexp_parser/expression/methods/tests'
 require 'regexp_parser/expression/methods/traverse'

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

@@ -26,9 +26,10 @@ module Regexp::Expression
         expressions.last << exp
       end
 
-      def add_sequence
+      def add_sequence(active_opts = {})
         raise TooManyBranches.new if branches.length == 2
-        Branch.add_to(self, { conditional_level: conditional_level + 1 })
+        params = { conditional_level: conditional_level + 1 }
+        Branch.add_to(self, params, active_opts)
       end
       alias :branch :add_sequence
 

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

@@ -60,10 +60,6 @@ module Regexp::Expression
         codepoint.chr('utf-8')
       end
 
-      def codepoint
-        raise NotImplementedError, 'implement in subclass'
-      end
-
       private
 
       def control_sequence_to_s(control_sequence)

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

@@ -0,0 +1,13 @@
+module Regexp::Expression
+  class Base
+    def match?(string)
+      !!match(string)
+    end
+    alias :matches? :match?
+
+    def match(string, offset = 0)
+      Regexp.new(to_s).match(string, offset)
+    end
+    alias :=~ :match
+  end
+end

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

@@ -0,0 +1,35 @@
+module Regexp::Expression
+  class Base
+    def multiline?
+      options[:m] == true
+    end
+    alias :m? :multiline?
+
+    def case_insensitive?
+      options[:i] == true
+    end
+    alias :i? :case_insensitive?
+    alias :ignore_case? :case_insensitive?
+
+    def free_spacing?
+      options[:x] == true
+    end
+    alias :x? :free_spacing?
+    alias :extended? :free_spacing?
+
+    def default_classes?
+      options[:d] == true
+    end
+    alias :d? :default_classes?
+
+    def ascii_classes?
+      options[:a] == true
+    end
+    alias :a? :ascii_classes?
+
+    def unicode_classes?
+      options[:u] == true
+    end
+    alias :u? :unicode_classes?
+  end
+end

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

@@ -1,5 +1,4 @@
 module Regexp::Expression
-
   class Base
 
     #   %l  Level (depth) of the expression. Returns 'root' for the root

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

@@ -75,32 +75,23 @@ module Regexp::Expression
     def one_of?(scope, top = true)
       case scope
       when Array
-        if scope.include?(:*)
-          return (scope.include?(token) or scope.include?(:*))
-        else
-          return scope.include?(token)
-        end
+        scope.include?(:*) || scope.include?(token)
 
       when Hash
         if scope.has_key?(:*)
           test_type = scope.has_key?(type) ? type : :*
-          return one_of?(scope[test_type], false)
+          one_of?(scope[test_type], false)
         else
-          return (scope.has_key?(type) and one_of?(scope[type], false))
+          scope.has_key?(type) && one_of?(scope[type], false)
         end
 
       when Symbol
-        return true if scope == :*
-
-        return is?(scope) unless top
-        return type?(scope) if top
+        scope.equal?(:*) || (top ? type?(scope) : is?(scope))
 
       else
-        raise "Array, Hash, or Symbol expected, #{scope.class.name} given"
+        raise ArgumentError,
+              "Array, Hash, or Symbol expected, #{scope.class.name} given"
       end
-
-      false
     end
-
   end
 end

data/lib/regexp_parser/expression/sequence.rb

@@ -18,13 +18,14 @@ module Regexp::Expression
     end
 
     class << self
-      def add_to(subexpression, options = {})
+      def add_to(subexpression, params = {}, active_opts = {})
         sequence = at_levels(
           subexpression.level,
           subexpression.set_level,
-          options[:conditional_level] || subexpression.conditional_level
+          params[:conditional_level] || subexpression.conditional_level
         )
         sequence.nesting_level = subexpression.nesting_level + 1
+        sequence.options = active_opts
         subexpression.expressions << sequence
         sequence
       end

data/lib/regexp_parser/expression/sequence_operation.rb

@@ -14,12 +14,8 @@ module Regexp::Expression
       expressions.last << exp
     end
 
-    def add_sequence
-      self.class::OPERAND.add_to(self)
-    end
-
-    def quantify(token, text, min = nil, max = nil, mode = :greedy)
-      sequences.last.last.quantify(token, text, min, max, mode)
+    def add_sequence(active_opts = {})
+      self.class::OPERAND.add_to(self, {}, active_opts)
     end
 
     def to_s(format = :full)

data/lib/regexp_parser/lexer.rb

@@ -39,10 +39,6 @@ class Regexp::Lexer
       current = Regexp::Token.new(type, token, text, ts + shift, te + shift,
                                   nesting, set_nesting, conditional_nesting)
 
-      current = merge_literal(current) if type == :literal and
-        set_nesting == 0 and
-        last and last.type == :literal
-
       current = merge_condition(current) if type == :conditional and
         [:condition, :condition_close].include?(token)
 
@@ -122,23 +118,6 @@ class Regexp::Lexer
     self.shift = shift + 3 # one space less, but extra \, u, {, and }
   end
 
-  # called by scan to merge two consecutive literals. this happens when tokens
-  # get normalized (as in the case of posix/bre) and end up becoming literals.
-  def merge_literal(current)
-    last = tokens.pop
-
-    Regexp::Token.new(
-      :literal,
-      :literal,
-      last.text + current.text,
-      last.ts,
-      current.te,
-      nesting,
-      set_nesting,
-      conditional_nesting,
-    )
-  end
-
   def merge_condition(current)
     last = tokens.pop
     Regexp::Token.new(:conditional, :condition, last.text + current.text,

data/lib/regexp_parser/parser.rb

@@ -215,9 +215,9 @@ class Regexp::Parser
       nest_conditional(Conditional::Expression.new(token, active_opts))
     when :condition
       conditional_nesting.last.condition = Conditional::Condition.new(token, active_opts)
-      conditional_nesting.last.branch
+      conditional_nesting.last.add_sequence(active_opts)
     when :separator
-      conditional_nesting.last.branch
+      conditional_nesting.last.add_sequence(active_opts)
       self.node = conditional_nesting.last.branches.last
     when :close
       conditional_nesting.pop
@@ -235,7 +235,7 @@ class Regexp::Parser
   end
 
   def posixclass(token)
-    node << PosixClass.new(token)
+    node << PosixClass.new(token, active_opts)
   end
 
   include Regexp::Expression::UnicodeProperty
@@ -497,6 +497,9 @@ class Regexp::Parser
     end
   end
 
+  MOD_FLAGS = %w[i m x].map(&:to_sym)
+  ENC_FLAGS = %w[a d u].map(&:to_sym)
+
   def options_group(token)
     positive, negative = token.text.split('-', 2)
     negative ||= ''
@@ -505,23 +508,23 @@ class Regexp::Parser
     opt_changes = {}
     new_active_opts = active_opts.dup
 
-    # Negative options have precedence. E.g. /(?i-i)a/ is case-sensitive.
-    %w[i m x].each do |flag|
-      if positive.include?(flag)
-        opt_changes[flag.to_sym] = new_active_opts[flag.to_sym] = true
+    MOD_FLAGS.each do |flag|
+      if positive.include?(flag.to_s)
+        opt_changes[flag] = new_active_opts[flag] = true
       end
-      if negative.include?(flag)
-        opt_changes[flag.to_sym] = false
-        new_active_opts.delete(flag.to_sym)
+      if negative.include?(flag.to_s)
+        opt_changes[flag] = false
+        new_active_opts.delete(flag)
       end
     end
 
-    # Any encoding flag overrides all previous encoding flags. If there are
-    # multiple encoding flags in an options string, the last one wins.
-    # E.g. /(?dau)\w/ matches UTF8 chars but /(?dua)\w/ only ASCII chars.
-    if (flag = positive.reverse[/[adu]/])
-      %w[a d u].each { |key| new_active_opts.delete(key.to_sym) }
-      opt_changes[flag.to_sym] = new_active_opts[flag.to_sym] = true
+    if (enc_flag = positive.reverse[/[adu]/])
+      enc_flag = enc_flag.to_sym
+      (ENC_FLAGS - [enc_flag]).each do |other|
+        opt_changes[other] = false if new_active_opts[other]
+        new_active_opts.delete(other)
+      end
+      opt_changes[enc_flag] = new_active_opts[enc_flag] = true
     end
 
     options_stack << new_active_opts
@@ -606,16 +609,14 @@ class Regexp::Parser
   end
 
   def sequence_operation(klass, token)
-    if node.last.is_a?(klass)
-      self.node = node.last
-    elsif !node.is_a?(klass)
+    unless node.is_a?(klass)
       operator = klass.new(token, active_opts)
-      sequence = operator.add_sequence
+      sequence = operator.add_sequence(active_opts)
       sequence.expressions = node.expressions
       node.expressions = []
       nest(operator)
     end
-    node.add_sequence
+    node.add_sequence(active_opts)
   end
 
   def active_opts

data/lib/regexp_parser/scanner.rb

@@ -2,7 +2,7 @@
 
 # line 1 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
-# line 710 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 661 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
 
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
@@ -82,7 +82,7 @@ class Regexp::Scanner
       input = input_object
       self.free_spacing = false
     end
-
+    self.spacing_stack = [{:free_spacing => free_spacing, :depth => 0}]
 
     data  = input.unpack("c*") if input.is_a?(String)
     eof   = data.length
@@ -90,18 +90,12 @@ class Regexp::Scanner
     self.tokens = []
     self.block  = block_given? ? block : nil
 
-    self.in_group = false
+    self.set_depth = 0
     self.group_depth = 0
-    self.spacing_stack = [{:free_spacing => free_spacing, :depth => 0}]
-
-    in_set = false
-    set_depth = 0
-    in_conditional = false
-    conditional_depth = 0
-    conditional_stack = []
+    self.conditional_stack = []
 
     
-# line 104 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 98 "/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=
@@ -110,60 +104,61 @@ self._re_scanner_trans_keys = [
 	0, 0, -128, -65, -128, -65, 
 	-128, -65, -128, -65, -128, 
 	-65, -128, -65, 10, 10, 
-	33, 126, 41, 41, 39, 122, 
-	33, 122, 48, 122, 39, 
-	60, 39, 122, 48, 57, 
-	39, 57, 48, 57, 39, 57, 
-	39, 122, 43, 122, 48, 
-	57, 48, 62, 48, 57, 
-	43, 62, 43, 122, 44, 125, 
-	48, 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, 45, 77, 77, 
-	45, 45, 45, 45, 67, 
-	99, 45, 45, 77, 77, 
-	45, 45, 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, -62, 127, -62, -33, 
-	-32, -17, -16, -12, 1, 
-	127, 1, 127, 9, 32, 
-	33, 126, 10, 126, 63, 63, 
-	43, 63, 43, 63, 43, 
-	63, 65, 122, 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, 92, 
-	92, 92, 92, 92, 92, 
-	48, 102, 39, 60, 39, 122, 
-	49, 57, 41, 57, 48, 
-	122, 0
+	41, 41, 39, 122, 33, 122, 
+	48, 122, 39, 60, 39, 
+	122, 48, 57, 39, 57, 
+	48, 57, 39, 57, 39, 122, 
+	43, 122, 48, 57, 48, 
+	62, 48, 57, 43, 62, 
+	43, 122, 44, 125, 48, 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, 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, -62, 127, -62, -33, 
+	-32, -17, -16, -12, 1, 127, 
+	1, 127, 9, 32, 33, 
+	126, 10, 126, 63, 63, 
+	33, 126, 33, 126, 43, 63, 
+	43, 63, 43, 63, 65, 
+	122, 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
 ]
 
 class << self
@@ -172,24 +167,25 @@ class << self
 end
 self._re_scanner_key_spans = [
 	0, 64, 64, 64, 64, 64, 64, 1, 
-	94, 1, 84, 90, 75, 22, 84, 10, 
-	19, 10, 19, 84, 80, 10, 15, 10, 
-	20, 80, 82, 78, 1, 114, 117, 114, 
-	64, 64, 1, 78, 78, 1, 27, 24, 
-	8, 3, 1, 1, 1, 1, 1, 1, 
+	1, 84, 90, 75, 22, 84, 10, 19, 
+	10, 19, 84, 80, 10, 15, 10, 20, 
+	80, 82, 78, 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, 
-	1, 1, 1, 1, 1, 1, 1, 4, 
+	1, 1, 1, 1, 1, 1, 4, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 58, 1, 
-	1, 1, 1, 1, 1, 33, 1, 1, 
-	1, 76, 55, 55, 55, 55, 117, 117, 
-	117, 117, 117, 117, 76, 1, 84, 17, 
-	75, 190, 30, 16, 5, 127, 127, 24, 
-	94, 117, 1, 21, 21, 21, 58, 21, 
-	52, 33, 188, 64, 64, 64, 1, 56, 
-	16, 75, 90, 8, 8, 1, 1, 1, 
-	55, 22, 84, 9, 17, 75
+	1, 1, 1, 1, 1, 58, 1, 1, 
+	1, 1, 1, 1, 1, 1, 76, 55, 
+	55, 55, 55, 117, 117, 117, 117, 117, 
+	117, 76, 1, 84, 17, 75, 190, 30, 
+	16, 5, 127, 127, 24, 94, 117, 1, 
+	94, 94, 21, 21, 21, 58, 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
 ]
 
 class << self
@@ -198,24 +194,25 @@ class << self
 end
 self._re_scanner_index_offsets = [
 	0, 0, 65, 130, 195, 260, 325, 390, 
-	392, 487, 489, 574, 665, 741, 764, 849, 
-	860, 880, 891, 911, 996, 1077, 1088, 1104, 
-	1115, 1136, 1217, 1300, 1379, 1381, 1496, 1614, 
-	1729, 1794, 1859, 1861, 1940, 2019, 2021, 2049, 
-	2074, 2083, 2087, 2089, 2091, 2093, 2095, 2097, 
-	2099, 2101, 2103, 2105, 2107, 2109, 2111, 2113, 
-	2115, 2117, 2119, 2121, 2123, 2125, 2127, 2129, 
-	2131, 2133, 2135, 2137, 2139, 2141, 2143, 2145, 
-	2150, 2152, 2154, 2156, 2158, 2160, 2162, 2164, 
-	2166, 2168, 2170, 2172, 2174, 2176, 2178, 2237, 
-	2239, 2241, 2243, 2245, 2247, 2249, 2283, 2285, 
-	2287, 2289, 2366, 2422, 2478, 2534, 2590, 2708, 
-	2826, 2944, 3062, 3180, 3298, 3375, 3377, 3462, 
-	3480, 3556, 3747, 3778, 3795, 3801, 3929, 4057, 
-	4082, 4177, 4295, 4297, 4319, 4341, 4363, 4422, 
-	4444, 4497, 4531, 4720, 4785, 4850, 4915, 4917, 
-	4974, 4991, 5067, 5158, 5167, 5176, 5178, 5180, 
-	5182, 5238, 5261, 5346, 5356, 5374
+	392, 394, 479, 570, 646, 669, 754, 765, 
+	785, 796, 816, 901, 982, 993, 1009, 1020, 
+	1041, 1122, 1205, 1284, 1286, 1401, 1519, 1634, 
+	1699, 1764, 1766, 1845, 1924, 1926, 1954, 1979, 
+	1988, 1992, 1994, 1996, 1998, 2000, 2002, 2004, 
+	2006, 2008, 2010, 2012, 2014, 2016, 2018, 2020, 
+	2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 
+	2038, 2040, 2042, 2044, 2046, 2048, 2050, 2055, 
+	2057, 2059, 2061, 2063, 2065, 2067, 2069, 2071, 
+	2073, 2075, 2077, 2079, 2081, 2083, 2142, 2144, 
+	2146, 2148, 2150, 2152, 2154, 2156, 2158, 2235, 
+	2291, 2347, 2403, 2459, 2577, 2695, 2813, 2931, 
+	3049, 3167, 3244, 3246, 3331, 3349, 3425, 3616, 
+	3647, 3664, 3670, 3798, 3926, 3951, 4046, 4164, 
+	4166, 4261, 4356, 4378, 4400, 4422, 4481, 4503, 
+	4556, 4590, 4779, 4844, 4909, 4974, 4976, 5033, 
+	5050, 5126, 5217, 5226, 5235, 5237, 5239, 5240, 
+	5274, 5276, 5277, 5279, 5335, 5358, 5443, 5453, 
+	5471
 ]
 
 class << self
@@ -272,437 +269,482 @@ self._re_scanner_indicies = [
 	6, 6, 6, 6, 6, 6, 6, 6, 
 	6, 6, 6, 6, 6, 6, 6, 6, 
 	6, 6, 6, 6, 6, 0, 9, 8, 
-	11, 10, 12, 10, 10, 10, 13, 14, 
-	10, 10, 10, 10, 15, 10, 10, 10, 
-	10, 10, 10, 10, 10, 10, 10, 10, 
-	10, 16, 10, 17, 11, 16, 10, 10, 
-	10, 10, 10, 10, 10, 10, 10, 10, 
-	10, 10, 10, 10, 10, 10, 10, 10, 
+	12, 11, 13, 10, 10, 10, 10, 10, 
+	10, 10, 10, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 10, 10, 10, 
+	10, 10, 10, 10, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 10, 10, 
+	10, 10, 14, 10, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 10, 15, 
 	10, 10, 10, 10, 10, 10, 10, 10, 
-	10, 10, 10, 10, 10, 10, 10, 10, 
-	15, 10, 10, 15, 10, 10, 10, 10, 
-	15, 10, 10, 10, 15, 10, 10, 10, 
-	10, 10, 10, 10, 15, 10, 10, 15, 
-	10, 10, 10, 10, 10, 16, 10, 18, 
-	12, 16, 10, 10, 10, 10, 10, 10, 
-	10, 10, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 10, 10, 10, 10, 
-	10, 10, 10, 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, 10, 10, 10, 
-	10, 13, 10, 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, 10, 11, 10, 
-	10, 10, 10, 10, 10, 10, 10, 10, 
-	10, 10, 10, 10, 10, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 10, 
-	10, 10, 11, 16, 10, 10, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	10, 10, 10, 10, 19, 10, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	10, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 10, 10, 10, 10, 16, 
-	10, 10, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 10, 10, 10, 10, 
-	19, 10, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 10, 21, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 22, 20, 23, 20, 20, 20, 
-	24, 20, 25, 20, 20, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 20, 
-	20, 20, 20, 20, 20, 20, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	20, 20, 20, 20, 26, 20, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	20, 27, 27, 27, 27, 27, 27, 27, 
-	27, 27, 27, 20, 23, 20, 20, 20, 
-	20, 20, 20, 20, 20, 27, 27, 27, 
-	27, 27, 27, 27, 27, 27, 27, 20, 
-	27, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 20, 23, 20, 20, 20, 24, 
-	20, 24, 20, 20, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 20, 23, 
-	20, 20, 20, 24, 20, 24, 20, 20, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 20, 20, 20, 20, 20, 20, 
-	20, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 20, 20, 20, 20, 26, 
-	20, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 20, 29, 20, 30, 20, 
-	20, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 20, 20, 20, 20, 23, 
-	20, 20, 31, 31, 31, 31, 31, 31, 
+	10, 10, 10, 10, 10, 10, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	10, 10, 10, 15, 13, 10, 10, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 10, 10, 10, 10, 16, 10, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 10, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 10, 10, 10, 10, 
+	13, 10, 10, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 10, 10, 10, 
+	10, 16, 10, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
+	16, 16, 16, 16, 16, 10, 18, 17, 
+	17, 17, 17, 17, 17, 17, 17, 17, 
+	17, 17, 17, 17, 17, 17, 17, 17, 
+	17, 17, 17, 19, 17, 20, 17, 17, 
+	17, 21, 17, 22, 17, 17, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	17, 17, 17, 17, 17, 17, 17, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 17, 17, 17, 17, 23, 17, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 17, 24, 24, 24, 24, 24, 24, 
+	24, 24, 24, 24, 17, 20, 17, 17, 
+	17, 17, 17, 17, 17, 17, 24, 24, 
+	24, 24, 24, 24, 24, 24, 24, 24, 
+	17, 24, 25, 25, 25, 25, 25, 25, 
+	25, 25, 25, 17, 20, 17, 17, 17, 
+	21, 17, 21, 17, 17, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 17, 
+	20, 17, 17, 17, 21, 17, 21, 17, 
+	17, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 17, 17, 17, 17, 17, 
+	17, 17, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 17, 17, 17, 17, 
+	23, 17, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 17, 26, 17, 27, 
+	17, 17, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 17, 17, 17, 17, 
+	20, 17, 17, 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, 17, 17, 17, 
+	17, 28, 17, 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, 17, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	17, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 17, 17, 17, 17, 20, 
+	17, 29, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 17, 26, 17, 26, 17, 
+	17, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 17, 17, 17, 17, 20, 
+	17, 26, 17, 26, 17, 17, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	17, 17, 17, 17, 20, 17, 17, 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, 17, 17, 17, 17, 28, 17, 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, 17, 32, 31, 31, 31, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
 	31, 31, 31, 31, 31, 31, 31, 31, 
 	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 20, 20, 20, 20, 
-	31, 20, 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, 20, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 20, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 20, 20, 20, 20, 23, 20, 
-	32, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 20, 29, 20, 29, 20, 20, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 20, 20, 20, 20, 23, 20, 
-	29, 20, 29, 20, 20, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 20, 
-	20, 20, 20, 23, 20, 20, 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, 
-	20, 20, 20, 20, 31, 20, 31, 31, 
 	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 34, 31, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 31, 
 	31, 31, 31, 31, 31, 31, 31, 31, 
 	31, 31, 31, 31, 31, 31, 31, 31, 
-	20, 35, 34, 34, 34, 36, 36, 36, 
-	36, 36, 36, 36, 36, 36, 36, 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, 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, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 37, 34, 35, 35, 35, 35, 
-	35, 35, 35, 35, 35, 35, 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, 
-	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, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 37, 34, 38, 39, 40, 40, 40, 
-	40, 40, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 40, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 40, 40, 39, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 39, 39, 
-	39, 40, 39, 39, 39, 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, 39, 
-	39, 39, 41, 40, 39, 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, 39, 
-	40, 40, 40, 40, 40, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 40, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 40, 40, 39, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 39, 39, 40, 39, 39, 39, 
-	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, 39, 39, 39, 39, 40, 39, 
-	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, 39, 39, 42, 39, 40, 40, 
-	40, 40, 40, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 40, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 40, 40, 39, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 39, 
-	39, 39, 40, 39, 39, 39, 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, 
-	39, 39, 39, 39, 40, 39, 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, 
-	39, 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, 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, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 43, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 43, 47, 46, 50, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 49, 49, 49, 49, 49, 
-	49, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 49, 50, 51, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 49, 49, 49, 49, 49, 49, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 49, 52, 49, 53, 49, 49, 
-	54, 55, 56, 57, 49, 49, 58, 49, 
-	49, 49, 49, 59, 49, 49, 49, 60, 
-	49, 49, 61, 49, 62, 49, 63, 64, 
-	49, 54, 55, 56, 57, 49, 49, 58, 
-	49, 49, 49, 49, 59, 49, 49, 49, 
-	60, 49, 49, 61, 49, 62, 49, 63, 
-	64, 49, 65, 49, 49, 49, 49, 49, 
-	49, 66, 49, 67, 49, 68, 49, 69, 
-	49, 70, 49, 71, 49, 72, 49, 73, 
-	49, 70, 49, 74, 49, 75, 49, 70, 
-	49, 76, 49, 77, 49, 78, 49, 70, 
-	49, 79, 49, 80, 49, 81, 49, 70, 
-	49, 82, 49, 83, 49, 84, 49, 70, 
-	49, 85, 49, 86, 49, 87, 49, 70, 
-	49, 88, 49, 89, 49, 90, 49, 70, 
-	49, 91, 49, 49, 92, 49, 93, 49, 
-	84, 49, 94, 49, 84, 49, 95, 49, 
-	96, 49, 97, 49, 70, 49, 98, 49, 
-	89, 49, 99, 49, 100, 49, 70, 49, 
-	57, 49, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 49, 49, 49, 49, 
-	49, 49, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 49, 102, 49, 103, 
-	49, 104, 39, 107, 106, 108, 106, 109, 
-	39, 112, 111, 111, 111, 111, 111, 111, 
-	111, 111, 111, 111, 111, 111, 111, 111, 
-	111, 111, 111, 111, 111, 111, 111, 111, 
+	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, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 34, 31, 35, 36, 37, 37, 
+	37, 37, 37, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 37, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 37, 37, 36, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 36, 
+	36, 36, 37, 36, 36, 36, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	36, 36, 36, 38, 37, 36, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	36, 37, 37, 37, 37, 37, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	37, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 37, 37, 36, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 36, 36, 36, 37, 36, 36, 
+	36, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 36, 36, 36, 36, 37, 
+	36, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 36, 36, 39, 36, 37, 
+	37, 37, 37, 37, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 37, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 37, 37, 36, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	36, 36, 36, 37, 36, 36, 36, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 36, 36, 36, 36, 37, 36, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 37, 37, 37, 37, 37, 37, 37, 
+	37, 36, 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, 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, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 40, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 40, 44, 43, 47, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 46, 46, 46, 46, 
+	46, 46, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 46, 47, 48, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 46, 46, 46, 46, 46, 
+	46, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 46, 49, 46, 50, 46, 
+	46, 51, 52, 53, 54, 46, 46, 55, 
+	46, 46, 46, 46, 56, 46, 46, 46, 
+	57, 46, 46, 58, 46, 59, 46, 60, 
+	61, 46, 51, 52, 53, 54, 46, 46, 
+	55, 46, 46, 46, 46, 56, 46, 46, 
+	46, 57, 46, 46, 58, 46, 59, 46, 
+	60, 61, 46, 62, 46, 46, 46, 46, 
+	46, 46, 63, 46, 64, 46, 65, 46, 
+	66, 46, 67, 46, 68, 46, 69, 46, 
+	70, 46, 67, 46, 71, 46, 72, 46, 
+	67, 46, 73, 46, 74, 46, 75, 46, 
+	67, 46, 76, 46, 77, 46, 78, 46, 
+	67, 46, 79, 46, 80, 46, 81, 46, 
+	67, 46, 82, 46, 83, 46, 84, 46, 
+	67, 46, 85, 46, 86, 46, 87, 46, 
+	67, 46, 88, 46, 46, 89, 46, 90, 
+	46, 81, 46, 91, 46, 81, 46, 92, 
+	46, 93, 46, 94, 46, 67, 46, 95, 
+	46, 86, 46, 96, 46, 97, 46, 67, 
+	46, 54, 46, 98, 98, 98, 98, 98, 
+	98, 98, 98, 98, 98, 98, 98, 98, 
+	98, 98, 98, 98, 98, 98, 98, 98, 
+	98, 98, 98, 98, 98, 46, 46, 46, 
+	46, 46, 46, 98, 98, 98, 98, 98, 
+	98, 98, 98, 98, 98, 98, 98, 98, 
+	98, 98, 98, 98, 98, 98, 98, 98, 
+	98, 98, 98, 98, 98, 46, 99, 46, 
+	100, 46, 101, 36, 103, 102, 105, 102, 
+	106, 36, 108, 107, 110, 107, 111, 111, 
 	111, 111, 111, 111, 111, 111, 111, 111, 
-	111, 113, 111, 113, 111, 114, 111, 115, 
-	111, 116, 116, 116, 116, 116, 116, 116, 
-	116, 116, 116, 39, 39, 39, 39, 39, 
-	39, 39, 116, 116, 116, 116, 116, 116, 
-	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, 116, 116, 116, 116, 116, 116, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 117, 39, 118, 118, 
+	36, 36, 36, 36, 36, 36, 36, 111, 
+	111, 111, 111, 111, 111, 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, 111, 
+	111, 111, 111, 111, 111, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 112, 36, 113, 113, 113, 113, 113, 
+	113, 113, 113, 113, 113, 36, 36, 36, 
+	36, 36, 36, 36, 113, 113, 113, 113, 
+	113, 113, 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, 113, 113, 113, 113, 
+	113, 113, 36, 114, 114, 114, 114, 114, 
+	114, 114, 114, 114, 114, 36, 36, 36, 
+	36, 36, 36, 36, 114, 114, 114, 114, 
+	114, 114, 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, 114, 114, 114, 114, 
+	114, 114, 36, 115, 115, 115, 115, 115, 
+	115, 115, 115, 115, 115, 36, 36, 36, 
+	36, 36, 36, 36, 115, 115, 115, 115, 
+	115, 115, 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, 115, 115, 115, 115, 
+	115, 115, 36, 116, 116, 116, 116, 116, 
+	116, 116, 116, 116, 116, 36, 36, 36, 
+	36, 36, 36, 36, 116, 116, 116, 116, 
+	116, 116, 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, 116, 116, 116, 116, 
+	116, 116, 36, 112, 112, 112, 112, 112, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 112, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 36, 36, 36, 36, 
+	36, 36, 36, 117, 117, 117, 117, 117, 
+	117, 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, 117, 117, 117, 117, 117, 
+	117, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 115, 
+	36, 112, 112, 112, 112, 112, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	112, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
 	118, 118, 118, 118, 118, 118, 118, 118, 
-	39, 39, 39, 39, 39, 39, 39, 118, 
-	118, 118, 118, 118, 118, 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, 118, 
-	118, 118, 118, 118, 118, 39, 119, 119, 
+	118, 118, 36, 36, 36, 36, 36, 36, 
+	36, 118, 118, 118, 118, 118, 118, 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, 118, 118, 118, 118, 118, 118, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 115, 36, 112, 
+	112, 112, 112, 112, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 112, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 119, 119, 
 	119, 119, 119, 119, 119, 119, 119, 119, 
-	39, 39, 39, 39, 39, 39, 39, 119, 
-	119, 119, 119, 119, 119, 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, 119, 
-	119, 119, 119, 119, 119, 39, 120, 120, 
-	120, 120, 120, 120, 120, 120, 120, 120, 
-	39, 39, 39, 39, 39, 39, 39, 120, 
-	120, 120, 120, 120, 120, 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, 120, 
-	120, 120, 120, 120, 120, 39, 121, 121, 
-	121, 121, 121, 121, 121, 121, 121, 121, 
-	39, 39, 39, 39, 39, 39, 39, 121, 
-	121, 121, 121, 121, 121, 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, 121, 
-	121, 121, 121, 121, 121, 39, 117, 117, 
-	117, 117, 117, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 117, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 122, 122, 122, 
-	122, 122, 122, 122, 122, 122, 122, 39, 
-	39, 39, 39, 39, 39, 39, 122, 122, 
-	122, 122, 122, 122, 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, 122, 122, 
-	122, 122, 122, 122, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 120, 39, 117, 117, 117, 117, 
-	117, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 117, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 123, 123, 123, 123, 123, 
-	123, 123, 123, 123, 123, 39, 39, 39, 
-	39, 39, 39, 39, 123, 123, 123, 123, 
-	123, 123, 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, 123, 123, 123, 123, 
-	123, 123, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	120, 39, 117, 117, 117, 117, 117, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 117, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 124, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 39, 39, 39, 39, 39, 
-	39, 39, 124, 124, 124, 124, 124, 124, 
-	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, 124, 124, 124, 124, 124, 124, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 120, 39, 
-	117, 117, 117, 117, 117, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 117, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 125, 
-	125, 125, 125, 125, 125, 125, 125, 125, 
-	125, 39, 39, 39, 39, 39, 39, 39, 
-	125, 125, 125, 125, 125, 125, 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, 
-	125, 125, 125, 125, 125, 125, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 120, 39, 117, 117, 
-	117, 117, 117, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 117, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 126, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 39, 
-	39, 39, 39, 39, 39, 39, 126, 126, 
-	126, 126, 126, 126, 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, 126, 126, 
-	126, 126, 126, 126, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 120, 39, 117, 117, 117, 117, 
-	117, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 117, 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, 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, 
-	120, 39, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 127, 127, 127, 127, 
-	127, 127, 127, 128, 128, 128, 128, 128, 
-	128, 127, 127, 127, 127, 127, 127, 127, 
+	36, 36, 36, 36, 36, 36, 36, 119, 
+	119, 119, 119, 119, 119, 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, 119, 
+	119, 119, 119, 119, 119, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 115, 36, 112, 112, 112, 
+	112, 112, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 112, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 120, 120, 120, 120, 
+	120, 120, 120, 120, 120, 120, 36, 36, 
+	36, 36, 36, 36, 36, 120, 120, 120, 
+	120, 120, 120, 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, 120, 120, 120, 
+	120, 120, 120, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 115, 36, 112, 112, 112, 112, 112, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 112, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 36, 36, 36, 36, 
+	36, 36, 36, 121, 121, 121, 121, 121, 
+	121, 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, 121, 121, 121, 121, 121, 
+	121, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 115, 
+	36, 112, 112, 112, 112, 112, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	112, 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, 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, 115, 36, 123, 
+	123, 123, 123, 123, 123, 123, 123, 123, 
+	123, 122, 122, 122, 122, 122, 122, 122, 
+	123, 123, 123, 123, 123, 123, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	123, 123, 123, 123, 123, 123, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 122, 122, 122, 122, 122, 122, 
+	122, 122, 36, 122, 125, 124, 126, 124, 
+	124, 124, 124, 124, 124, 124, 124, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 124, 124, 124, 124, 124, 124, 124, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 127, 124, 124, 124, 124, 127, 124, 
 	127, 127, 127, 127, 127, 127, 127, 127, 
 	127, 127, 127, 127, 127, 127, 127, 127, 
-	127, 127, 127, 128, 128, 128, 128, 128, 
-	128, 127, 127, 127, 127, 127, 127, 127, 
 	127, 127, 127, 127, 127, 127, 127, 127, 
-	127, 127, 127, 127, 127, 39, 127, 130, 
-	129, 131, 129, 129, 129, 129, 129, 129, 
-	129, 129, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 129, 129, 129, 129, 
-	129, 129, 129, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 129, 129, 129, 
-	129, 132, 129, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 129, 130, 129, 
-	129, 129, 129, 129, 129, 133, 133, 133, 
-	133, 133, 133, 133, 133, 133, 133, 129, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 129, 129, 129, 129, 131, 129, 
-	129, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 129, 129, 129, 129, 134, 
-	129, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 129, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 136, 136, 136, 136, 136, 136, 
+	127, 127, 124, 125, 124, 124, 124, 124, 
+	124, 124, 128, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 124, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 124, 
+	124, 124, 124, 126, 124, 124, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	124, 124, 124, 124, 129, 124, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	124, 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, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 132, 
+	132, 132, 132, 132, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	133, 133, 133, 133, 133, 133, 133, 133, 
+	134, 134, 134, 134, 134, 133, 133, 133, 
+	133, 133, 133, 133, 133, 133, 133, 133, 
+	133, 133, 133, 133, 133, 133, 133, 135, 
+	136, 136, 137, 138, 136, 136, 136, 139, 
+	140, 141, 142, 136, 136, 143, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 144, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 145, 146, 31, 147, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 33, 148, 31, 136, 133, 31, 
+	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, 149, 131, 
+	131, 131, 131, 131, 131, 131, 131, 131, 
+	131, 131, 131, 131, 131, 131, 131, 149, 
+	132, 132, 132, 132, 132, 149, 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, 133, 133, 133, 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, 149, 133, 149, 133, 133, 
+	133, 133, 133, 133, 133, 133, 134, 134, 
+	134, 134, 134, 133, 133, 133, 133, 133, 
+	133, 133, 133, 133, 133, 133, 133, 133, 
+	133, 133, 133, 133, 133, 135, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 133, 150, 135, 135, 
+	135, 135, 135, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 135, 150, 136, 
+	136, 136, 149, 136, 136, 136, 149, 149, 
+	149, 149, 136, 136, 149, 136, 136, 136, 
 	136, 136, 136, 136, 136, 136, 136, 136, 
-	136, 136, 137, 137, 137, 137, 137, 34, 
-	34, 34, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 138, 138, 138, 138, 138, 
-	138, 138, 138, 139, 139, 139, 139, 139, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
-	138, 138, 140, 141, 141, 142, 143, 141, 
-	141, 141, 144, 145, 146, 147, 141, 141, 
-	148, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 149, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 150, 151, 34, 
-	152, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 36, 153, 34, 
-	141, 138, 34, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 154, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 149, 136, 136, 
 	136, 136, 136, 136, 136, 136, 136, 136, 
-	136, 136, 154, 137, 137, 137, 137, 137, 
-	154, 138, 138, 138, 138, 138, 138, 138, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 149, 149, 149, 149, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 149, 149, 149, 136, 149, 9, 8, 
+	8, 8, 8, 8, 8, 8, 8, 8, 
+	8, 8, 8, 8, 8, 8, 8, 8, 
+	8, 8, 8, 8, 8, 137, 137, 137, 
+	8, 137, 137, 137, 8, 8, 8, 8, 
+	137, 137, 8, 137, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 137, 
+	137, 137, 137, 8, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 8, 
+	8, 8, 8, 137, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 137, 
+	137, 137, 137, 137, 137, 137, 137, 8, 
+	8, 8, 137, 8, 152, 151, 15, 154, 
+	11, 154, 154, 154, 14, 155, 153, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 154, 154, 154, 154, 13, 
+	154, 156, 15, 13, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
@@ -710,126 +752,88 @@ self._re_scanner_indicies = [
 	154, 154, 154, 154, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 13, 154, 153, 154, 153, 
+	154, 154, 154, 153, 153, 153, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 154, 154, 154, 157, 154, 
+	153, 153, 153, 154, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
 	154, 154, 154, 154, 154, 154, 154, 154, 
-	154, 154, 154, 154, 154, 154, 154, 138, 
-	154, 138, 138, 138, 138, 138, 138, 138, 
-	138, 139, 139, 139, 139, 139, 138, 138, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
-	138, 138, 138, 138, 138, 138, 138, 138, 
-	140, 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, 
-	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, 138, 
-	155, 140, 140, 140, 140, 140, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	140, 155, 141, 141, 141, 154, 141, 141, 
-	141, 154, 154, 154, 154, 141, 141, 154, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	154, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 154, 154, 154, 154, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 141, 141, 141, 141, 
-	141, 141, 141, 141, 154, 154, 154, 141, 
-	154, 9, 8, 8, 8, 8, 8, 8, 
-	8, 8, 8, 8, 8, 8, 8, 8, 
-	8, 8, 8, 8, 8, 8, 8, 8, 
-	142, 142, 142, 8, 142, 142, 142, 8, 
-	8, 8, 8, 142, 142, 8, 142, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 142, 142, 142, 142, 8, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 8, 8, 8, 8, 142, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 142, 142, 142, 142, 142, 142, 
-	142, 142, 8, 8, 8, 142, 8, 157, 
-	156, 159, 158, 158, 158, 158, 158, 158, 
+	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 154, 154, 154, 154, 154, 154, 
+	154, 154, 153, 154, 159, 158, 158, 158, 
 	158, 158, 158, 158, 158, 158, 158, 158, 
-	158, 158, 158, 158, 158, 159, 158, 161, 
-	160, 160, 160, 160, 160, 160, 160, 160, 
+	158, 158, 158, 158, 158, 158, 158, 158, 
+	159, 158, 161, 160, 160, 160, 160, 160, 
 	160, 160, 160, 160, 160, 160, 160, 160, 
-	160, 160, 160, 161, 160, 163, 162, 162, 
+	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, 162, 162, 162, 162, 
-	162, 163, 162, 165, 165, 164, 164, 164, 
-	164, 165, 164, 164, 164, 166, 164, 164, 
-	164, 164, 164, 164, 164, 164, 164, 164, 
-	164, 164, 164, 164, 165, 164, 164, 164, 
+	162, 162, 162, 162, 163, 162, 165, 165, 
 	164, 164, 164, 164, 165, 164, 164, 164, 
-	164, 167, 164, 164, 164, 167, 164, 164, 
-	164, 164, 164, 164, 164, 164, 164, 164, 
-	164, 164, 164, 164, 165, 164, 169, 168, 
+	166, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 165, 
+	164, 164, 164, 164, 164, 164, 164, 165, 
+	164, 164, 164, 164, 167, 164, 164, 164, 
+	167, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 165, 
+	164, 169, 168, 168, 168, 168, 168, 168, 
 	168, 168, 168, 168, 168, 168, 168, 168, 
-	168, 168, 168, 168, 168, 168, 168, 168, 
-	168, 168, 169, 168, 170, 39, 39, 39, 
-	170, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 170, 170, 39, 39, 39, 170, 
-	170, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 170, 39, 39, 39, 
-	170, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 170, 39, 39, 39, 170, 
-	39, 171, 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, 171, 39, 172, 172, 172, 172, 172, 
+	168, 168, 168, 168, 168, 169, 168, 170, 
+	36, 36, 36, 170, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 170, 170, 36, 
+	36, 36, 170, 170, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 170, 
+	36, 36, 36, 170, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 170, 36, 
+	36, 36, 170, 36, 171, 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, 171, 36, 172, 172, 
 	172, 172, 172, 172, 172, 172, 172, 172, 
 	172, 172, 172, 172, 172, 172, 172, 172, 
 	172, 172, 172, 172, 172, 172, 172, 172, 
-	172, 173, 173, 173, 173, 173, 173, 173, 
+	172, 172, 172, 172, 173, 173, 173, 173, 
 	173, 173, 173, 173, 173, 173, 173, 173, 
-	173, 174, 174, 174, 174, 174, 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, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 175, 44, 176, 
-	44, 175, 175, 175, 175, 44, 177, 175, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	175, 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, 44, 178, 179, 180, 181, 
-	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, 44, 44, 175, 175, 175, 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, 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, 44, 44, 44, 44, 44, 
-	44, 44, 44, 44, 44, 44, 44, 44, 
-	182, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 182, 183, 183, 183, 183, 183, 183, 
+	173, 173, 173, 173, 174, 174, 174, 174, 
+	174, 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, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	175, 41, 176, 41, 175, 175, 175, 175, 
+	41, 177, 175, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 175, 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, 41, 178, 
+	179, 180, 181, 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, 41, 41, 175, 
+	175, 175, 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, 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, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 182, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 42, 42, 42, 42, 
+	42, 42, 42, 42, 182, 183, 183, 183, 
 	183, 183, 183, 183, 183, 183, 183, 183, 
 	183, 183, 183, 183, 183, 183, 183, 183, 
 	183, 183, 183, 183, 183, 183, 183, 183, 
@@ -837,74 +841,79 @@ self._re_scanner_indicies = [
 	183, 183, 183, 183, 183, 183, 183, 183, 
 	183, 183, 183, 183, 183, 183, 183, 183, 
 	183, 183, 183, 183, 183, 183, 183, 183, 
-	183, 183, 182, 184, 182, 186, 185, 185, 
-	185, 185, 185, 185, 185, 185, 185, 185, 
+	183, 183, 183, 183, 183, 182, 184, 182, 
+	186, 185, 185, 185, 185, 185, 185, 185, 
 	185, 185, 185, 185, 185, 185, 185, 185, 
 	185, 185, 185, 185, 185, 185, 185, 185, 
 	185, 185, 185, 185, 185, 185, 185, 185, 
 	185, 185, 185, 185, 185, 185, 185, 185, 
 	185, 185, 185, 185, 185, 185, 185, 185, 
-	185, 185, 185, 185, 187, 185, 190, 189, 
-	189, 189, 189, 189, 189, 189, 189, 189, 
-	189, 189, 191, 189, 189, 192, 189, 194, 
-	194, 194, 194, 194, 194, 194, 194, 194, 
-	194, 193, 193, 193, 193, 193, 193, 193, 
-	194, 194, 194, 193, 193, 193, 194, 193, 
+	185, 185, 185, 185, 185, 185, 185, 187, 
+	185, 190, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 189, 189, 191, 189, 189, 
+	192, 189, 194, 194, 194, 194, 194, 194, 
+	194, 194, 194, 194, 193, 193, 193, 193, 
+	193, 193, 193, 194, 194, 194, 193, 193, 
+	193, 194, 193, 193, 193, 194, 193, 194, 
+	193, 193, 193, 193, 194, 193, 193, 193, 
 	193, 193, 194, 193, 194, 193, 193, 193, 
-	193, 194, 193, 193, 193, 193, 193, 194, 
-	193, 194, 193, 193, 193, 193, 193, 193, 
-	193, 193, 194, 193, 193, 193, 194, 193, 
-	193, 193, 194, 193, 193, 193, 193, 193, 
+	193, 193, 193, 193, 193, 194, 193, 193, 
+	193, 194, 193, 193, 193, 194, 193, 193, 
 	193, 193, 193, 193, 193, 193, 193, 193, 
-	193, 194, 193, 196, 195, 195, 195, 196, 
-	196, 196, 196, 195, 195, 196, 195, 197, 
-	198, 198, 198, 198, 198, 198, 198, 199, 
-	199, 195, 195, 195, 195, 195, 196, 195, 
-	39, 39, 200, 201, 195, 195, 39, 201, 
-	195, 195, 39, 195, 202, 195, 195, 203, 
-	195, 201, 201, 195, 195, 195, 201, 201, 
-	195, 39, 196, 196, 196, 196, 195, 195, 
-	204, 204, 104, 201, 204, 204, 39, 201, 
-	195, 195, 39, 195, 195, 204, 195, 203, 
-	195, 204, 201, 204, 205, 204, 201, 206, 
-	195, 39, 196, 196, 196, 195, 208, 208, 
-	208, 208, 208, 208, 208, 208, 207, 210, 
-	210, 210, 210, 210, 210, 210, 210, 209, 
-	213, 212, 216, 215, 217, 215, 220, 220, 
-	220, 220, 220, 220, 220, 220, 220, 220, 
-	219, 219, 219, 219, 219, 219, 219, 220, 
-	220, 220, 220, 220, 220, 219, 219, 219, 
-	219, 219, 219, 219, 219, 219, 219, 219, 
-	219, 219, 219, 219, 219, 219, 219, 219, 
-	219, 219, 219, 219, 219, 219, 219, 220, 
-	220, 220, 220, 220, 220, 219, 222, 221, 
-	221, 221, 221, 221, 223, 221, 221, 221, 
-	224, 224, 224, 224, 224, 224, 224, 224, 
-	224, 221, 221, 225, 221, 131, 226, 226, 
-	226, 226, 226, 226, 226, 226, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	226, 226, 226, 226, 226, 226, 226, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 226, 226, 226, 226, 132, 226, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 132, 132, 132, 132, 132, 132, 132, 
-	132, 226, 133, 133, 133, 133, 133, 133, 
-	133, 133, 133, 226, 130, 226, 226, 226, 
-	226, 226, 226, 133, 133, 133, 133, 133, 
-	133, 133, 133, 133, 133, 226, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	226, 226, 226, 226, 131, 226, 226, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 226, 226, 226, 226, 134, 226, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 226, 0
+	193, 193, 193, 193, 194, 193, 196, 195, 
+	195, 195, 196, 196, 196, 196, 195, 195, 
+	196, 195, 197, 198, 198, 198, 198, 198, 
+	198, 198, 199, 199, 195, 195, 195, 195, 
+	195, 196, 195, 36, 36, 200, 201, 195, 
+	195, 36, 201, 195, 195, 36, 195, 202, 
+	195, 195, 203, 195, 201, 201, 195, 195, 
+	195, 201, 201, 195, 36, 196, 196, 196, 
+	196, 195, 195, 204, 204, 101, 201, 204, 
+	204, 36, 201, 195, 195, 36, 195, 195, 
+	204, 195, 203, 195, 204, 201, 204, 205, 
+	204, 201, 206, 195, 36, 196, 196, 196, 
+	195, 208, 208, 208, 208, 208, 208, 208, 
+	208, 207, 210, 210, 210, 210, 210, 210, 
+	210, 210, 209, 212, 102, 214, 213, 102, 
+	216, 107, 107, 107, 107, 107, 107, 107, 
+	107, 107, 107, 107, 107, 107, 107, 107, 
+	107, 107, 107, 107, 107, 107, 107, 107, 
+	107, 107, 107, 107, 107, 107, 107, 107, 
+	217, 107, 219, 218, 107, 110, 107, 222, 
+	222, 222, 222, 222, 222, 222, 222, 222, 
+	222, 221, 221, 221, 221, 221, 221, 221, 
+	222, 222, 222, 222, 222, 222, 221, 221, 
+	221, 221, 221, 221, 221, 221, 221, 221, 
+	221, 221, 221, 221, 221, 221, 221, 221, 
+	221, 221, 221, 221, 221, 221, 221, 221, 
+	222, 222, 222, 222, 222, 222, 221, 224, 
+	223, 223, 223, 223, 223, 225, 223, 223, 
+	223, 226, 226, 226, 226, 226, 226, 226, 
+	226, 226, 223, 223, 227, 223, 126, 228, 
+	228, 228, 228, 228, 228, 228, 228, 127, 
+	127, 127, 127, 127, 127, 127, 127, 127, 
+	127, 228, 228, 228, 228, 228, 228, 228, 
+	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, 228, 228, 228, 228, 127, 228, 
+	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, 228, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 228, 125, 228, 228, 
+	228, 228, 228, 228, 128, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 228, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 228, 228, 228, 228, 126, 228, 228, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 228, 228, 228, 228, 129, 228, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 129, 129, 129, 129, 129, 129, 
+	129, 129, 228, 0
 ]
 
 class << self
@@ -912,35 +921,35 @@ class << self
 	private :_re_scanner_trans_targs, :_re_scanner_trans_targs=
 end
 self._re_scanner_trans_targs = [
-	113, 114, 3, 115, 5, 6, 116, 113, 
-	7, 113, 113, 113, 9, 10, 113, 113, 
-	113, 11, 113, 12, 113, 14, 20, 113, 
-	15, 17, 19, 16, 18, 21, 23, 25, 
-	22, 24, 0, 27, 26, 127, 29, 0, 
-	30, 31, 129, 130, 130, 32, 130, 130, 
-	130, 130, 36, 37, 130, 39, 40, 51, 
-	55, 59, 63, 67, 71, 76, 80, 82, 
-	85, 41, 48, 42, 46, 43, 44, 45, 
-	130, 47, 49, 50, 52, 53, 54, 56, 
-	57, 58, 60, 61, 62, 64, 65, 66, 
-	68, 69, 70, 72, 74, 73, 75, 77, 
-	78, 79, 81, 83, 84, 87, 88, 130, 
-	141, 138, 138, 91, 138, 142, 138, 138, 
-	94, 143, 96, 138, 98, 101, 99, 100, 
-	138, 102, 103, 104, 105, 106, 107, 138, 
-	144, 145, 145, 109, 110, 111, 112, 1, 
-	2, 4, 117, 118, 119, 120, 121, 113, 
-	122, 113, 123, 124, 113, 125, 113, 126, 
-	113, 113, 113, 113, 113, 8, 113, 113, 
-	113, 113, 113, 113, 113, 113, 113, 13, 
-	113, 113, 128, 28, 131, 132, 133, 130, 
-	134, 135, 136, 130, 130, 130, 130, 33, 
-	130, 130, 34, 130, 130, 130, 35, 38, 
-	86, 137, 137, 138, 138, 139, 139, 138, 
-	89, 138, 92, 138, 138, 97, 108, 138, 
-	140, 138, 138, 138, 138, 90, 138, 138, 
-	93, 95, 138, 138, 138, 145, 146, 147, 
-	148, 149, 145
+	110, 111, 3, 112, 5, 6, 113, 110, 
+	7, 110, 110, 8, 110, 110, 9, 110, 
+	11, 110, 13, 19, 110, 14, 16, 18, 
+	15, 17, 20, 22, 24, 21, 23, 0, 
+	26, 25, 126, 28, 0, 29, 30, 128, 
+	129, 129, 31, 129, 129, 129, 129, 35, 
+	36, 129, 38, 39, 50, 54, 58, 62, 
+	66, 70, 75, 79, 81, 84, 40, 47, 
+	41, 45, 42, 43, 44, 129, 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, 129, 89, 137, 140, 
+	137, 142, 92, 137, 143, 137, 145, 95, 
+	98, 96, 97, 137, 99, 100, 101, 102, 
+	103, 104, 137, 147, 148, 148, 106, 107, 
+	108, 109, 1, 2, 4, 114, 115, 116, 
+	117, 118, 110, 119, 110, 122, 123, 110, 
+	124, 110, 125, 110, 110, 110, 110, 110, 
+	120, 110, 121, 110, 10, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 12, 
+	110, 110, 127, 27, 130, 131, 132, 129, 
+	133, 134, 135, 129, 129, 129, 129, 32, 
+	129, 129, 33, 129, 129, 129, 34, 37, 
+	85, 136, 136, 137, 137, 138, 138, 137, 
+	88, 137, 91, 137, 137, 94, 105, 137, 
+	139, 137, 137, 137, 141, 137, 90, 137, 
+	144, 146, 137, 93, 137, 137, 137, 148, 
+	149, 150, 151, 152, 148
 ]
 
 class << self
@@ -949,34 +958,34 @@ class << self
 end
 self._re_scanner_trans_actions = [
 	1, 2, 0, 2, 0, 0, 2, 3, 
-	0, 4, 5, 6, 7, 0, 8, 9, 
-	10, 0, 11, 0, 12, 0, 0, 13, 
+	0, 4, 5, 6, 7, 8, 0, 9, 
+	0, 10, 0, 0, 11, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 12, 
+	0, 0, 0, 0, 0, 0, 0, 14, 
+	15, 16, 0, 17, 18, 19, 20, 0, 
+	0, 21, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 14, 0, 0, 0, 0, 0, 
-	0, 0, 16, 17, 18, 0, 19, 20, 
-	21, 22, 0, 0, 23, 0, 0, 0, 
+	0, 0, 0, 0, 0, 22, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 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, 23, 0, 24, 0, 
+	25, 0, 0, 26, 0, 27, 0, 0, 
+	0, 0, 0, 28, 0, 0, 0, 0, 
+	0, 0, 29, 0, 30, 31, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 25, 
-	26, 27, 28, 0, 29, 26, 30, 31, 
-	0, 26, 0, 32, 0, 0, 0, 0, 
-	33, 0, 0, 0, 0, 0, 0, 34, 
-	0, 35, 36, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 26, 39, 
-	40, 41, 0, 0, 42, 0, 43, 26, 
-	44, 45, 46, 47, 48, 49, 50, 51, 
-	52, 53, 54, 55, 56, 57, 58, 0, 
-	59, 60, 62, 0, 0, 26, 26, 63, 
-	0, 26, 26, 64, 65, 66, 67, 0, 
+	0, 34, 35, 36, 37, 0, 0, 38, 
+	0, 39, 34, 40, 41, 42, 43, 44, 
+	45, 46, 0, 47, 0, 48, 49, 50, 
+	51, 52, 53, 54, 55, 56, 57, 0, 
+	58, 59, 61, 0, 0, 34, 34, 62, 
+	0, 34, 63, 64, 65, 66, 67, 0, 
 	68, 69, 0, 70, 71, 72, 0, 0, 
 	0, 73, 74, 75, 76, 77, 78, 79, 
 	0, 80, 0, 81, 82, 0, 0, 83, 
-	0, 84, 85, 86, 87, 0, 88, 89, 
-	0, 0, 90, 91, 92, 93, 26, 26, 
-	26, 26, 94
+	0, 84, 85, 86, 34, 87, 0, 88, 
+	34, 0, 89, 0, 90, 91, 92, 93, 
+	34, 34, 34, 34, 94
 ]
 
 class << self
@@ -997,12 +1006,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, 32, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 37, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	61, 61, 61, 0, 0, 0, 0, 0, 
-	0, 61, 61, 0, 0, 0, 0, 0, 
-	0, 61, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 60, 
+	60, 60, 0, 0, 0, 0, 0, 0, 
+	60, 60, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 60, 0, 0, 0, 
+	0
 ]
 
 class << self
@@ -1023,12 +1033,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, 33, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 38, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	38, 38, 38, 0, 0, 0, 0, 0, 
-	0, 38, 38, 0, 0, 0, 0, 0, 
-	0, 38, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 33, 
+	33, 33, 0, 0, 0, 0, 0, 0, 
+	33, 33, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 33, 0, 0, 0, 
+	0
 ]
 
 class << self
@@ -1039,22 +1050,23 @@ 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, 14, 14, 15, 15, 15, 15, 
+	0, 12, 12, 13, 13, 13, 13, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 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, 
+	12, 12, 0, 12, 12, 0, 12, 12, 
+	12, 12, 12, 12, 12, 12, 12, 12, 
+	12, 12, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 14, 0, 0, 14, 0, 0, 0, 
-	0, 14, 14, 14, 14, 14, 14, 14, 
-	14, 14, 14, 14, 14, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 12, 0, 0, 0, 0, 0, 0, 
+	0, 12, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 14, 0, 0, 0, 0, 0, 
-	0, 0, 14, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0
+	0
 ]
 
 class << self
@@ -1063,34 +1075,35 @@ class << self
 end
 self._re_scanner_eof_trans = [
 	0, 1, 1, 1, 1, 1, 1, 8, 
-	11, 11, 11, 11, 11, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 0, 0, 0, 0, 0, 0, 
-	44, 44, 47, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 49, 49, 49, 49, 49, 49, 49, 
-	49, 0, 106, 106, 0, 111, 111, 111, 
-	111, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 130, 130, 130, 
-	130, 0, 155, 155, 155, 155, 156, 156, 
-	155, 155, 157, 159, 161, 163, 165, 169, 
-	0, 0, 0, 183, 183, 183, 183, 186, 
-	189, 0, 0, 208, 210, 212, 215, 215, 
-	219, 0, 227, 227, 227, 227
+	11, 11, 11, 11, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 0, 0, 0, 0, 0, 0, 41, 
+	41, 44, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	0, 0, 105, 0, 0, 110, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 125, 125, 125, 125, 0, 150, 
+	150, 150, 150, 151, 151, 150, 150, 152, 
+	154, 154, 159, 161, 163, 165, 169, 0, 
+	0, 0, 183, 183, 183, 183, 186, 189, 
+	0, 0, 208, 210, 212, 212, 212, 216, 
+	216, 216, 216, 221, 0, 229, 229, 229, 
+	229
 ]
 
 class << self
 	attr_accessor :re_scanner_start
 end
-self.re_scanner_start = 113;
+self.re_scanner_start = 110;
 class << self
 	attr_accessor :re_scanner_first_final
 end
-self.re_scanner_first_final = 113;
+self.re_scanner_first_final = 110;
 class << self
 	attr_accessor :re_scanner_error
 end
@@ -1099,36 +1112,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 = 145;
+self.re_scanner_en_conditional_expression = 148;
 class << self
 	attr_accessor :re_scanner_en_main
 end
-self.re_scanner_en_main = 113;
+self.re_scanner_en_main = 110;
 
 
-# line 808 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 753 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1131 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1144 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -1139,9 +1152,9 @@ begin
 	act = 0
 end
 
-# line 809 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 754 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
     
-# line 1144 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1157 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -1164,12 +1177,12 @@ begin
 	end
 	if _goto_level <= _resume
 	case _re_scanner_from_state_actions[cs] 
-	when 38 then
+	when 33 then
 # line 1 "NONE"
 		begin
 ts = p
 		end
-# line 1172 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 1185 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 	_keys = cs << 1
 	_inds = _re_scanner_index_offsets[cs]
@@ -1188,23 +1201,27 @@ ts = p
 	cs = _re_scanner_trans_targs[_trans]
 	if _re_scanner_trans_actions[_trans] != 0
 	case _re_scanner_trans_actions[_trans]
-	when 14 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 12 then
+# line 131 "/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
-	when 7 then
+	when 36 then
 # line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
- self.group_depth = group_depth - 1; in_group = group_depth > 0 ? true : false 		end
-	when 26 then
+ self.group_depth = group_depth + 1 		end
+	when 6 then
+# line 144 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.group_depth = group_depth - 1 		end
+	when 34 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-	when 62 then
+	when 61 then
 # line 12 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/char_type.rl"
 		begin
 te = p+1
@@ -1220,9 +1237,6 @@ te = p+1
       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)
-      else
-        raise ScannerError.new(
-          "Unexpected character in type at #{text} (char #{ts})")
       end
       	begin
 		top -= 1
@@ -1233,7 +1247,7 @@ te = p+1
 
      end
 		end
-	when 16 then
+	when 14 then
 # line 16 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/property.rl"
 		begin
 te = p+1
@@ -1257,65 +1271,8 @@ te = p+1
 
      end
 		end
-	when 65 then
-# line 149 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p+1
- begin 
-      set_depth -= 1
-      in_set = set_depth > 0 ? true : false
-
-      emit(:set, :close, *text(data, ts, te))
-
-      if set_depth == 0
-        	begin
-		cs = 113
-		_goto_level = _again
-		next
-	end
-
-      else
-        	begin
-		top -= 1
-		cs = stack[top]
-		_goto_level = _again
-		next
-	end
-
-      end
-     end
-		end
-	when 70 then
-# line 162 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p+1
- begin  # special case, emits two tokens
-      set_depth -= 1
-      in_set = set_depth > 0 ? true : false
-
-      emit(:literal, :literal, copy(data, ts..te-2), ts, te)
-      emit(:set, :close, copy(data, ts+1..te-1), ts, te)
-
-      if set_depth == 0
-        	begin
-		cs = 113
-		_goto_level = _again
-		next
-	end
-
-      else
-        	begin
-		top -= 1
-		cs = stack[top]
-		_goto_level = _again
-		next
-	end
-
-      end
-     end
-		end
-	when 20 then
-# line 176 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 18 then
+# line 171 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin  # special case, emits two tokens
@@ -1324,7 +1281,7 @@ te = p+1
      end
 		end
 	when 66 then
-# line 181 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 176 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1337,7 +1294,7 @@ te = p+1
      end
 		end
 	when 68 then
-# line 202 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 197 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1345,63 +1302,30 @@ te = p+1
      end
 		end
 	when 64 then
-# line 206 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 201 "/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 24 then
-# line 217 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p+1
- begin 
-      text = text(data, ts, te).first
-
-      type = :posixclass
-      class_name = text[2..-3]
-      if class_name[0].chr == '^'
-        class_name = class_name[1..-1]
-        type = :nonposixclass
-      end
-
-      emit(type, class_name.to_sym, text, ts, te)
-     end
-		end
-	when 23 then
-# line 230 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p+1
- begin 
-      emit(:set, :collation, *text(data, ts, te))
-     end
-		end
-	when 25 then
-# line 234 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p+1
- begin 
-      emit(:set, :equivalent, *text(data, ts, te))
-     end
-		end
-	when 63 then
-# line 238 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 62 then
+# line 231 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:literal, :literal, *text(data, ts, te))
      end
 		end
-	when 18 then
-# line 246 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 16 then
+# line 239 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1411,7 +1335,7 @@ te = p+1
      end
 		end
 	when 69 then
-# line 190 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 185 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1425,17 +1349,15 @@ p = p - 1; begin
      end
 		end
 	when 72 then
-# line 210 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 205 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      set_depth += 1
-
       emit(:set, :open, *text(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 129
 		_goto_level = _again
 		next
 	end
@@ -1443,7 +1365,7 @@ p = p - 1; begin
      end
 		end
 	when 67 then
-# line 246 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 239 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1452,8 +1374,8 @@ p = p - 1; begin
       emit(:literal, :literal, char, *rest)
      end
 		end
-	when 19 then
-# line 190 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 17 then
+# line 185 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1466,26 +1388,24 @@ p = p - 1; begin
       end
      end
 		end
-	when 22 then
-# line 210 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 20 then
+# line 205 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
-      set_depth += 1
-
       emit(:set, :open, *text(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 129
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 17 then
-# line 246 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 15 then
+# line 239 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1495,7 +1415,7 @@ p = p - 1; begin
      end
 		end
 	when 74 then
-# line 256 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 249 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1510,16 +1430,16 @@ te = p+1
      end
 		end
 	when 73 then
-# line 261 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 254 "/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
@@ -1527,7 +1447,7 @@ te = p+1
      end
 		end
 	when 79 then
-# line 272 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 265 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1543,7 +1463,7 @@ te = p+1
      end
 		end
 	when 85 then
-# line 278 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1558,7 +1478,7 @@ te = p+1
      end
 		end
 	when 76 then
-# line 283 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 276 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1589,7 +1509,7 @@ te = p+1
      end
 		end
 	when 82 then
-# line 304 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 297 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1614,8 +1534,8 @@ te = p+1
 
      end
 		end
-	when 33 then
-# line 320 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 28 then
+# line 313 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1635,7 +1555,7 @@ te = p+1
      end
 		end
 	when 92 then
-# line 330 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 323 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1649,22 +1569,12 @@ te = p+1
 
      end
 		end
-	when 29 then
-# line 339 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 24 then
+# line 332 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :control, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("control sequence")
-        end
-      else
-        raise PrematureEndError.new("control sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :control)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1674,22 +1584,12 @@ te = p+1
 
      end
 		end
-	when 32 then
-# line 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 26 then
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :meta_sequence, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("meta sequence")
-        end
-      else
-        raise PrematureEndError.new("meta sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :meta_sequence)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1700,16 +1600,16 @@ te = p+1
      end
 		end
 	when 80 then
-# line 369 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 342 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = ((in_set ? 130 : 113));
+      cs = ((in_set? ? 129 : 110));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 128
+		cs = 127
 		_goto_level = _again
 		next
 	end
@@ -1717,16 +1617,16 @@ te = p+1
      end
 		end
 	when 81 then
-# line 375 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 348 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = ((in_set ? 130 : 113));
+      cs = ((in_set? ? 129 : 110));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 129
+		cs = 128
 		_goto_level = _again
 		next
 	end
@@ -1734,7 +1634,7 @@ te = p+1
      end
 		end
 	when 75 then
-# line 381 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1749,7 +1649,7 @@ te = p+1
      end
 		end
 	when 84 then
-# line 278 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1764,7 +1664,7 @@ p = p - 1; begin
      end
 		end
 	when 91 then
-# line 330 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 323 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1779,21 +1679,11 @@ p = p - 1; begin
      end
 		end
 	when 87 then
-# line 339 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 332 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :control, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("control sequence")
-        end
-      else
-        raise PrematureEndError.new("control sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :control)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1804,71 +1694,11 @@ p = p - 1; begin
      end
 		end
 	when 89 then
-# line 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :meta_sequence, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("meta sequence")
-        end
-      else
-        raise PrematureEndError.new("meta sequence")
-      end
-      	begin
-		top -= 1
-		cs = stack[top]
-		_goto_level = _again
-		next
-	end
-
-     end
-		end
-	when 28 then
-# line 339 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
- begin p = ((te))-1; end
- begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :control, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("control sequence")
-        end
-      else
-        raise PrematureEndError.new("control sequence")
-      end
-      	begin
-		top -= 1
-		cs = stack[top]
-		_goto_level = _again
-		next
-	end
-
-     end
-		end
-	when 31 then
-# line 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
- begin p = ((te))-1; end
- begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :meta_sequence, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("meta sequence")
-        end
-      else
-        raise PrematureEndError.new("meta sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :meta_sequence)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1909,8 +1739,8 @@ p = p - 1; begin
     end
 end 
 			end
-	when 36 then
-# line 391 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 31 then
+# line 364 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1920,7 +1750,7 @@ te = p+1
      end
 		end
 	when 93 then
-# line 397 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 370 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1928,7 +1758,7 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 113
+		cs = 110
 		_goto_level = _again
 		next
 	end
@@ -1936,7 +1766,7 @@ te = p+1
      end
 		end
 	when 94 then
-# line 397 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 370 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1944,15 +1774,15 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 113
+		cs = 110
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 35 then
-# line 397 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 30 then
+# line 370 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1960,60 +1790,59 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 113
+		cs = 110
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 42 then
-# line 410 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 38 then
+# line 383 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:meta, :dot, *text(data, ts, te))
      end
 		end
-	when 45 then
-# line 414 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 41 then
+# line 387 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      if in_conditional and conditional_stack.length > 0 and
-         conditional_stack.last[1] == group_depth
+      if conditional_stack.last == group_depth
         emit(:conditional, :separator, *text(data, ts, te))
       else
         emit(:meta, :alternation, *text(data, ts, te))
       end
      end
 		end
-	when 44 then
-# line 425 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 40 then
+# line 397 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:anchor, :bol, *text(data, ts, te))
      end
 		end
-	when 39 then
-# line 429 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 35 then
+# line 401 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:anchor, :eol, *text(data, ts, te))
      end
 		end
-	when 58 then
-# line 433 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 57 then
+# line 405 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:keep, :mark, *text(data, ts, te))
      end
 		end
-	when 57 then
-# line 437 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 56 then
+# line 409 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2024,64 +1853,44 @@ te = p+1
       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)
-      else
-        raise ScannerError.new(
-          "Unexpected character in anchor at #{text} (char #{ts})")
       end
      end
 		end
-	when 43 then
-# line 453 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p+1
- begin 
-      set_depth += 1
-      in_set = true
-
-      emit(:set, :open, *text(data, ts, te))
-      	begin
-		stack[top] = cs
-		top+= 1
-		cs = 130
-		_goto_level = _again
-		next
-	end
-
-     end
-		end
-	when 8 then
-# line 465 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 47 then
+# line 431 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       text = text(data, ts, te).first
 
-      in_conditional = true unless in_conditional
-      conditional_depth += 1
-      conditional_stack << [conditional_depth, group_depth]
+      conditional_stack << group_depth
 
       emit(:conditional, :open, text[0..-2], ts, te-1)
       emit(:conditional, :condition_open, '(', te-1, te)
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 145
+		cs = 148
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 9 then
-# line 498 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 48 then
+# line 462 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      p = scan_options(p, data, ts, te)
+      text = text(data, ts, te).first
+      if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
+        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+      end
+      emit_options(text, ts, te)
      end
 		end
-	when 6 then
-# line 508 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 9 then
+# line 476 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2093,8 +1902,8 @@ te = p+1
       end
      end
 		end
-	when 10 then
-# line 525 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 8 then
+# line 493 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2103,33 +1912,26 @@ te = p+1
       when '(?>';  emit(:group, :atomic,       text, ts, te)
       when '(?~';  emit(:group, :absence,      text, ts, te)
 
-      when /^\(\?<(\w*)>/
-        empty_name_error(:group, 'named group (ab)') if $1.empty?
+      when /^\(\?(?:<>|'')/
+        validation_error(:group, 'named group', 'name is empty')
 
+      when /^\(\?<\w*>/
         emit(:group, :named_ab,  text, ts, te)
 
-      when /^\(\?'(\w*)'/
-        empty_name_error(:group, 'named group (sq)') if $1.empty?
-
+      when /^\(\?'\w*'/
         emit(:group, :named_sq,  text, ts, te)
 
-      else
-        raise ScannerError.new(
-          "Unknown subexpression group format '#{text}'")
       end
      end
 		end
-	when 13 then
-# line 577 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 11 then
+# line 534 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       case text = text(data, ts, te).first
-      when /^\\([gk])<>/ # angle brackets
-        empty_backref_error("ref/call (ab)")
-
-      when /^\\([gk])''/ # single quotes
-        empty_backref_error("ref/call (sq)")
+      when /^\\([gk])(<>|'')/ # angle brackets
+        validation_error(:backref, 'ref/call', 'ref ID is empty')
 
       when /^\\([gk])<[^\d+-]\w*>/ # angle-brackets
         if $1 == 'k'
@@ -2185,14 +1987,11 @@ te = p+1
       when /^\\([gk])'[+\-]?\d+[+\-]\d+'/ # single-quotes
         emit(:backref, :number_recursion_ref_sq, text, ts, te)
 
-      else
-        raise ScannerError.new(
-          "Unknown backreference format '#{text}'")
       end
      end
 		end
-	when 55 then
-# line 648 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 54 then
+# line 599 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2203,8 +2002,8 @@ te = p+1
       end
      end
 		end
-	when 51 then
-# line 656 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 50 then
+# line 607 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2215,8 +2014,8 @@ te = p+1
       end
      end
 		end
-	when 53 then
-# line 664 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 52 then
+# line 615 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2227,8 +2026,8 @@ te = p+1
       end
      end
 		end
-	when 60 then
-# line 672 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 59 then
+# line 623 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2236,7 +2035,7 @@ te = p+1
      end
 		end
 	when 4 then
-# line 682 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 633 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2247,8 +2046,20 @@ te = p+1
       end
      end
 		end
-	when 48 then
-# line 547 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 46 then
+# line 462 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p
+p = p - 1; begin 
+      text = text(data, ts, te).first
+      if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
+        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+      end
+      emit_options(text, ts, te)
+     end
+		end
+	when 44 then
+# line 511 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2256,8 +2067,8 @@ p = p - 1; begin
       emit(:group, :capture, text, ts, te)
      end
 		end
-	when 54 then
-# line 648 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 53 then
+# line 599 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2268,8 +2079,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 50 then
-# line 656 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 49 then
+# line 607 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2280,8 +2091,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 52 then
-# line 664 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 51 then
+# line 615 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2292,31 +2103,31 @@ p = p - 1; begin
       end
      end
 		end
-	when 59 then
-# line 672 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 58 then
+# line 623 "/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))
      end
 		end
-	when 56 then
-# line 678 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 55 then
+# line 629 "/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 47 then
-# line 690 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 43 then
+# line 641 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2327,8 +2138,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 46 then
-# line 705 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 42 then
+# line 656 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2336,23 +2147,26 @@ p = p - 1; begin
      end
 		end
 	when 5 then
-# line 547 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 462 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
       text = text(data, ts, te).first
-      emit(:group, :capture, text, ts, te)
+      if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
+        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+      end
+      emit_options(text, ts, te)
      end
 		end
-	when 12 then
-# line 678 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 10 then
+# line 629 "/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
@@ -2360,7 +2174,7 @@ p = p - 1; begin
      end
 		end
 	when 3 then
-# line 705 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 656 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2386,47 +2200,43 @@ end
 end 
 			end
 	when 71 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 131 "/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 210 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 205 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      set_depth += 1
-
       emit(:set, :open, *text(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 129
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 21 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 19 then
+# line 131 "/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 210 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 205 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
-      set_depth += 1
-
       emit(:set, :open, *text(data, ts, te))
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 130
+		cs = 129
 		_goto_level = _again
 		next
 	end
@@ -2434,13 +2244,13 @@ p = p - 1; begin
      end
 		end
 	when 90 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 131 "/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 330 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 323 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2455,27 +2265,17 @@ p = p - 1; begin
      end
 		end
 	when 86 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 131 "/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 339 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 332 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :control, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("control sequence")
-        end
-      else
-        raise PrematureEndError.new("control sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :control)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -2486,27 +2286,17 @@ p = p - 1; begin
      end
 		end
 	when 88 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 131 "/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 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :meta_sequence, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("meta sequence")
-        end
-      else
-        raise PrematureEndError.new("meta sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :meta_sequence)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -2516,28 +2306,18 @@ p = p - 1; begin
 
      end
 		end
-	when 27 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 25 then
+# line 131 "/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 339 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 332 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :control, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("control sequence")
-        end
-      else
-        raise PrematureEndError.new("control sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :control)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -2547,28 +2327,18 @@ p = p - 1; begin
 
      end
 		end
-	when 30 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 27 then
+# line 131 "/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 354 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 337 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
-      if data[te]
-        c = data[te].chr
-        if c =~ /[\x00-\x7F]/
-          emit(:escape, :meta_sequence, copy(data, ts-1..te), ts-1, te+1)
-          p += 1
-        else
-          raise InvalidSequenceError.new("meta sequence")
-        end
-      else
-        raise PrematureEndError.new("meta sequence")
-      end
+      emit_meta_control_sequence(data, ts, te, :meta_sequence)
       	begin
 		top -= 1
 		cs = stack[top]
@@ -2578,14 +2348,14 @@ p = p - 1; begin
 
      end
 		end
-	when 34 then
-# line 136 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 29 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 InvalidSequenceError.new('sequence', text)
+    validation_error(:sequence, 'sequence', text)
   		end
-# line 335 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 328 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2598,46 +2368,32 @@ te = p+1
 
      end
 		end
-	when 49 then
-# line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
- self.group_depth = group_depth - 1; in_group = group_depth > 0 ? true : false 		end
-# line 142 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
-		begin
- self.group_depth = group_depth + 1; in_group = true 		end
-	when 11 then
-# line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 7 then
+# line 144 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
- self.group_depth = group_depth - 1; in_group = group_depth > 0 ? true : false 		end
-# line 483 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+ self.group_depth = group_depth - 1 		end
+# line 447 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:group, :comment, *text(data, ts, te))
      end
 		end
-	when 41 then
-# line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 37 then
+# line 144 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
- self.group_depth = group_depth - 1; in_group = group_depth > 0 ? true : false 		end
-# line 552 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+ self.group_depth = group_depth - 1 		end
+# line 516 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
-      if in_conditional and conditional_stack.last and
-         conditional_stack.last[1] == (group_depth + 1)
-
-        emit(:conditional, :close, *text(data, ts, te))
+      if conditional_stack.last == group_depth + 1
         conditional_stack.pop
-
-        if conditional_stack.length == 0
-          in_conditional = false
-        end
+        emit(:conditional, :close, *text(data, ts, te))
       else
-        if spacing_stack.length > 1 and
-          spacing_stack.last[:depth] == (group_depth + 1)
+        if spacing_stack.length > 1 &&
+           spacing_stack.last[:depth] == group_depth + 1
           spacing_stack.pop
-
           self.free_spacing = spacing_stack.last[:free_spacing]
         end
 
@@ -2645,20 +2401,136 @@ te = p+1
       end
      end
 		end
-	when 40 then
+	when 39 then
+# line 145 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.set_depth   = set_depth   + 1 		end
+# line 422 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p+1
+ begin 
+      emit(:set, :open, *text(data, ts, te))
+      	begin
+		stack[top] = cs
+		top+= 1
+		cs = 129
+		_goto_level = _again
+		next
+	end
+
+     end
+		end
+	when 65 then
+# line 146 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.set_depth   = set_depth   - 1 		end
+# line 152 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p+1
+ begin 
+      emit(:set, :close, *text(data, ts, te))
+      if in_set?
+        	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+
+      else
+        	begin
+		cs = 110
+		_goto_level = _again
+		next
+	end
+
+      end
+     end
+		end
+	when 70 then
+# line 146 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.set_depth   = set_depth   - 1 		end
+# line 161 "/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)
+      if in_set?
+        	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+
+      else
+        	begin
+		cs = 110
+		_goto_level = _again
+		next
+	end
+
+      end
+     end
+		end
+	when 22 then
+# line 146 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.set_depth   = set_depth   - 1 		end
+# line 210 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p+1
+ begin 
+      text = text(data, ts, te).first
+
+      type = :posixclass
+      class_name = text[2..-3]
+      if class_name[0].chr == '^'
+        class_name = class_name[1..-1]
+        type = :nonposixclass
+      end
+
+      emit(type, class_name.to_sym, text, ts, te)
+     end
+		end
+	when 21 then
+# line 146 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.set_depth   = set_depth   - 1 		end
+# line 223 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p+1
+ begin 
+      emit(:set, :collation, *text(data, ts, te))
+     end
+		end
+	when 23 then
+# line 146 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.set_depth   = set_depth   - 1 		end
+# line 227 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+te = p+1
+ begin 
+      emit(:set, :equivalent, *text(data, ts, te))
+     end
+		end
+	when 63 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 142 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 145 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
- self.group_depth = group_depth + 1; in_group = true 		end
+ self.set_depth   = set_depth   + 1 		end
 	when 78 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 272 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 265 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 18;		end
 	when 77 then
@@ -2666,7 +2538,7 @@ act = 18;		end
 		begin
 te = p+1
 		end
-# line 278 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 271 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 19;		end
 	when 2 then
@@ -2674,20 +2546,31 @@ act = 19;		end
 		begin
 te = p+1
 		end
-# line 705 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 656 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 54;		end
-# line 2680 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+	when 45 then
+# line 1 "NONE"
+		begin
+te = p+1
+		end
+# line 144 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.group_depth = group_depth - 1 		end
+# line 143 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+		begin
+ self.group_depth = group_depth + 1 		end
+# line 2563 "/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 61 then
+	when 60 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-	when 37 then
+	when 32 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
@@ -2695,7 +2578,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 2698 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2581 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	end
 
 	if cs == 0
@@ -2716,20 +2599,20 @@ act = 0
 		next;
 	end
 	  case _re_scanner_eof_actions[cs]
-	when 15 then
+	when 13 then
 # line 8 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/property.rl"
 		begin
 
     raise PrematureEndError.new('unicode property')
   		end
-	when 14 then
-# line 130 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+	when 12 then
+# line 131 "/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 2732 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
+# line 2615 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner.rb"
 	  end
 	end
 
@@ -2740,7 +2623,7 @@ act = 0
 end
 	end
 
-# line 810 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
+# line 755 "/Users/jannoschmuller/code/regexp_parser/lib/regexp_parser/scanner/scanner.rl"
 
     # to avoid "warning: assigned but unused variable - testEof"
     testEof = testEof
@@ -2751,9 +2634,9 @@ end
     end
 
     raise PrematureEndError.new("(missing group closing paranthesis) "+
-          "[#{in_group}:#{group_depth}]") if in_group
+          "[#{group_depth}]") if in_group?
     raise PrematureEndError.new("(missing set closing bracket) "+
-          "[#{in_set}:#{set_depth}]") if in_set
+          "[#{set_depth}]") if in_set?
 
     # when the entire expression is a literal run
     emit_literal if literal
@@ -2788,62 +2671,15 @@ end
 
   private
 
-  attr_accessor :tokens, :literal, :block,
-                :in_group, :group_depth,
-                :free_spacing, :spacing_stack
-
-  # Ragel's regex-based scan of the group options introduced a lot of
-  # ambiguity, so we just ask it to find the beginning of what looks
-  # like an options run and handle the rest in here.
-  def scan_options(p, data, ts, te)
-    text = text(data, ts, te).first
-
-    options_char, options_length = true, 0
+  attr_accessor :tokens, :literal, :block, :free_spacing, :spacing_stack,
+                :group_depth, :set_depth, :conditional_stack
 
-    # Copy while we have option characters. There is no maximum length,
-    # as ruby allows things like '(?xxxxxxxxx-xxxxxxxxxxxxx:abc)'.
-    negative_options = false
-    while options_char
-      if data[te + options_length]
-        c = data[te + options_length].chr
-
-        if c =~ /[-mixdau]/
-          negative_options = true if c == '-'
-
-          raise InvalidGroupOption.new(c, text) if negative_options and
-            c =~ /[dau]/
-
-          text << c ; p += 1 ; options_length += 1
-        else
-          options_char = false
-        end
-      else
-        raise PrematureEndError.new("expression options `#{text}'")
-      end
-    end
-
-    if data[te + options_length]
-      c = data[te + options_length].chr
-
-      if c == ':'
-        # Include the ':' in the options text
-        text << c ; p += 1 ; options_length += 1
-        emit_options(text, ts, te + options_length)
-
-      elsif c == ')'
-        # Don't include the closing ')', let group_close handle it.
-        emit_options(text, ts, te + options_length)
-
-      else
-        # Plain Regexp reports this as 'undefined group option'
-        raise ScannerError.new(
-          "Unexpected `#{c}' in options sequence, ':' or ')' expected")
-      end
-    else
-      raise PrematureEndError.new("expression options `#{text}'")
-    end
+  def in_group?
+    group_depth > 0
+  end
 
-    p # return the new value of the data pointer
+  def in_set?
+    set_depth > 0
   end
 
   # Copy from ts to te from data as text
@@ -2879,32 +2715,39 @@ end
   def emit_options(text, ts, te)
     token = nil
 
-    if text =~ /\(\?([mixdau]*)-?([mix]*)(:)?/
-      positive, negative, group_local = $1, $2, $3
+    # Ruby allows things like '(?-xxxx)' or '(?xx-xx--xx-:abc)'.
+    text =~ /\(\?([mixdau]*)(-(?:[mix]*))*(:)?/
+    positive, negative, group_local = $1, $2, $3
 
-      if positive.include?('x')
-        self.free_spacing = true
-      end
+    if positive.include?('x')
+      self.free_spacing = true
+    end
 
-      # If the x appears in both, treat it like ruby does, the second cancels
-      # the first.
-      if negative.include?('x')
-        self.free_spacing = false
-      end
+    # If the x appears in both, treat it like ruby does, the second cancels
+    # the first.
+    if negative && negative.include?('x')
+      self.free_spacing = false
+    end
 
-      if group_local
-        spacing_stack << {:free_spacing => free_spacing, :depth => group_depth}
-        token = :options
-      else
-        # switch for parent group level
-        spacing_stack.last[:free_spacing] = free_spacing
-        token = :options_switch
-      end
+    if group_local
+      spacing_stack << {:free_spacing => free_spacing, :depth => group_depth}
+      token = :options
+    else
+      # switch for parent group level
+      spacing_stack.last[:free_spacing] = free_spacing
+      token = :options_switch
     end
 
     emit(:group, token, text, ts, te)
   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))
+  end
+
   # Centralizes and unifies the handling of validation related
   # errors.
   def validation_error(type, what, reason)
@@ -2915,21 +2758,8 @@ end
       error = InvalidBackrefError.new(what, reason)
     when :sequence
       error = InvalidSequenceError.new(what, reason)
-    else
-      error = ValidationError.new('expression')
     end
 
     raise error # unless @@config.validation_ignore
   end
-
-  # Used for references with an empty name or number
-  def empty_backref_error(type, what)
-    validation_error(:backref, what, 'ref ID is empty')
-  end
-
-  # Used for named expressions with an empty name
-  def empty_name_error(type, what)
-    validation_error(type, what, 'name is empty')
-  end
-
 end # module Regexp::Scanner