puppet 0.24.9 → 0.25.0

data/lib/puppet/parser/interpreter.rb

@@ -26,17 +26,17 @@ class Puppet::Parser::Interpreter
     def compile(node)
         raise Puppet::ParseError, "Could not parse configuration; cannot compile on node %s" % node.name unless env_parser = parser(node.environment)
         begin
-          return Puppet::Parser::Compiler.new(node, env_parser).compile
+            return Puppet::Parser::Compiler.new(node, env_parser).compile.to_resource
         rescue => detail
-          puts detail.backtrace if Puppet[:trace]
-          raise Puppet::Error, detail.to_s + " on node %s" % node.name
+            puts detail.backtrace if Puppet[:trace]
+            raise Puppet::Error, detail.to_s + " on node %s" % node.name
         end
     end
 
     # create our interpreter
     def initialize
         # The class won't always be defined during testing.
-        if Puppet[:storeconfigs] 
+        if Puppet[:storeconfigs]
             if Puppet.features.rails?
                 Puppet::Rails.init
             else

data/lib/puppet/parser/lexer.rb

@@ -134,6 +134,8 @@ class Puppet::Parser::Lexer
         '*' => :TIMES,
         '<<' => :LSHIFT,
         '>>' => :RSHIFT,
+        '=~' => :MATCH,
+        '!~' => :NOMATCH,
         %r{([a-z][-\w]*)?(::[a-z][-\w]*)+} => :CLASSNAME, # Require '::' in the class name, else we'd compete with NAME
         %r{((::){0,1}[A-Z][-\w]*)+} => :CLASSREF
     )
@@ -169,6 +171,16 @@ class Puppet::Parser::Lexer
         [self,value]
     end
 
+    TOKENS.add_token :REGEX, %r{/[^/]*/} do |lexer, value|
+        # Make sure we haven't matched an escaped /
+        while value[-2..-2] == '\\'
+            other = lexer.scan_until(%r{/})
+            value += other
+        end
+        regex = value.sub(%r{\A/}, "").sub(%r{/\Z}, '').gsub("\\/", "/")
+        [self, Regexp.new(regex)]
+    end
+
     TOKENS.add_token :RETURN, "\n", :skip => true, :incr_line => true, :skip_text => true
 
     TOKENS.add_token :SQUOTE, "'" do |lexer, value|
@@ -281,11 +293,11 @@ class Puppet::Parser::Lexer
         # I tried optimizing based on the first char, but it had
         # a slightly negative affect and was a good bit more complicated.
         TOKENS.regex_tokens.each do |token|
-            next unless match_length = @scanner.match?(token.regex) 
-            
+            next unless match_length = @scanner.match?(token.regex)
+
             # We've found a longer match
             if match_length > length
-                value = @scanner.scan(token.regex) 
+                value = @scanner.scan(token.regex)
                 length = value.length
                 matched_token = token
             end
@@ -332,7 +344,7 @@ class Puppet::Parser::Lexer
         @namestack = []
         @indefine = false
         @expected = []
-        @commentstack = ['']
+        @commentstack = [ ['', @line] ]
     end
 
     # Make any necessary changes to the token and/or value.
@@ -348,12 +360,14 @@ class Puppet::Parser::Lexer
         return unless token
 
         if token.accumulate?
-            @commentstack.last << value + "\n"
+            comment = @commentstack.pop
+            comment[0] << value + "\n"
+            @commentstack.push(comment)
         end
 
         return if token.skip
 
-        return token, value
+        return token, { :value => value, :line => @line }
     end
 
     # Go up one in the namespace.
@@ -415,9 +429,14 @@ class Puppet::Parser::Lexer
                 @last_return = false
             end
 
-            final_token, value = munge_token(matched_token, value)
+            final_token, token_value = munge_token(matched_token, value)
 
-            next unless final_token
+            unless final_token
+                skip()
+                next
+            end
+
+            value = token_value[:value]
 
             if match = @@pairs[value] and final_token.name != :DQUOTE and final_token.name != :SQUOTE
                 @expected << match
@@ -429,7 +448,7 @@ class Puppet::Parser::Lexer
                 commentpush
             end
 
-            yield [final_token.name, value]
+            yield [final_token.name, token_value]
 
             if @previous_token
                 namestack(value) if @previous_token.name == :CLASS
@@ -458,6 +477,12 @@ class Puppet::Parser::Lexer
         @scanner.skip(@skip)
     end
 
+    # Provide some limited access to the scanner, for those
+    # tokens that need it.
+    def scan_until(regex)
+        @scanner.scan_until(regex)
+    end
+
     # we've encountered an opening quote...
     # slurp in the rest of the string and return it
     def slurpstring(quote)
@@ -485,16 +510,20 @@ class Puppet::Parser::Lexer
 
     # returns the content of the currently accumulated content cache
     def commentpop
-        return @commentstack.pop
+        return @commentstack.pop[0]
     end
 
-    def getcomment
-        comment = @commentstack.pop
-        @commentstack.push('')
-        return comment
+    def getcomment(line = nil)
+        comment = @commentstack.last
+        if line.nil? or comment[1] <= line
+            @commentstack.pop
+            @commentstack.push(['', @line])
+            return comment[0]
+        end
+        return ''
     end
 
     def commentpush
-        @commentstack.push('')
+        @commentstack.push(['', @line])
     end
 end

data/lib/puppet/parser/loaded_code.rb

@@ -0,0 +1,115 @@
+class Puppet::Parser::LoadedCode
+    def initialize
+        @hostclasses = {}
+        @definitions = {}
+        @nodes = {}
+
+        # So we can keep a list and match the first-defined regex
+        @node_list = []
+    end
+
+    def add_hostclass(name, code)
+        @hostclasses[munge_name(name)] = code
+    end
+
+    def hostclass(name)
+        @hostclasses[munge_name(name)]
+    end
+
+    def add_node(name, code)
+        name = check_name(name)
+        @node_list << name unless @node_list.include?(name)
+        @nodes[name] = code
+    end
+
+    def node(name)
+        name = check_name(name)
+
+        if node = @nodes[name]
+            return node
+        end
+
+        @node_list.each do |nodename|
+            n = @nodes[nodename]
+            return n if nodename.regex? and nodename.match(name)
+        end
+        nil
+    end
+
+    def nodes?
+        @nodes.length > 0
+    end
+
+    def add_definition(name, code)
+        @definitions[munge_name(name)] = code
+    end
+
+    def definition(name)
+        @definitions[munge_name(name)]
+    end
+
+    def find(namespace, name, type)
+        if r = find_fully_qualified(name, type)
+            return r
+        end
+
+        ary = namespace.split("::")
+
+        while ary.length > 0
+            tmp_namespace = ary.join("::")
+            if r = find_partially_qualified(tmp_namespace, name, type)
+                return r
+            end
+
+            # Delete the second to last object, which reduces our namespace by one.
+            ary.pop
+        end
+
+        send(type, name)
+    end
+
+    def find_node(name)
+        find("", name, :node)
+    end
+
+    def find_hostclass(namespace, name)
+        find(namespace, name, :hostclass)
+    end
+
+    def find_definition(namespace, name)
+        find(namespace, name, :definition)
+    end
+
+    [:hostclasses, :nodes, :definitions].each do |m|
+        define_method(m) do
+            instance_variable_get("@#{m}").dup
+        end
+    end
+
+    private
+
+    def find_fully_qualified(name, type)
+        return nil unless name =~ /^::/
+
+        name = name.sub(/^::/, '')
+
+        send(type, name)
+    end
+
+    def find_partially_qualified(namespace, name, type)
+        send(type, [namespace, name].join("::"))
+    end
+
+    def munge_name(name)
+        name.to_s.downcase
+    end
+
+    # Check that the given (node) name is an HostName instance
+    # We're doing this so that hashing of node in the @nodes hash
+    # is consistent (see AST::HostName#hash and AST::HostName#eql?)
+    # and that the @nodes hash still keep its O(1) get/put properties.
+    def check_name(name)
+        name = Puppet::Parser::AST::HostName.new(:value => name) unless name.is_a?(Puppet::Parser::AST::HostName)
+        name
+    end
+end

data/lib/puppet/parser/makefile

@@ -0,0 +1,8 @@
+#parser.rb: grammar.ry
+#	ryacc --output parser grammar
+
+parser.rb: grammar.ra
+	racc -o$@ grammar.ra
+
+grammar.output: grammar.ra
+	racc -v -o$@ grammar.ra

data/lib/puppet/parser/parser.rb

@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id987bcfd032', 'grammar.ra', 759
+module_eval <<'..end grammar.ra modeval..ide7bdbd4a34', 'grammar.ra', 802
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -41,690 +41,729 @@ require 'puppet/parser/parser_support'
 
 # $Id$
 
-..end grammar.ra modeval..id987bcfd032
+..end grammar.ra modeval..ide7bdbd4a34
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 60, :_reduce_1,
- 1, 60, :_reduce_none,
- 1, 61, :_reduce_none,
- 2, 61, :_reduce_4,
+ 1, 63, :_reduce_1,
  1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 4, 71, :_reduce_18,
- 5, 71, :_reduce_19,
- 3, 71, :_reduce_20,
- 2, 71, :_reduce_21,
- 1, 77, :_reduce_none,
- 1, 77, :_reduce_none,
- 3, 77, :_reduce_24,
- 3, 77, :_reduce_25,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_33,
- 5, 64, :_reduce_34,
- 5, 64, :_reduce_35,
- 5, 64, :_reduce_36,
- 5, 75, :_reduce_37,
- 2, 65, :_reduce_38,
- 1, 94, :_reduce_39,
- 2, 94, :_reduce_40,
- 2, 66, :_reduce_41,
- 3, 95, :_reduce_42,
- 3, 95, :_reduce_43,
- 1, 96, :_reduce_none,
- 1, 96, :_reduce_none,
- 3, 96, :_reduce_46,
- 1, 97, :_reduce_none,
- 3, 97, :_reduce_48,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 3, 99, :_reduce_51,
- 3, 99, :_reduce_52,
- 1, 100, :_reduce_none,
+ 1, 64, :_reduce_none,
+ 2, 64, :_reduce_4,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 1, 66, :_reduce_none,
+ 4, 74, :_reduce_18,
+ 5, 74, :_reduce_19,
+ 3, 74, :_reduce_20,
+ 2, 74, :_reduce_21,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 3, 80, :_reduce_24,
+ 3, 80, :_reduce_25,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_33,
+ 5, 67, :_reduce_34,
+ 5, 67, :_reduce_35,
+ 5, 67, :_reduce_36,
+ 5, 78, :_reduce_37,
+ 2, 68, :_reduce_38,
+ 1, 97, :_reduce_39,
+ 2, 97, :_reduce_40,
+ 6, 69, :_reduce_41,
+ 2, 69, :_reduce_42,
+ 3, 98, :_reduce_43,
+ 3, 98, :_reduce_44,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 3, 99, :_reduce_47,
  1, 100, :_reduce_none,
- 4, 102, :_reduce_55,
- 1, 88, :_reduce_none,
- 3, 88, :_reduce_57,
- 0, 89, :_reduce_none,
- 1, 89, :_reduce_none,
- 1, 104, :_reduce_60,
- 1, 80, :_reduce_61,
- 1, 82, :_reduce_62,
- 1, 103, :_reduce_none,
- 1, 103, :_reduce_none,
+ 3, 100, :_reduce_49,
+ 1, 101, :_reduce_50,
+ 1, 101, :_reduce_51,
+ 3, 102, :_reduce_52,
+ 3, 102, :_reduce_53,
  1, 103, :_reduce_none,
  1, 103, :_reduce_none,
- 1, 103, :_reduce_none,
- 1, 103, :_reduce_none,
- 3, 67, :_reduce_69,
- 3, 76, :_reduce_70,
- 0, 90, :_reduce_71,
- 1, 90, :_reduce_72,
- 3, 90, :_reduce_73,
- 3, 107, :_reduce_74,
- 3, 109, :_reduce_75,
- 1, 110, :_reduce_none,
- 1, 110, :_reduce_none,
- 0, 93, :_reduce_78,
- 1, 93, :_reduce_79,
- 3, 93, :_reduce_80,
- 1, 111, :_reduce_none,
- 3, 111, :_reduce_82,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
- 4, 84, :_reduce_99,
- 3, 84, :_reduce_100,
- 1, 86, :_reduce_101,
- 1, 86, :_reduce_102,
- 1, 83, :_reduce_103,
- 4, 79, :_reduce_104,
- 4, 79, :_reduce_105,
- 6, 69, :_reduce_106,
- 5, 69, :_reduce_107,
- 0, 113, :_reduce_none,
- 4, 113, :_reduce_109,
- 3, 113, :_reduce_110,
+ 4, 105, :_reduce_56,
+ 1, 91, :_reduce_none,
+ 3, 91, :_reduce_58,
+ 0, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 107, :_reduce_61,
+ 1, 83, :_reduce_62,
+ 1, 85, :_reduce_63,
+ 1, 106, :_reduce_none,
  1, 106, :_reduce_none,
- 3, 106, :_reduce_112,
- 3, 106, :_reduce_113,
- 3, 106, :_reduce_114,
- 3, 106, :_reduce_115,
- 3, 106, :_reduce_116,
- 3, 106, :_reduce_117,
- 2, 106, :_reduce_118,
- 3, 106, :_reduce_119,
- 3, 106, :_reduce_120,
- 3, 106, :_reduce_121,
- 3, 106, :_reduce_122,
- 3, 106, :_reduce_123,
- 3, 106, :_reduce_124,
- 2, 106, :_reduce_125,
- 3, 106, :_reduce_126,
- 3, 106, :_reduce_127,
- 3, 106, :_reduce_128,
- 5, 68, :_reduce_129,
+ 1, 106, :_reduce_none,
+ 1, 106, :_reduce_none,
+ 1, 106, :_reduce_none,
+ 1, 106, :_reduce_none,
+ 3, 70, :_reduce_70,
+ 3, 79, :_reduce_71,
+ 0, 93, :_reduce_72,
+ 1, 93, :_reduce_73,
+ 3, 93, :_reduce_74,
+ 3, 110, :_reduce_75,
+ 3, 112, :_reduce_76,
+ 1, 113, :_reduce_none,
+ 1, 113, :_reduce_none,
+ 0, 96, :_reduce_79,
+ 1, 96, :_reduce_80,
+ 3, 96, :_reduce_81,
  1, 114, :_reduce_none,
- 2, 114, :_reduce_131,
- 5, 115, :_reduce_132,
- 4, 115, :_reduce_133,
- 1, 116, :_reduce_none,
- 3, 116, :_reduce_135,
- 3, 85, :_reduce_136,
+ 3, 114, :_reduce_83,
+ 1, 104, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 1, 111, :_reduce_none,
+ 4, 87, :_reduce_100,
+ 3, 87, :_reduce_101,
+ 1, 89, :_reduce_102,
+ 1, 89, :_reduce_103,
+ 1, 86, :_reduce_104,
+ 4, 82, :_reduce_105,
+ 4, 82, :_reduce_106,
+ 6, 72, :_reduce_107,
+ 5, 72, :_reduce_108,
+ 0, 116, :_reduce_none,
+ 4, 116, :_reduce_110,
+ 3, 116, :_reduce_111,
+ 1, 109, :_reduce_none,
+ 3, 109, :_reduce_113,
+ 3, 109, :_reduce_114,
+ 3, 109, :_reduce_115,
+ 3, 109, :_reduce_116,
+ 3, 109, :_reduce_117,
+ 3, 109, :_reduce_118,
+ 3, 109, :_reduce_119,
+ 3, 109, :_reduce_120,
+ 2, 109, :_reduce_121,
+ 3, 109, :_reduce_122,
+ 3, 109, :_reduce_123,
+ 3, 109, :_reduce_124,
+ 3, 109, :_reduce_125,
+ 3, 109, :_reduce_126,
+ 3, 109, :_reduce_127,
+ 2, 109, :_reduce_128,
+ 3, 109, :_reduce_129,
+ 3, 109, :_reduce_130,
+ 3, 109, :_reduce_131,
+ 5, 71, :_reduce_132,
  1, 118, :_reduce_none,
- 4, 118, :_reduce_138,
+ 2, 118, :_reduce_134,
+ 5, 119, :_reduce_135,
+ 4, 119, :_reduce_136,
  1, 120, :_reduce_none,
- 3, 120, :_reduce_140,
- 3, 119, :_reduce_141,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_none,
- 1, 117, :_reduce_149,
- 1, 121, :_reduce_150,
- 3, 121, :_reduce_151,
- 2, 70, :_reduce_152,
- 6, 72, :_reduce_153,
- 5, 72, :_reduce_154,
- 6, 73, :_reduce_155,
- 5, 73, :_reduce_156,
- 6, 74, :_reduce_157,
- 5, 74, :_reduce_158,
- 1, 92, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 124, :_reduce_none,
- 3, 124, :_reduce_163,
- 1, 126, :_reduce_none,
- 1, 126, :_reduce_none,
- 1, 126, :_reduce_none,
- 1, 126, :_reduce_none,
- 0, 62, :_reduce_168,
- 0, 127, :_reduce_169,
+ 3, 120, :_reduce_138,
+ 3, 88, :_reduce_139,
  1, 122, :_reduce_none,
- 3, 122, :_reduce_171,
- 3, 122, :_reduce_172,
+ 4, 122, :_reduce_141,
+ 1, 124, :_reduce_none,
+ 3, 124, :_reduce_143,
+ 3, 123, :_reduce_144,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_152,
+ 1, 121, :_reduce_none,
+ 1, 125, :_reduce_154,
+ 3, 125, :_reduce_155,
+ 2, 73, :_reduce_156,
+ 6, 75, :_reduce_157,
+ 5, 75, :_reduce_158,
+ 6, 76, :_reduce_159,
+ 5, 76, :_reduce_160,
+ 6, 77, :_reduce_161,
+ 5, 77, :_reduce_162,
+ 1, 95, :_reduce_163,
+ 1, 90, :_reduce_164,
+ 1, 90, :_reduce_165,
  1, 128, :_reduce_none,
- 3, 128, :_reduce_174,
- 3, 129, :_reduce_175,
- 1, 129, :_reduce_176,
- 3, 129, :_reduce_177,
- 1, 129, :_reduce_178,
- 1, 125, :_reduce_none,
- 2, 125, :_reduce_180,
- 1, 123, :_reduce_none,
- 2, 123, :_reduce_182,
- 1, 130, :_reduce_none,
- 1, 130, :_reduce_none,
- 1, 81, :_reduce_185,
- 3, 105, :_reduce_186,
- 4, 105, :_reduce_187,
- 2, 105, :_reduce_188,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 0, 91, :_reduce_none,
- 1, 91, :_reduce_192 ]
-
-racc_reduce_n = 193
-
-racc_shift_n = 317
+ 3, 128, :_reduce_167,
+ 1, 130, :_reduce_168,
+ 1, 131, :_reduce_169,
+ 1, 131, :_reduce_170,
+ 1, 131, :_reduce_171,
+ 1, 131, :_reduce_172,
+ 1, 131, :_reduce_none,
+ 0, 65, :_reduce_174,
+ 0, 132, :_reduce_175,
+ 1, 126, :_reduce_none,
+ 3, 126, :_reduce_177,
+ 3, 126, :_reduce_178,
+ 1, 133, :_reduce_none,
+ 3, 133, :_reduce_180,
+ 3, 134, :_reduce_181,
+ 1, 134, :_reduce_182,
+ 3, 134, :_reduce_183,
+ 1, 134, :_reduce_184,
+ 1, 129, :_reduce_none,
+ 2, 129, :_reduce_186,
+ 1, 127, :_reduce_none,
+ 2, 127, :_reduce_188,
+ 1, 135, :_reduce_none,
+ 1, 135, :_reduce_none,
+ 1, 84, :_reduce_191,
+ 3, 108, :_reduce_192,
+ 4, 108, :_reduce_193,
+ 2, 108, :_reduce_194,
+ 1, 115, :_reduce_none,
+ 1, 115, :_reduce_none,
+ 0, 94, :_reduce_none,
+ 1, 94, :_reduce_198,
+ 1, 117, :_reduce_199 ]
+
+racc_reduce_n = 200
+
+racc_shift_n = 329
 
 racc_action_table = [
-    75,    57,    61,   260,   179,    38,    40,    35,    44,   196,
-    54,   287,    45,   239,     3,     6,   187,   298,   240,  -145,
-    74,    75,    57,    61,   286,    47,    38,    40,   194,   195,
-   132,    49,    38,    40,   112,    60,    64,   194,   195,    70,
-    41,    74,   149,    43,    55,    77,   178,   118,    66,    48,
-   141,    87,    49,    75,    57,    61,    60,    64,    49,   109,
-    70,    41,   253,   123,    43,    55,    77,    41,   105,    66,
-    43,  -146,    87,    74,    75,    57,    61,   202,   151,   152,
-   153,   139,   140,   142,    49,   282,   128,   133,    60,    64,
-   201,   239,    70,   281,    74,   149,   240,    55,    77,   271,
-   118,    66,   179,   141,    87,    49,    75,    57,    61,    60,
-    64,    49,   193,    70,    35,   132,   123,   174,    55,    77,
-   192,     3,    66,    35,   258,    87,    74,    75,    57,    61,
-     3,   151,   152,   153,   139,   140,   142,    49,   116,    35,
-   155,    60,    64,   153,   139,    70,     3,    74,   149,  -147,
-    55,    77,  -143,   118,    66,   156,   141,    87,    49,    75,
-    57,    61,    60,    64,    49,   157,    70,   153,   139,   123,
-   134,    55,    77,    57,    61,    66,    33,    34,    87,    74,
-    75,    57,    61,   132,   151,   152,   153,   139,   140,   142,
-    49,  -145,   203,   274,    60,    64,   187,   188,    70,   275,
-    74,   149,  -142,    55,    77,  -144,   118,    66,    45,   141,
-    87,    49,    75,    57,    61,    60,    64,    49,    44,    70,
-    57,    61,   123,  -142,    55,    77,  -159,   128,    66,   177,
-   181,    87,    74,    75,    57,    61,  -143,   151,   152,   153,
-   139,   140,   142,    49,   116,   198,   278,    60,    64,   194,
-   195,    70,   248,    74,   186,  -145,    55,    77,   187,   188,
-    66,   216,   183,    87,    49,   187,   217,  -142,    60,    64,
-   150,   283,    70,   151,   152,   153,   139,    55,    77,   145,
-   149,    66,   284,   285,    87,   190,   105,   290,   141,   143,
-   146,   148,   101,   190,    75,    57,    61,   151,   152,   153,
-   139,   140,   142,   151,   152,   153,   139,   140,   142,   116,
-    98,    97,   144,   147,    74,  -142,   151,   152,   153,   139,
-   140,   142,  -144,  -143,  -147,    49,    75,    57,    61,    60,
-    64,  -144,   246,    70,   151,   152,   153,   139,    55,    77,
-   244,   278,    66,   301,   302,    87,    74,    75,    57,    61,
-  -144,   179,  -145,  -148,    73,   190,  -143,    49,   310,  -192,
-    37,    60,    64,  -147,  -146,    70,   292,    74,   nil,   nil,
-    55,    77,   nil,   nil,    66,   nil,   nil,    87,    49,    75,
-    57,    61,    60,    64,   nil,   nil,    70,   nil,   nil,   nil,
-   nil,    55,    77,   nil,   nil,    66,   nil,   nil,    87,    74,
-    75,    57,    61,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    49,   nil,   nil,   nil,    60,    64,   nil,   nil,    70,   nil,
-    74,   nil,   nil,    55,    77,   nil,   nil,    66,   nil,   nil,
-    87,    49,    75,    57,    61,    60,    64,   nil,   nil,    70,
-   nil,   nil,   nil,   nil,    55,    77,   nil,   nil,    66,   nil,
-   nil,    87,    74,    75,    57,    61,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    49,   nil,   nil,   nil,    60,    64,   nil,
-   nil,    70,   nil,    74,   nil,   nil,    55,    77,   nil,   nil,
-    66,   nil,   nil,    87,    49,    75,    57,    61,    60,    64,
-   nil,   nil,    70,   nil,   nil,   nil,   nil,    55,    77,   nil,
-   nil,    66,   nil,   nil,    87,    74,    75,    57,    61,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    49,    75,    57,    61,
-    60,    64,   nil,   nil,    70,   nil,    74,   nil,   nil,    55,
-    77,   nil,   nil,    66,   nil,   nil,    87,    49,    75,    57,
-    61,    60,    64,   nil,   nil,    70,   nil,   nil,    49,   nil,
-    55,    77,    60,    64,    66,   nil,    70,    87,    74,   nil,
-   nil,    55,   nil,   nil,   nil,    66,   nil,   nil,   nil,    49,
-    54,    57,    61,    60,    64,   nil,   nil,    70,   nil,   nil,
-   nil,   nil,    55,    77,   nil,   nil,    66,   nil,   nil,    87,
-    51,    75,    57,    61,   nil,   nil,   nil,    75,    57,    61,
-   nil,    49,   nil,   nil,   nil,    60,    64,   nil,   nil,    70,
-   nil,   nil,   nil,    52,    55,    75,    57,    61,    66,   nil,
-   nil,   nil,    49,   nil,   nil,   nil,    60,   168,    49,   nil,
-    70,   nil,    60,   209,   nil,   161,    70,   nil,   nil,    66,
-   nil,   161,   nil,   nil,   nil,    66,    49,   nil,   nil,   nil,
-    60,    64,   nil,   nil,    70,    75,    57,    61,   137,    55,
-   nil,   nil,   nil,    66,   nil,    75,    57,    61,   nil,   nil,
-   nil,    75,    57,    61,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    75,    57,    61,   nil,   nil,    49,    75,    57,    61,
-    60,    64,   nil,   nil,    70,   nil,    49,   nil,   nil,    55,
-    60,    64,    49,    66,    70,   nil,    60,    64,   nil,    55,
-    70,   nil,    49,    66,   nil,    55,    60,    64,    49,    66,
-    70,   nil,    60,    64,   nil,    55,    70,   nil,   nil,    66,
-   nil,    55,    75,    57,    61,    66,   nil,   nil,    75,    57,
-    61,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    75,    57,
-    61,   nil,   nil,   nil,   nil,    57,    61,   nil,   nil,   nil,
-   nil,   nil,   nil,    49,   nil,    57,    61,    60,    64,    49,
-   nil,    70,   nil,    60,    64,   nil,    55,    70,   nil,    49,
-    66,   nil,    55,    60,    64,    49,    66,    70,   nil,    60,
-   209,   nil,    55,    70,   nil,    49,    66,   nil,   161,    60,
-   209,   nil,    66,    70,    57,    61,    57,    61,   161,   nil,
-   nil,   nil,    66,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    57,    61,    57,    61,   270,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    49,   nil,    49,   nil,    60,    64,
-    60,   209,    70,   nil,    70,   nil,    52,    55,   nil,   161,
-    49,    66,    49,    66,    60,   209,    60,    64,    70,   nil,
-    70,    57,    61,   161,    52,    55,   nil,    66,   nil,    66,
-   nil,    57,    61,   nil,   nil,   280,   nil,    57,    61,   nil,
-   nil,   130,   nil,   nil,   nil,   nil,   nil,    57,    61,   nil,
-   nil,    49,   nil,   nil,   nil,    60,    64,    57,    61,    70,
-   210,    49,   nil,    52,    55,    60,   209,    49,    66,    70,
-   nil,    60,   209,   nil,   161,    70,   nil,    49,    66,   nil,
-   161,    60,   209,   nil,    66,    70,   nil,    49,    57,    61,
-   161,    60,   209,   nil,    66,    70,   nil,   nil,   nil,   nil,
-   161,   nil,   nil,   nil,    66,   145,   149,   nil,   205,   nil,
-   nil,   nil,   nil,   nil,   141,   143,   146,   148,    49,   nil,
-   nil,   nil,    60,    64,   nil,   nil,    70,   nil,   nil,   nil,
-    52,    55,   nil,   nil,   nil,    66,   nil,   nil,   144,   147,
-   145,   149,   151,   152,   153,   139,   140,   142,   215,   141,
-   143,   146,   148,   145,   149,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   141,   143,   146,   148,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   144,   147,   145,   149,   151,   152,   153,
-   139,   140,   142,   nil,   141,   143,   146,   148,   145,   149,
-   151,   152,   153,   139,   140,   142,   nil,   141,   143,   146,
-   148,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   147,
-   289,   nil,   151,   152,   153,   139,   140,   142,   nil,   nil,
-   nil,   144,   147,   nil,   nil,   151,   152,   153,   139,   140,
-   142,    16,   294,    23,    26,   nil,     1,     4,   nil,     9,
-   nil,    13,   nil,    20,   nil,    27,   nil,   nil,     3,     6,
-   nil,   295,   nil,    16,   nil,    23,    26,   nil,     1,     4,
-   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,   nil,
-     3,     6,    16,   276,    23,    26,   nil,     1,     4,   nil,
-     9,   nil,    13,   nil,    20,   nil,    27,   nil,   nil,     3,
-     6,   nil,   307,   nil,    16,   nil,    23,    26,   nil,     1,
-     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,
-   nil,     3,     6,    16,   230,    23,    26,   nil,     1,     4,
-   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,   nil,
-     3,     6,   nil,   312,   nil,    16,   nil,    23,    26,   nil,
-     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,
-   nil,   nil,     3,     6,    16,   314,    23,    26,   nil,     1,
-     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,
-   nil,     3,     6,   nil,   256,   nil,    16,   nil,    23,    26,
-   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,
-    27,   nil,   nil,     3,     6,    16,   315,    23,    26,   nil,
-     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,
-   nil,   nil,     3,     6,   nil,   250,   nil,    16,   nil,    23,
-    26,   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,
-   nil,    27,   nil,   nil,     3,     6,    16,   316,    23,    26,
-   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,
-    27,   nil,   nil,     3,     6,   nil,   nil,   nil,    16,   nil,
-    23,    26,   nil,     1,     4,   nil,     9,   nil,    13,   nil,
-    20,   nil,    27,   nil,   nil,     3,     6,    16,   nil,    23,
-    26,   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,
-   nil,    27,   nil,   nil,     3,     6,    16,   nil,    23,    26,
-   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,
-    27,   nil,   nil,     3,     6 ]
+    77,    56,    59,    56,    59,    54,   285,   187,   165,   126,
+   158,   159,   160,   144,   284,    56,    59,   152,   156,    48,
+    73,    77,    56,    59,   170,   138,    90,    77,    56,    59,
+    91,    48,   249,    48,   123,    58,    61,    58,   201,    68,
+   248,    68,   312,    92,    55,    78,   111,    73,    63,   194,
+    63,    84,    48,    77,    56,    59,    58,    61,    48,    41,
+    68,    41,    58,    61,   187,    55,    68,    93,   261,    63,
+   247,    55,    78,    38,    39,    63,  -146,   138,    84,  -151,
+    41,   287,    38,    39,    48,   253,    41,   301,    58,   201,
+   257,   264,    68,    77,    56,    59,   137,   111,   245,   246,
+   300,    63,   165,    77,    56,    59,   245,   246,    40,   277,
+   253,    44,    41,    48,    36,   257,   163,    40,   170,   165,
+    44,     4,     8,    73,    48,    54,    56,    59,    58,    61,
+    48,    41,    68,   165,    48,   170,    36,    55,    58,    61,
+    41,    63,    68,     4,    48,    51,    36,    55,    78,   170,
+   207,    63,    41,     4,    84,   163,    48,    77,    56,    59,
+    58,    61,    41,   206,    68,    38,    39,    36,    52,    55,
+   183,   208,  -148,    63,     4,   210,   211,    73,    77,    56,
+    59,   160,   144,  -145,    41,   270,   152,   156,    48,   160,
+   144,   130,    58,    61,   152,   156,    68,    77,    56,    59,
+    40,    55,    78,    44,   272,    63,   250,   138,    84,    48,
+   245,   246,  -147,    58,    61,  -149,    41,    68,    77,    56,
+    59,  -150,    55,    41,   161,   217,    63,   278,    48,   210,
+   218,   258,    58,    61,   163,   241,    68,    41,    73,   210,
+   211,    55,    33,    34,    41,    63,    56,    59,   175,    48,
+    77,    56,    59,    58,    61,  -146,    41,    68,   210,   311,
+   152,   156,    55,    78,   152,   156,    63,  -148,    90,    84,
+  -145,    77,    56,    59,   176,   137,   177,    41,   280,  -163,
+    41,    48,   178,  -149,  -147,    58,    61,    91,   286,    68,
+   184,  -147,   132,   130,    55,   196,   298,   299,    63,   186,
+   302,   189,    48,    77,    56,    59,    58,    61,   105,    41,
+    68,   189,  -145,  -148,   189,    55,  -150,   280,   314,    63,
+    99,  -147,  -145,    73,    77,    56,    59,  -148,  -146,  -150,
+    41,   316,   190,  -146,    48,    97,   130,    47,    58,    61,
+   322,  -198,    68,    37,   196,   187,   192,    55,    78,   nil,
+   nil,    63,   nil,   nil,    84,    48,    77,    56,    59,    58,
+    61,   nil,    41,    68,   nil,   nil,   nil,   nil,    55,   nil,
+   nil,   nil,    63,   nil,   nil,   nil,    73,    77,    56,    59,
+   nil,   nil,   nil,    41,   nil,   nil,   nil,    48,   nil,   nil,
+   nil,    58,    61,   nil,   nil,    68,   nil,    73,   nil,   nil,
+    55,    78,   nil,   nil,    63,   nil,   nil,    84,    48,    77,
+    56,    59,    58,    61,   nil,    41,    68,   nil,   nil,   nil,
+   nil,    55,    78,   nil,   nil,    63,   nil,   nil,    84,    73,
+    77,    56,    59,   nil,   nil,   nil,    41,   nil,   nil,   nil,
+    48,   nil,   nil,   nil,    58,    61,   nil,   nil,    68,   nil,
+    73,   nil,   nil,    55,    78,   nil,   nil,    63,   nil,   nil,
+    84,    48,    77,    56,    59,    58,    61,   nil,    41,    68,
+   nil,   nil,   nil,   nil,    55,    78,   nil,   nil,    63,   nil,
+   nil,    84,   nil,    77,    56,    59,   nil,   nil,   nil,    41,
+   nil,   nil,   nil,    48,   nil,   nil,   nil,    58,   113,   nil,
+   nil,    68,   nil,    73,   nil,   nil,   111,   nil,   nil,   nil,
+    63,   nil,   155,   nil,    48,   nil,   nil,   nil,    58,    61,
+   146,    41,    68,    77,    56,    59,   141,    55,    78,   nil,
+   nil,    63,   nil,   nil,    84,   nil,   nil,    77,    56,    59,
+   nil,   nil,    41,   nil,    77,    56,    59,   nil,   158,   159,
+   160,   144,   145,   147,    48,   152,   156,   nil,    58,    61,
+   nil,   nil,    68,   nil,    73,   nil,   nil,    55,    48,   155,
+   nil,    63,    58,    61,   nil,    48,    68,   146,   nil,    58,
+    61,    55,    41,    68,   nil,    63,   nil,   nil,    55,    78,
+   nil,   nil,    63,   nil,   nil,    84,    41,    77,    56,    59,
+    56,    59,   nil,    41,   nil,   158,   159,   160,   144,   145,
+   147,   nil,   152,   156,   nil,   nil,   nil,    73,    77,    56,
+    59,   nil,   nil,   nil,    77,    56,    59,   nil,    48,   nil,
+    48,   nil,    58,    61,    58,   201,    68,   nil,    68,   nil,
+   nil,    55,    78,   111,    73,    63,   nil,    63,    84,    48,
+    77,    56,    59,    58,    61,    48,    41,    68,    41,    58,
+    61,   nil,    55,    68,   nil,   nil,    63,   nil,    55,    78,
+    73,   nil,    63,   nil,   nil,    84,   nil,    41,   nil,   155,
+   nil,    48,   nil,    41,   nil,    58,    61,   146,   nil,    68,
+    77,    56,    59,   nil,    55,    78,   nil,   nil,    63,   nil,
+   nil,    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    41,
+    73,    77,    56,    59,   nil,   158,   159,   160,   144,   145,
+   147,    48,   152,   156,   nil,    58,    61,   nil,   nil,    68,
+   nil,    73,   nil,   nil,    55,    78,   nil,   nil,    63,   nil,
+   nil,    84,    48,    77,    56,    59,    58,    61,   nil,    41,
+    68,   nil,   nil,   nil,   nil,    55,    78,   nil,   nil,    63,
+   nil,   nil,    84,    73,    77,    56,    59,   nil,   nil,   nil,
+    41,   nil,   nil,   nil,    48,   nil,   nil,   nil,    58,    61,
+   nil,   nil,    68,   nil,    73,   nil,   nil,    55,    78,   nil,
+   nil,    63,   nil,   nil,    84,    48,    77,    56,    59,    58,
+    61,   nil,    41,    68,   nil,   nil,   nil,   nil,    55,    78,
+   nil,   nil,    63,   nil,   nil,    84,    73,   nil,    56,    59,
+   nil,   nil,   nil,    41,    56,    59,   nil,    48,   nil,   nil,
+   nil,    58,    61,   nil,   nil,    68,   nil,   nil,   133,   nil,
+    55,    78,   nil,   nil,    63,   nil,   nil,    84,    48,    56,
+    59,   nil,    58,    61,    48,    41,    68,   nil,    58,   201,
+    52,    55,    68,    56,    59,    63,   nil,   111,   nil,   275,
+   nil,    63,   nil,   nil,   nil,   nil,    41,   nil,   nil,    48,
+   nil,   nil,    41,    58,    61,    56,    59,    68,   nil,   nil,
+   nil,    52,    55,    48,   nil,   nil,    63,    58,   201,    56,
+    59,    68,   nil,   nil,   nil,   214,   111,    41,   nil,   nil,
+    63,   nil,   nil,   nil,   nil,    48,   nil,    56,    59,    58,
+    61,    41,   nil,    68,   nil,   nil,   nil,    52,    55,    48,
+   nil,   nil,    63,    58,   201,    56,    59,    68,   203,   nil,
+   nil,   nil,   111,    41,   nil,   nil,    63,    48,   nil,    56,
+    59,    58,    61,   nil,   nil,    68,   nil,    41,   nil,    52,
+    55,   nil,   nil,   nil,    63,    48,   nil,    56,    59,    58,
+   201,   282,   nil,    68,   nil,    41,   nil,   nil,   111,    48,
+   nil,   nil,    63,    58,   201,   nil,   nil,    68,   nil,   nil,
+   nil,   nil,   111,    41,   nil,   nil,    63,    48,   nil,   157,
+   nil,    58,   201,   nil,   nil,    68,   nil,    41,   150,   155,
+   111,   nil,   nil,   nil,    63,   nil,   nil,   146,   148,   151,
+   154,   150,   155,   nil,   nil,    41,   nil,   nil,   nil,   nil,
+   146,   148,   151,   154,   nil,   nil,   158,   159,   160,   144,
+   nil,   149,   153,   152,   156,   158,   159,   160,   144,   145,
+   147,   nil,   152,   156,   nil,   nil,   nil,   nil,   158,   159,
+   160,   144,   145,   147,   nil,   152,   156,   150,   155,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   146,   148,   151,   154,
+   150,   155,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   146,
+   148,   151,   154,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   149,   153,   nil,   nil,   158,   159,   160,   144,   145,   147,
+   nil,   152,   156,   149,   153,   nil,   nil,   158,   159,   160,
+   144,   145,   147,   nil,   152,   156,   150,   155,   nil,   nil,
+   nil,   nil,   nil,   nil,   216,   146,   148,   151,   154,   150,
+   155,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   146,   148,
+   151,   154,   nil,   155,   nil,   nil,   nil,   nil,   nil,   149,
+   153,   146,   nil,   158,   159,   160,   144,   145,   147,   nil,
+   152,   156,   nil,   153,   nil,   nil,   158,   159,   160,   144,
+   145,   147,   281,   152,   156,   nil,   nil,   nil,   nil,   158,
+   159,   160,   144,   145,   147,   nil,   152,   156,   nil,   nil,
+   nil,   303,   nil,    18,   nil,    23,    26,   nil,     1,     5,
+   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,   nil,
+     4,     8,    18,   305,    23,    26,   nil,     1,     5,   nil,
+    12,   nil,    16,   nil,    20,   nil,    27,   nil,   nil,     4,
+     8,   nil,   307,   nil,    18,   nil,    23,    26,   nil,     1,
+     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,
+   nil,     4,     8,    18,   320,    23,    26,   nil,     1,     5,
+   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,   nil,
+     4,     8,   nil,   259,   nil,    18,   nil,    23,    26,   nil,
+     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,
+   nil,   nil,     4,     8,    18,   232,    23,    26,   nil,     1,
+     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,
+   nil,     4,     8,   nil,   323,   nil,    18,   nil,    23,    26,
+   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,
+    27,   nil,   nil,     4,     8,    18,   325,    23,    26,   nil,
+     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,
+   nil,   nil,     4,     8,   nil,   327,   nil,    18,   nil,    23,
+    26,   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,
+   nil,    27,   nil,   nil,     4,     8,    18,   267,    23,    26,
+   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,
+    27,   nil,   nil,     4,     8,   nil,   328,   nil,    18,   nil,
+    23,    26,   nil,     1,     5,   nil,    12,   nil,    16,   nil,
+    20,   nil,    27,   nil,   nil,     4,     8,    18,   nil,    23,
+    26,   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,
+   nil,    27,   nil,   nil,     4,     8,    18,   nil,    23,    26,
+   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,
+    27,   nil,   nil,     4,     8,    18,   nil,    23,    26,   nil,
+     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,
+   nil,   nil,     4,     8,   158,   159,   160,   144,   145,   147,
+   nil,   152,   156,   158,   159,   160,   144,   145,   147,   nil,
+   152,   156 ]
 
 racc_action_check = [
-    34,    34,    34,   191,   105,   112,   112,    17,    11,   125,
-    64,   242,    11,   287,    17,    17,   273,   273,   287,   263,
-    34,   153,   153,   153,   242,    11,     9,     9,   191,   191,
-    64,    34,   109,   109,    39,    34,    34,   125,   125,    34,
-   112,   153,   222,   112,    34,    34,   105,    48,    34,    11,
-   222,    34,   153,   139,   139,   139,   153,   153,    48,    39,
-   153,     9,   180,    48,     9,   153,   153,   109,   181,   153,
-   109,    69,   153,   139,   140,   140,   140,   129,   222,   222,
-   222,   222,   222,   222,   139,   236,   204,    68,   139,   139,
-   129,   157,   139,   236,   140,   227,   157,   139,   139,   204,
-   197,   139,   168,   227,   139,   140,   151,   151,   151,   140,
-   140,   197,   120,   140,   101,   168,   197,   101,   140,   140,
-   120,   101,   140,    26,   189,   140,   151,   141,   141,   141,
-    26,   227,   227,   227,   227,   227,   227,   151,   190,     4,
-    93,   151,   151,   232,   232,   151,     4,   141,   225,    67,
-   151,   151,    65,   118,   151,    94,   225,   151,   141,    77,
-    77,    77,   141,   141,   118,    96,   141,   231,   231,   118,
-    73,   141,   141,    23,    23,   141,     1,     1,   141,    77,
-   142,   142,   142,   209,   225,   225,   225,   225,   225,   225,
-    77,    62,   131,   211,    77,    77,   131,   131,    77,   217,
-   142,   224,    78,    77,    77,   173,    47,    77,    90,   224,
-    77,   142,    16,    16,    16,   142,   142,    47,    59,   142,
-   156,   156,    47,    58,   142,   142,    55,    50,   142,   102,
-   106,   142,    16,    74,    74,    74,   167,   224,   224,   224,
-   224,   224,   224,    16,    45,   127,   230,    16,    16,   127,
-   127,    16,   166,    74,   113,   165,    16,    16,   113,   113,
-    16,   136,   110,    16,    74,   136,   136,   163,    74,    74,
-    84,   239,    74,   221,   221,   221,   221,    74,    74,    84,
-    84,    74,   240,   241,    74,   162,    37,   245,    84,    84,
-    84,    84,    36,   115,    87,    87,    87,   220,   220,   220,
-   220,   220,   220,   228,   228,   228,   228,   228,   228,   248,
-    30,    27,    84,    84,    87,   262,    84,    84,    84,    84,
-    84,    84,    72,   264,   265,    87,   149,   149,   149,    87,
-    87,   267,   160,    87,   219,   219,   219,   219,    87,    87,
-   158,   276,    87,   278,   281,    87,   149,   148,   148,   148,
-    89,   116,    79,    80,    15,   293,    81,   149,   297,   298,
-     7,   149,   149,    83,    85,   149,   247,   148,   nil,   nil,
-   149,   149,   nil,   nil,   149,   nil,   nil,   149,   148,   143,
-   143,   143,   148,   148,   nil,   nil,   148,   nil,   nil,   nil,
-   nil,   148,   148,   nil,   nil,   148,   nil,   nil,   148,   143,
-   144,   144,   144,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   143,   nil,   nil,   nil,   143,   143,   nil,   nil,   143,   nil,
-   144,   nil,   nil,   143,   143,   nil,   nil,   143,   nil,   nil,
-   143,   144,    33,    33,    33,   144,   144,   nil,   nil,   144,
-   nil,   nil,   nil,   nil,   144,   144,   nil,   nil,   144,   nil,
-   nil,   144,    33,   152,   152,   152,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    33,   nil,   nil,   nil,    33,    33,   nil,
-   nil,    33,   nil,   152,   nil,   nil,    33,    33,   nil,   nil,
-    33,   nil,   nil,    33,   152,   147,   147,   147,   152,   152,
-   nil,   nil,   152,   nil,   nil,   nil,   nil,   152,   152,   nil,
-   nil,   152,   nil,   nil,   152,   147,   146,   146,   146,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   147,    44,    44,    44,
-   147,   147,   nil,   nil,   147,   nil,   146,   nil,   nil,   147,
-   147,   nil,   nil,   147,   nil,   nil,   147,   146,   145,   145,
-   145,   146,   146,   nil,   nil,   146,   nil,   nil,    44,   nil,
-   146,   146,    44,    44,   146,   nil,    44,   146,   145,   nil,
-   nil,    44,   nil,   nil,   nil,    44,   nil,   nil,   nil,   145,
-    13,    13,    13,   145,   145,   nil,   nil,   145,   nil,   nil,
-   nil,   nil,   145,   145,   nil,   nil,   145,   nil,   nil,   145,
-    13,    98,    98,    98,   nil,   nil,   nil,   246,   246,   246,
-   nil,    13,   nil,   nil,   nil,    13,    13,   nil,   nil,    13,
-   nil,   nil,   nil,    13,    13,   274,   274,   274,    13,   nil,
-   nil,   nil,    98,   nil,   nil,   nil,    98,    98,   246,   nil,
-    98,   nil,   246,   246,   nil,    98,   246,   nil,   nil,    98,
-   nil,   246,   nil,   nil,   nil,   246,   274,   nil,   nil,   nil,
-   274,   274,   nil,   nil,   274,    75,    75,    75,    75,   274,
-   nil,   nil,   nil,   274,   nil,    54,    54,    54,   nil,   nil,
-   nil,   284,   284,   284,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   178,   178,   178,   nil,   nil,    75,    20,    20,    20,
-    75,    75,   nil,   nil,    75,   nil,    54,   nil,   nil,    75,
-    54,    54,   284,    75,    54,   nil,   284,   284,   nil,    54,
-   284,   nil,   178,    54,   nil,   284,   178,   178,    20,   284,
-   178,   nil,    20,    20,   nil,   178,    20,   nil,   nil,   178,
-   nil,    20,   179,   179,   179,    20,   nil,   nil,   283,   283,
-   283,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   185,   185,
-   185,   nil,   nil,   nil,   nil,   193,   193,   nil,   nil,   nil,
-   nil,   nil,   nil,   179,   nil,   192,   192,   179,   179,   283,
-   nil,   179,   nil,   283,   283,   nil,   179,   283,   nil,   185,
-   179,   nil,   283,   185,   185,   193,   283,   185,   nil,   193,
-   193,   nil,   185,   193,   nil,   192,   185,   nil,   193,   192,
-   192,   nil,   193,   192,   202,   202,   210,   210,   192,   nil,
-   nil,   nil,   192,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   282,   282,   128,   128,   202,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   202,   nil,   210,   nil,   202,   202,
-   210,   210,   202,   nil,   210,   nil,   202,   202,   nil,   210,
-   282,   202,   128,   210,   282,   282,   128,   128,   282,   nil,
-   128,    51,    51,   282,   128,   128,   nil,   282,   nil,   128,
-   nil,   234,   234,   nil,   nil,   234,   nil,   296,   296,   nil,
-   nil,    51,   nil,   nil,   nil,   nil,   nil,   155,   155,   nil,
-   nil,    51,   nil,   nil,   nil,    51,    51,   133,   133,    51,
-   133,   234,   nil,    51,    51,   234,   234,   296,    51,   234,
-   nil,   296,   296,   nil,   234,   296,   nil,   155,   234,   nil,
-   296,   155,   155,   nil,   296,   155,   nil,   133,   132,   132,
-   155,   133,   133,   nil,   155,   133,   nil,   nil,   nil,   nil,
-   133,   nil,   nil,   nil,   133,   100,   100,   nil,   132,   nil,
-   nil,   nil,   nil,   nil,   100,   100,   100,   100,   132,   nil,
-   nil,   nil,   132,   132,   nil,   nil,   132,   nil,   nil,   nil,
-   132,   132,   nil,   nil,   nil,   132,   nil,   nil,   100,   100,
-   135,   135,   100,   100,   100,   100,   100,   100,   135,   135,
-   135,   135,   135,   226,   226,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   226,   226,   226,   226,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   135,   135,   223,   223,   135,   135,   135,
-   135,   135,   135,   nil,   223,   223,   223,   223,    99,    99,
-   226,   226,   226,   226,   226,   226,   nil,    99,    99,    99,
-    99,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   223,
-   244,   nil,   223,   223,   223,   223,   223,   223,   nil,   nil,
-   nil,    99,    99,   nil,   nil,    99,    99,    99,    99,    99,
-    99,   244,   249,   244,   244,   nil,   244,   244,   nil,   244,
-   nil,   244,   nil,   244,   nil,   244,   nil,   nil,   244,   244,
-   nil,   255,   nil,   249,   nil,   249,   249,   nil,   249,   249,
-   nil,   249,   nil,   249,   nil,   249,   nil,   249,   nil,   nil,
-   249,   249,   255,   229,   255,   255,   nil,   255,   255,   nil,
-   255,   nil,   255,   nil,   255,   nil,   255,   nil,   nil,   255,
-   255,   nil,   288,   nil,   229,   nil,   229,   229,   nil,   229,
-   229,   nil,   229,   nil,   229,   nil,   229,   nil,   229,   nil,
-   nil,   229,   229,   288,   150,   288,   288,   nil,   288,   288,
-   nil,   288,   nil,   288,   nil,   288,   nil,   288,   nil,   nil,
-   288,   288,   nil,   301,   nil,   150,   nil,   150,   150,   nil,
-   150,   150,   nil,   150,   nil,   150,   nil,   150,   nil,   150,
-   nil,   nil,   150,   150,   301,   302,   301,   301,   nil,   301,
-   301,   nil,   301,   nil,   301,   nil,   301,   nil,   301,   nil,
-   nil,   301,   301,   nil,   183,   nil,   302,   nil,   302,   302,
-   nil,   302,   302,   nil,   302,   nil,   302,   nil,   302,   nil,
-   302,   nil,   nil,   302,   302,   183,   311,   183,   183,   nil,
-   183,   183,   nil,   183,   nil,   183,   nil,   183,   nil,   183,
-   nil,   nil,   183,   183,   nil,   177,   nil,   311,   nil,   311,
-   311,   nil,   311,   311,   nil,   311,   nil,   311,   nil,   311,
-   nil,   311,   nil,   nil,   311,   311,   177,   313,   177,   177,
-   nil,   177,   177,   nil,   177,   nil,   177,   nil,   177,   nil,
-   177,   nil,   nil,   177,   177,   nil,   nil,   nil,   313,   nil,
-   313,   313,   nil,   313,   313,   nil,   313,   nil,   313,   nil,
-   313,   nil,   313,   nil,   nil,   313,   313,    19,   nil,    19,
-    19,   nil,    19,    19,   nil,    19,   nil,    19,   nil,    19,
-   nil,    19,   nil,   nil,    19,    19,     0,   nil,     0,     0,
+   155,   155,   155,   248,   248,    61,   240,   130,    93,    43,
+   222,   222,   222,   222,   240,   176,   176,   222,   222,    93,
+   155,    90,    90,    90,    93,    61,    21,    84,    84,    84,
+    21,   155,   169,   248,    43,   155,   155,   248,   248,   155,
+   169,   248,   280,    21,   155,   155,   248,    84,   155,   130,
+   248,   155,    90,   186,   186,   186,    90,    90,    84,   155,
+    90,   248,    84,    84,   113,    90,    84,    21,   185,    90,
+   166,    84,    84,    12,    12,    84,    83,   113,    84,    82,
+    90,   243,   123,   123,   186,   178,    84,   255,   186,   186,
+   178,   188,   186,   187,   187,   187,   215,   186,   166,   166,
+   255,   186,    92,   159,   159,   159,   243,   243,    12,   215,
+   301,    12,   186,    92,    28,   301,   189,   123,    92,   244,
+   123,    28,    28,   159,   187,    16,    16,    16,   187,   187,
+   244,    12,   187,   165,   159,   244,     5,   187,   159,   159,
+   123,   187,   159,     5,   165,    16,    26,   159,   159,   165,
+   134,   159,   187,    26,   159,   190,    16,    18,    18,    18,
+    16,    16,   159,   134,    16,   126,   126,   105,    16,    16,
+   105,   136,    81,    16,   105,   136,   136,    18,    20,    20,
+    20,   234,   234,    80,    16,   195,   234,   234,    18,   235,
+   235,   196,    18,    18,   235,   235,    18,   194,   194,   194,
+   126,    18,    18,   126,   197,    18,   174,   201,    18,    20,
+   174,   174,    76,    20,    20,    72,    18,    20,   144,   144,
+   144,    71,    20,   126,    89,   140,    20,   218,   194,   140,
+   140,   179,   194,   194,    91,   162,   194,    20,   144,   162,
+   162,   194,     1,     1,   156,   194,    23,    23,    94,   144,
+   302,   302,   302,   144,   144,    70,   194,   144,   274,   274,
+   236,   236,   144,   144,   219,   219,   144,    67,    66,   144,
+    64,   298,   298,   298,    96,    57,    97,   144,   232,    55,
+   152,   302,    98,    88,    53,   302,   302,   101,   242,   302,
+   106,   110,    49,    47,   302,   251,   253,   254,   302,   112,
+   257,   114,   298,    78,    78,    78,   298,   298,    35,   302,
+   298,   266,   115,   117,   164,   298,    86,   281,   284,   298,
+    27,   290,   292,    78,   272,   272,   272,   293,   294,   295,
+   298,   297,   118,   119,    78,    25,   175,    15,    78,    78,
+   310,   311,    78,     9,   131,   163,   124,    78,    78,   nil,
+   nil,    78,   nil,   nil,    78,   272,   145,   145,   145,   272,
+   272,   nil,    78,   272,   nil,   nil,   nil,   nil,   272,   nil,
+   nil,   nil,   272,   nil,   nil,   nil,   145,    33,    33,    33,
+   nil,   nil,   nil,   272,   nil,   nil,   nil,   145,   nil,   nil,
+   nil,   145,   145,   nil,   nil,   145,   nil,    33,   nil,   nil,
+   145,   145,   nil,   nil,   145,   nil,   nil,   145,    33,    34,
+    34,    34,    33,    33,   nil,   145,    33,   nil,   nil,   nil,
+   nil,    33,    33,   nil,   nil,    33,   nil,   nil,    33,    34,
+   146,   146,   146,   nil,   nil,   nil,    33,   nil,   nil,   nil,
+    34,   nil,   nil,   nil,    34,    34,   nil,   nil,    34,   nil,
+   146,   nil,   nil,    34,    34,   nil,   nil,    34,   nil,   nil,
+    34,   146,    37,    37,    37,   146,   146,   nil,    34,   146,
+   nil,   nil,   nil,   nil,   146,   146,   nil,   nil,   146,   nil,
+   nil,   146,   nil,   147,   147,   147,   nil,   nil,   nil,   146,
+   nil,   nil,   nil,    37,   nil,   nil,   nil,    37,    37,   nil,
+   nil,    37,   nil,   147,   nil,   nil,    37,   nil,   nil,   nil,
+    37,   nil,   223,   nil,   147,   nil,   nil,   nil,   147,   147,
+   223,    37,   147,    77,    77,    77,    77,   147,   147,   nil,
+   nil,   147,   nil,   nil,   147,   nil,   nil,   209,   209,   209,
+   nil,   nil,   147,   nil,    73,    73,    73,   nil,   223,   223,
+   223,   223,   223,   223,    77,   223,   223,   nil,    77,    77,
+   nil,   nil,    77,   nil,    73,   nil,   nil,    77,   209,   226,
+   nil,    77,   209,   209,   nil,    73,   209,   226,   nil,    73,
+    73,   209,    77,    73,   nil,   209,   nil,   nil,    73,    73,
+   nil,   nil,    73,   nil,   nil,    73,   209,   158,   158,   158,
+   203,   203,   nil,    73,   nil,   226,   226,   226,   226,   226,
+   226,   nil,   226,   226,   nil,   nil,   nil,   158,    54,    54,
+    54,   nil,   nil,   nil,   148,   148,   148,   nil,   158,   nil,
+   203,   nil,   158,   158,   203,   203,   158,   nil,   203,   nil,
+   nil,   158,   158,   203,   148,   158,   nil,   203,   158,    54,
+   149,   149,   149,    54,    54,   148,   158,    54,   203,   148,
+   148,   nil,    54,   148,   nil,   nil,    54,   nil,   148,   148,
+   149,   nil,   148,   nil,   nil,   148,   nil,    54,   nil,   229,
+   nil,   149,   nil,   148,   nil,   149,   149,   229,   nil,   149,
+   150,   150,   150,   nil,   149,   149,   nil,   nil,   149,   nil,
+   nil,   149,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   149,
+   150,   151,   151,   151,   nil,   229,   229,   229,   229,   229,
+   229,   150,   229,   229,   nil,   150,   150,   nil,   nil,   150,
+   nil,   151,   nil,   nil,   150,   150,   nil,   nil,   150,   nil,
+   nil,   150,   151,   153,   153,   153,   151,   151,   nil,   150,
+   151,   nil,   nil,   nil,   nil,   151,   151,   nil,   nil,   151,
+   nil,   nil,   151,   153,   154,   154,   154,   nil,   nil,   nil,
+   151,   nil,   nil,   nil,   153,   nil,   nil,   nil,   153,   153,
+   nil,   nil,   153,   nil,   154,   nil,   nil,   153,   153,   nil,
+   nil,   153,   nil,   nil,   153,   154,   160,   160,   160,   154,
+   154,   nil,   153,   154,   nil,   nil,   nil,   nil,   154,   154,
+   nil,   nil,   154,   nil,   nil,   154,   160,   nil,    51,    51,
+   nil,   nil,   nil,   154,   249,   249,   nil,   160,   nil,   nil,
+   nil,   160,   160,   nil,   nil,   160,   nil,   nil,    51,   nil,
+   160,   160,   nil,   nil,   160,   nil,   nil,   160,    51,   207,
+   207,   nil,    51,    51,   249,   160,    51,   nil,   249,   249,
+    51,    51,   249,   285,   285,    51,   nil,   249,   nil,   207,
+   nil,   249,   nil,   nil,   nil,   nil,    51,   nil,   nil,   207,
+   nil,   nil,   249,   207,   207,   138,   138,   207,   nil,   nil,
+   nil,   207,   207,   285,   nil,   nil,   207,   285,   285,   309,
+   309,   285,   nil,   nil,   nil,   138,   285,   207,   nil,   nil,
+   285,   nil,   nil,   nil,   nil,   138,   nil,   137,   137,   138,
+   138,   285,   nil,   138,   nil,   nil,   nil,   138,   138,   309,
+   nil,   nil,   138,   309,   309,   132,   132,   309,   132,   nil,
+   nil,   nil,   309,   138,   nil,   nil,   309,   137,   nil,   161,
+   161,   137,   137,   nil,   nil,   137,   nil,   309,   nil,   137,
+   137,   nil,   nil,   nil,   137,   132,   nil,   238,   238,   132,
+   132,   238,   nil,   132,   nil,   137,   nil,   nil,   132,   161,
+   nil,   nil,   132,   161,   161,   nil,   nil,   161,   nil,   nil,
+   nil,   nil,   161,   132,   nil,   nil,   161,   238,   nil,    87,
+   nil,   238,   238,   nil,   nil,   238,   nil,   161,    87,    87,
+   238,   nil,   nil,   nil,   238,   nil,   nil,    87,    87,    87,
+    87,   228,   228,   nil,   nil,   238,   nil,   nil,   nil,   nil,
+   228,   228,   228,   228,   nil,   nil,   220,   220,   220,   220,
+   nil,    87,    87,   220,   220,    87,    87,    87,    87,    87,
+    87,   nil,    87,    87,   nil,   nil,   nil,   nil,   228,   228,
+   228,   228,   228,   228,   nil,   228,   228,   103,   103,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   103,   103,   103,   103,
+   104,   104,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   104,
+   104,   104,   104,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   103,   103,   nil,   nil,   103,   103,   103,   103,   103,   103,
+   nil,   103,   103,   104,   104,   nil,   nil,   104,   104,   104,
+   104,   104,   104,   nil,   104,   104,   139,   139,   nil,   nil,
+   nil,   nil,   nil,   nil,   139,   139,   139,   139,   139,   224,
+   224,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   224,   224,
+   224,   224,   nil,   225,   nil,   nil,   nil,   nil,   nil,   139,
+   139,   225,   nil,   139,   139,   139,   139,   139,   139,   nil,
+   139,   139,   nil,   224,   nil,   nil,   224,   224,   224,   224,
+   224,   224,   233,   224,   224,   nil,   nil,   nil,   nil,   225,
+   225,   225,   225,   225,   225,   nil,   225,   225,   nil,   nil,
+   nil,   258,   nil,   233,   nil,   233,   233,   nil,   233,   233,
+   nil,   233,   nil,   233,   nil,   233,   nil,   233,   nil,   nil,
+   233,   233,   258,   260,   258,   258,   nil,   258,   258,   nil,
+   258,   nil,   258,   nil,   258,   nil,   258,   nil,   nil,   258,
+   258,   nil,   268,   nil,   260,   nil,   260,   260,   nil,   260,
+   260,   nil,   260,   nil,   260,   nil,   260,   nil,   260,   nil,
+   nil,   260,   260,   268,   304,   268,   268,   nil,   268,   268,
+   nil,   268,   nil,   268,   nil,   268,   nil,   268,   nil,   nil,
+   268,   268,   nil,   184,   nil,   304,   nil,   304,   304,   nil,
+   304,   304,   nil,   304,   nil,   304,   nil,   304,   nil,   304,
+   nil,   nil,   304,   304,   184,   157,   184,   184,   nil,   184,
+   184,   nil,   184,   nil,   184,   nil,   184,   nil,   184,   nil,
+   nil,   184,   184,   nil,   312,   nil,   157,   nil,   157,   157,
+   nil,   157,   157,   nil,   157,   nil,   157,   nil,   157,   nil,
+   157,   nil,   nil,   157,   157,   312,   314,   312,   312,   nil,
+   312,   312,   nil,   312,   nil,   312,   nil,   312,   nil,   312,
+   nil,   nil,   312,   312,   nil,   324,   nil,   314,   nil,   314,
+   314,   nil,   314,   314,   nil,   314,   nil,   314,   nil,   314,
+   nil,   314,   nil,   nil,   314,   314,   324,   192,   324,   324,
+   nil,   324,   324,   nil,   324,   nil,   324,   nil,   324,   nil,
+   324,   nil,   nil,   324,   324,   nil,   326,   nil,   192,   nil,
+   192,   192,   nil,   192,   192,   nil,   192,   nil,   192,   nil,
+   192,   nil,   192,   nil,   nil,   192,   192,   326,   nil,   326,
+   326,   nil,   326,   326,   nil,   326,   nil,   326,   nil,   326,
+   nil,   326,   nil,   nil,   326,   326,     0,   nil,     0,     0,
    nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
-     0,   nil,   nil,     0,     0 ]
+     0,   nil,   nil,     0,     0,    30,   nil,    30,    30,   nil,
+    30,    30,   nil,    30,   nil,    30,   nil,    30,   nil,    30,
+   nil,   nil,    30,    30,   230,   230,   230,   230,   230,   230,
+   nil,   230,   230,   221,   221,   221,   221,   221,   221,   nil,
+   221,   221 ]
 
 racc_action_pointer = [
-  1308,   163,   nil,   nil,   101,   nil,   nil,   354,   nil,    23,
-   nil,     6,   nil,   568,   nil,   354,   210,   -31,   nil,  1289,
-   685,   nil,   nil,   170,   nil,   nil,    85,   269,   nil,   nil,
-   304,   nil,   nil,   430,    -2,   nil,   257,   248,   nil,    24,
-   nil,   nil,   nil,   nil,   515,   206,   nil,   184,    25,   nil,
-   217,   858,   nil,   nil,   663,   224,   nil,   nil,   202,   216,
-   nil,   nil,   170,   nil,     8,   131,   nil,   128,    66,    50,
-   nil,   nil,   301,   170,   231,   653,   nil,   157,   181,   331,
-   332,   335,   nil,   342,   264,   343,   nil,   292,   nil,   329,
-   202,   nil,   nil,   134,   145,   nil,   143,   nil,   589,  1013,
-   930,    76,   223,   nil,   nil,    -5,   220,   nil,   nil,    29,
-   256,   nil,     2,   249,   nil,   283,   342,   nil,   131,   nil,
-    96,   nil,   nil,   nil,   nil,   -11,   nil,   201,   819,    67,
-   nil,   187,   925,   894,   nil,   965,   256,   nil,   nil,    51,
-    72,   125,   178,   377,   398,   536,   504,   483,   345,   324,
-  1147,   104,   451,    19,   nil,   884,   217,    58,   334,   nil,
-   293,   nil,   275,   246,   nil,   234,   234,   215,    93,   nil,
-   nil,   nil,   nil,   184,   nil,   nil,   nil,  1248,   679,   730,
-    55,    30,   nil,  1207,   nil,   746,   nil,   nil,   nil,   117,
-   100,   -20,   762,   752,   nil,   nil,   nil,    78,   nil,   nil,
-   nil,   nil,   801,   nil,    76,   nil,   nil,   nil,   nil,   161,
-   803,   184,   nil,   nil,   nil,   nil,   nil,   194,   nil,   282,
-   245,   221,    26,  1000,   185,   132,   978,    79,   251,  1106,
-   217,   113,    89,   nil,   868,   nil,    75,   nil,   nil,   258,
-   269,   260,     1,   nil,  1043,   280,   595,   359,   271,  1065,
-   nil,   nil,   nil,   nil,   nil,  1084,   nil,   nil,   nil,   nil,
-   nil,   nil,   294,    -2,   302,   303,   nil,   310,   nil,   nil,
-   nil,   nil,   nil,     7,   613,   nil,   312,   nil,   337,   nil,
-   nil,   338,   817,   736,   669,   nil,   nil,   -20,  1125,   nil,
-   nil,   nil,   nil,   345,   nil,   nil,   874,   351,   352,   nil,
-   nil,  1166,  1188,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,  1229,   nil,  1270,   nil,   nil,   nil ]
+  1418,   229,   nil,   nil,   nil,    98,   nil,   nil,   nil,   337,
+   nil,   nil,    70,   nil,   nil,   331,   123,   nil,   155,   nil,
+   176,    24,   nil,   243,   nil,   335,   108,   278,    76,   nil,
+  1437,   nil,   nil,   375,   407,   273,   nil,   460,   nil,   nil,
+   nil,   nil,   nil,    -1,   nil,   nil,   nil,   255,   nil,   271,
+   nil,   815,   nil,   263,   616,   277,   nil,   265,   nil,   nil,
+   nil,     3,   nil,   nil,   249,   nil,   266,   246,   nil,   nil,
+   234,   200,   194,   542,   nil,   nil,   191,   521,   301,   nil,
+   162,   151,    58,    55,    25,   nil,   295,   993,   262,   218,
+    19,   196,    80,   -14,   242,   nil,   264,   276,   260,   nil,
+   nil,   281,   nil,  1052,  1065,   129,   284,   nil,   nil,   nil,
+   270,   nil,   260,    55,   291,   291,   nil,   292,   314,   312,
+   nil,   nil,   nil,    79,   340,   nil,   162,   nil,   nil,   nil,
+    -2,   334,   932,   nil,   140,   nil,   166,   914,   882,  1111,
+   220,   nil,   nil,   nil,   216,   354,   428,   481,   622,   648,
+   688,   709,   219,   741,   762,    -2,   183,  1298,   595,   101,
+   794,   946,   230,   336,   304,   111,    50,   nil,   nil,    16,
+   nil,   nil,   nil,   nil,   162,   298,    12,   nil,    52,   225,
+   nil,   nil,   nil,   nil,  1276,    61,    51,    91,    84,    78,
+   117,   nil,  1380,   nil,   195,   178,   153,   195,   nil,   nil,
+   nil,   185,   nil,   597,   nil,   nil,   nil,   846,   nil,   535,
+   nil,   nil,   nil,   nil,   nil,    86,   nil,   nil,   222,   205,
+   984,  1441,   -42,   496,  1124,  1137,   553,   nil,  1006,   663,
+  1432,   nil,   249,  1175,   127,   135,   201,   nil,   964,   nil,
+    -4,   nil,   281,    58,    97,   nil,   nil,   nil,     0,   821,
+   nil,   285,   nil,   283,   274,    77,   nil,   287,  1194,   nil,
+  1216,   nil,   nil,   nil,   nil,   nil,   301,   nil,  1235,   nil,
+   nil,   nil,   322,   nil,   249,   nil,   nil,   nil,   nil,   nil,
+    36,   288,   nil,   nil,   312,   860,   nil,   nil,   nil,   nil,
+   300,   nil,   301,   306,   307,   308,   nil,   324,   269,   nil,
+   nil,    77,   248,   nil,  1257,   nil,   nil,   nil,   nil,   896,
+   333,   334,  1317,   nil,  1339,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,  1358,   nil,  1399,   nil,   nil ]
 
 racc_action_default = [
-  -168,  -193,    -7,  -161,  -193,    -8,  -159,  -193,    -9,  -193,
-   -10,  -193,   -11,  -160,   -12,  -193,  -193,  -193,   -13,    -1,
-  -193,   -14,    -2,  -193,   -15,    -3,  -193,   -39,   -16,    -5,
-  -193,   -17,    -6,  -193,  -193,  -160,  -168,   -78,  -166,  -168,
-  -165,  -164,  -162,  -167,  -193,   -71,   -41,  -168,  -168,  -185,
-   -21,  -193,   -33,   -22,  -193,   -62,   -23,  -101,   -26,  -193,
-  -103,  -102,   -27,  -148,   -61,   -28,   -60,   -29,  -193,   -30,
-  -149,   -31,   -32,  -193,  -193,  -193,   -96,  -193,   -90,   -94,
-   -98,   -91,   -95,   -92,  -193,   -97,   -93,  -193,  -111,   -89,
-  -193,   -38,    -4,  -193,  -152,  -150,  -168,   -40,   -71,   -69,
-   -70,  -193,  -193,  -181,   -79,  -193,  -191,   -76,   -77,  -193,
-  -193,  -179,  -193,  -193,   -81,  -191,  -193,   -72,  -168,   -47,
-  -193,   -54,   -53,   -61,   -44,  -193,   -45,  -193,  -193,  -193,
-   -20,  -193,  -193,  -193,   317,  -193,  -193,  -188,  -125,  -193,
-  -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,
-  -193,  -193,  -193,  -193,  -118,  -193,  -193,  -169,  -193,  -170,
-   -58,   -62,  -191,   -64,   -56,   -67,  -193,   -65,   -61,  -147,
-   -68,  -146,   -66,   -63,  -184,  -182,  -183,  -193,  -193,  -193,
-  -193,  -192,  -180,  -193,  -163,  -193,  -105,  -189,  -190,  -193,
-  -192,  -193,  -193,  -193,   -50,   -49,   -43,  -193,   -42,   -24,
-   -25,   -18,  -193,  -104,  -193,  -100,  -142,  -145,  -143,   -61,
-  -193,  -193,  -136,  -144,  -137,  -128,  -186,  -190,  -114,  -116,
-  -120,  -117,  -122,  -127,  -124,  -121,  -126,  -123,  -119,  -193,
-  -108,  -112,  -113,  -115,  -193,  -130,  -193,  -134,  -151,  -178,
-  -176,  -193,  -193,  -173,  -193,  -193,   -59,  -193,   -71,  -193,
-  -156,   -75,   -74,   -37,   -80,  -193,  -158,   -82,   -36,   -73,
-   -48,   -51,   -84,   -88,   -85,   -86,   -87,   -83,   -52,   -46,
-   -19,   -99,  -139,  -191,  -193,  -187,  -108,  -107,  -193,  -131,
-  -129,  -193,  -193,  -193,  -193,  -171,  -172,  -193,  -193,  -154,
-   -34,   -57,   -35,  -191,  -155,  -157,  -193,  -193,  -190,  -141,
-  -106,  -193,  -193,  -135,  -177,  -175,  -174,  -153,   -55,  -140,
-  -138,  -193,  -110,  -193,  -133,  -109,  -132 ]
+  -174,  -200,   -15,    -3,  -165,  -200,   -16,    -5,  -163,  -200,
+   -17,    -6,  -200,    -7,    -8,  -200,  -164,    -9,  -200,   -10,
+  -200,  -200,   -11,  -200,   -12,  -200,  -200,   -39,  -200,   -13,
+    -1,   -14,    -2,  -200,  -200,  -174,  -164,   -72,  -171,  -170,
+  -169,  -199,  -173,  -174,  -172,  -166,  -168,   -79,  -191,  -200,
+   -31,  -200,   -33,   -32,  -200,   -63,  -102,   -21,  -104,  -103,
+   -22,   -62,   -23,   -61,   -26,  -153,  -200,   -27,  -152,  -151,
+   -28,   -29,   -30,  -200,   -94,  -112,   -90,  -200,  -200,   -97,
+   -91,   -95,   -99,   -92,  -200,   -96,   -93,  -200,   -98,  -200,
+  -200,   -72,  -174,  -174,   -42,  -154,  -156,  -200,  -174,   -40,
+   -38,  -200,    -4,   -70,   -71,  -200,  -200,  -187,   -73,   -67,
+   -64,   -63,   -59,   -62,  -197,   -65,   -57,   -68,  -200,   -66,
+  -150,   -69,  -149,  -200,  -200,  -185,  -200,   -77,   -78,   -80,
+  -200,  -197,  -200,   -20,  -200,   -82,  -200,  -200,  -200,  -200,
+  -200,  -194,  -128,  -121,  -200,  -200,  -200,  -200,  -200,  -200,
+  -200,  -200,  -200,  -200,  -200,  -200,  -200,  -200,  -200,  -200,
+  -200,  -200,  -200,  -200,  -197,  -174,  -200,   -46,   -48,  -200,
+   -62,   -55,   -54,   -45,  -200,   -79,  -200,   329,  -175,  -200,
+  -176,  -189,  -188,  -190,  -200,  -200,   -60,  -200,  -200,  -198,
+   -72,  -186,  -200,  -167,  -200,  -200,  -198,  -200,  -147,  -139,
+  -140,   -62,  -145,  -200,  -148,  -146,   -18,  -200,  -105,  -200,
+  -195,  -196,   -24,   -25,  -101,  -200,  -131,  -192,  -196,  -117,
+  -119,  -123,  -120,  -125,  -130,  -127,  -124,  -113,  -129,  -126,
+  -122,  -114,  -109,  -200,  -115,  -116,  -118,  -137,  -200,  -133,
+  -200,  -106,  -200,  -200,  -200,   -51,   -50,   -44,  -200,  -200,
+   -43,  -197,  -155,  -184,  -200,  -200,  -179,  -182,  -200,  -160,
+  -200,   -34,   -58,   -75,   -35,   -74,  -197,  -162,  -200,   -76,
+   -37,   -81,  -200,  -142,  -197,   -19,   -83,  -100,  -193,  -108,
+  -200,  -109,  -132,  -134,  -200,  -200,   -36,   -49,   -47,   -88,
+   -84,   -52,   -85,   -89,   -86,   -87,   -53,  -200,  -200,  -177,
+  -178,  -200,  -200,  -158,  -200,  -159,   -56,  -161,  -144,  -200,
+  -200,  -196,  -200,  -107,  -200,  -138,   -41,  -183,  -180,  -181,
+  -157,  -143,  -141,  -111,  -200,  -136,  -200,  -110,  -135 ]
 
 racc_goto_table = [
-     7,    92,    65,    11,   214,   115,   180,    19,   170,   243,
-   107,   164,   211,    56,    50,   189,   104,    36,   235,     7,
-    90,    71,    11,    15,    42,   199,   277,    63,   261,   268,
-    22,   296,   125,   127,   237,   269,   113,   234,    46,    96,
-    65,   106,   212,   245,   273,    94,   131,   158,   102,    39,
-   110,    56,   129,   160,   241,   242,    91,   175,   162,    71,
-   nil,   nil,   247,   nil,   nil,    63,   103,   136,    93,   111,
-   nil,   nil,   300,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   272,   nil,   nil,   nil,   nil,   nil,   167,   nil,   211,
-   nil,   nil,   114,   nil,   nil,   nil,   nil,   279,   nil,   199,
-    62,   nil,   114,   191,   nil,   nil,   172,   nil,   nil,   nil,
-   nil,   nil,    63,   237,   176,   nil,   nil,    65,   nil,   nil,
-   nil,    65,   208,   114,   182,   nil,   159,   184,   200,   nil,
-   nil,   nil,    56,   204,   122,   122,    71,   nil,    62,   306,
-    71,   nil,    63,   nil,   208,   nil,    63,    63,   nil,   nil,
-     7,   nil,   nil,    11,   107,   nil,   170,   229,    69,   291,
-   254,   303,   nil,   259,   nil,   nil,   nil,   309,   nil,    63,
-   nil,   nil,   nil,   297,   nil,   211,   nil,     7,   nil,   nil,
-    11,   264,   264,     7,   249,   165,    11,   nil,   nil,   nil,
-   255,    65,   nil,   308,   nil,   nil,    69,   nil,   nil,   208,
-   266,   266,   200,   nil,   nil,   122,    63,    63,   293,   nil,
-    71,    92,   nil,   nil,   nil,    62,    63,   nil,   nil,    62,
-   207,   nil,   nil,   208,    63,   nil,   251,   252,   nil,     7,
-   nil,    92,    11,   257,    58,   167,   nil,    92,   nil,   nil,
-   nil,   nil,   207,   171,     7,    67,   nil,    11,    63,     7,
-   nil,   288,    11,   nil,   172,     7,   nil,   nil,    11,   nil,
-    63,   nil,   nil,   nil,   nil,    72,   nil,   nil,   121,   121,
-    92,   208,    58,    69,   nil,    95,   nil,    69,   171,   263,
-   263,   nil,   nil,    67,   122,   208,   nil,   nil,     7,    62,
-   nil,    11,   nil,    92,   nil,    92,    63,   207,   nil,   nil,
-   171,     7,     7,    72,    11,    11,   nil,   nil,   311,   313,
-    63,     7,   nil,     7,    11,   nil,    11,   nil,   nil,   163,
-   nil,   207,   299,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   169,   304,   305,   165,   nil,   nil,   nil,   171,   171,   121,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    69,   nil,    58,
-   173,   nil,   nil,    58,   206,   171,   nil,   nil,   nil,   nil,
-    67,   nil,   nil,   nil,    67,   169,   nil,   nil,   nil,   207,
-   nil,   nil,   nil,   nil,   nil,   nil,   206,   nil,   nil,   171,
-    72,   nil,   nil,   207,    72,   213,   nil,   169,   nil,   nil,
-   nil,   171,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   213,   238,   nil,
-   nil,   nil,   nil,   262,   262,   nil,   nil,   nil,   121,   nil,
-   nil,   nil,   nil,    58,   265,   265,   nil,   171,   nil,    84,
-   nil,   206,   nil,   nil,    67,   nil,   nil,   nil,   nil,   nil,
-   nil,   171,   169,   nil,   267,   267,    99,   100,   nil,   nil,
-   nil,   nil,   nil,   nil,    72,   206,   nil,   nil,   nil,   nil,
-   nil,   nil,   213,   nil,   nil,   nil,   169,   163,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   213,   135,   nil,   nil,
-   138,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   173,   nil,
-   154,   nil,   nil,   206,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   169,   nil,   nil,   206,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,   nil,
-   nil,   nil,   nil,   nil,   213,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   213,   nil,
-   nil,   nil,   218,   219,   220,   221,   222,   223,   224,   225,
-   226,   227,   228,   nil,   231,   232,   233 ]
+    15,    21,   102,   197,    30,   116,   200,   114,    42,   256,
+   188,   131,    50,    57,   121,    45,    62,    35,   239,   212,
+    32,   166,   174,   279,    69,    25,   136,   195,   271,   101,
+    15,    21,   237,   109,   291,   296,   309,   127,    98,   238,
+   288,    94,   199,   185,   274,    69,    96,    50,   134,   140,
+    67,    62,    72,   179,   106,   107,    43,   124,   112,    69,
+   242,   164,   162,   125,   191,   254,   255,   100,   182,   nil,
+   nil,   117,   313,   122,   197,   nil,   nil,   273,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    67,   nil,    72,   nil,   212,
+   nil,   nil,   nil,   nil,   243,   283,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   237,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   181,   180,    42,
+   nil,    89,    42,   nil,   nil,   nil,   172,   172,   nil,   193,
+   nil,   nil,   318,    50,    50,   215,   nil,   213,    62,   251,
+    69,   nil,   nil,   nil,   nil,    69,    69,   297,   227,   nil,
+   nil,   nil,   231,   nil,   262,   135,   315,    15,    21,   nil,
+   266,   233,   306,   121,   nil,   127,   204,   nil,   122,    69,
+   310,    67,    67,    72,    72,   nil,   nil,   nil,   135,   265,
+   197,   nil,   109,   321,    15,    21,   127,   nil,   260,   nil,
+   nil,   135,    15,    21,    69,   204,   268,   122,   nil,   172,
+   nil,   nil,   nil,    50,   nil,   102,   nil,   213,   nil,   nil,
+   nil,    69,   nil,   nil,    53,    69,   nil,    71,   nil,   nil,
+   117,    95,   122,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    64,   nil,   102,    15,    21,   110,   nil,   204,   120,   122,
+   102,    67,   nil,    72,   289,   289,    69,   nil,   nil,    53,
+   nil,   115,    71,   nil,   nil,   nil,    69,    69,    15,    21,
+    15,    21,   304,   nil,   nil,    64,   nil,   nil,    15,    21,
+   nil,   nil,   204,    70,   122,   nil,   102,   nil,   172,   nil,
+   nil,   nil,   293,   293,   122,   122,   nil,   nil,   263,   nil,
+   nil,   nil,   nil,    69,   119,   269,   102,   nil,   102,   nil,
+   nil,   nil,   nil,   nil,    15,    21,   171,   171,    70,   nil,
+   276,   nil,    15,    21,    15,    21,   324,    69,   326,   204,
+   nil,   122,   nil,   nil,    15,    21,    15,    21,   nil,   nil,
+   198,   nil,   nil,   120,   nil,    53,    53,   nil,    71,    71,
+   nil,   nil,   nil,   204,   nil,   122,   202,   nil,   nil,   nil,
+   nil,    64,    64,   nil,   nil,   nil,   nil,   nil,   nil,   198,
+   nil,   nil,   120,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   308,   252,   202,   nil,   nil,   nil,   171,
+   nil,   nil,   nil,   nil,   110,   nil,   nil,   120,   nil,   205,
+   nil,   nil,   nil,   nil,    70,    70,   nil,   nil,   nil,   317,
+   115,   198,   nil,   319,   120,    53,   nil,   nil,    71,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   202,   205,    87,
+   nil,    64,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   103,   104,   198,   nil,   nil,   120,
+   nil,   nil,   nil,   119,   nil,   nil,   290,   290,   nil,   295,
+   295,   nil,   202,   nil,   nil,   nil,   nil,   nil,   171,   nil,
+   205,   nil,   292,   292,    70,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   139,   nil,   nil,   nil,   nil,   142,
+   nil,   nil,   nil,   198,   nil,   143,   120,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   205,   nil,   nil,   nil,   202,
+   nil,   nil,   nil,   nil,   nil,   294,   294,   198,   nil,   nil,
+   120,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   202,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   205,   nil,   nil,   219,   220,   221,   222,   223,
+   224,   225,   226,   nil,   228,   229,   230,   nil,   nil,   234,
+   235,   236,   nil,   nil,   nil,   nil,   205 ]
 
 racc_goto_check = [
-    20,     4,    23,    33,    60,    31,    32,     2,    46,    70,
-    48,    43,    58,    20,    18,    32,    51,    28,    56,    20,
-    33,    26,    33,     1,    67,    19,    54,    45,    42,    42,
-     3,    53,    37,    37,    58,    38,    52,    55,    36,    28,
-    23,    34,    59,    30,    61,    62,    52,    63,    64,    65,
-    66,    20,    18,    29,    68,    69,     5,    71,    31,    26,
-   nil,   nil,    32,   nil,   nil,    45,     3,    52,    49,     3,
-   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    60,   nil,   nil,   nil,   nil,   nil,    23,   nil,    58,
-   nil,   nil,    49,   nil,   nil,   nil,   nil,    56,   nil,    19,
-    22,   nil,    49,    37,   nil,   nil,    26,   nil,   nil,   nil,
-   nil,   nil,    45,    58,    28,   nil,   nil,    23,   nil,   nil,
-   nil,    23,    23,    49,    67,   nil,     3,    67,    20,   nil,
-   nil,   nil,    20,    18,    22,    22,    26,   nil,    22,    70,
-    26,   nil,    45,   nil,    23,   nil,    45,    45,   nil,   nil,
-    20,   nil,   nil,    33,    48,   nil,    46,     2,    25,    43,
-    51,    58,   nil,    48,   nil,   nil,   nil,    60,   nil,    45,
-   nil,   nil,   nil,    32,   nil,    58,   nil,    20,   nil,   nil,
-    33,    23,    23,    20,     2,    22,    33,   nil,   nil,   nil,
-     2,    23,   nil,    32,   nil,   nil,    25,   nil,   nil,    23,
-    26,    26,    20,   nil,   nil,    22,    45,    45,    31,   nil,
-    26,     4,   nil,   nil,   nil,    22,    45,   nil,   nil,    22,
-    22,   nil,   nil,    23,    45,   nil,    49,    49,   nil,    20,
-   nil,     4,    33,    49,    21,    23,   nil,     4,   nil,   nil,
-   nil,   nil,    22,    25,    20,    24,   nil,    33,    45,    20,
-   nil,     2,    33,   nil,    26,    20,   nil,   nil,    33,   nil,
-    45,   nil,   nil,   nil,   nil,    27,   nil,   nil,    21,    21,
-     4,    23,    21,    25,   nil,    27,   nil,    25,    25,    22,
-    22,   nil,   nil,    24,    22,    23,   nil,   nil,    20,    22,
-   nil,    33,   nil,     4,   nil,     4,    45,    22,   nil,   nil,
-    25,    20,    20,    27,    33,    33,   nil,   nil,     2,     2,
-    45,    20,   nil,    20,    33,   nil,    33,   nil,   nil,    21,
-   nil,    22,    49,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    24,    49,    49,    22,   nil,   nil,   nil,    25,    25,    21,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,    21,
-    27,   nil,   nil,    21,    21,    25,   nil,   nil,   nil,   nil,
-    24,   nil,   nil,   nil,    24,    24,   nil,   nil,   nil,    22,
-   nil,   nil,   nil,   nil,   nil,   nil,    21,   nil,   nil,    25,
-    27,   nil,   nil,    22,    27,    27,   nil,    24,   nil,   nil,
-   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,    27,   nil,
-   nil,   nil,   nil,    21,    21,   nil,   nil,   nil,    21,   nil,
-   nil,   nil,   nil,    21,    24,    24,   nil,    25,   nil,    47,
-   nil,    21,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,
-   nil,    25,    24,   nil,    27,    27,    47,    47,   nil,   nil,
-   nil,   nil,   nil,   nil,    27,    21,   nil,   nil,   nil,   nil,
-   nil,   nil,    27,   nil,   nil,   nil,    24,    21,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    27,    47,   nil,   nil,
-    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,
-    47,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    24,   nil,   nil,    21,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,
-   nil,   nil,   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,
-   nil,   nil,    47,    47,    47,    47,    47,    47,    47,    47,
-    47,    47,    47,   nil,    47,    47,    47 ]
+    20,    33,     4,    59,     2,    43,    61,    31,    55,    72,
+    32,    34,    26,    18,    46,    68,    20,    28,    57,    19,
+     3,    37,    37,    54,    45,     1,    52,    32,    51,    33,
+    20,    33,    59,    26,    42,    42,    53,    48,    28,    56,
+    38,    36,    60,    30,    62,    45,    63,    26,    18,    52,
+    22,    20,    25,    64,    65,     3,    66,    67,    29,    45,
+    32,    31,    52,     3,    69,    70,    71,     5,    73,   nil,
+   nil,    22,    54,    25,    59,   nil,   nil,    61,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    22,   nil,    25,   nil,    19,
+   nil,   nil,   nil,   nil,    37,    57,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    59,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,     3,    55,
+   nil,    49,    55,   nil,   nil,   nil,    22,    22,   nil,    68,
+   nil,   nil,    72,    26,    26,    18,   nil,    20,    20,    34,
+    45,   nil,   nil,   nil,   nil,    45,    45,    32,    55,   nil,
+   nil,   nil,    55,   nil,    43,    49,    59,    20,    33,   nil,
+    31,     2,    32,    46,   nil,    48,    22,   nil,    25,    45,
+    32,    22,    22,    25,    25,   nil,   nil,   nil,    49,    48,
+    59,   nil,    26,    61,    20,    33,    48,   nil,     2,   nil,
+   nil,    49,    20,    33,    45,    22,     2,    25,   nil,    22,
+   nil,   nil,   nil,    26,   nil,     4,   nil,    20,   nil,   nil,
+   nil,    45,   nil,   nil,    27,    45,   nil,    24,   nil,   nil,
+    22,    27,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    21,   nil,     4,    20,    33,    27,   nil,    22,    24,    25,
+     4,    22,   nil,    25,    26,    26,    45,   nil,   nil,    27,
+   nil,    21,    24,   nil,   nil,   nil,    45,    45,    20,    33,
+    20,    33,     2,   nil,   nil,    21,   nil,   nil,    20,    33,
+   nil,   nil,    22,    23,    25,   nil,     4,   nil,    22,   nil,
+   nil,   nil,    22,    22,    25,    25,   nil,   nil,    49,   nil,
+   nil,   nil,   nil,    45,    23,    49,     4,   nil,     4,   nil,
+   nil,   nil,   nil,   nil,    20,    33,    21,    21,    23,   nil,
+    49,   nil,    20,    33,    20,    33,     2,    45,     2,    22,
+   nil,    25,   nil,   nil,    20,    33,    20,    33,   nil,   nil,
+    27,   nil,   nil,    24,   nil,    27,    27,   nil,    24,    24,
+   nil,   nil,   nil,    22,   nil,    25,    21,   nil,   nil,   nil,
+   nil,    21,    21,   nil,   nil,   nil,   nil,   nil,   nil,    27,
+   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    49,    27,    21,   nil,   nil,   nil,    21,
+   nil,   nil,   nil,   nil,    27,   nil,   nil,    24,   nil,    23,
+   nil,   nil,   nil,   nil,    23,    23,   nil,   nil,   nil,    49,
+    21,    27,   nil,    49,    24,    27,   nil,   nil,    24,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,    23,    47,
+   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    47,    47,    27,   nil,   nil,    24,
+   nil,   nil,   nil,    23,   nil,   nil,    27,    27,   nil,    24,
+    24,   nil,    21,   nil,   nil,   nil,   nil,   nil,    21,   nil,
+    23,   nil,    21,    21,    23,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    47,   nil,   nil,   nil,   nil,    47,
+   nil,   nil,   nil,    27,   nil,    47,    24,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,    21,
+   nil,   nil,   nil,   nil,   nil,    23,    23,    27,   nil,   nil,
+    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    23,   nil,   nil,    47,    47,    47,    47,    47,
+    47,    47,    47,   nil,    47,    47,    47,   nil,   nil,    47,
+    47,    47,   nil,   nil,   nil,   nil,    23 ]
 
 racc_goto_pointer = [
-   nil,    23,     7,    30,   -18,    39,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,  -103,
-     0,   221,    87,   -11,   232,   145,     8,   252,    13,   -45,
-  -117,   -40,  -100,     3,     4,   nil,    27,   -15,  -162,   nil,
-   nil,   nil,  -164,   -87,   nil,    14,   -90,   413,   -27,    48,
-   nil,   -21,    -8,  -242,  -204,  -118,  -137,   nil,  -121,   -91,
-  -129,  -166,    22,   -49,    12,    40,    11,    15,  -103,  -102,
-  -148,   -44 ]
+   nil,    25,     4,    20,   -28,    39,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,  -118,
+     0,   214,    34,   257,   201,    36,    -4,   198,    12,    21,
+   -69,   -30,  -104,     1,   -36,   nil,    20,   -71,  -204,   nil,
+   nil,   nil,  -214,   -32,   nil,     8,   -23,   401,   -10,   101,
+   nil,  -168,   -28,  -238,  -209,    -4,  -122,  -143,   nil,  -129,
+   -90,  -126,  -159,    23,   -45,    19,    44,    14,     3,   -59,
+  -113,  -112,  -169,   -37 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   124,    25,    29,    32,     2,     5,     8,
-    10,    12,    14,    18,    21,    24,    28,    31,   nil,    53,
-    76,    78,    79,    81,    83,    85,    86,    89,    30,   nil,
-   nil,   nil,   nil,    59,   nil,    17,   nil,   nil,   126,   197,
-   119,   120,   nil,   nil,   166,    80,    82,   nil,   117,    88,
-   108,   nil,   nil,   185,   nil,   nil,   nil,   236,    68,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil ]
+   nil,   nil,   nil,   173,     3,     7,    11,    13,    14,    17,
+    19,    22,    24,    29,    31,     2,     6,    10,   nil,    60,
+    79,    80,    81,    83,    86,    88,    74,    76,     9,   nil,
+   nil,   nil,   nil,    66,   nil,    28,   nil,   nil,   167,   244,
+   168,   169,   nil,   nil,   118,    82,    85,   nil,   108,    75,
+   128,   129,   nil,   209,   nil,    65,   nil,   nil,   240,    49,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    46,
+   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -785,11 +824,14 @@ racc_token_table = {
  :DIV => 55,
  :LSHIFT => 56,
  :RSHIFT => 57,
- :UMINUS => 58 }
+ :UMINUS => 58,
+ :MATCH => 59,
+ :NOMATCH => 60,
+ :REGEX => 61 }
 
 racc_use_result_var = true
 
-racc_nt_base = 59
+racc_nt_base = 62
 
 Racc_arg = [
  racc_action_table,
@@ -867,6 +909,9 @@ Racc_token_to_s_table = [
 'LSHIFT',
 'RSHIFT',
 'UMINUS',
+'MATCH',
+'NOMATCH',
+'REGEX',
 '$start',
 'program',
 'statements',
@@ -922,6 +967,7 @@ Racc_token_to_s_table = [
 'rvalues',
 'comma',
 'else',
+'regex',
 'caseopts',
 'caseopt',
 'casevalues',
@@ -934,6 +980,7 @@ Racc_token_to_s_table = [
 'classparent',
 'hostnames',
 'nodeparent',
+'nodename',
 'hostname',
 'nothing',
 'arguments',
@@ -946,7 +993,7 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 42
+module_eval <<'.,.,', 'grammar.ra', 44
   def _reduce_1( val, _values, result )
     if val[0]
         # Make sure we always return an array.
@@ -970,7 +1017,7 @@ module_eval <<'.,.,', 'grammar.ra', 42
 
  # reduce 3 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 58
+module_eval <<'.,.,', 'grammar.ra', 60
   def _reduce_4( val, _values, result )
     if val[0] and val[1]
         if val[0].instance_of?(AST::ASTArray)
@@ -1013,43 +1060,47 @@ module_eval <<'.,.,', 'grammar.ra', 58
 
  # reduce 17 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 81
+module_eval <<'.,.,', 'grammar.ra', 84
   def _reduce_18( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
-        :name => val[0],
+        :name => val[0][:value],
+        :line => val[0][:line],
         :arguments => args,
         :ftype => :statement
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 88
+module_eval <<'.,.,', 'grammar.ra', 92
   def _reduce_19( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
-        :name => val[0],
+        :name => val[0][:value],
+        :line => val[0][:line],
         :arguments => args,
         :ftype => :statement
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 93
+module_eval <<'.,.,', 'grammar.ra', 98
   def _reduce_20( val, _values, result )
     result = ast AST::Function,
-        :name => val[0],
+        :name => val[0][:value],
+        :line => val[0][:line],
         :arguments => AST::ASTArray.new({}),
         :ftype => :statement
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 100
+module_eval <<'.,.,', 'grammar.ra', 106
   def _reduce_21( val, _values, result )
     args = aryfy(val[1])
     result = ast AST::Function,
-        :name => val[0],
+        :name => val[0][:value],
+        :line => val[0][:line],
         :arguments => args,
         :ftype => :statement
    result
@@ -1060,7 +1111,7 @@ module_eval <<'.,.,', 'grammar.ra', 100
 
  # reduce 23 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 108
+module_eval <<'.,.,', 'grammar.ra', 114
   def _reduce_24( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
@@ -1069,7 +1120,7 @@ module_eval <<'.,.,', 'grammar.ra', 108
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 117
+module_eval <<'.,.,', 'grammar.ra', 123
   def _reduce_25( val, _values, result )
     unless val[0].is_a?(AST::ASTArray)
         val[0] = aryfy(val[0])
@@ -1096,14 +1147,14 @@ module_eval <<'.,.,', 'grammar.ra', 117
 
  # reduce 32 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 130
+module_eval <<'.,.,', 'grammar.ra', 136
   def _reduce_33( val, _values, result )
-                    result = ast AST::Name, :value => val[0]
+                    result = ast AST::Name, :value => val[0][:value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 152
+module_eval <<'.,.,', 'grammar.ra', 158
   def _reduce_34( val, _values, result )
     @lexer.commentpop
     array = val[2]
@@ -1128,7 +1179,7 @@ module_eval <<'.,.,', 'grammar.ra', 152
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 155
+module_eval <<'.,.,', 'grammar.ra', 161
   def _reduce_35( val, _values, result )
     # This is a deprecated syntax.
     error "All resource specifications require names"
@@ -1136,7 +1187,7 @@ module_eval <<'.,.,', 'grammar.ra', 155
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 158
+module_eval <<'.,.,', 'grammar.ra', 164
   def _reduce_36( val, _values, result )
     # a defaults setting for a type
     result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
@@ -1144,7 +1195,7 @@ module_eval <<'.,.,', 'grammar.ra', 158
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 164
+module_eval <<'.,.,', 'grammar.ra', 170
   def _reduce_37( val, _values, result )
     @lexer.commentpop
     result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
@@ -1152,7 +1203,7 @@ module_eval <<'.,.,', 'grammar.ra', 164
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 191
+module_eval <<'.,.,', 'grammar.ra', 197
   def _reduce_38( val, _values, result )
     type = val[0]
 
@@ -1180,27 +1231,27 @@ module_eval <<'.,.,', 'grammar.ra', 191
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 192
+module_eval <<'.,.,', 'grammar.ra', 198
   def _reduce_39( val, _values, result )
  result = :virtual
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 193
+module_eval <<'.,.,', 'grammar.ra', 199
   def _reduce_40( val, _values, result )
  result = :exported
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 216
+module_eval <<'.,.,', 'grammar.ra', 223
   def _reduce_41( val, _values, result )
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
     end
     type = val[0].downcase
-    args = {:type => type }
+    args = {:type => type}
 
     if val[1].is_a?(AST::CollExpr)
         args[:query] = val[1]
@@ -1212,13 +1263,37 @@ module_eval <<'.,.,', 'grammar.ra', 216
     if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
         Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
     end
+    args[:override] = val[3]
     result = ast AST::Collection, args
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 226
+module_eval <<'.,.,', 'grammar.ra', 242
   def _reduce_42( val, _values, result )
+    if val[0] =~ /^[a-z]/
+        Puppet.warning addcontext("Collection names must now be capitalized")
+    end
+    type = val[0].downcase
+    args = {:type => type }
+
+    if val[1].is_a?(AST::CollExpr)
+        args[:query] = val[1]
+        args[:query].type = type
+        args[:form] = args[:query].form
+    else
+        args[:form] = val[1]
+    end
+    if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+        Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
+    end
+    result = ast AST::Collection, args
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 252
+  def _reduce_43( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :virtual
@@ -1229,8 +1304,8 @@ module_eval <<'.,.,', 'grammar.ra', 226
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 234
-  def _reduce_43( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 260
+  def _reduce_44( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :exported
@@ -1241,64 +1316,74 @@ module_eval <<'.,.,', 'grammar.ra', 234
   end
 .,.,
 
- # reduce 44 omitted
-
  # reduce 45 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 242
-  def _reduce_46( val, _values, result )
+ # reduce 46 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 268
+  def _reduce_47( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
   end
 .,.,
 
- # reduce 47 omitted
+ # reduce 48 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 248
-  def _reduce_48( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 274
+  def _reduce_49( val, _values, result )
     result = val[1]
     result.parens = true
    result
   end
 .,.,
 
- # reduce 49 omitted
-
- # reduce 50 omitted
+module_eval <<'.,.,', 'grammar.ra', 275
+  def _reduce_50( val, _values, result )
+ result=val[0][:value]
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'grammar.ra', 256
+module_eval <<'.,.,', 'grammar.ra', 276
   def _reduce_51( val, _values, result )
-    result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
-    #result = ast AST::CollExpr
-    #result.push *val
+ result=val[0][:value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 261
+module_eval <<'.,.,', 'grammar.ra', 283
   def _reduce_52( val, _values, result )
-    result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
+    result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
    result
   end
 .,.,
 
- # reduce 53 omitted
+module_eval <<'.,.,', 'grammar.ra', 288
+  def _reduce_53( val, _values, result )
+    result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
+    #result = ast AST::CollExpr
+    #result.push *val
+   result
+  end
+.,.,
 
  # reduce 54 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 268
-  def _reduce_55( val, _values, result )
+ # reduce 55 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 295
+  def _reduce_56( val, _values, result )
     result = ast AST::ResourceInstance, :children => [val[0],val[2]]
    result
   end
 .,.,
 
- # reduce 56 omitted
+ # reduce 57 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 278
-  def _reduce_57( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 305
+  def _reduce_58( val, _values, result )
     if val[0].instance_of?(AST::ResourceInstance)
         result = ast AST::ASTArray, :children => [val[0],val[2]]
     else
@@ -1309,33 +1394,31 @@ module_eval <<'.,.,', 'grammar.ra', 278
   end
 .,.,
 
- # reduce 58 omitted
-
  # reduce 59 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 285
-  def _reduce_60( val, _values, result )
+ # reduce 60 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 312
+  def _reduce_61( val, _values, result )
     result = ast AST::Undef, :value => :undef
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 289
-  def _reduce_61( val, _values, result )
-    result = ast AST::Name, :value => val[0]
+module_eval <<'.,.,', 'grammar.ra', 316
+  def _reduce_62( val, _values, result )
+    result = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 293
-  def _reduce_62( val, _values, result )
-    result = ast AST::Type, :value => val[0]
+module_eval <<'.,.,', 'grammar.ra', 320
+  def _reduce_63( val, _values, result )
+    result = ast AST::Type, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
- # reduce 63 omitted
-
  # reduce 64 omitted
 
  # reduce 65 omitted
@@ -1346,42 +1429,44 @@ module_eval <<'.,.,', 'grammar.ra', 293
 
  # reduce 68 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 309
-  def _reduce_69( val, _values, result )
-    if val[0] =~ /::/
+ # reduce 69 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 336
+  def _reduce_70( val, _values, result )
+    if val[0][:value] =~ /::/
         raise Puppet::ParseError, "Cannot assign to variables in other namespaces"
     end
     # this is distinct from referencing a variable
-    variable = ast AST::Name, :value => val[0]
-    result = ast AST::VarDef, :name => variable, :value => val[2]
+    variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
+    result = ast AST::VarDef, :name => variable, :value => val[2], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 314
-  def _reduce_70( val, _values, result )
-    variable = ast AST::Name, :value => val[0]
-    result = ast AST::VarDef, :name => variable, :value => val[2], :append => true
+module_eval <<'.,.,', 'grammar.ra', 341
+  def _reduce_71( val, _values, result )
+    variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
+    result = ast AST::VarDef, :name => variable, :value => val[2], :append => true, :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 319
-  def _reduce_71( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 346
+  def _reduce_72( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 319
-  def _reduce_72( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 346
+  def _reduce_73( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 328
-  def _reduce_73( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 355
+  def _reduce_74( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1392,41 +1477,41 @@ module_eval <<'.,.,', 'grammar.ra', 328
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 332
-  def _reduce_74( val, _values, result )
-    result = ast AST::ResourceParam, :param => val[0], :value => val[2]
+module_eval <<'.,.,', 'grammar.ra', 359
+  def _reduce_75( val, _values, result )
+    result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 337
-  def _reduce_75( val, _values, result )
-    result = ast AST::ResourceParam, :param => val[0], :value => val[2],
+module_eval <<'.,.,', 'grammar.ra', 364
+  def _reduce_76( val, _values, result )
+    result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2],
                                      :add => true
    result
   end
 .,.,
 
- # reduce 76 omitted
-
  # reduce 77 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 345
-  def _reduce_78( val, _values, result )
+ # reduce 78 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 372
+  def _reduce_79( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 345
-  def _reduce_79( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 372
+  def _reduce_80( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 354
-  def _reduce_80( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 381
+  def _reduce_81( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1437,10 +1522,10 @@ module_eval <<'.,.,', 'grammar.ra', 354
   end
 .,.,
 
- # reduce 81 omitted
+ # reduce 82 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 363
-  def _reduce_82( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 390
+  def _reduce_83( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -1450,8 +1535,6 @@ module_eval <<'.,.,', 'grammar.ra', 363
   end
 .,.,
 
- # reduce 83 omitted
-
  # reduce 84 omitted
 
  # reduce 85 omitted
@@ -1482,65 +1565,67 @@ module_eval <<'.,.,', 'grammar.ra', 363
 
  # reduce 98 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 390
-  def _reduce_99( val, _values, result )
+ # reduce 99 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 417
+  def _reduce_100( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
-        :name => val[0],
+        :name => val[0][:value], :line => val[0][:line],
         :arguments => args,
         :ftype => :rvalue
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 395
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 422
+  def _reduce_101( val, _values, result )
     result = ast AST::Function,
-        :name => val[0],
+        :name => val[0][:value], :line => val[0][:line],
         :arguments => AST::ASTArray.new({}),
         :ftype => :rvalue
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 399
-  def _reduce_101( val, _values, result )
-    result = ast AST::String, :value => val[0]
+module_eval <<'.,.,', 'grammar.ra', 426
+  def _reduce_102( val, _values, result )
+    result = ast AST::String, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 401
-  def _reduce_102( val, _values, result )
-    result = ast AST::FlatString, :value => val[0]
+module_eval <<'.,.,', 'grammar.ra', 428
+  def _reduce_103( val, _values, result )
+    result = ast AST::FlatString, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 405
-  def _reduce_103( val, _values, result )
-    result = ast AST::Boolean, :value => val[0]
+module_eval <<'.,.,', 'grammar.ra', 432
+  def _reduce_104( val, _values, result )
+    result = ast AST::Boolean, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 410
-  def _reduce_104( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 437
+  def _reduce_105( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
-    result = ast AST::ResourceReference, :type => val[0], :title => val[2]
+    result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 412
-  def _reduce_105( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 439
+  def _reduce_106( val, _values, result )
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 426
-  def _reduce_106( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 453
+  def _reduce_107( val, _values, result )
     @lexer.commentpop
     args = {
         :test => val[1],
@@ -1556,8 +1641,8 @@ module_eval <<'.,.,', 'grammar.ra', 426
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 439
-  def _reduce_107( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 466
+  def _reduce_108( val, _values, result )
     @lexer.commentpop
     args = {
         :test => val[1],
@@ -1573,147 +1658,161 @@ module_eval <<'.,.,', 'grammar.ra', 439
   end
 .,.,
 
- # reduce 108 omitted
+ # reduce 109 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 445
-  def _reduce_109( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 472
+  def _reduce_110( val, _values, result )
     @lexer.commentpop
     result = ast AST::Else, :statements => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 449
-  def _reduce_110( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 476
+  def _reduce_111( val, _values, result )
     @lexer.commentpop
     result = ast AST::Else, :statements => ast(AST::Nop)
    result
   end
 .,.,
 
- # reduce 111 omitted
+ # reduce 112 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 466
-  def _reduce_112( val, _values, result )
-    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
-   result
-  end
-.,.,
-
-module_eval <<'.,.,', 'grammar.ra', 469
+module_eval <<'.,.,', 'grammar.ra', 493
   def _reduce_113( val, _values, result )
-    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 472
+module_eval <<'.,.,', 'grammar.ra', 496
   def _reduce_114( val, _values, result )
-    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 475
+module_eval <<'.,.,', 'grammar.ra', 499
   def _reduce_115( val, _values, result )
-    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 478
+module_eval <<'.,.,', 'grammar.ra', 502
   def _reduce_116( val, _values, result )
-    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 481
+module_eval <<'.,.,', 'grammar.ra', 505
   def _reduce_117( val, _values, result )
-    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 484
+module_eval <<'.,.,', 'grammar.ra', 508
   def _reduce_118( val, _values, result )
-    result = ast AST::Minus, :value => val[1]
+    result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 487
+module_eval <<'.,.,', 'grammar.ra', 511
   def _reduce_119( val, _values, result )
-    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 490
+module_eval <<'.,.,', 'grammar.ra', 514
   def _reduce_120( val, _values, result )
-    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 493
+module_eval <<'.,.,', 'grammar.ra', 517
   def _reduce_121( val, _values, result )
-    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::Minus, :value => val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 496
+module_eval <<'.,.,', 'grammar.ra', 520
   def _reduce_122( val, _values, result )
-    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 499
+module_eval <<'.,.,', 'grammar.ra', 523
   def _reduce_123( val, _values, result )
-    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 502
+module_eval <<'.,.,', 'grammar.ra', 526
   def _reduce_124( val, _values, result )
-    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 505
+module_eval <<'.,.,', 'grammar.ra', 529
   def _reduce_125( val, _values, result )
-    result = ast AST::Not, :value => val[1]
+    result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 508
+module_eval <<'.,.,', 'grammar.ra', 532
   def _reduce_126( val, _values, result )
-    result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 511
+module_eval <<'.,.,', 'grammar.ra', 535
   def _reduce_127( val, _values, result )
-    result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+    result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 514
+module_eval <<'.,.,', 'grammar.ra', 538
   def _reduce_128( val, _values, result )
-    result = val[1]
+    result = ast AST::Not, :value => val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 523
+module_eval <<'.,.,', 'grammar.ra', 541
   def _reduce_129( val, _values, result )
+    result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 544
+  def _reduce_130( val, _values, result )
+    result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 547
+  def _reduce_131( val, _values, result )
+    result = val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 556
+  def _reduce_132( val, _values, result )
     @lexer.commentpop
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
@@ -1724,10 +1823,10 @@ module_eval <<'.,.,', 'grammar.ra', 523
   end
 .,.,
 
- # reduce 130 omitted
+ # reduce 133 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 533
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 566
+  def _reduce_134( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1738,16 +1837,16 @@ module_eval <<'.,.,', 'grammar.ra', 533
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 538
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 571
+  def _reduce_135( val, _values, result )
     @lexer.commentpop
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 544
-  def _reduce_133( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 577
+  def _reduce_136( val, _values, result )
     @lexer.commentpop
     result = ast(AST::CaseOpt,
         :value => val[0],
@@ -1757,10 +1856,10 @@ module_eval <<'.,.,', 'grammar.ra', 544
   end
 .,.,
 
- # reduce 134 omitted
+ # reduce 137 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 554
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 587
+  def _reduce_138( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1771,27 +1870,27 @@ module_eval <<'.,.,', 'grammar.ra', 554
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 558
-  def _reduce_136( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 591
+  def _reduce_139( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
 
- # reduce 137 omitted
+ # reduce 140 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 564
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 597
+  def _reduce_141( val, _values, result )
     @lexer.commentpop
     result = val[1]
    result
   end
 .,.,
 
- # reduce 139 omitted
+ # reduce 142 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 574
-  def _reduce_140( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 607
+  def _reduce_143( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1802,19 +1901,13 @@ module_eval <<'.,.,', 'grammar.ra', 574
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 578
-  def _reduce_141( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 611
+  def _reduce_144( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 142 omitted
-
- # reduce 143 omitted
-
- # reduce 144 omitted
-
  # reduce 145 omitted
 
  # reduce 146 omitted
@@ -1823,29 +1916,37 @@ module_eval <<'.,.,', 'grammar.ra', 578
 
  # reduce 148 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 589
-  def _reduce_149( val, _values, result )
-    result = ast AST::Default, :value => val[0]
+ # reduce 149 omitted
+
+ # reduce 150 omitted
+
+ # reduce 151 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 622
+  def _reduce_152( val, _values, result )
+    result = ast AST::Default, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 591
-  def _reduce_150( val, _values, result )
+ # reduce 153 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 625
+  def _reduce_154( val, _values, result )
  result = [val[0].value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 595
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 629
+  def _reduce_155( val, _values, result )
     results = val[0] << val[2].value
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 603
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 637
+  def _reduce_156( val, _values, result )
     val[1].each do |file|
         import(file)
     end
@@ -1855,10 +1956,10 @@ module_eval <<'.,.,', 'grammar.ra', 603
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 614
-  def _reduce_153( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 648
+  def _reduce_157( val, _values, result )
     @lexer.commentpop
-    newdefine classname(val[1]), :arguments => val[2], :code => val[4]
+    newdefine classname(val[1]), :arguments => val[2], :code => val[4], :line => val[0][:line]
     @lexer.indefine = false
     result = nil
 
@@ -1867,66 +1968,81 @@ module_eval <<'.,.,', 'grammar.ra', 614
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 619
-  def _reduce_154( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 653
+  def _reduce_158( val, _values, result )
     @lexer.commentpop
-    newdefine classname(val[1]), :arguments => val[2]
+    newdefine classname(val[1]), :arguments => val[2], :line => val[0][:line]
     @lexer.indefine = false
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 628
-  def _reduce_155( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 662
+  def _reduce_159( val, _values, result )
     @lexer.commentpop
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
-    newclass classname(val[1]), :code => val[4], :parent => val[2]
+    newclass classname(val[1]), :code => val[4], :parent => val[2], :line => val[0][:line]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 634
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 668
+  def _reduce_160( val, _values, result )
     @lexer.commentpop
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
-    newclass classname(val[1]), :parent => val[2]
+    newclass classname(val[1]), :parent => val[2], :line => val[0][:line]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 640
-  def _reduce_157( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 674
+  def _reduce_161( val, _values, result )
     @lexer.commentpop
-    newnode val[1], :parent => val[2], :code => val[4]
+    newnode val[1], :parent => val[2], :code => val[4], :line => val[0][:line]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 644
-  def _reduce_158( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 678
+  def _reduce_162( val, _values, result )
     @lexer.commentpop
-    newnode val[1], :parent => val[2]
+    newnode val[1], :parent => val[2], :line => val[0][:line]
     result = nil
    result
   end
 .,.,
 
- # reduce 159 omitted
+module_eval <<'.,.,', 'grammar.ra', 679
+  def _reduce_163( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
 
- # reduce 160 omitted
+module_eval <<'.,.,', 'grammar.ra', 681
+  def _reduce_164( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
 
- # reduce 161 omitted
+module_eval <<'.,.,', 'grammar.ra', 682
+  def _reduce_165( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
 
- # reduce 162 omitted
+ # reduce 166 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 658
-  def _reduce_163( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 692
+  def _reduce_167( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -1934,49 +2050,78 @@ module_eval <<'.,.,', 'grammar.ra', 658
   end
 .,.,
 
- # reduce 164 omitted
+module_eval <<'.,.,', 'grammar.ra', 696
+  def _reduce_168( val, _values, result )
+    result = ast AST::HostName, :value => val[0]
+   result
+  end
+.,.,
 
- # reduce 165 omitted
+module_eval <<'.,.,', 'grammar.ra', 697
+  def _reduce_169( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
 
- # reduce 166 omitted
+module_eval <<'.,.,', 'grammar.ra', 698
+  def _reduce_170( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
 
- # reduce 167 omitted
+module_eval <<'.,.,', 'grammar.ra', 699
+  def _reduce_171( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'grammar.ra', 667
-  def _reduce_168( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 700
+  def _reduce_172( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
+
+ # reduce 173 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 706
+  def _reduce_174( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 671
-  def _reduce_169( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 710
+  def _reduce_175( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 170 omitted
+ # reduce 176 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 676
-  def _reduce_171( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 715
+  def _reduce_177( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 680
-  def _reduce_172( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 719
+  def _reduce_178( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 173 omitted
+ # reduce 179 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 687
-  def _reduce_174( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 726
+  def _reduce_180( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1984,67 +2129,67 @@ module_eval <<'.,.,', 'grammar.ra', 687
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 692
-  def _reduce_175( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 731
+  def _reduce_181( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
-    result = [val[0], val[2]]
+    result = [val[0][:value], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 696
-  def _reduce_176( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 735
+  def _reduce_182( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
-    result = [val[0]]
+    result = [val[0][:value]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 698
-  def _reduce_177( val, _values, result )
-    result = [val[0], val[2]]
+module_eval <<'.,.,', 'grammar.ra', 737
+  def _reduce_183( val, _values, result )
+    result = [val[0][:value], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 700
-  def _reduce_178( val, _values, result )
-    result = [val[0]]
+module_eval <<'.,.,', 'grammar.ra', 739
+  def _reduce_184( val, _values, result )
+    result = [val[0][:value]]
    result
   end
 .,.,
 
- # reduce 179 omitted
+ # reduce 185 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 705
-  def _reduce_180( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 744
+  def _reduce_186( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 181 omitted
+ # reduce 187 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 710
-  def _reduce_182( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 749
+  def _reduce_188( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 183 omitted
+ # reduce 189 omitted
 
- # reduce 184 omitted
+ # reduce 190 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 716
-  def _reduce_185( val, _values, result )
-    result = ast AST::Variable, :value => val[0]
+module_eval <<'.,.,', 'grammar.ra', 755
+  def _reduce_191( val, _values, result )
+    result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 724
-  def _reduce_186( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 763
+  def _reduce_192( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -2054,8 +2199,8 @@ module_eval <<'.,.,', 'grammar.ra', 724
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 731
-  def _reduce_187( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 770
+  def _reduce_193( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -2065,26 +2210,33 @@ module_eval <<'.,.,', 'grammar.ra', 731
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 733
-  def _reduce_188( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 772
+  def _reduce_194( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 189 omitted
+ # reduce 195 omitted
 
- # reduce 190 omitted
+ # reduce 196 omitted
 
- # reduce 191 omitted
+ # reduce 197 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 738
-  def _reduce_192( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 777
+  def _reduce_198( val, _values, result )
  result = nil
    result
   end
 .,.,
 
+module_eval <<'.,.,', 'grammar.ra', 782
+  def _reduce_199( val, _values, result )
+    result = ast AST::Regex, :value => val[0][:value]
+   result
+  end
+.,.,
+
  def _reduce_none( val, _values, result )
   result
  end