sourcify 0.5.0 → 0.6.0.rc1

data/lib/sourcify/method/parser/raw_scanner.rl

@@ -0,0 +1,144 @@
+Sourcify.require_rb('method', 'parser', 'raw_scanner_extensions')
+
+module Sourcify
+  module Method
+    class Parser
+      module RawScanner #:nodoc:all
+
+%%{
+
+  machine scanner;
+  include common 'common.rl';
+
+  ## MACHINE >> New statement
+  new_statement := |*
+
+    (kw_for | kw_while | kw_until) . ^vchar => {
+      push(:kw_do_alias2, ts, te)
+      increment_counter(0..1)
+      fgoto main;
+    };
+
+    (
+      ((kw_class | kw_module | kw_do | kw_begin | kw_case | kw_if | kw_unless) . ^vchar) |
+      (kw_class . ospaces . '<<' . ospaces . ^(newline | smcolon)+)
+    ) => {
+      push(:kw_do_alias1, ts, te)
+      increment_counter(1)
+      fgoto main;
+    };
+
+    ospaces => { push(:space, ts, te) };
+    any => { fhold; fgoto main; };
+
+  *|;
+
+
+  ## MACHINE >> Main
+  main := |*
+
+    ## == Start/end of def..end block
+
+    kw_def => {
+      push(:kw_def, ts, te)
+      increment_counter(1)
+      fgoto new_statement;
+    };
+
+    kw_end => {
+      push(:kw_end, ts, te)
+      decrement_counter()
+    };
+
+    ## == Start/end of {...} block
+
+    lbrace => {
+      push(:lbrace, ts, te)
+    };
+
+    rbrace => {
+      push(:rbrace, ts, te)
+    };
+
+    assoc => {
+      push(:assoc, ts, te)
+    };
+
+    label => {
+      push_label(ts, te)
+    };
+
+    ## == New statement
+
+    newline => {
+      push(:newline, ts, te)
+      increment_lineno
+      fgoto new_statement;
+    };
+
+    smcolon | lparen | assgn | kw_then | comma => {
+      push(:newline_alias, ts, te)
+      fgoto new_statement;
+    };
+
+    ## == Comment
+
+    '#' => {
+      fgoto per_line_comment;
+    };
+
+    newline . '=begin' . ospaces . (ospaces . ^newline+)* . newline => {
+      push_comment(ts, te)
+      increment_lineno
+      fgoto block_comment;
+    };
+
+    ## == Strings
+
+    ('<<' | '<<-') . ["']? . (const | var) . ["']? . newline => {
+      push_heredoc(ts, te)
+      increment_lineno
+      fgoto heredoc;
+    };
+
+    ('"' | "'" | '`' | '%') => {
+      fhold; fgoto string;
+    };
+
+    '/' => {
+      if preceded_with?(:char, :digit, :var, :const, :symbol, :dstring, :sstring, ')', ']', '}')
+        push(:op, ts, te)
+      else
+        fhold; fgoto string;
+      end
+    };
+
+    ## == Misc
+
+    var         => { push(:var, ts, te) };
+    bslash      => { push(:bslash, ts, te) };
+    const       => { push(:const, ts, te) };
+    symbol      => { push(:symbol, ts, te) };
+    mspaces     => { push(:space, ts, te) };
+    [0-9]       => { push(:digit, ts, te) };
+    lower       => { push(:char, ts, te) };
+    any         => { push(:any, ts, te) };
+
+  *|;
+
+}%%
+%% write data;
+
+        extend Extensions
+
+        def self.execute!
+          data = @data
+          eof = data.length
+          %% write init;
+          %% write exec;
+        end
+
+      end
+    end
+  end
+end

data/lib/sourcify/method/parser/raw_scanner_extensions.rb

@@ -0,0 +1,64 @@
+Sourcify.require_rb('common', 'parser', 'raw_scanner', 'extensions')
+
+module Sourcify
+  module Method
+    class Parser
+      module RawScanner #:nodoc:all
+        module Extensions
+
+          include Common::Parser::RawScanner::Extensions
+          Counter = Common::Parser::RawScanner::Counter
+
+          def increment_lineno
+            stop_if_probably_defined_by_proc
+            super
+          end
+
+          def stop_if_probably_defined_by_proc
+            raise ProbablyDefinedByProc if @lineno == 1 && @results.empty? && !@counter.started?
+          end
+
+          def increment_counter(count = 1)
+            unless @counter.started?
+              return if (@rejecting_block = codified_tokens !~ @start_pattern)
+              offset_attributes
+            end
+            @counter.increment(count)
+          end
+
+          def decrement_counter
+            @counter.decrement
+            construct_result_code if @counter.balanced?
+          end
+
+          def construct_result_code
+            code = codified_tokens.strip
+
+            begin
+              if valid?(code) && @body_matcher.call(code)
+                # NOTE: Need to fix singleton method to avoid errors (eg. undefined object)
+                # downstream
+                @results << code.sub(%r{^(def\s+)(?:[^\.]+\.)?(#{@name}.*end)$}m, '\1\2')
+                raise Escape if @stop_on_newline or @lineno != 1
+                reset_attributes
+              end
+            rescue Exception
+              raise if $!.is_a?(Escape)
+            end
+          end
+
+          def reset_attributes
+            @counter = Counter.new
+            super
+          end
+
+          def valid?(*args)
+            # TODO: shouldn't need this check, there seems to be a bug w raw_scanner.rl.
+            args[0].start_with?('def') && super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/sourcify/method/parser/scanner.rb

@@ -0,0 +1,48 @@
+Sourcify.require_rb('method', 'parser', 'raw_scanner')
+
+module Sourcify
+  module Method
+    class Parser #:nodoc:all
+      class Scanner
+        class << self
+
+          def process(source_code, opts, &matcher)
+            results = rscan(source_code.to_s, {
+              :start_pattern => scan_pattern_hint(opts[:attached_to]),
+              :body_matcher => opts[:body_matcher],
+              :ignore_nested => opts[:ignore_nested],
+              :stop_on_newline => false,
+            }).flatten.select(&matcher)
+            case results.size
+            when 0 then raise NoMatchingMethodError
+            when 1 then results[0]
+            else raise MultipleMatchingMethodsPerLineError
+            end
+          end
+
+          def scan_pattern_hint(val)
+            case val
+            when Regexp then val
+            when String, Symbol then /^(?:.*?\W|)#{val}(?:\W)/
+            when nil then /.*/
+            else raise TypeError
+            end
+          end
+
+          def rscan(str, opts)
+            results = RawScanner.process(str, opts) || []
+            return results if opts[:ignore_nested]
+            results.map do |outer|
+              inner = rscan(
+                outer.sub(/^def(.*)end$/,'\1').sub(/^(?:.*?)(def.*)$/,'\1'),
+                opts.merge(:stop_on_newline => true)
+              )
+              [outer, inner]
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/sourcify/method/parser/source_code.rb

@@ -0,0 +1,8 @@
+module Sourcify
+  module Method
+    class Parser #:nodoc:all
+      Sourcify.require_rb('common', 'parser', 'source_code')
+      SourceCode = Common::Parser::SourceCode
+    end
+  end
+end

data/lib/sourcify/proc.rb

@@ -2,8 +2,6 @@ module Sourcify
 
   class MultipleMatchingProcsPerLineError < Exception; end
   class NoMatchingProcError < Exception; end
-  class ParserInternalError < Exception; end
-  class CannotParseEvalCodeError < Exception; end
   class CannotHandleCreatedOnTheFlyProcError < Exception; end
 
   module Proc

data/lib/sourcify/proc/parser.rb

@@ -1,5 +1,4 @@
-Sourcify.require_rb('proc', 'scanner')
-%w{normalizer code_scanner source_code converter}.each do |file|
+%w{normalizer scanner source_code converter}.each do |file|
   Sourcify.require_rb('proc', 'parser', file)
 end
 
@@ -7,8 +6,6 @@ module Sourcify
   module Proc
     class Parser #:nodoc:all
 
-      IS_19x = RUBY_VERSION.include?('1.9.')
-
       def initialize(_proc)
         @arity, @source_code = _proc.arity, SourceCode.new(*_proc.source_location(false))
         raise CannotHandleCreatedOnTheFlyProcError unless @source_code.file
@@ -38,7 +35,7 @@ module Sourcify
       private
 
         def extracted_source(opts)
-          CodeScanner.process(@source_code, opts) do |code|
+          Scanner.process(@source_code, opts) do |code|
             begin
               eval(code).arity == @arity
             rescue Exception

data/lib/sourcify/proc/parser/converter.rb

@@ -1,29 +1,8 @@
 module Sourcify
   module Proc
     class Parser #:nodoc:all
-      class Converter
-        class << self
-
-          RUBY_PARSER = RubyParser.new
-          RUBY_2_RUBY = Ruby2Ruby.new
-
-          def to_sexp(code, file = nil)
-            retried = false
-            begin
-              RUBY_PARSER.reset
-              (retried ? RubyParser.new : RUBY_PARSER).parse(*[code, file].compact)
-            rescue Racc::ParseError, SyntaxError
-              return nil if retried
-              retried = true; retry
-            end
-          end
-
-          def to_code(sexp)
-            RUBY_2_RUBY.process(Sexp.from_array(sexp.to_a))
-          end
-
-        end
-      end
+      Sourcify.require_rb('common', 'parser', 'converter')
+      Converter = Common::Parser::Converter
     end
   end
 end

data/lib/sourcify/proc/{scanner.rb → parser/raw_scanner.rb}

@@ -1,25 +1,26 @@
 
-# line 1 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-Sourcify.require_rb('proc', 'scanner', 'extensions')
+# line 1 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+Sourcify.require_rb('proc', 'parser', 'raw_scanner_extensions')
 
 module Sourcify
   module Proc
-    module Scanner #:nodoc:all
+    class Parser
+      module RawScanner #:nodoc:all
 
 
-# line 471 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 134 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 
 
-# line 2 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rb"
+# line 2 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rb"
 class << self
-	attr_accessor :_proc_scanner_actions
-	private :_proc_scanner_actions, :_proc_scanner_actions=
+	attr_accessor :_scanner_actions
+	private :_scanner_actions, :_scanner_actions=
 end
-self._proc_scanner_actions = [
+self._scanner_actions = [
 	0, 1, 0, 1, 2, 1, 3, 1, 
-	4, 1, 5, 1, 6, 1, 7, 1, 
-	8, 1, 9, 1, 10, 1, 11, 1, 
-	13, 1, 15, 1, 16, 1, 17, 1, 
+	5, 1, 7, 1, 8, 1, 9, 1, 
+	12, 1, 13, 1, 14, 1, 15, 1, 
+	16, 1, 17, 1, 18, 1, 19, 1, 
 	20, 1, 21, 1, 22, 1, 23, 1, 
 	24, 1, 25, 1, 26, 1, 27, 1, 
 	28, 1, 29, 1, 30, 1, 31, 1, 
@@ -43,64 +44,64 @@ self._proc_scanner_actions = [
 	104, 1, 105, 1, 106, 1, 107, 1, 
 	108, 1, 109, 1, 110, 1, 111, 1, 
 	112, 1, 113, 2, 0, 1, 2, 3, 
-	12, 2, 3, 14, 2, 3, 18, 2, 
-	3, 19, 2, 3, 84, 2, 3, 85, 
+	4, 2, 3, 6, 2, 3, 10, 2, 
+	3, 11, 2, 3, 84, 2, 3, 85, 
 	2, 3, 86, 2, 3, 87
 ]
 
 class << self
-	attr_accessor :_proc_scanner_key_offsets
-	private :_proc_scanner_key_offsets, :_proc_scanner_key_offsets=
+	attr_accessor :_scanner_key_offsets
+	private :_scanner_key_offsets, :_scanner_key_offsets=
 end
-self._proc_scanner_key_offsets = [
+self._scanner_key_offsets = [
 	0, 0, 1, 2, 3, 4, 5, 6, 
 	7, 11, 19, 24, 35, 36, 37, 41, 
-	51, 58, 62, 63, 64, 65, 72, 73, 
-	74, 75, 76, 77, 89, 94, 95, 96, 
-	97, 98, 105, 106, 107, 108, 110, 111, 
-	112, 113, 114, 115, 116, 117, 118, 119, 
-	121, 123, 125, 127, 128, 129, 157, 185, 
-	187, 188, 189, 191, 193, 195, 196, 197, 
-	199, 201, 203, 204, 205, 207, 209, 211, 
-	212, 213, 215, 217, 219, 220, 221, 223, 
-	225, 227, 228, 229, 231, 233, 235, 236, 
-	237, 239, 241, 243, 244, 245, 247, 249, 
-	251, 252, 253, 255, 257, 259, 260, 261, 
-	263, 265, 267, 268, 269, 271, 273, 275, 
-	276, 277, 279, 281, 283, 284, 285, 287, 
-	289, 291, 292, 293, 295, 297, 299, 300, 
-	301, 303, 305, 307, 308, 309, 311, 313, 
-	315, 316, 317, 319, 321, 323, 324, 325, 
-	327, 329, 331, 332, 333, 335, 337, 339, 
-	340, 341, 343, 345, 347, 348, 349, 351, 
-	353, 355, 356, 358, 360, 361, 362, 364, 
-	365, 366, 368, 370, 372, 373, 374, 376, 
-	378, 380, 381, 382, 384, 386, 388, 389, 
-	390, 392, 394, 396, 397, 398, 400, 402, 
-	404, 405, 406, 408, 410, 411, 412, 413, 
-	414, 415, 416, 417, 418, 419, 420, 421, 
-	422, 423, 424, 425, 426, 427, 428, 429, 
+	51, 58, 62, 63, 65, 67, 69, 71, 
+	72, 73, 101, 129, 131, 132, 133, 135, 
+	137, 139, 140, 141, 143, 145, 147, 148, 
+	149, 151, 153, 155, 156, 157, 159, 161, 
+	163, 164, 165, 167, 169, 171, 172, 173, 
+	175, 177, 179, 180, 181, 183, 185, 187, 
+	188, 189, 191, 193, 195, 196, 197, 199, 
+	201, 203, 204, 205, 207, 209, 211, 212, 
+	213, 215, 217, 219, 220, 221, 223, 225, 
+	227, 228, 229, 231, 233, 235, 236, 237, 
+	239, 241, 243, 244, 245, 247, 249, 251, 
+	252, 253, 255, 257, 259, 260, 261, 263, 
+	265, 267, 268, 269, 271, 273, 275, 276, 
+	277, 279, 281, 283, 284, 285, 287, 289, 
+	291, 292, 293, 295, 297, 299, 300, 302, 
+	304, 305, 306, 308, 309, 310, 312, 314, 
+	316, 317, 318, 320, 322, 324, 325, 326, 
+	328, 330, 332, 333, 334, 336, 338, 340, 
+	341, 342, 344, 346, 348, 349, 350, 352, 
+	354, 355, 356, 357, 358, 359, 360, 361, 
+	362, 363, 364, 365, 366, 367, 368, 369, 
+	370, 371, 372, 373, 374, 375, 376, 377, 
+	378, 379, 380, 381, 382, 383, 384, 385, 
+	392, 393, 394, 395, 396, 397, 409, 414, 
+	415, 416, 417, 418, 425, 426, 427, 428, 
 	430, 431, 432, 433, 434, 435, 436, 437, 
 	438, 466, 470, 471, 476, 484, 491, 492, 
 	493, 501, 502, 503, 511, 520, 529, 538, 
-	547, 556, 565, 577, 581, 582, 584, 589, 
-	590, 591, 592, 593, 594, 595, 596, 597, 
-	598, 599, 600, 601, 602, 603, 608, 642, 
-	644, 646, 648, 650, 652, 654, 656, 658, 
-	660, 662, 664, 666, 668, 670, 672, 674, 
-	676, 678, 680, 682, 684, 686, 687, 689, 
-	691, 693, 695, 697, 699, 701, 702, 703, 
-	704, 705, 706, 707, 708, 709, 710, 711, 
-	712, 713, 714, 715, 716, 717, 718, 719, 
-	720, 721, 722, 723, 724, 725, 726, 727, 
+	547, 556, 565, 566, 567, 568, 569, 570, 
+	571, 576, 610, 612, 614, 616, 618, 620, 
+	622, 624, 626, 628, 630, 632, 634, 636, 
+	638, 640, 642, 644, 646, 648, 650, 652, 
+	654, 655, 657, 659, 661, 663, 665, 667, 
+	669, 670, 671, 672, 673, 674, 675, 676, 
+	677, 678, 679, 680, 681, 682, 683, 684, 
+	685, 686, 687, 688, 689, 690, 691, 692, 
+	693, 694, 695, 696, 697, 709, 713, 714, 
+	716, 721, 722, 723, 724, 725, 726, 727, 
 	728
 ]
 
 class << self
-	attr_accessor :_proc_scanner_trans_keys
-	private :_proc_scanner_trans_keys, :_proc_scanner_trans_keys=
+	attr_accessor :_scanner_trans_keys
+	private :_scanner_trans_keys, :_scanner_trans_keys=
 end
-self._proc_scanner_trans_keys = [
+self._scanner_trans_keys = [
 	98, 101, 103, 105, 110, 10, 58, 65, 
 	90, 97, 122, 34, 39, 45, 95, 65, 
 	90, 97, 122, 95, 65, 90, 97, 122, 
@@ -108,14 +109,7 @@ self._proc_scanner_trans_keys = [
 	90, 97, 122, 10, 58, 65, 90, 97, 
 	122, 10, 34, 39, 95, 48, 57, 65, 
 	90, 97, 122, 34, 39, 95, 65, 90, 
-	97, 122, 65, 90, 97, 122, 103, 105, 
-	110, 95, 48, 57, 65, 90, 97, 122, 
-	115, 101, 97, 115, 115, 9, 32, 60, 
-	95, 11, 13, 48, 57, 65, 90, 97, 
-	122, 9, 32, 60, 11, 13, 60, 10, 
-	102, 114, 95, 48, 57, 65, 90, 97, 
-	122, 100, 117, 108, 108, 116, 101, 115, 
-	115, 105, 108, 105, 108, 101, 10, 10, 
+	97, 122, 65, 90, 97, 122, 10, 10, 
 	61, 10, 101, 10, 110, 10, 100, 10, 
 	10, 33, 34, 35, 36, 37, 38, 39, 
 	40, 42, 43, 44, 45, 46, 47, 58, 
@@ -155,7 +149,14 @@ self._proc_scanner_trans_keys = [
 	92, 126, 34, 39, 47, 96, 126, 33, 
 	64, 35, 36, 37, 94, 38, 42, 45, 
 	95, 43, 61, 62, 124, 58, 59, 44, 
-	46, 63, 125, 93, 41, 92, 10, 32, 
+	46, 63, 125, 93, 41, 92, 103, 105, 
+	110, 95, 48, 57, 65, 90, 97, 122, 
+	115, 101, 97, 115, 115, 9, 32, 60, 
+	95, 11, 13, 48, 57, 65, 90, 97, 
+	122, 9, 32, 60, 11, 13, 60, 10, 
+	102, 114, 95, 48, 57, 65, 90, 97, 
+	122, 100, 117, 108, 108, 116, 101, 115, 
+	115, 105, 108, 105, 108, 101, 10, 32, 
 	34, 35, 37, 39, 40, 44, 47, 58, 
 	59, 60, 61, 92, 96, 100, 101, 116, 
 	123, 125, 9, 13, 48, 57, 65, 90, 
@@ -171,11 +172,7 @@ self._proc_scanner_trans_keys = [
 	97, 122, 58, 95, 104, 48, 57, 65, 
 	90, 97, 122, 58, 95, 101, 48, 57, 
 	65, 90, 97, 122, 58, 95, 110, 48, 
-	57, 65, 90, 97, 122, 9, 32, 98, 
-	99, 100, 102, 105, 109, 117, 119, 11, 
-	13, 9, 32, 11, 13, 101, 97, 108, 
-	9, 32, 60, 11, 13, 10, 60, 101, 
-	111, 102, 111, 110, 104, 10, 10, 10, 
+	57, 65, 90, 97, 122, 10, 10, 10, 
 	10, 10, 10, 34, 37, 39, 47, 96, 
 	33, 34, 35, 36, 37, 38, 39, 40, 
 	42, 43, 44, 45, 46, 47, 58, 59, 
@@ -192,21 +189,24 @@ self._proc_scanner_trans_keys = [
 	96, 126, 33, 64, 35, 36, 37, 94, 
 	38, 42, 45, 95, 43, 61, 62, 124, 
 	58, 59, 44, 46, 63, 125, 93, 41, 
-	92, 0
+	92, 9, 32, 98, 99, 100, 102, 105, 
+	109, 117, 119, 11, 13, 9, 32, 11, 
+	13, 101, 97, 108, 9, 32, 60, 11, 
+	13, 10, 60, 101, 111, 102, 111, 110, 
+	104, 0
 ]
 
 class << self
-	attr_accessor :_proc_scanner_single_lengths
-	private :_proc_scanner_single_lengths, :_proc_scanner_single_lengths=
+	attr_accessor :_scanner_single_lengths
+	private :_scanner_single_lengths, :_scanner_single_lengths=
 end
-self._proc_scanner_single_lengths = [
+self._scanner_single_lengths = [
 	0, 1, 1, 1, 1, 1, 1, 1, 
 	0, 4, 1, 5, 1, 1, 0, 4, 
-	3, 0, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 4, 3, 1, 1, 1, 
-	1, 1, 1, 1, 1, 2, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 2, 
-	2, 2, 2, 1, 1, 28, 28, 2, 
+	3, 0, 1, 2, 2, 2, 2, 1, 
+	1, 28, 28, 2, 1, 1, 2, 2, 
+	2, 1, 1, 2, 2, 2, 1, 1, 
+	2, 2, 2, 1, 1, 2, 2, 2, 
 	1, 1, 2, 2, 2, 1, 1, 2, 
 	2, 2, 1, 1, 2, 2, 2, 1, 
 	1, 2, 2, 2, 1, 1, 2, 2, 
@@ -217,43 +217,41 @@ self._proc_scanner_single_lengths = [
 	1, 2, 2, 2, 1, 1, 2, 2, 
 	2, 1, 1, 2, 2, 2, 1, 1, 
 	2, 2, 2, 1, 1, 2, 2, 2, 
+	1, 1, 2, 2, 2, 1, 2, 2, 
+	1, 1, 2, 1, 1, 2, 2, 2, 
 	1, 1, 2, 2, 2, 1, 1, 2, 
 	2, 2, 1, 1, 2, 2, 2, 1, 
 	1, 2, 2, 2, 1, 1, 2, 2, 
-	2, 1, 2, 2, 1, 1, 2, 1, 
-	1, 2, 2, 2, 1, 1, 2, 2, 
-	2, 1, 1, 2, 2, 2, 1, 1, 
-	2, 2, 2, 1, 1, 2, 2, 2, 
-	1, 1, 2, 2, 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, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 4, 3, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
 	20, 2, 1, 1, 2, 1, 1, 1, 
 	2, 1, 1, 2, 3, 3, 3, 3, 
-	3, 3, 10, 2, 1, 2, 3, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 5, 34, 2, 
+	3, 3, 1, 1, 1, 1, 1, 1, 
+	5, 34, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 1, 2, 2, 
-	2, 2, 2, 2, 2, 1, 1, 1, 
+	1, 2, 2, 2, 2, 2, 2, 2, 
 	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, 10, 2, 1, 2, 
+	3, 1, 1, 1, 1, 1, 1, 1, 
 	1
 ]
 
 class << self
-	attr_accessor :_proc_scanner_range_lengths
-	private :_proc_scanner_range_lengths, :_proc_scanner_range_lengths=
+	attr_accessor :_scanner_range_lengths
+	private :_scanner_range_lengths, :_scanner_range_lengths=
 end
-self._proc_scanner_range_lengths = [
+self._scanner_range_lengths = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	2, 2, 2, 3, 0, 0, 2, 3, 
-	2, 2, 0, 0, 0, 3, 0, 0, 
-	0, 0, 0, 4, 1, 0, 0, 0, 
-	0, 3, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
+	2, 2, 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, 
@@ -275,12 +273,13 @@ self._proc_scanner_range_lengths = [
 	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, 3, 
+	0, 0, 0, 0, 0, 4, 1, 0, 
+	0, 0, 0, 3, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	4, 1, 0, 2, 3, 3, 0, 0, 
 	3, 0, 0, 3, 3, 3, 3, 3, 
-	3, 3, 1, 1, 0, 0, 1, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
+	3, 3, 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, 
@@ -288,62 +287,64 @@ self._proc_scanner_range_lengths = [
 	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, 1, 1, 0, 0, 
+	1, 0, 0, 0, 0, 0, 0, 0, 
 	0
 ]
 
 class << self
-	attr_accessor :_proc_scanner_index_offsets
-	private :_proc_scanner_index_offsets, :_proc_scanner_index_offsets=
+	attr_accessor :_scanner_index_offsets
+	private :_scanner_index_offsets, :_scanner_index_offsets=
 end
-self._proc_scanner_index_offsets = [
+self._scanner_index_offsets = [
 	0, 0, 2, 4, 6, 8, 10, 12, 
 	14, 17, 24, 28, 37, 39, 41, 44, 
-	52, 58, 61, 63, 65, 67, 72, 74, 
-	76, 78, 80, 82, 91, 96, 98, 100, 
-	102, 104, 109, 111, 113, 115, 118, 120, 
-	122, 124, 126, 128, 130, 132, 134, 136, 
-	139, 142, 145, 148, 150, 152, 181, 210, 
-	213, 215, 217, 220, 223, 226, 228, 230, 
-	233, 236, 239, 241, 243, 246, 249, 252, 
-	254, 256, 259, 262, 265, 267, 269, 272, 
-	275, 278, 280, 282, 285, 288, 291, 293, 
-	295, 298, 301, 304, 306, 308, 311, 314, 
-	317, 319, 321, 324, 327, 330, 332, 334, 
-	337, 340, 343, 345, 347, 350, 353, 356, 
-	358, 360, 363, 366, 369, 371, 373, 376, 
-	379, 382, 384, 386, 389, 392, 395, 397, 
-	399, 402, 405, 408, 410, 412, 415, 418, 
-	421, 423, 425, 428, 431, 434, 436, 438, 
-	441, 444, 447, 449, 451, 454, 457, 460, 
-	462, 464, 467, 470, 473, 475, 477, 480, 
-	483, 486, 488, 491, 494, 496, 498, 501, 
-	503, 505, 508, 511, 514, 516, 518, 521, 
-	524, 527, 529, 531, 534, 537, 540, 542, 
-	544, 547, 550, 553, 555, 557, 560, 563, 
-	566, 568, 570, 573, 576, 578, 580, 582, 
-	584, 586, 588, 590, 592, 594, 596, 598, 
-	600, 602, 604, 606, 608, 610, 612, 614, 
+	52, 58, 61, 63, 66, 69, 72, 75, 
+	77, 79, 108, 137, 140, 142, 144, 147, 
+	150, 153, 155, 157, 160, 163, 166, 168, 
+	170, 173, 176, 179, 181, 183, 186, 189, 
+	192, 194, 196, 199, 202, 205, 207, 209, 
+	212, 215, 218, 220, 222, 225, 228, 231, 
+	233, 235, 238, 241, 244, 246, 248, 251, 
+	254, 257, 259, 261, 264, 267, 270, 272, 
+	274, 277, 280, 283, 285, 287, 290, 293, 
+	296, 298, 300, 303, 306, 309, 311, 313, 
+	316, 319, 322, 324, 326, 329, 332, 335, 
+	337, 339, 342, 345, 348, 350, 352, 355, 
+	358, 361, 363, 365, 368, 371, 374, 376, 
+	378, 381, 384, 387, 389, 391, 394, 397, 
+	400, 402, 404, 407, 410, 413, 415, 418, 
+	421, 423, 425, 428, 430, 432, 435, 438, 
+	441, 443, 445, 448, 451, 454, 456, 458, 
+	461, 464, 467, 469, 471, 474, 477, 480, 
+	482, 484, 487, 490, 493, 495, 497, 500, 
+	503, 505, 507, 509, 511, 513, 515, 517, 
+	519, 521, 523, 525, 527, 529, 531, 533, 
+	535, 537, 539, 541, 543, 545, 547, 549, 
+	551, 553, 555, 557, 559, 561, 563, 565, 
+	570, 572, 574, 576, 578, 580, 589, 594, 
+	596, 598, 600, 602, 607, 609, 611, 613, 
 	616, 618, 620, 622, 624, 626, 628, 630, 
 	632, 657, 661, 663, 667, 673, 678, 680, 
 	682, 688, 690, 692, 698, 705, 712, 719, 
-	726, 733, 740, 752, 756, 758, 761, 766, 
-	768, 770, 772, 774, 776, 778, 780, 782, 
-	784, 786, 788, 790, 792, 794, 800, 835, 
-	838, 841, 844, 847, 850, 853, 856, 859, 
-	862, 865, 868, 871, 874, 877, 880, 883, 
-	886, 889, 892, 895, 898, 901, 903, 906, 
-	909, 912, 915, 918, 921, 924, 926, 928, 
-	930, 932, 934, 936, 938, 940, 942, 944, 
-	946, 948, 950, 952, 954, 956, 958, 960, 
-	962, 964, 966, 968, 970, 972, 974, 976, 
+	726, 733, 740, 742, 744, 746, 748, 750, 
+	752, 758, 793, 796, 799, 802, 805, 808, 
+	811, 814, 817, 820, 823, 826, 829, 832, 
+	835, 838, 841, 844, 847, 850, 853, 856, 
+	859, 861, 864, 867, 870, 873, 876, 879, 
+	882, 884, 886, 888, 890, 892, 894, 896, 
+	898, 900, 902, 904, 906, 908, 910, 912, 
+	914, 916, 918, 920, 922, 924, 926, 928, 
+	930, 932, 934, 936, 938, 950, 954, 956, 
+	959, 964, 966, 968, 970, 972, 974, 976, 
 	978
 ]
 
 class << self
-	attr_accessor :_proc_scanner_indicies
-	private :_proc_scanner_indicies, :_proc_scanner_indicies=
+	attr_accessor :_scanner_indicies
+	private :_scanner_indicies, :_scanner_indicies=
 end
-self._proc_scanner_indicies = [
+self._scanner_indicies = [
 	1, 0, 2, 0, 3, 0, 4, 0, 
 	5, 0, 6, 5, 8, 7, 9, 9, 
 	7, 11, 11, 12, 14, 13, 14, 10, 
@@ -351,78 +352,78 @@ self._proc_scanner_indicies = [
 	13, 13, 13, 13, 10, 15, 10, 18, 
 	10, 13, 13, 10, 15, 16, 16, 14, 
 	14, 14, 14, 10, 11, 11, 14, 13, 
-	14, 10, 20, 20, 19, 22, 21, 23, 
-	21, 24, 21, 21, 21, 21, 21, 25, 
-	26, 21, 24, 21, 27, 21, 28, 21, 
-	29, 21, 30, 30, 31, 21, 30, 21, 
-	21, 21, 25, 33, 33, 34, 33, 32, 
-	35, 32, 32, 36, 24, 21, 37, 21, 
-	21, 21, 21, 21, 38, 39, 21, 40, 
-	21, 26, 21, 41, 42, 21, 43, 21, 
-	44, 21, 24, 21, 45, 21, 37, 21, 
-	46, 21, 47, 21, 37, 21, 50, 49, 
-	50, 51, 49, 50, 52, 49, 50, 53, 
-	49, 50, 54, 49, 56, 55, 58, 57, 
-	60, 61, 62, 63, 64, 65, 66, 67, 
-	68, 69, 70, 71, 72, 73, 74, 75, 
-	76, 77, 78, 79, 80, 81, 82, 83, 
-	84, 85, 86, 87, 59, 88, 89, 90, 
-	91, 92, 93, 94, 95, 96, 97, 98, 
-	99, 100, 101, 102, 103, 104, 105, 106, 
-	107, 108, 109, 110, 111, 112, 113, 114, 
-	115, 59, 116, 117, 88, 119, 118, 116, 
-	118, 116, 122, 121, 119, 122, 121, 116, 
-	123, 89, 125, 124, 116, 124, 116, 127, 
-	126, 125, 127, 126, 116, 128, 90, 130, 
-	129, 116, 129, 116, 132, 131, 130, 132, 
-	131, 116, 133, 91, 135, 134, 116, 134, 
-	116, 137, 136, 135, 137, 136, 116, 138, 
-	92, 140, 139, 116, 139, 116, 142, 141, 
-	140, 142, 141, 116, 143, 93, 145, 144, 
-	116, 144, 116, 147, 146, 145, 147, 146, 
-	116, 149, 94, 151, 150, 116, 150, 116, 
-	153, 152, 151, 153, 152, 116, 154, 95, 
-	156, 155, 116, 155, 116, 158, 157, 156, 
-	158, 157, 116, 159, 96, 161, 160, 116, 
-	160, 116, 163, 162, 161, 163, 162, 116, 
-	164, 97, 166, 165, 116, 165, 116, 168, 
-	167, 166, 168, 167, 116, 169, 98, 171, 
-	170, 116, 170, 116, 173, 172, 171, 173, 
-	172, 116, 174, 99, 176, 175, 116, 175, 
-	116, 178, 177, 176, 178, 177, 116, 179, 
-	100, 181, 180, 116, 180, 116, 183, 182, 
-	181, 183, 182, 116, 184, 101, 186, 185, 
-	116, 185, 116, 188, 187, 186, 188, 187, 
-	116, 189, 102, 191, 190, 116, 190, 116, 
-	193, 192, 191, 193, 192, 116, 194, 103, 
-	196, 195, 116, 195, 116, 198, 197, 196, 
-	198, 197, 116, 199, 104, 201, 200, 116, 
-	200, 116, 203, 202, 201, 203, 202, 116, 
-	204, 105, 206, 205, 116, 205, 116, 208, 
-	207, 206, 208, 207, 116, 209, 106, 211, 
-	210, 116, 210, 116, 213, 212, 211, 213, 
-	212, 116, 214, 107, 216, 215, 116, 215, 
-	116, 218, 217, 216, 218, 217, 219, 116, 
-	108, 221, 220, 116, 220, 223, 116, 222, 
-	223, 221, 222, 224, 225, 109, 116, 224, 
-	120, 227, 226, 120, 228, 226, 230, 229, 
-	225, 229, 231, 116, 110, 233, 232, 116, 
-	232, 235, 116, 234, 235, 233, 234, 236, 
-	116, 111, 238, 237, 116, 237, 240, 116, 
-	239, 240, 238, 239, 241, 116, 112, 243, 
-	242, 116, 242, 245, 116, 244, 245, 243, 
-	244, 246, 116, 113, 248, 247, 116, 247, 
-	250, 116, 249, 250, 248, 249, 251, 116, 
-	114, 253, 252, 116, 252, 255, 116, 254, 
-	255, 253, 254, 256, 116, 115, 258, 257, 
-	116, 257, 260, 116, 259, 260, 258, 259, 
-	262, 261, 264, 263, 266, 265, 268, 267, 
-	270, 269, 272, 271, 274, 273, 276, 275, 
-	278, 277, 280, 279, 282, 281, 284, 283, 
-	286, 285, 288, 287, 290, 289, 292, 291, 
-	294, 293, 296, 295, 298, 297, 300, 299, 
-	302, 301, 304, 303, 306, 305, 308, 307, 
-	310, 309, 312, 311, 314, 313, 316, 315, 
+	14, 10, 20, 20, 19, 23, 22, 23, 
+	24, 22, 23, 25, 22, 23, 26, 22, 
+	23, 27, 22, 29, 28, 31, 30, 33, 
+	34, 35, 36, 37, 38, 39, 40, 41, 
+	42, 43, 44, 45, 46, 47, 48, 49, 
+	50, 51, 52, 53, 54, 55, 56, 57, 
+	58, 59, 60, 32, 61, 62, 63, 64, 
+	65, 66, 67, 68, 69, 70, 71, 72, 
+	73, 74, 75, 76, 77, 78, 79, 80, 
+	81, 82, 83, 84, 85, 86, 87, 88, 
+	32, 89, 90, 61, 92, 91, 89, 91, 
+	89, 95, 94, 92, 95, 94, 89, 96, 
+	62, 98, 97, 89, 97, 89, 100, 99, 
+	98, 100, 99, 89, 101, 63, 103, 102, 
+	89, 102, 89, 105, 104, 103, 105, 104, 
+	89, 106, 64, 108, 107, 89, 107, 89, 
+	110, 109, 108, 110, 109, 89, 111, 65, 
+	113, 112, 89, 112, 89, 115, 114, 113, 
+	115, 114, 89, 116, 66, 118, 117, 89, 
+	117, 89, 120, 119, 118, 120, 119, 89, 
+	122, 67, 124, 123, 89, 123, 89, 126, 
+	125, 124, 126, 125, 89, 127, 68, 129, 
+	128, 89, 128, 89, 131, 130, 129, 131, 
+	130, 89, 132, 69, 134, 133, 89, 133, 
+	89, 136, 135, 134, 136, 135, 89, 137, 
+	70, 139, 138, 89, 138, 89, 141, 140, 
+	139, 141, 140, 89, 142, 71, 144, 143, 
+	89, 143, 89, 146, 145, 144, 146, 145, 
+	89, 147, 72, 149, 148, 89, 148, 89, 
+	151, 150, 149, 151, 150, 89, 152, 73, 
+	154, 153, 89, 153, 89, 156, 155, 154, 
+	156, 155, 89, 157, 74, 159, 158, 89, 
+	158, 89, 161, 160, 159, 161, 160, 89, 
+	162, 75, 164, 163, 89, 163, 89, 166, 
+	165, 164, 166, 165, 89, 167, 76, 169, 
+	168, 89, 168, 89, 171, 170, 169, 171, 
+	170, 89, 172, 77, 174, 173, 89, 173, 
+	89, 176, 175, 174, 176, 175, 89, 177, 
+	78, 179, 178, 89, 178, 89, 181, 180, 
+	179, 181, 180, 89, 182, 79, 184, 183, 
+	89, 183, 89, 186, 185, 184, 186, 185, 
+	89, 187, 80, 189, 188, 89, 188, 89, 
+	191, 190, 189, 191, 190, 192, 89, 81, 
+	194, 193, 89, 193, 196, 89, 195, 196, 
+	194, 195, 197, 198, 82, 89, 197, 93, 
+	200, 199, 93, 201, 199, 203, 202, 198, 
+	202, 204, 89, 83, 206, 205, 89, 205, 
+	208, 89, 207, 208, 206, 207, 209, 89, 
+	84, 211, 210, 89, 210, 213, 89, 212, 
+	213, 211, 212, 214, 89, 85, 216, 215, 
+	89, 215, 218, 89, 217, 218, 216, 217, 
+	219, 89, 86, 221, 220, 89, 220, 223, 
+	89, 222, 223, 221, 222, 224, 89, 87, 
+	226, 225, 89, 225, 228, 89, 227, 228, 
+	226, 227, 229, 89, 88, 231, 230, 89, 
+	230, 233, 89, 232, 233, 231, 232, 235, 
+	234, 237, 236, 239, 238, 241, 240, 243, 
+	242, 245, 244, 247, 246, 249, 248, 251, 
+	250, 253, 252, 255, 254, 257, 256, 259, 
+	258, 261, 260, 263, 262, 265, 264, 267, 
+	266, 269, 268, 271, 270, 273, 272, 275, 
+	274, 277, 276, 279, 278, 281, 280, 283, 
+	282, 285, 284, 287, 286, 289, 288, 291, 
+	290, 292, 290, 293, 290, 290, 290, 290, 
+	290, 294, 295, 290, 293, 290, 296, 290, 
+	297, 290, 298, 290, 299, 299, 300, 290, 
+	299, 290, 290, 290, 294, 302, 302, 303, 
+	302, 301, 304, 301, 301, 305, 293, 290, 
+	306, 290, 290, 290, 290, 290, 307, 308, 
+	290, 309, 290, 295, 290, 310, 311, 290, 
+	312, 290, 313, 290, 293, 290, 314, 290, 
+	306, 290, 315, 290, 316, 290, 306, 290, 
 	319, 318, 320, 321, 320, 320, 322, 322, 
 	323, 325, 322, 326, 327, 328, 320, 330, 
 	331, 332, 333, 334, 318, 324, 20, 329, 
@@ -436,120 +437,116 @@ self._proc_scanner_indicies = [
 	351, 329, 355, 329, 329, 329, 352, 351, 
 	329, 356, 329, 329, 329, 352, 351, 329, 
 	357, 329, 329, 329, 352, 351, 329, 358, 
-	329, 329, 329, 352, 360, 360, 361, 362, 
-	363, 364, 365, 366, 367, 368, 360, 359, 
-	360, 360, 360, 369, 371, 370, 372, 373, 
-	370, 33, 33, 34, 33, 374, 374, 36, 
-	35, 374, 375, 370, 376, 370, 24, 370, 
-	377, 370, 378, 370, 379, 370, 58, 380, 
-	381, 380, 50, 49, 50, 54, 56, 55, 
-	383, 57, 61, 385, 386, 73, 84, 384, 
-	60, 61, 62, 63, 64, 65, 66, 67, 
-	68, 69, 70, 71, 72, 73, 74, 75, 
-	76, 77, 78, 79, 388, 388, 80, 81, 
-	82, 83, 84, 389, 388, 389, 388, 85, 
-	86, 87, 387, 116, 122, 121, 116, 127, 
-	126, 116, 132, 131, 116, 137, 136, 116, 
-	142, 141, 116, 147, 146, 116, 153, 152, 
-	116, 158, 157, 116, 163, 162, 116, 168, 
-	167, 116, 173, 172, 116, 178, 177, 116, 
-	183, 182, 116, 188, 187, 116, 193, 192, 
-	116, 198, 197, 116, 203, 202, 116, 208, 
-	207, 116, 213, 212, 116, 218, 217, 223, 
-	116, 222, 390, 228, 226, 230, 229, 235, 
-	116, 234, 240, 116, 239, 245, 116, 244, 
-	250, 116, 249, 255, 116, 254, 260, 116, 
-	259, 116, 149, 94, 262, 261, 264, 263, 
-	266, 265, 268, 267, 270, 269, 272, 271, 
-	274, 273, 276, 275, 278, 277, 280, 279, 
-	282, 281, 284, 283, 286, 285, 288, 287, 
-	290, 289, 292, 291, 294, 293, 296, 295, 
-	298, 297, 300, 299, 302, 301, 304, 303, 
-	306, 305, 308, 307, 310, 309, 312, 311, 
-	314, 313, 316, 315, 0
+	329, 329, 329, 352, 31, 359, 360, 359, 
+	23, 22, 23, 27, 29, 28, 362, 30, 
+	34, 364, 365, 46, 57, 363, 33, 34, 
+	35, 36, 37, 38, 39, 40, 41, 42, 
+	43, 44, 45, 46, 47, 48, 49, 50, 
+	51, 52, 367, 367, 53, 54, 55, 56, 
+	57, 368, 367, 368, 367, 58, 59, 60, 
+	366, 89, 95, 94, 89, 100, 99, 89, 
+	105, 104, 89, 110, 109, 89, 115, 114, 
+	89, 120, 119, 89, 126, 125, 89, 131, 
+	130, 89, 136, 135, 89, 141, 140, 89, 
+	146, 145, 89, 151, 150, 89, 156, 155, 
+	89, 161, 160, 89, 166, 165, 89, 171, 
+	170, 89, 176, 175, 89, 181, 180, 89, 
+	186, 185, 89, 191, 190, 196, 89, 195, 
+	369, 201, 199, 203, 202, 208, 89, 207, 
+	213, 89, 212, 218, 89, 217, 223, 89, 
+	222, 228, 89, 227, 233, 89, 232, 89, 
+	122, 67, 235, 234, 237, 236, 239, 238, 
+	241, 240, 243, 242, 245, 244, 247, 246, 
+	249, 248, 251, 250, 253, 252, 255, 254, 
+	257, 256, 259, 258, 261, 260, 263, 262, 
+	265, 264, 267, 266, 269, 268, 271, 270, 
+	273, 272, 275, 274, 277, 276, 279, 278, 
+	281, 280, 283, 282, 285, 284, 287, 286, 
+	289, 288, 372, 372, 373, 374, 375, 376, 
+	377, 378, 379, 380, 372, 371, 372, 372, 
+	372, 381, 383, 382, 384, 385, 382, 302, 
+	302, 303, 302, 386, 386, 305, 304, 386, 
+	387, 382, 388, 382, 293, 382, 389, 382, 
+	390, 382, 391, 382, 0
 ]
 
 class << self
-	attr_accessor :_proc_scanner_trans_targs
-	private :_proc_scanner_trans_targs, :_proc_scanner_trans_targs=
+	attr_accessor :_scanner_trans_targs
+	private :_scanner_trans_targs, :_scanner_trans_targs=
 end
-self._proc_scanner_trans_targs = [
+self._scanner_trans_targs = [
 	224, 2, 3, 4, 5, 6, 224, 224, 
 	8, 228, 224, 10, 16, 11, 15, 224, 
-	12, 13, 14, 224, 232, 242, 19, 20, 
-	21, 242, 23, 25, 26, 27, 246, 248, 
-	242, 28, 29, 30, 247, 33, 242, 35, 
-	36, 38, 41, 39, 40, 42, 44, 45, 
-	257, 46, 47, 48, 49, 50, 258, 51, 
-	52, 260, 0, 261, 261, 261, 261, 261, 
-	261, 261, 261, 261, 261, 261, 261, 261, 
-	261, 261, 261, 261, 261, 261, 261, 261, 
-	261, 261, 261, 261, 261, 261, 261, 261, 
-	55, 60, 65, 70, 75, 80, 85, 90, 
-	95, 100, 105, 110, 115, 120, 125, 130, 
-	135, 140, 145, 150, 155, 160, 166, 171, 
-	176, 181, 186, 191, 261, 56, 57, 263, 
-	261, 58, 59, 61, 62, 264, 63, 64, 
-	66, 67, 265, 68, 69, 71, 72, 266, 
-	73, 74, 76, 77, 267, 78, 79, 81, 
-	82, 268, 83, 84, 261, 86, 87, 269, 
-	88, 89, 91, 92, 270, 93, 94, 96, 
-	97, 271, 98, 99, 101, 102, 272, 103, 
-	104, 106, 107, 273, 108, 109, 111, 112, 
-	274, 113, 114, 116, 117, 275, 118, 119, 
-	121, 122, 276, 123, 124, 126, 127, 277, 
-	128, 129, 131, 132, 278, 133, 134, 136, 
-	137, 279, 138, 139, 141, 142, 280, 143, 
-	144, 146, 147, 281, 148, 149, 151, 152, 
-	282, 153, 154, 156, 157, 283, 158, 159, 
-	161, 284, 162, 163, 164, 165, 285, 167, 
-	168, 286, 169, 170, 172, 173, 287, 174, 
-	175, 177, 178, 288, 179, 180, 182, 183, 
-	289, 184, 185, 187, 188, 290, 189, 190, 
-	192, 193, 291, 194, 195, 196, 293, 197, 
-	294, 198, 295, 199, 296, 200, 297, 201, 
-	298, 202, 299, 203, 300, 204, 301, 205, 
-	302, 206, 303, 207, 304, 208, 305, 209, 
-	306, 210, 307, 211, 308, 212, 309, 213, 
-	310, 214, 311, 215, 312, 216, 313, 217, 
-	314, 218, 315, 219, 316, 220, 317, 221, 
-	318, 222, 319, 223, 320, 224, 225, 226, 
+	12, 13, 14, 224, 232, 244, 18, 19, 
+	20, 21, 22, 245, 23, 24, 247, 0, 
+	248, 248, 248, 248, 248, 248, 248, 248, 
+	248, 248, 248, 248, 248, 248, 248, 248, 
+	248, 248, 248, 248, 248, 248, 248, 248, 
+	248, 248, 248, 248, 248, 27, 32, 37, 
+	42, 47, 52, 57, 62, 67, 72, 77, 
+	82, 87, 92, 97, 102, 107, 112, 117, 
+	122, 127, 132, 138, 143, 148, 153, 158, 
+	163, 248, 28, 29, 250, 248, 30, 31, 
+	33, 34, 251, 35, 36, 38, 39, 252, 
+	40, 41, 43, 44, 253, 45, 46, 48, 
+	49, 254, 50, 51, 53, 54, 255, 55, 
+	56, 248, 58, 59, 256, 60, 61, 63, 
+	64, 257, 65, 66, 68, 69, 258, 70, 
+	71, 73, 74, 259, 75, 76, 78, 79, 
+	260, 80, 81, 83, 84, 261, 85, 86, 
+	88, 89, 262, 90, 91, 93, 94, 263, 
+	95, 96, 98, 99, 264, 100, 101, 103, 
+	104, 265, 105, 106, 108, 109, 266, 110, 
+	111, 113, 114, 267, 115, 116, 118, 119, 
+	268, 120, 121, 123, 124, 269, 125, 126, 
+	128, 129, 270, 130, 131, 133, 271, 134, 
+	135, 136, 137, 272, 139, 140, 273, 141, 
+	142, 144, 145, 274, 146, 147, 149, 150, 
+	275, 151, 152, 154, 155, 276, 156, 157, 
+	159, 160, 277, 161, 162, 164, 165, 278, 
+	166, 167, 168, 280, 169, 281, 170, 282, 
+	171, 283, 172, 284, 173, 285, 174, 286, 
+	175, 287, 176, 288, 177, 289, 178, 290, 
+	179, 291, 180, 292, 181, 293, 182, 294, 
+	183, 295, 184, 296, 185, 297, 186, 298, 
+	187, 299, 188, 300, 189, 301, 190, 302, 
+	191, 303, 192, 304, 193, 305, 194, 306, 
+	195, 307, 308, 197, 198, 199, 308, 201, 
+	203, 204, 205, 312, 314, 308, 206, 207, 
+	208, 313, 211, 308, 213, 214, 216, 219, 
+	217, 218, 220, 222, 223, 224, 225, 226, 
 	224, 224, 224, 224, 224, 227, 230, 231, 
 	234, 235, 236, 237, 239, 224, 224, 224, 
 	224, 1, 224, 229, 224, 7, 9, 224, 
 	224, 224, 233, 224, 17, 224, 224, 224, 
-	224, 235, 238, 235, 240, 241, 235, 242, 
-	243, 244, 245, 249, 250, 251, 252, 253, 
-	254, 242, 242, 18, 22, 24, 242, 31, 
-	32, 34, 37, 43, 256, 255, 257, 259, 
-	261, 262, 292, 261, 53, 54, 261, 261
+	224, 235, 238, 235, 240, 241, 235, 243, 
+	242, 244, 246, 248, 249, 279, 248, 25, 
+	26, 248, 248, 308, 309, 310, 311, 315, 
+	316, 317, 318, 319, 320, 308, 308, 196, 
+	200, 202, 308, 209, 210, 212, 215, 221
 ]
 
 class << self
-	attr_accessor :_proc_scanner_trans_actions
-	private :_proc_scanner_trans_actions, :_proc_scanner_trans_actions=
+	attr_accessor :_scanner_trans_actions
+	private :_scanner_trans_actions, :_scanner_trans_actions=
 end
-self._proc_scanner_trans_actions = [
+self._scanner_trans_actions = [
 	203, 0, 0, 0, 0, 0, 171, 205, 
 	0, 5, 207, 0, 0, 0, 0, 173, 
-	0, 0, 0, 201, 0, 21, 0, 0, 
-	0, 9, 0, 0, 0, 0, 5, 5, 
-	19, 0, 0, 0, 0, 0, 7, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	27, 0, 0, 0, 0, 0, 217, 0, 
-	0, 0, 0, 99, 43, 33, 47, 49, 
-	51, 55, 35, 85, 57, 63, 75, 59, 
-	77, 37, 71, 73, 67, 65, 79, 45, 
-	83, 87, 53, 61, 39, 81, 69, 41, 
+	0, 0, 0, 201, 0, 11, 0, 0, 
+	0, 0, 0, 217, 0, 0, 0, 0, 
+	83, 27, 17, 31, 33, 35, 39, 19, 
+	69, 41, 47, 59, 43, 61, 21, 55, 
+	57, 51, 49, 63, 29, 67, 71, 37, 
+	45, 23, 65, 53, 25, 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, 31, 0, 0, 5, 
-	97, 0, 0, 0, 0, 5, 0, 0, 
+	0, 15, 0, 0, 5, 81, 0, 0, 
 	0, 0, 5, 0, 0, 0, 0, 5, 
 	0, 0, 0, 0, 5, 0, 0, 0, 
-	0, 5, 0, 0, 101, 0, 0, 5, 
-	0, 0, 0, 0, 5, 0, 0, 0, 
+	0, 5, 0, 0, 0, 0, 5, 0, 
+	0, 85, 0, 0, 5, 0, 0, 0, 
 	0, 5, 0, 0, 0, 0, 5, 0, 
 	0, 0, 0, 5, 0, 0, 0, 0, 
 	5, 0, 0, 0, 0, 5, 0, 0, 
@@ -558,34 +555,38 @@ self._proc_scanner_trans_actions = [
 	0, 5, 0, 0, 0, 0, 5, 0, 
 	0, 0, 0, 5, 0, 0, 0, 0, 
 	5, 0, 0, 0, 0, 5, 0, 0, 
-	0, 5, 0, 0, 0, 0, 5, 0, 
-	0, 5, 0, 0, 0, 0, 5, 0, 
+	0, 0, 5, 0, 0, 0, 5, 0, 
+	0, 0, 0, 5, 0, 0, 5, 0, 
 	0, 0, 0, 5, 0, 0, 0, 0, 
 	5, 0, 0, 0, 0, 5, 0, 0, 
-	0, 0, 5, 0, 0, 0, 103, 0, 
-	105, 0, 107, 0, 109, 0, 111, 0, 
-	113, 0, 115, 0, 117, 0, 119, 0, 
-	121, 0, 123, 0, 125, 0, 127, 0, 
-	129, 0, 131, 0, 133, 0, 135, 0, 
-	137, 0, 139, 0, 141, 0, 143, 0, 
-	145, 0, 147, 0, 149, 0, 151, 0, 
-	153, 0, 155, 0, 157, 183, 0, 5, 
+	0, 0, 5, 0, 0, 0, 0, 5, 
+	0, 0, 0, 87, 0, 89, 0, 91, 
+	0, 93, 0, 95, 0, 97, 0, 99, 
+	0, 101, 0, 103, 0, 105, 0, 107, 
+	0, 109, 0, 111, 0, 113, 0, 115, 
+	0, 117, 0, 119, 0, 121, 0, 123, 
+	0, 125, 0, 127, 0, 129, 0, 131, 
+	0, 133, 0, 135, 0, 137, 0, 139, 
+	0, 141, 157, 0, 0, 0, 145, 0, 
+	0, 0, 0, 5, 5, 155, 0, 0, 
+	0, 0, 0, 143, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 183, 0, 5, 
 	175, 169, 167, 177, 181, 0, 5, 0, 
 	0, 235, 0, 0, 0, 159, 161, 197, 
 	187, 0, 199, 0, 195, 0, 0, 189, 
 	163, 193, 5, 185, 0, 179, 209, 165, 
-	191, 226, 0, 229, 0, 0, 232, 11, 
-	0, 5, 5, 5, 5, 5, 5, 5, 
-	5, 15, 17, 0, 0, 0, 13, 0, 
-	0, 0, 0, 0, 214, 23, 25, 29, 
-	89, 223, 220, 95, 0, 0, 91, 93
+	191, 226, 0, 229, 0, 0, 232, 214, 
+	7, 9, 13, 73, 223, 220, 79, 0, 
+	0, 75, 77, 147, 0, 5, 5, 5, 
+	5, 5, 5, 5, 5, 151, 153, 0, 
+	0, 0, 149, 0, 0, 0, 0, 0
 ]
 
 class << self
-	attr_accessor :_proc_scanner_to_state_actions
-	private :_proc_scanner_to_state_actions, :_proc_scanner_to_state_actions=
+	attr_accessor :_scanner_to_state_actions
+	private :_scanner_to_state_actions, :_scanner_to_state_actions=
 end
-self._proc_scanner_to_state_actions = [
+self._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, 
@@ -616,24 +617,24 @@ self._proc_scanner_to_state_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	1, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 1, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 211, 
-	0, 211, 0, 1, 0, 1, 0, 0, 
+	0, 0, 211, 0, 211, 0, 1, 0, 
+	1, 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, 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, 1, 1, 1, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0
 ]
 
 class << self
-	attr_accessor :_proc_scanner_from_state_actions
-	private :_proc_scanner_from_state_actions, :_proc_scanner_from_state_actions=
+	attr_accessor :_scanner_from_state_actions
+	private :_scanner_from_state_actions, :_scanner_from_state_actions=
 end
-self._proc_scanner_from_state_actions = [
+self._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, 
@@ -664,239 +665,239 @@ self._proc_scanner_from_state_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	3, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 3, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 3, 
-	0, 3, 0, 3, 0, 3, 0, 0, 
+	0, 0, 3, 0, 3, 0, 3, 0, 
+	3, 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, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
-	3
+	3, 3, 3, 3, 3, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0
 ]
 
 class << self
-	attr_accessor :_proc_scanner_eof_trans
-	private :_proc_scanner_eof_trans, :_proc_scanner_eof_trans=
+	attr_accessor :_scanner_eof_trans
+	private :_scanner_eof_trans, :_scanner_eof_trans=
 end
-self._proc_scanner_eof_trans = [
+self._scanner_eof_trans = [
 	0, 1, 1, 1, 1, 1, 1, 8, 
 	8, 11, 11, 11, 11, 11, 11, 11, 
-	11, 20, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 33, 33, 33, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 49, 49, 
-	49, 49, 49, 0, 0, 60, 60, 60, 
-	60, 60, 121, 121, 60, 60, 60, 121, 
-	121, 60, 60, 60, 121, 121, 60, 60, 
-	60, 121, 121, 60, 60, 60, 121, 121, 
-	60, 60, 60, 121, 121, 149, 149, 149, 
-	121, 121, 60, 60, 60, 121, 121, 60, 
-	60, 60, 121, 121, 60, 60, 60, 121, 
-	121, 60, 60, 60, 121, 121, 60, 60, 
-	60, 121, 121, 60, 60, 60, 121, 121, 
-	60, 60, 60, 121, 121, 60, 60, 60, 
-	121, 121, 60, 60, 60, 121, 121, 60, 
-	60, 60, 121, 121, 60, 60, 60, 121, 
-	121, 60, 60, 60, 121, 121, 60, 60, 
-	60, 121, 121, 60, 60, 60, 121, 121, 
-	60, 60, 121, 121, 121, 121, 60, 60, 
-	60, 121, 121, 60, 60, 60, 121, 121, 
-	60, 60, 60, 121, 121, 60, 60, 60, 
-	121, 121, 60, 60, 60, 121, 121, 60, 
-	60, 60, 121, 121, 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, 
+	11, 20, 22, 22, 22, 22, 22, 0, 
+	0, 33, 33, 33, 33, 33, 94, 94, 
+	33, 33, 33, 94, 94, 33, 33, 33, 
+	94, 94, 33, 33, 33, 94, 94, 33, 
+	33, 33, 94, 94, 33, 33, 33, 94, 
+	94, 122, 122, 122, 94, 94, 33, 33, 
+	33, 94, 94, 33, 33, 33, 94, 94, 
+	33, 33, 33, 94, 94, 33, 33, 33, 
+	94, 94, 33, 33, 33, 94, 94, 33, 
+	33, 33, 94, 94, 33, 33, 33, 94, 
+	94, 33, 33, 33, 94, 94, 33, 33, 
+	33, 94, 94, 33, 33, 33, 94, 94, 
+	33, 33, 33, 94, 94, 33, 33, 33, 
+	94, 94, 33, 33, 33, 94, 94, 33, 
+	33, 33, 94, 94, 33, 33, 94, 94, 
+	94, 94, 33, 33, 33, 94, 94, 33, 
+	33, 33, 94, 94, 33, 33, 33, 94, 
+	94, 33, 33, 33, 94, 94, 33, 33, 
+	33, 94, 94, 33, 33, 33, 94, 94, 
+	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, 291, 291, 291, 291, 
+	291, 291, 291, 291, 291, 291, 302, 302, 
+	302, 291, 291, 291, 291, 291, 291, 291, 
+	291, 291, 291, 291, 291, 291, 291, 291, 
 	0, 336, 337, 339, 341, 341, 339, 344, 
 	346, 348, 339, 351, 353, 353, 353, 353, 
-	353, 353, 0, 370, 371, 371, 375, 375, 
-	375, 371, 371, 371, 371, 371, 371, 0, 
-	382, 0, 383, 0, 384, 0, 388, 391, 
-	391, 391, 391, 391, 391, 391, 391, 391, 
-	391, 391, 391, 391, 391, 391, 391, 391, 
-	391, 391, 391, 391, 391, 391, 391, 391, 
-	391, 391, 391, 391, 392, 0, 0, 0, 
+	353, 353, 0, 361, 0, 362, 0, 363, 
+	0, 367, 370, 370, 370, 370, 370, 370, 
+	370, 370, 370, 370, 370, 370, 370, 370, 
+	370, 370, 370, 370, 370, 370, 370, 370, 
+	370, 370, 370, 370, 370, 370, 370, 371, 
 	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, 382, 383, 383, 
+	387, 387, 387, 383, 383, 383, 383, 383, 
+	383
 ]
 
 class << self
-	attr_accessor :proc_scanner_start
+	attr_accessor :scanner_start
 end
-self.proc_scanner_start = 224;
+self.scanner_start = 224;
 class << self
-	attr_accessor :proc_scanner_first_final
+	attr_accessor :scanner_first_final
 end
-self.proc_scanner_first_final = 224;
+self.scanner_first_final = 224;
 class << self
-	attr_accessor :proc_scanner_error
+	attr_accessor :scanner_error
 end
-self.proc_scanner_error = 0;
+self.scanner_error = 0;
 
 class << self
-	attr_accessor :proc_scanner_en_new_statement
+	attr_accessor :scanner_en_per_line_comment
 end
-self.proc_scanner_en_new_statement = 242;
+self.scanner_en_per_line_comment = 242;
 class << self
-	attr_accessor :proc_scanner_en_per_line_comment
+	attr_accessor :scanner_en_block_comment
 end
-self.proc_scanner_en_per_line_comment = 255;
+self.scanner_en_block_comment = 244;
 class << self
-	attr_accessor :proc_scanner_en_block_comment
+	attr_accessor :scanner_en_heredoc
 end
-self.proc_scanner_en_block_comment = 257;
+self.scanner_en_heredoc = 246;
 class << self
-	attr_accessor :proc_scanner_en_heredoc
+	attr_accessor :scanner_en_string
 end
-self.proc_scanner_en_heredoc = 259;
+self.scanner_en_string = 248;
 class << self
-	attr_accessor :proc_scanner_en_string
+	attr_accessor :scanner_en_dstring1
 end
-self.proc_scanner_en_string = 261;
+self.scanner_en_dstring1 = 280;
 class << self
-	attr_accessor :proc_scanner_en_dstring1
+	attr_accessor :scanner_en_dstring2
 end
-self.proc_scanner_en_dstring1 = 293;
+self.scanner_en_dstring2 = 281;
 class << self
-	attr_accessor :proc_scanner_en_dstring2
+	attr_accessor :scanner_en_dstring3
 end
-self.proc_scanner_en_dstring2 = 294;
+self.scanner_en_dstring3 = 282;
 class << self
-	attr_accessor :proc_scanner_en_dstring3
+	attr_accessor :scanner_en_dstring4
 end
-self.proc_scanner_en_dstring3 = 295;
+self.scanner_en_dstring4 = 283;
 class << self
-	attr_accessor :proc_scanner_en_dstring4
+	attr_accessor :scanner_en_dstring5
 end
-self.proc_scanner_en_dstring4 = 296;
+self.scanner_en_dstring5 = 284;
 class << self
-	attr_accessor :proc_scanner_en_dstring5
+	attr_accessor :scanner_en_dstring6
 end
-self.proc_scanner_en_dstring5 = 297;
+self.scanner_en_dstring6 = 285;
 class << self
-	attr_accessor :proc_scanner_en_dstring6
+	attr_accessor :scanner_en_dstring7
 end
-self.proc_scanner_en_dstring6 = 298;
+self.scanner_en_dstring7 = 286;
 class << self
-	attr_accessor :proc_scanner_en_dstring7
+	attr_accessor :scanner_en_dstring8
 end
-self.proc_scanner_en_dstring7 = 299;
+self.scanner_en_dstring8 = 287;
 class << self
-	attr_accessor :proc_scanner_en_dstring8
+	attr_accessor :scanner_en_dstring9
 end
-self.proc_scanner_en_dstring8 = 300;
+self.scanner_en_dstring9 = 288;
 class << self
-	attr_accessor :proc_scanner_en_dstring9
+	attr_accessor :scanner_en_dstring10
 end
-self.proc_scanner_en_dstring9 = 301;
+self.scanner_en_dstring10 = 289;
 class << self
-	attr_accessor :proc_scanner_en_dstring10
+	attr_accessor :scanner_en_dstring11
 end
-self.proc_scanner_en_dstring10 = 302;
+self.scanner_en_dstring11 = 290;
 class << self
-	attr_accessor :proc_scanner_en_dstring11
+	attr_accessor :scanner_en_dstring12
 end
-self.proc_scanner_en_dstring11 = 303;
+self.scanner_en_dstring12 = 291;
 class << self
-	attr_accessor :proc_scanner_en_dstring12
+	attr_accessor :scanner_en_dstring13
 end
-self.proc_scanner_en_dstring12 = 304;
+self.scanner_en_dstring13 = 292;
 class << self
-	attr_accessor :proc_scanner_en_dstring13
+	attr_accessor :scanner_en_dstring14
 end
-self.proc_scanner_en_dstring13 = 305;
+self.scanner_en_dstring14 = 293;
 class << self
-	attr_accessor :proc_scanner_en_dstring14
+	attr_accessor :scanner_en_dstring15
 end
-self.proc_scanner_en_dstring14 = 306;
+self.scanner_en_dstring15 = 294;
 class << self
-	attr_accessor :proc_scanner_en_dstring15
+	attr_accessor :scanner_en_dstring16
 end
-self.proc_scanner_en_dstring15 = 307;
+self.scanner_en_dstring16 = 295;
 class << self
-	attr_accessor :proc_scanner_en_dstring16
+	attr_accessor :scanner_en_dstring17
 end
-self.proc_scanner_en_dstring16 = 308;
+self.scanner_en_dstring17 = 296;
 class << self
-	attr_accessor :proc_scanner_en_dstring17
+	attr_accessor :scanner_en_dstring18
 end
-self.proc_scanner_en_dstring17 = 309;
+self.scanner_en_dstring18 = 297;
 class << self
-	attr_accessor :proc_scanner_en_dstring18
+	attr_accessor :scanner_en_dstring19
 end
-self.proc_scanner_en_dstring18 = 310;
+self.scanner_en_dstring19 = 298;
 class << self
-	attr_accessor :proc_scanner_en_dstring19
+	attr_accessor :scanner_en_dstring20
 end
-self.proc_scanner_en_dstring19 = 311;
+self.scanner_en_dstring20 = 299;
 class << self
-	attr_accessor :proc_scanner_en_dstring20
+	attr_accessor :scanner_en_dstring21
 end
-self.proc_scanner_en_dstring20 = 312;
+self.scanner_en_dstring21 = 300;
 class << self
-	attr_accessor :proc_scanner_en_dstring21
+	attr_accessor :scanner_en_dstring22
 end
-self.proc_scanner_en_dstring21 = 313;
+self.scanner_en_dstring22 = 301;
 class << self
-	attr_accessor :proc_scanner_en_dstring22
+	attr_accessor :scanner_en_dstring23
 end
-self.proc_scanner_en_dstring22 = 314;
+self.scanner_en_dstring23 = 302;
 class << self
-	attr_accessor :proc_scanner_en_dstring23
+	attr_accessor :scanner_en_dstring24
 end
-self.proc_scanner_en_dstring23 = 315;
+self.scanner_en_dstring24 = 303;
 class << self
-	attr_accessor :proc_scanner_en_dstring24
+	attr_accessor :scanner_en_dstring25
 end
-self.proc_scanner_en_dstring24 = 316;
+self.scanner_en_dstring25 = 304;
 class << self
-	attr_accessor :proc_scanner_en_dstring25
+	attr_accessor :scanner_en_dstring26
 end
-self.proc_scanner_en_dstring25 = 317;
+self.scanner_en_dstring26 = 305;
 class << self
-	attr_accessor :proc_scanner_en_dstring26
+	attr_accessor :scanner_en_dstring27
 end
-self.proc_scanner_en_dstring26 = 318;
+self.scanner_en_dstring27 = 306;
 class << self
-	attr_accessor :proc_scanner_en_dstring27
+	attr_accessor :scanner_en_dstring28
 end
-self.proc_scanner_en_dstring27 = 319;
+self.scanner_en_dstring28 = 307;
 class << self
-	attr_accessor :proc_scanner_en_dstring28
+	attr_accessor :scanner_en_new_statement
 end
-self.proc_scanner_en_dstring28 = 320;
+self.scanner_en_new_statement = 308;
 class << self
-	attr_accessor :proc_scanner_en_main
+	attr_accessor :scanner_en_main
 end
-self.proc_scanner_en_main = 224;
+self.scanner_en_main = 224;
 
 
-# line 473 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 136 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 
-      extend Scanner::Extensions
+        extend Extensions
 
-      def self.execute!
-        data = @data
-        eof = data.length
-        
-# line 2 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rb"
+        def self.execute!
+          data = @data
+          eof = data.length
+          
+# line 2 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rb"
 begin
 	p ||= 0
 	pe ||= data.length
-	cs = proc_scanner_start
+	cs = scanner_start
 	ts = nil
 	te = nil
 	act = 0
 end
 
-# line 480 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-        
-# line 2 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rb"
+# line 143 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+          
+# line 2 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -918,27 +919,27 @@ begin
 	end
 	end
 	if _goto_level <= _resume
-	_acts = _proc_scanner_from_state_actions[cs]
-	_nacts = _proc_scanner_actions[_acts]
+	_acts = _scanner_from_state_actions[cs]
+	_nacts = _scanner_actions[_acts]
 	_acts += 1
 	while _nacts > 0
 		_nacts -= 1
 		_acts += 1
-		case _proc_scanner_actions[_acts - 1]
+		case _scanner_actions[_acts - 1]
 			when 2 then
 # line 1 "NONE"
 		begin
 ts = p
 		end
-# line 2 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rb"
+# line 2 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
 		next
 	end
-	_keys = _proc_scanner_key_offsets[cs]
-	_trans = _proc_scanner_index_offsets[cs]
-	_klen = _proc_scanner_single_lengths[cs]
+	_keys = _scanner_key_offsets[cs]
+	_trans = _scanner_index_offsets[cs]
+	_klen = _scanner_single_lengths[cs]
 	_break_match = false
 	
 	begin
@@ -950,9 +951,9 @@ ts = p
 	        break if _upper < _lower
 	        _mid = _lower + ( (_upper - _lower) >> 1 )
 
-	        if data[p] < _proc_scanner_trans_keys[_mid]
+	        if data[p] < _scanner_trans_keys[_mid]
 	           _upper = _mid - 1
-	        elsif data[p] > _proc_scanner_trans_keys[_mid]
+	        elsif data[p] > _scanner_trans_keys[_mid]
 	           _lower = _mid + 1
 	        else
 	           _trans += (_mid - _keys)
@@ -964,16 +965,16 @@ ts = p
 	     _keys += _klen
 	     _trans += _klen
 	  end
-	  _klen = _proc_scanner_range_lengths[cs]
+	  _klen = _scanner_range_lengths[cs]
 	  if _klen > 0
 	     _lower = _keys
 	     _upper = _keys + (_klen << 1) - 2
 	     loop do
 	        break if _upper < _lower
 	        _mid = _lower + (((_upper-_lower) >> 1) & ~1)
-	        if data[p] < _proc_scanner_trans_keys[_mid]
+	        if data[p] < _scanner_trans_keys[_mid]
 	          _upper = _mid - 2
-	        elsif data[p] > _proc_scanner_trans_keys[_mid+1]
+	        elsif data[p] > _scanner_trans_keys[_mid+1]
 	          _lower = _mid + 2
 	        else
 	          _trans += ((_mid - _keys) >> 1)
@@ -985,134 +986,28 @@ ts = p
 	     _trans += _klen
 	  end
 	end while false
-	_trans = _proc_scanner_indicies[_trans]
+	_trans = _scanner_indicies[_trans]
 	end
 	if _goto_level <= _eof_trans
-	cs = _proc_scanner_trans_targs[_trans]
-	if _proc_scanner_trans_actions[_trans] != 0
-		_acts = _proc_scanner_trans_actions[_trans]
-		_nacts = _proc_scanner_actions[_acts]
+	cs = _scanner_trans_targs[_trans]
+	if _scanner_trans_actions[_trans] != 0
+		_acts = _scanner_trans_actions[_trans]
+		_nacts = _scanner_actions[_acts]
 		_acts += 1
 		while _nacts > 0
 			_nacts -= 1
 			_acts += 1
-			case _proc_scanner_actions[_acts - 1]
+			case _scanner_actions[_acts - 1]
 when 3 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
 when 4 then
-# line 47 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 7 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
-te = p+1
- begin 
-      push(:kw_do_alias2, ts, te)
-      increment_counter(:do_end, 0..1)
-      	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-
-     end
-		end
+act = 1;		end
 when 5 then
-# line 56 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
-te = p+1
- begin 
-      push(:kw_do_alias1, ts, te)
-      increment_counter(:do_end, 1)
-      	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-
-     end
-		end
-when 6 then
-# line 63 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
-te = p+1
- begin  p = p - 1; 	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-  end
-		end
-when 7 then
-# line 56 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
-te = p
-p = p - 1; begin 
-      push(:kw_do_alias1, ts, te)
-      increment_counter(:do_end, 1)
-      	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-
-     end
-		end
-when 8 then
-# line 62 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
-te = p
-p = p - 1; begin  push(:space, ts, te)  end
-		end
-when 9 then
-# line 63 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
-te = p
-p = p - 1; begin  p = p - 1; 	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-  end
-		end
-when 10 then
-# line 56 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
- begin p = ((te))-1; end
- begin 
-      push(:kw_do_alias1, ts, te)
-      increment_counter(:do_end, 1)
-      	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-
-     end
-		end
-when 11 then
-# line 63 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
- begin p = ((te))-1; end
- begin  p = p - 1; 	begin
-		cs = 224
-		_trigger_goto = true
-		_goto_level = _again
-		break
-	end
-  end
-		end
-when 12 then
-# line 69 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-		begin
-act = 5;		end
-when 13 then
 # line 1 "NONE"
 		begin
 	case act
@@ -1124,7 +1019,7 @@ when 13 then
 		break
 	end
 end
-	when 5 then
+	when 1 then
 	begin begin p = ((te))-1; end
 
       push(:comment, ts.pred, te)
@@ -1138,12 +1033,12 @@ end
     end
 end 
 			end
-when 14 then
-# line 77 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 6 then
+# line 16 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
-act = 6;		end
-when 15 then
-# line 77 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+act = 2;		end
+when 7 then
+# line 16 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1158,7 +1053,7 @@ p = p - 1; begin
       end
      end
 		end
-when 16 then
+when 8 then
 # line 1 "NONE"
 		begin
 	case act
@@ -1170,7 +1065,7 @@ when 16 then
 		break
 	end
 end
-	when 6 then
+	when 2 then
 	begin begin p = ((te))-1; end
 
       unless push_comment(ts, te)
@@ -1185,8 +1080,8 @@ end
     end
 end 
 			end
-when 17 then
-# line 86 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 9 then
+# line 26 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1201,16 +1096,16 @@ p = p - 1; begin
       end
      end
 		end
-when 18 then
-# line 142 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 10 then
+# line 83 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
-act = 10;		end
-when 19 then
-# line 171 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+act = 6;		end
+when 11 then
+# line 112 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
-act = 37;		end
-when 20 then
-# line 135 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+act = 33;		end
+when 12 then
+# line 76 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1224,344 +1119,344 @@ te = p+1
 
      end
 		end
-when 21 then
-# line 141 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 13 then
+# line 82 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 293
+		cs = 280
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 22 then
-# line 142 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 14 then
+# line 83 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 294
+		cs = 281
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 23 then
-# line 143 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 15 then
+# line 84 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 295
+		cs = 282
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 24 then
-# line 144 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 16 then
+# line 85 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 296
+		cs = 283
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 25 then
-# line 145 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 17 then
+# line 86 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 297
+		cs = 284
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 26 then
-# line 146 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 18 then
+# line 87 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 298
+		cs = 285
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 27 then
-# line 147 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 19 then
+# line 88 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 299
+		cs = 286
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 28 then
-# line 148 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 20 then
+# line 89 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 300
+		cs = 287
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 29 then
-# line 149 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 21 then
+# line 90 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 301
+		cs = 288
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 30 then
-# line 150 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 22 then
+# line 91 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 302
+		cs = 289
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 31 then
-# line 151 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 23 then
+# line 92 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 303
+		cs = 290
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 32 then
-# line 152 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 24 then
+# line 93 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 304
+		cs = 291
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 33 then
-# line 153 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 25 then
+# line 94 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 305
+		cs = 292
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 34 then
-# line 154 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 26 then
+# line 95 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 306
+		cs = 293
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 35 then
-# line 155 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 27 then
+# line 96 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 307
+		cs = 294
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 36 then
-# line 156 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 28 then
+# line 97 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 308
+		cs = 295
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 37 then
-# line 157 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 29 then
+# line 98 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 309
+		cs = 296
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 38 then
-# line 158 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 30 then
+# line 99 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 310
+		cs = 297
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 39 then
-# line 159 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 31 then
+# line 100 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 311
+		cs = 298
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 40 then
-# line 160 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 32 then
+# line 101 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 312
+		cs = 299
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 41 then
-# line 161 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 33 then
+# line 102 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 313
+		cs = 300
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 42 then
-# line 162 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 34 then
+# line 103 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 314
+		cs = 301
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 43 then
-# line 163 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 35 then
+# line 104 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 315
+		cs = 302
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 44 then
-# line 164 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 36 then
+# line 105 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 316
+		cs = 303
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 45 then
-# line 165 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 37 then
+# line 106 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 317
+		cs = 304
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 46 then
-# line 166 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 38 then
+# line 107 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 318
+		cs = 305
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 47 then
-# line 167 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 39 then
+# line 108 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 319
+		cs = 306
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 48 then
-# line 168 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 40 then
+# line 109 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin  push_dstring(ts, te); 	begin
-		cs = 320
+		cs = 307
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 49 then
-# line 171 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 41 then
+# line 112 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1575,8 +1470,8 @@ te = p+1
 
      end
 		end
-when 50 then
-# line 135 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 42 then
+# line 76 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1590,20 +1485,20 @@ p = p - 1; begin
 
      end
 		end
-when 51 then
-# line 142 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 43 then
+# line 83 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p
 p = p - 1; begin  push_dstring(ts, te); 	begin
-		cs = 294
+		cs = 281
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
   end
 		end
-when 52 then
-# line 171 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 44 then
+# line 112 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1617,8 +1512,8 @@ p = p - 1; begin
 
      end
 		end
-when 53 then
-# line 135 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 45 then
+# line 76 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1632,8 +1527,8 @@ when 53 then
 
      end
 		end
-when 54 then
-# line 171 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 46 then
+# line 112 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1647,20 +1542,20 @@ when 54 then
 
      end
 		end
-when 55 then
+when 47 then
 # line 1 "NONE"
 		begin
 	case act
-	when 10 then
+	when 6 then
 	begin begin p = ((te))-1; end
  push_dstring(ts, te); 	begin
-		cs = 294
+		cs = 281
 		_trigger_goto = true
 		_goto_level = _again
 		break
 	end
  end
-	when 37 then
+	when 33 then
 	begin begin p = ((te))-1; end
 
       push(:any, ts, te)
@@ -1674,8 +1569,8 @@ when 55 then
     end
 end 
 			end
-when 56 then
-# line 179 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 48 then
+# line 121 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1690,8 +1585,8 @@ te = p+1
       end
      end
 		end
-when 57 then
-# line 186 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 49 then
+# line 128 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1706,8 +1601,8 @@ te = p+1
       end
      end
 		end
-when 58 then
-# line 193 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 50 then
+# line 135 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1722,8 +1617,8 @@ te = p+1
       end
      end
 		end
-when 59 then
-# line 200 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 51 then
+# line 142 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1738,8 +1633,8 @@ te = p+1
       end
      end
 		end
-when 60 then
-# line 207 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 52 then
+# line 149 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1754,8 +1649,8 @@ te = p+1
       end
      end
 		end
-when 61 then
-# line 214 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 53 then
+# line 156 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1770,8 +1665,8 @@ te = p+1
       end
      end
 		end
-when 62 then
-# line 221 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 54 then
+# line 163 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1786,8 +1681,8 @@ te = p+1
       end
      end
 		end
-when 63 then
-# line 228 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 55 then
+# line 170 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1802,8 +1697,8 @@ te = p+1
       end
      end
 		end
-when 64 then
-# line 235 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 56 then
+# line 177 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1818,8 +1713,8 @@ te = p+1
       end
      end
 		end
-when 65 then
-# line 242 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 57 then
+# line 184 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1834,8 +1729,8 @@ te = p+1
       end
      end
 		end
-when 66 then
-# line 249 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 58 then
+# line 191 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1850,8 +1745,8 @@ te = p+1
       end
      end
 		end
-when 67 then
-# line 256 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 59 then
+# line 198 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1866,8 +1761,8 @@ te = p+1
       end
      end
 		end
-when 68 then
-# line 263 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 60 then
+# line 205 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1882,8 +1777,8 @@ te = p+1
       end
      end
 		end
-when 69 then
-# line 270 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 61 then
+# line 212 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1898,8 +1793,8 @@ te = p+1
       end
      end
 		end
-when 70 then
-# line 277 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 62 then
+# line 219 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1914,8 +1809,8 @@ te = p+1
       end
      end
 		end
-when 71 then
-# line 284 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 63 then
+# line 226 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1930,8 +1825,8 @@ te = p+1
       end
      end
 		end
-when 72 then
-# line 291 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 64 then
+# line 233 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1946,8 +1841,8 @@ te = p+1
       end
      end
 		end
-when 73 then
-# line 298 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 65 then
+# line 240 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1962,8 +1857,8 @@ te = p+1
       end
      end
 		end
-when 74 then
-# line 305 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 66 then
+# line 247 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1978,8 +1873,8 @@ te = p+1
       end
      end
 		end
-when 75 then
-# line 312 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 67 then
+# line 254 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -1994,8 +1889,8 @@ te = p+1
       end
      end
 		end
-when 76 then
-# line 319 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 68 then
+# line 261 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2010,8 +1905,8 @@ te = p+1
       end
      end
 		end
-when 77 then
-# line 326 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 69 then
+# line 268 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2026,8 +1921,8 @@ te = p+1
       end
      end
 		end
-when 78 then
-# line 333 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 70 then
+# line 275 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2042,8 +1937,8 @@ te = p+1
       end
      end
 		end
-when 79 then
-# line 340 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 71 then
+# line 282 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2058,8 +1953,8 @@ te = p+1
       end
      end
 		end
-when 80 then
-# line 347 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 72 then
+# line 289 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2074,8 +1969,8 @@ te = p+1
       end
      end
 		end
-when 81 then
-# line 354 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 73 then
+# line 296 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2090,8 +1985,8 @@ te = p+1
       end
      end
 		end
-when 82 then
-# line 361 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 74 then
+# line 303 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2106,8 +2001,8 @@ te = p+1
       end
      end
 		end
-when 83 then
-# line 368 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+when 75 then
+# line 310 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/common/ragel/machines.rl"
 		begin
 te = p+1
  begin 
@@ -2122,24 +2017,130 @@ te = p+1
       end
      end
 		end
+when 76 then
+# line 17 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+te = p+1
+ begin 
+      push(:kw_do_alias2, ts, te)
+      increment_counter(:do_end, 0..1)
+      	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+
+     end
+		end
+when 77 then
+# line 26 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+te = p+1
+ begin 
+      push(:kw_do_alias1, ts, te)
+      increment_counter(:do_end, 1)
+      	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+
+     end
+		end
+when 78 then
+# line 33 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+te = p+1
+ begin  p = p - 1; 	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+  end
+		end
+when 79 then
+# line 26 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+te = p
+p = p - 1; begin 
+      push(:kw_do_alias1, ts, te)
+      increment_counter(:do_end, 1)
+      	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+
+     end
+		end
+when 80 then
+# line 32 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+te = p
+p = p - 1; begin  push(:space, ts, te)  end
+		end
+when 81 then
+# line 33 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+te = p
+p = p - 1; begin  p = p - 1; 	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+  end
+		end
+when 82 then
+# line 26 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+ begin p = ((te))-1; end
+ begin 
+      push(:kw_do_alias1, ts, te)
+      increment_counter(:do_end, 1)
+      	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+
+     end
+		end
+when 83 then
+# line 33 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+		begin
+ begin p = ((te))-1; end
+ begin  p = p - 1; 	begin
+		cs = 224
+		_trigger_goto = true
+		_goto_level = _again
+		break
+	end
+  end
+		end
 when 84 then
-# line 380 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 43 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 act = 66;		end
 when 85 then
-# line 386 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 49 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 act = 67;		end
 when 86 then
-# line 421 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 84 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 act = 73;		end
 when 87 then
-# line 460 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 123 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 act = 79;		end
 when 88 then
-# line 393 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 56 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2148,7 +2149,7 @@ te = p+1
      end
 		end
 when 89 then
-# line 398 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 61 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2157,7 +2158,7 @@ te = p+1
      end
 		end
 when 90 then
-# line 403 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 66 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2166,7 +2167,7 @@ te = p+1
      end
 		end
 when 91 then
-# line 408 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 71 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2175,13 +2176,13 @@ te = p+1
      end
 		end
 when 92 then
-# line 421 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 84 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
       push(:newline_alias, ts, te)
       	begin
-		cs = 242
+		cs = 308
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2190,12 +2191,12 @@ te = p+1
      end
 		end
 when 93 then
-# line 428 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 91 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
       	begin
-		cs = 255
+		cs = 242
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2204,14 +2205,14 @@ te = p+1
      end
 		end
 when 94 then
-# line 432 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 95 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
       push_comment(ts, te)
       increment_lineno
       	begin
-		cs = 257
+		cs = 244
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2220,14 +2221,14 @@ te = p+1
      end
 		end
 when 95 then
-# line 440 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 103 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
       push_heredoc(ts, te)
       increment_lineno
       	begin
-		cs = 259
+		cs = 246
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2236,12 +2237,12 @@ te = p+1
      end
 		end
 when 96 then
-# line 446 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 109 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1; 	begin
-		cs = 261
+		cs = 248
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2250,7 +2251,7 @@ te = p+1
      end
 		end
 when 97 then
-# line 450 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 113 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2258,7 +2259,7 @@ te = p+1
         push(:op, ts, te)
       else
         p = p - 1; 	begin
-		cs = 261
+		cs = 248
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2268,25 +2269,25 @@ te = p+1
      end
 		end
 when 98 then
-# line 461 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 124 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin  push(:bslash, ts, te)  end
 		end
 when 99 then
-# line 465 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 128 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin  push(:digit, ts, te)  end
 		end
 when 100 then
-# line 467 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 130 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p+1
  begin  push(:any, ts, te)  end
 		end
 when 101 then
-# line 408 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 71 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2295,14 +2296,14 @@ p = p - 1; begin
      end
 		end
 when 102 then
-# line 415 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 78 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       push(:newline, ts, te)
       increment_lineno
       	begin
-		cs = 242
+		cs = 308
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2311,13 +2312,13 @@ p = p - 1; begin
      end
 		end
 when 103 then
-# line 421 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 84 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       push(:newline_alias, ts, te)
       	begin
-		cs = 242
+		cs = 308
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2326,37 +2327,37 @@ p = p - 1; begin
      end
 		end
 when 104 then
-# line 460 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 123 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin  push(:var, ts, te)  end
 		end
 when 105 then
-# line 462 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 125 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin  push(:const, ts, te)  end
 		end
 when 106 then
-# line 463 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 126 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin  push(:symbol, ts, te)  end
 		end
 when 107 then
-# line 464 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 127 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin  push(:space, ts, te)  end
 		end
 when 108 then
-# line 467 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 130 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
 te = p
 p = p - 1; begin  push(:any, ts, te)  end
 		end
 when 109 then
-# line 408 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 71 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2365,14 +2366,14 @@ when 109 then
      end
 		end
 when 110 then
-# line 415 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 78 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
       push(:newline, ts, te)
       increment_lineno
       	begin
-		cs = 242
+		cs = 308
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2381,13 +2382,13 @@ when 110 then
      end
 		end
 when 111 then
-# line 463 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 126 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin  push(:symbol, ts, te)  end
 		end
 when 112 then
-# line 467 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
+# line 130 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin  push(:any, ts, te)  end
@@ -2402,7 +2403,7 @@ when 113 then
       push(:kw_do, ts, te)
       increment_counter(:do_end)
       	begin
-		cs = 242
+		cs = 308
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2420,7 +2421,7 @@ when 113 then
 
       push(:newline_alias, ts, te)
       	begin
-		cs = 242
+		cs = 308
 		_trigger_goto = true
 		_goto_level = _again
 		break
@@ -2432,7 +2433,7 @@ when 113 then
  push(:var, ts, te) end
 end 
 			end
-# line 2 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rb"
+# line 2 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rb"
 			end # action switch
 		end
 	end
@@ -2441,13 +2442,13 @@ end
 	end
 	end
 	if _goto_level <= _again
-	_acts = _proc_scanner_to_state_actions[cs]
-	_nacts = _proc_scanner_actions[_acts]
+	_acts = _scanner_to_state_actions[cs]
+	_nacts = _scanner_actions[_acts]
 	_acts += 1
 	while _nacts > 0
 		_nacts -= 1
 		_acts += 1
-		case _proc_scanner_actions[_acts - 1]
+		case _scanner_actions[_acts - 1]
 when 0 then
 # line 1 "NONE"
 		begin
@@ -2457,7 +2458,7 @@ when 1 then
 		begin
 act = 0
 		end
-# line 2 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rb"
+# line 2 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
@@ -2475,8 +2476,8 @@ act = 0
 	end
 	if _goto_level <= _test_eof
 	if p == eof
-	if _proc_scanner_eof_trans[cs] > 0
-		_trans = _proc_scanner_eof_trans[cs] - 1;
+	if _scanner_eof_trans[cs] > 0
+		_trans = _scanner_eof_trans[cs] - 1;
 		_goto_level = _eof_trans
 		next;
 	end
@@ -2488,9 +2489,10 @@ end
 	end
 	end
 
-# line 481 "/home/ty.archlinux/dev/ty/sourcify/spec/../lib/sourcify/proc/scanner.rl"
-      end
+# line 144 "/home/ty.archlinux/dev/ty/sourcify/lib/sourcify/proc/parser/raw_scanner.rl"
+        end
 
+      end
     end
   end
 end