puppet 2.6.18 → 2.7.1

data/lib/puppet/parser/functions/sha1.rb

@@ -1,5 +1,5 @@
 Puppet::Parser::Functions::newfunction(:sha1, :type => :rvalue, :doc => "Returns a SHA1 hash value from a provided string.") do |args|
-      require 'sha1'
+      require 'digest/sha1'
 
       Digest::SHA1.hexdigest(args[0])
 end

data/lib/puppet/parser/grammar.ra

@@ -28,41 +28,33 @@ prechigh
 preclow
 
 rule
-program:    statements {
-  if val[0]
-    # Make sure we always return an array.
-    if val[0].is_a?(AST::ASTArray)
-      if val[0].children.empty?
-        result = nil
-      else
-        result = val[0]
-      end
-    else
-      result = aryfy(val[0])
-    end
-  else
-    result = nil
-  end
-}
+program:    statements_and_declarations
   | nil
 
-statements:   statement
-  | statements statement {
-    if val[0] and val[1]
-    if val[0].instance_of?(AST::ASTArray)
+  statements_and_declarations:   statement_or_declaration {
+    result = ast AST::ASTArray, :children => (val[0] ? [val[0]] : [])
+  }
+  | statements_and_declarations statement_or_declaration {
+    if val[1]
       val[0].push(val[1])
-      result = val[0]
-    else
-      result = ast AST::ASTArray, :children => [val[0],val[1]]
     end
-  elsif obj = (val[0] || val[1])
-    result = obj
-  else result = nil
+    result = val[0]
+  }
+
+# statements is like statements_and_declarations, but it doesn't allow
+# nested definitions, classes, or nodes.
+statements: statements_and_declarations {
+  val[0].each do |stmt|
+    if stmt.is_a?(AST::TopLevelConstruct)
+      error "Classes, definitions, and nodes may only appear at toplevel or inside other classes", \
+          :line => stmt.context[:line], :file => stmt.context[:file]
+    end
   end
+  result = val[0]
 }
 
 # The main list of valid statements
-statement:    resource
+statement_or_declaration:    resource
   | virtualresource
   | collection
   | assignment
@@ -89,19 +81,17 @@ relationship_side: resource | resourceref | collection
 edge: IN_EDGE | OUT_EDGE | IN_EDGE_SUB | OUT_EDGE_SUB
 
 fstatement:   NAME LPAREN funcvalues RPAREN {
-  args = aryfy(val[2])
   result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[2],
     :ftype => :statement
 }
 | NAME LPAREN funcvalues COMMA RPAREN {
-  args = aryfy(val[2])
   result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[2],
     :ftype => :statement
 }            | NAME LPAREN RPAREN {
   result = ast AST::Function,
@@ -111,29 +101,22 @@ fstatement:   NAME LPAREN funcvalues RPAREN {
     :ftype => :statement
 }
   | NAME funcvalues {
-    args = aryfy(val[1])
     result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[1],
     :ftype => :statement
 }
 
-funcvalues:       namestring
-  | resourceref
+funcvalues: namestring { result = aryfy(val[0]) }
+  | resourceref        { result = aryfy(val[0]) }
   | funcvalues COMMA namestring {
-    result = aryfy(val[0], val[2])
-    result.line = @lexer.line
-    result.file = @lexer.file
+    val[0].push(val[2])
+    result = val[0]
 }
   | funcvalues COMMA resourceref {
-    unless val[0].is_a?(AST::ASTArray)
-    val[0] = aryfy(val[0])
-  end
-
-  val[0].push(val[2])
-
-  result = val[0]
+    val[0].push(val[2])
+    result = val[0]
 }
 
 # This is *almost* an rvalue, but I couldn't get a full
@@ -152,23 +135,7 @@ namestring:       name
 
 resource:       classname LBRACE resourceinstances endsemi RBRACE {
   @lexer.commentpop
-  array = val[2]
-  array = [array] if array.instance_of?(AST::ResourceInstance)
-  result = ast AST::ASTArray
-
-  # this iterates across each specified resourceinstance
-  array.each { |instance|
-    raise Puppet::Dev, "Got something that isn't an instance" unless instance.instance_of?(AST::ResourceInstance)
-    # now, i need to somehow differentiate between those things with
-    # arrays in their names, and normal things
-
-      result.push ast(
-        AST::Resource,
-      :type => val[0],
-      :title => instance[0],
-
-      :parameters => instance[1])
-  }
+  result = ast(AST::Resource, :type => val[0], :instances => val[2])
 }           | classname LBRACE params endcomma RBRACE {
   # This is a deprecated syntax.
   error "All resource specifications require names"
@@ -189,7 +156,7 @@ resourceoverride:     resourceref LBRACE anyparams endcomma RBRACE {
 virtualresource:  at resource {
   type = val[0]
 
-  if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
+  if (type == :exported and ! Puppet[:storeconfigs])
     Puppet.warning addcontext("You cannot collect without storeconfigs being set")
   end
 
@@ -197,14 +164,8 @@ virtualresource:  at resource {
 
   method = type.to_s + "="
 
-  # Just mark our resources as exported and pass them through.
-  if val[1].instance_of?(AST::ASTArray)
-    val[1].each do |obj|
-      obj.send(method, true)
-    end
-  else
-    val[1].send(method, true)
-  end
+  # Just mark our resource as exported and pass it through.
+  val[1].send(method, true)
 
   result = val[1]
 }
@@ -227,7 +188,7 @@ collection:     classref collectrhand LBRACE anyparams endcomma RBRACE {
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   args[:override] = val[3]
@@ -247,7 +208,7 @@ collection:     classref collectrhand LBRACE anyparams endcomma RBRACE {
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   result = ast AST::Collection, args
@@ -303,17 +264,13 @@ colllval:                 variable
   | name
 
 resourceinst:   resourcename COLON params endcomma {
-  result = ast AST::ResourceInstance, :children => [val[0],val[2]]
+  result = ast AST::ResourceInstance, :title => val[0], :parameters => val[2]
 }
 
-resourceinstances:   resourceinst
+resourceinstances:   resourceinst { result = aryfy(val[0]) }
   | resourceinstances SEMIC resourceinst {
-    if val[0].instance_of?(AST::ResourceInstance)
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  else
     val[0].push val[2]
     result = val[0]
-  end
 }
 
 endsemi:      # nothing
@@ -358,14 +315,10 @@ params:   # nothing
 {
   result = ast AST::ASTArray
 }
-  | param { result = val[0] }
+  | param { result = aryfy(val[0]) }
   | params COMMA param {
-    if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  end
 }
 
 param:        NAME FARROW rvalue {
@@ -384,24 +337,14 @@ anyparams:   # nothing
 {
   result = ast AST::ASTArray
 }
-  | anyparam { result = val[0] }
+  | anyparam { result = aryfy(val[0]) }
   | anyparams COMMA anyparam {
-    if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  end
 }
 
-rvalues:      rvalue
-  | rvalues comma rvalue {
-    if val[0].instance_of?(AST::ASTArray)
-    result = val[0].push(val[2])
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  end
-}
+rvalues: rvalue               { result = aryfy(val[0]) }
+       | rvalues comma rvalue { result = val[0].push(val[2]) }
 
 simplervalue:       quotedtext
   | name
@@ -425,10 +368,9 @@ rvalue:       quotedtext
 
 # We currently require arguments in these functions.
 funcrvalue:   NAME LPAREN funcvalues RPAREN {
-  args = aryfy(val[2])
   result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[2],
     :ftype => :rvalue
 }           | NAME LPAREN RPAREN {
   result = ast AST::Function,
@@ -572,19 +514,13 @@ expression:   rvalue
 
 casestatement:  CASE rvalue LBRACE caseopts RBRACE {
   @lexer.commentpop
-  options = val[3]
-  options = ast AST::ASTArray, :children => [val[3]] unless options.instance_of?(AST::ASTArray)
-  result = ast AST::CaseStatement, :test => val[1], :options => options
+  result = ast AST::CaseStatement, :test => val[1], :options => val[3]
 }
 
-caseopts:     caseopt
+caseopts:     caseopt { result = aryfy(val[0]) }
   | caseopts caseopt {
-    if val[0].instance_of?(AST::ASTArray)
     val[0].push val[1]
     result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0], val[1]]
-  end
 }
 
 caseopt:        casevalues COLON LBRACE statements RBRACE {
@@ -601,14 +537,10 @@ caseopt:        casevalues COLON LBRACE statements RBRACE {
   )
 }
 
-casevalues:       selectlhand
+casevalues:       selectlhand { result = aryfy(val[0]) }
   | casevalues COMMA selectlhand {
-    if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  end
 }
 
 selector:     selectlhand QMARK svalues {
@@ -658,48 +590,51 @@ import: IMPORT strings {
     import(file)
   end
 
-  result = AST::ASTArray.new(:children => [])
+  result = nil
 }
 
 # Disable definition inheritance for now. 8/27/06, luke
 #definition: DEFINE NAME argumentlist parent LBRACE statements RBRACE {
 definition: DEFINE classname argumentlist LBRACE statements RBRACE {
   @lexer.commentpop
-  newdefine classname(val[1]), :arguments => val[2], :code => val[4], :line => val[0][:line]
+  result = Puppet::Parser::AST::Definition.new(classname(val[1]),
+                                               ast_context(true).merge(:arguments => val[2], :code => val[4],
+                                                                       :line => val[0][:line]))
   @lexer.indefine = false
-  result = nil
 
 #}           | DEFINE NAME argumentlist parent LBRACE RBRACE {
 }           | DEFINE classname argumentlist LBRACE RBRACE {
   @lexer.commentpop
-  newdefine classname(val[1]), :arguments => val[2], :line => val[0][:line]
+  result = Puppet::Parser::AST::Definition.new(classname(val[1]),
+                                               ast_context(true).merge(:arguments => val[2], :line => val[0][:line]))
   @lexer.indefine = false
-  result = nil
 }
 
 #hostclass: CLASS NAME argumentlist parent LBRACE statements RBRACE {
-hostclass: CLASS classname argumentlist classparent LBRACE statements RBRACE {
+hostclass: CLASS classname argumentlist classparent LBRACE statements_and_declarations RBRACE {
   @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
-  newclass classname(val[1]), :arguments => val[2], :parent => val[3], :code => val[5], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Hostclass.new(classname(val[1]),
+                                              ast_context(true).merge(:arguments => val[2], :parent => val[3],
+                                                                      :code => val[5], :line => val[0][:line]))
 }           | CLASS classname argumentlist classparent LBRACE RBRACE {
   @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
-  newclass classname(val[1]), :arguments => val[2], :parent => val[3], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Hostclass.new(classname(val[1]),
+                                              ast_context(true).merge(:arguments => val[2], :parent => val[3],
+                                                                      :line => val[0][:line]))
 }
 
 nodedef: NODE hostnames nodeparent LBRACE statements RBRACE {
   @lexer.commentpop
-  newnode val[1], :parent => val[2], :code => val[4], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Node.new(val[1],
+                                         ast_context(true).merge(:parent => val[2], :code => val[4],
+                                                                 :line => val[0][:line]))
 }       |  NODE hostnames nodeparent LBRACE RBRACE {
   @lexer.commentpop
-  newnode val[1], :parent => val[2], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Node.new(val[1], ast_context(true).merge(:parent => val[2], :line => val[0][:line]))
 }
 
 classref:       CLASSREF { result = val[0][:value] }
@@ -710,10 +645,11 @@ classname:       NAME { result = val[0][:value] }
 
 # Multiple hostnames, as used for node names.  These are all literal
 # strings, not AST objects.
-hostnames:    nodename
+hostnames:    nodename {
+    result = [result]
+}
   | hostnames COMMA nodename {
     result = val[0]
-    result = [result] unless result.is_a?(Array)
     result << val[2]
 }
 
@@ -779,22 +715,9 @@ variable:     VARIABLE {
   result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
 }
 
-array:        LBRACK rvalues RBRACK {
-  if val[1].instance_of?(AST::ASTArray)
-    result = val[1]
-  else
-    result = ast AST::ASTArray, :children => [val[1]]
-  end
-}
-  | LBRACK rvalues COMMA RBRACK {
-    if val[1].instance_of?(AST::ASTArray)
-    result = val[1]
-  else
-    result = ast AST::ASTArray, :children => [val[1]]
-  end
-}           | LBRACK RBRACK {
-  result = ast AST::ASTArray
-}
+array: LBRACK rvalues       RBRACK { result = val[1] }
+     | LBRACK rvalues COMMA RBRACK { result = val[1] }
+     | LBRACK               RBRACK { result = ast AST::ASTArray }
 
 comma:        FARROW
   | COMMA

data/lib/puppet/parser/lexer.rb

@@ -533,7 +533,7 @@ class Puppet::Parser::Lexer
         when 'n'; "\n"
         when 't'; "\t"
         when 's'; " "
-        when "\n": ''
+        when "\n"; ''
         else      ch
         end
       else

data/lib/puppet/parser/parser.rb

@@ -21,7 +21,7 @@ module Puppet
   module Parser
     class Parser < Racc::Parser
 
-module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 866)
+module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 789)
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -30,647 +30,612 @@ require 'puppet/parser/parser_support'
 # Local Variables:
 # mode: ruby
 # End:
-
-# $Id$
 ...end grammar.ra/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
-   256,   257,   228,    63,   327,    64,   156,    54,    82,   356,
-  -166,   245,   176,   205,   210,   254,    37,   357,    65,   244,
-    38,  -168,   201,   203,   206,   209,   184,    11,   255,   241,
-   242,   158,    54,   251,    72,    75,    72,    75,   102,   117,
-   106,  -170,    62,   194,   230,    58,   204,   208,    60,   306,
-   213,   196,   197,   198,   200,   202,    97,   207,   211,    72,
-    75,   241,   242,   102,   199,   106,   163,    71,    59,   307,
-    58,    83,    86,    60,   193,    92,    54,   162,    72,    75,
-    78,   100,   169,   163,    89,    72,    75,    94,   308,   102,
-   163,   106,    71,    59,   162,    59,    83,    86,    59,   169,
-    92,   162,   311,    72,    75,    78,   169,    97,   181,    89,
-   353,    71,   228,   352,    58,    83,   269,    60,    71,    92,
-    59,   345,    83,    86,   137,   184,    92,  -171,    89,    72,
-    75,    78,   100,   246,   368,    89,    71,    59,    94,    59,
-    83,    86,   309,   173,    92,   314,    59,   163,    76,    78,
-    72,    75,  -167,    89,   102,   310,   106,    37,   162,   173,
-   218,   127,    71,   169,    59,   220,    83,   269,    11,    14,
-    92,    63,    97,   152,    37,   137,    72,    75,   127,    89,
-   102,   319,   106,    71,   218,    11,    14,    83,    86,   220,
-    59,    92,    72,    75,    72,    75,    78,   100,   270,   279,
-    89,   349,   278,    94,   353,   207,   211,   352,   320,    71,
-  -169,    59,   199,    83,    86,   197,   198,    92,    72,    75,
-   207,   211,    78,  -169,    37,    71,    89,   199,    38,    83,
-   269,  -167,   193,    92,  -166,    11,    14,    59,   137,    72,
-    75,   272,    89,   102,   182,   106,    37,   207,   211,  -186,
-    38,    71,   181,    59,   199,    83,    86,    11,   337,    92,
-   231,    97,   339,    76,    78,    72,    75,    37,    89,    82,
-    48,    38,    71,    48,   323,   176,    83,    86,    11,    59,
-    92,   342,    46,    47,   184,    78,   100,    74,  -168,    89,
-    72,    75,    94,  -172,   102,   346,   106,  -173,    71,   175,
-    59,    59,    83,    86,   240,  -171,    92,  -170,   241,   242,
-    76,    78,    97,   197,   198,    89,    72,    75,   207,   211,
-   102,   214,   106,    71,    64,   199,    59,    83,    86,   276,
-   215,    92,   217,   246,   275,   173,    78,   100,    97,    82,
-    89,    72,    75,    94,   155,   102,   122,   106,   152,    71,
-   223,    59,  -168,    83,    86,   249,   277,    92,   176,   246,
-   247,   122,    78,   100,   225,  -166,    89,    72,    75,    94,
-   117,   102,   226,   106,    71,  -169,   271,    59,    83,    86,
-   246,   247,    92,   -21,   -21,   -21,   -21,    78,   226,    97,
-  -167,    89,    72,    75,    52,  -168,   102,  -166,   106,  -169,
-    71,  -167,    59,  -171,    83,    86,   366,   152,    92,   -23,
-   -23,   -23,   -23,    78,   100,   228,   226,    89,    72,    75,
-    94,    50,   102,   373,   106,    71,    49,   375,    59,    83,
-    86,   229,  -221,    92,   237,   378,    72,    75,    78,    40,
-    97,    39,    89,   355,    44,    45,    41,    42,   231,   234,
-   nil,    71,   nil,    59,   nil,    83,    86,   nil,   nil,    92,
-    44,    45,    41,    42,    78,   100,    72,    75,    89,    71,
-   102,    94,   106,    83,   269,   nil,   nil,    92,   nil,    59,
-   nil,   nil,   137,   nil,   nil,   nil,    89,   nil,    97,   nil,
-   nil,   nil,    72,    75,   nil,   nil,   102,    59,   106,    71,
-   nil,   nil,   nil,    83,    86,   nil,   nil,    92,   nil,   nil,
-   nil,   nil,    78,   100,    97,   nil,    89,   nil,   nil,    94,
-   nil,   nil,    72,    75,   nil,    71,   102,    59,   106,    83,
-    86,   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,   100,
-   nil,   nil,    89,   nil,    97,    94,   nil,   nil,    72,    75,
-   nil,   nil,   102,    59,   106,    71,   nil,   nil,   nil,    83,
-    86,   nil,   nil,    92,   nil,   nil,    72,    75,    78,   100,
-    97,   nil,    89,    72,    75,    94,   nil,   102,   nil,   106,
-   nil,    71,   nil,    59,   nil,    83,    86,    72,    75,    92,
-   nil,   102,   nil,   nil,    78,   100,   nil,   nil,    89,    71,
-   nil,    94,   nil,    83,   269,   nil,    71,    92,   nil,    59,
-    83,    86,   137,   nil,    92,   nil,    89,   nil,   nil,    78,
-    71,   nil,   nil,    89,    83,   143,   nil,    59,    92,   nil,
-   nil,   nil,   nil,   137,    59,    72,    75,    89,   nil,   102,
-   nil,   106,   213,   196,   197,   198,   200,   202,    59,   207,
-   211,   nil,   213,   196,   197,   198,   199,    97,   nil,   207,
-   211,    72,    75,   nil,   nil,   102,   199,   106,    71,   nil,
-   nil,   nil,    83,    86,   nil,   nil,    92,   nil,   nil,   nil,
-   nil,    78,   100,    97,   nil,    89,   nil,   nil,    94,   nil,
-   nil,    72,    75,   nil,    71,   102,    59,   106,    83,    86,
-   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,   100,   nil,
-   nil,    89,   nil,    97,    94,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    59,   nil,    71,   nil,   nil,   nil,    83,    86,
-    72,    75,    92,   nil,   102,   189,   106,    78,   100,   nil,
-   nil,    89,   nil,   nil,    94,   nil,   nil,   nil,   nil,    72,
-    75,   nil,    59,   102,   nil,   106,    72,    75,   nil,   nil,
-   102,   nil,   106,    71,   nil,   nil,   nil,    83,    86,   nil,
-   nil,    92,   nil,   nil,   nil,   nil,    78,   nil,    97,   nil,
-    89,   nil,    71,   nil,   nil,   nil,    83,    86,   nil,    71,
-    92,    59,   nil,    83,    86,    78,   nil,    92,   nil,    89,
-   nil,   nil,    78,   100,   nil,   nil,    89,    72,    75,    94,
-    59,   102,   nil,   106,   nil,   nil,   nil,    59,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    72,    75,   nil,    97,
-   102,   nil,   106,    72,    75,   nil,   nil,   102,   nil,   106,
-    71,   nil,   nil,   nil,    83,    86,   nil,   nil,    92,   nil,
-   nil,   nil,   nil,    78,   100,    97,   nil,    89,   nil,    71,
-    94,   nil,   nil,    83,    86,   nil,    71,    92,    59,   nil,
-    83,    86,    78,   nil,    92,   nil,    89,   nil,   nil,    78,
-   100,   nil,   nil,    89,    72,    75,    94,    59,   102,   nil,
-   106,   nil,   nil,   nil,    59,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    72,    75,   nil,    97,   nil,   nil,    72,
-    75,   nil,   nil,   nil,   nil,   nil,   nil,    71,   nil,   nil,
-   nil,    83,    86,   nil,   nil,    92,   340,   nil,   nil,   nil,
-    78,   100,   177,   nil,    89,   nil,    71,    94,   nil,   nil,
-    83,    86,    71,   nil,    92,    59,    83,    86,    76,    78,
-    92,   nil,   nil,    89,    76,    78,    72,    75,   nil,    89,
-   102,   nil,   106,   nil,    59,   nil,   213,   196,   197,   198,
-    59,   nil,   nil,   207,   211,    72,    75,   nil,    97,   102,
-   199,   106,    72,    75,   nil,   nil,   nil,   nil,   nil,    71,
-   nil,   nil,   nil,    83,    86,   nil,   nil,    92,   nil,   nil,
-    72,    75,    78,   100,   nil,   nil,    89,   nil,    71,    94,
-   nil,   nil,    83,    86,   nil,    71,    92,    59,   nil,    83,
-   269,    78,   nil,    92,   nil,    89,   nil,   nil,   137,   nil,
-   nil,   nil,    89,    71,   nil,   nil,    59,    83,   269,   nil,
-   nil,    92,   nil,    59,   nil,   nil,   137,    72,    75,   nil,
-    89,   102,   nil,   106,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    59,   nil,   nil,   nil,   nil,    72,    75,   nil,    97,
-   102,   nil,   106,    72,    75,   nil,   nil,   102,   nil,   106,
-    71,   nil,   nil,   nil,    83,    86,   nil,   nil,    92,   nil,
-   nil,   nil,   nil,    78,   100,    72,    75,    89,   nil,    71,
-    94,   nil,   nil,    83,    86,   nil,    71,    92,    59,   nil,
-    83,    86,    78,   nil,    92,   nil,    89,   nil,   nil,    78,
-    72,    75,   nil,    89,   102,   nil,   106,    59,    71,   nil,
-   nil,   nil,    83,   269,    59,   nil,    92,   nil,    72,    75,
-   nil,   137,   102,   nil,   106,    89,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    71,   nil,   nil,    59,    83,    86,   nil,
-    97,    92,   nil,    72,    75,   nil,    78,   102,   nil,   106,
-    89,    71,   nil,    72,    75,    83,    86,   102,   nil,    92,
-   nil,    59,   nil,   nil,    78,   100,   nil,   nil,    89,   nil,
-   nil,    94,   nil,   nil,   nil,   nil,    71,   nil,   nil,    59,
-    83,    86,   nil,   nil,    92,   nil,    71,   nil,   nil,    78,
-    83,   269,   nil,    89,    92,   nil,    72,    75,   nil,   137,
-   102,   nil,   106,    89,    59,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    59,    72,    75,   nil,    97,   102,
-   nil,   106,    72,    75,   nil,   nil,   102,   nil,   106,    71,
-   nil,   nil,   nil,    83,    86,   nil,   nil,    92,   nil,   nil,
-   nil,   nil,    78,   100,    97,   nil,    89,   nil,    71,    94,
-   nil,   nil,    83,    86,   nil,    71,    92,    59,   nil,    83,
-    86,    78,   nil,    92,   nil,    89,   nil,   nil,    78,   100,
-   212,   nil,    89,   nil,   nil,    94,    59,   nil,   nil,   205,
-   210,   nil,   nil,    59,   nil,   nil,   nil,   nil,   201,   203,
-   206,   209,   nil,   nil,   205,   210,   nil,   nil,   nil,   nil,
-   nil,   nil,   274,   201,   203,   206,   209,   nil,   nil,   nil,
-   nil,   nil,   204,   208,   nil,   nil,   213,   196,   197,   198,
-   200,   202,   nil,   207,   211,   nil,   nil,   204,   208,   nil,
-   199,   213,   196,   197,   198,   200,   202,   nil,   207,   211,
-   205,   210,   nil,   nil,   nil,   199,   nil,   nil,   nil,   201,
-   203,   206,   209,   nil,   nil,   205,   210,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   201,   203,   206,   209,   nil,   nil,
-   nil,   nil,   nil,   nil,   208,   nil,   nil,   213,   196,   197,
-   198,   200,   202,   nil,   207,   211,   nil,   nil,   204,   208,
-   nil,   199,   213,   196,   197,   198,   200,   202,   nil,   207,
-   211,   205,   210,   nil,   nil,   nil,   199,   nil,   nil,   nil,
-   201,   203,   206,   209,   nil,   nil,   205,   210,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   201,   203,   206,   209,   nil,
-   nil,   nil,   nil,   nil,   204,   208,   nil,   nil,   213,   196,
-   197,   198,   200,   202,   nil,   207,   211,   nil,   nil,   nil,
-   nil,   nil,   199,   213,   196,   197,   198,   200,   202,   nil,
-   207,   211,   205,   210,   nil,   nil,   nil,   199,   nil,   nil,
-   nil,   201,   203,   206,   209,   nil,   nil,   nil,   210,   nil,
-   213,   196,   197,   198,   200,   202,   201,   207,   211,   nil,
-   nil,   nil,   nil,   nil,   199,   204,   208,   210,   nil,   213,
-   196,   197,   198,   200,   202,   201,   207,   211,   nil,   nil,
-   nil,   nil,   210,   199,   213,   196,   197,   198,   200,   202,
-   201,   207,   211,   nil,   nil,   nil,   nil,   nil,   199,   nil,
-   nil,   210,   nil,   213,   196,   197,   198,   200,   202,   201,
-   207,   211,   nil,   nil,   nil,   nil,   nil,   199,   213,   196,
-   197,   198,   200,   202,   nil,   207,   211,   nil,   nil,   384,
-   nil,   nil,   199,   nil,   nil,   nil,   nil,   213,   196,   197,
-   198,   200,   202,   nil,   207,   211,   nil,   nil,   297,   nil,
-    26,   199,    33,     1,   nil,     7,    12,   nil,    17,   nil,
-    23,   nil,    29,   nil,     3,   nil,   nil,    11,    14,    26,
-   305,    33,     1,   nil,     7,    12,   nil,    17,   nil,    23,
-   nil,    29,   nil,     3,   nil,   nil,    11,    14,   nil,   383,
-   nil,    26,   nil,    33,     1,   nil,     7,    12,   nil,    17,
-   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,    14,
-    26,   325,    33,     1,   nil,     7,    12,   nil,    17,   nil,
-    23,   nil,    29,   nil,     3,   nil,   nil,    11,    14,   nil,
-   382,   nil,    26,   nil,    33,     1,   nil,     7,    12,   nil,
-    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,
-    14,    26,   380,    33,     1,   nil,     7,    12,   nil,    17,
-   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,    14,
-   nil,   376,   nil,    26,   nil,    33,     1,   nil,     7,    12,
-   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,
-    11,    14,    26,   350,    33,     1,   nil,     7,    12,   nil,
-    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,
-    14,   nil,   358,   nil,    26,   nil,    33,     1,   nil,     7,
-    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,
-   nil,    11,    14,    26,   365,    33,     1,   nil,     7,    12,
-   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,
-    11,    14,   nil,   364,   nil,    26,   nil,    33,     1,   nil,
-     7,    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,
-   nil,   nil,    11,    14,    26,   nil,    33,     1,   nil,     7,
-    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,
-   nil,    11,    14,    26,   nil,    33,     1,   nil,     7,    12,
-   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,
-    11,    14,    26,   nil,    33,     1,   nil,     7,    12,   nil,
-    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,
-    14 ]
+   242,   243,    55,    68,    71,   299,   157,    55,    78,   117,
+   199,    68,    71,   181,   186,  -169,    36,   112,   341,   113,
+    38,    55,   177,   179,   182,   185,   170,    10,    68,    71,
+   231,   158,   114,   292,   293,   356,   257,   368,    68,    71,
+    59,   198,   100,    61,   103,    59,   180,   184,    61,   198,
+   189,   172,   173,   174,   176,   178,   111,   183,   187,    59,
+    95,    66,    61,    60,   175,    79,   253,   154,    60,    88,
+   345,    66,   233,   229,   139,    79,    81,   231,    84,    88,
+    68,    71,    60,   225,    74,    99,    68,    71,    84,    60,
+   100,    90,   103,   203,   203,   292,   293,   223,   296,    60,
+   203,   117,   231,    78,   202,   202,   295,   240,    95,   209,
+   209,   202,   166,    66,   186,   170,   209,    79,   253,    66,
+   241,    88,   177,    79,    81,   334,   139,    88,    68,    71,
+    84,   310,    74,    99,    68,    71,    84,   357,   100,    90,
+   103,    60,   183,   187,   311,   358,   307,    60,   308,   175,
+   189,   172,   173,   174,   176,   178,    95,   183,   187,    36,
+   309,    66,   288,    38,   175,    79,   253,    66,   218,    88,
+    10,    79,    81,   219,   139,    88,   338,   312,    84,   336,
+    74,    99,    68,    71,    84,   218,   100,    90,   103,    60,
+   219,   173,   174,   217,   285,    60,   183,   187,   257,   284,
+   203,    68,    71,   175,    95,   100,    36,   103,    68,    71,
+   127,   202,   100,   316,   103,    66,   209,    10,    15,    79,
+    81,   173,   174,    88,   183,   187,   183,   187,    74,    99,
+    95,   175,    84,   175,    66,    90,   113,   338,    79,    81,
+   336,    66,    88,    60,   213,    79,    81,    74,   319,    88,
+   216,    84,    68,    71,    74,    99,   213,    49,    84,    68,
+    71,    90,    60,   100,   215,   103,    47,    48,   287,    60,
+   154,   286,   189,   172,   173,   174,   324,    68,    71,   183,
+   187,   100,   213,   103,    36,    66,   175,   327,    38,    79,
+   253,   314,    66,    88,   200,    10,    79,    81,   139,    95,
+    88,  -171,    84,    68,    71,    74,   330,    78,   170,    84,
+    66,  -172,   259,    60,    79,    81,   257,   258,    88,  -173,
+    60,  -168,  -170,    74,    99,    70,   228,    84,    68,    71,
+    90,    36,   100,  -167,   103,   127,    66,  -167,    60,   161,
+    79,    81,    10,    15,    88,  -169,  -171,   297,    72,    74,
+    95,   257,   258,    84,    68,    71,    36,  -172,   100,  -168,
+    38,    66,   112,  -170,    60,    79,    81,    10,    15,    88,
+   -22,   -22,   -22,   -22,    74,    99,    68,    71,    84,   290,
+   100,    90,   103,   292,   293,  -167,   167,    66,   166,    60,
+   335,    79,   253,   229,  -187,    88,   339,    68,    71,   161,
+   139,   100,    49,   103,    84,    43,    44,    40,    41,    66,
+   234,  -169,  -174,    79,    81,    60,   156,    88,   154,    68,
+    71,   354,    74,   100,   122,   103,    84,   122,   359,   161,
+    66,    60,  -170,    53,    79,    81,   229,    60,    88,   366,
+    68,    71,    52,    74,   100,  -168,   103,    84,    43,    44,
+    40,    41,    66,   232,    51,   373,    79,    81,    60,   374,
+    88,  -169,    95,  -167,  -170,    74,    68,    71,  -168,    84,
+   100,  -172,   103,    66,    60,   376,    45,    79,    81,  -222,
+    60,    88,   -24,   -24,   -24,   -24,    74,    99,    95,   234,
+    84,   379,   238,    90,    39,   384,    68,    71,   385,    66,
+   100,    60,   103,    79,    81,   nil,   nil,    88,   nil,   nil,
+   nil,   nil,    74,    99,   nil,   nil,    84,   nil,    95,    90,
+   nil,   nil,    68,    71,   nil,   nil,   100,    60,   103,    66,
+   nil,   nil,   nil,    79,    81,   nil,   nil,    88,   nil,   nil,
+   nil,   nil,    74,    99,    95,   nil,    84,   nil,   nil,    90,
+   nil,   nil,    68,    71,   nil,    66,   100,    60,   103,    79,
+    81,   nil,   nil,    88,   nil,   nil,   nil,   nil,    74,    99,
+   nil,   nil,    84,   nil,    95,    90,   nil,   nil,    68,    71,
+   nil,   nil,   100,    60,   103,    66,   nil,   nil,   nil,    79,
+    81,   nil,   nil,    88,   nil,   nil,   nil,   nil,    74,    99,
+    95,   nil,    84,   nil,   nil,    90,   nil,   nil,    68,    71,
+   nil,    66,   100,    60,   103,    79,    81,   nil,   nil,    88,
+   nil,   nil,   nil,   nil,    74,    99,   nil,   nil,    84,   nil,
+    95,    90,   nil,   nil,    68,    71,   nil,   nil,   100,    60,
+   103,    66,   nil,   nil,   nil,    79,    81,   nil,   nil,    88,
+    68,    71,   nil,   nil,    74,    99,    68,    71,    84,   nil,
+   100,    90,   103,   nil,   nil,   nil,   nil,    66,   nil,    60,
+   nil,    79,    81,   nil,   nil,    88,   nil,   nil,    95,   nil,
+    74,    68,    71,    66,    84,   100,   nil,    79,   253,    66,
+   nil,    88,   nil,    79,    81,    60,   139,    88,   nil,   nil,
+    84,   nil,    74,    99,   nil,   nil,    84,    68,    71,    90,
+   nil,    60,   nil,   nil,    66,   nil,   nil,    60,    79,   144,
+   nil,   nil,    88,   nil,   nil,   nil,   nil,   139,    68,    71,
+   nil,    84,   100,   nil,   103,   nil,   nil,   nil,   nil,   nil,
+    66,   nil,    60,   nil,    79,   253,    68,    71,    88,   nil,
+   100,   nil,   103,   139,   nil,   nil,   nil,    84,   nil,   nil,
+   nil,    66,   nil,   nil,   nil,    79,    81,   nil,    60,    88,
+   nil,    68,    71,   nil,    74,   nil,   nil,   nil,    84,    66,
+   nil,   nil,   nil,    79,    81,   nil,   nil,    88,   nil,    60,
+   nil,   nil,    74,   nil,   261,   nil,    84,    68,    71,   nil,
+   nil,   100,   nil,   103,    66,   nil,   nil,    60,    79,    81,
+   nil,   nil,    88,   nil,   nil,   nil,    72,    74,    68,    71,
+   nil,    84,   100,   nil,   103,   nil,   nil,   nil,   nil,   nil,
+    66,   nil,    60,   nil,    79,    81,   nil,   nil,    88,   nil,
+    95,   nil,   nil,    74,    68,    71,   nil,    84,   nil,   nil,
+   nil,    66,   nil,   nil,   nil,    79,    81,   nil,    60,    88,
+   nil,   nil,   nil,   nil,    74,    99,   nil,   162,    84,    68,
+    71,    90,   nil,   100,   nil,   103,   nil,    66,   nil,    60,
+   nil,    79,    81,   nil,   nil,    88,   nil,   nil,   nil,    72,
+    74,    95,   nil,   nil,    84,    68,    71,   nil,   nil,   100,
+   nil,   103,    66,   nil,   nil,    60,    79,    81,   nil,   nil,
+    88,   nil,   nil,   nil,   nil,    74,    99,    95,   nil,    84,
+    68,    71,    90,   nil,   100,   nil,   103,   nil,    66,   nil,
+    60,   nil,    79,    81,    68,    71,    88,   nil,   nil,   nil,
+   255,    74,    99,   nil,   nil,    84,   nil,   nil,    90,   nil,
+   nil,   nil,   nil,    66,   nil,   nil,    60,    79,    81,    68,
+    71,    88,   nil,   100,   nil,   103,    74,    66,   nil,   nil,
+    84,    79,   253,   nil,   nil,    88,   nil,   nil,    68,    71,
+   139,    60,   nil,   nil,    84,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    66,   nil,   nil,    60,    79,    81,   nil,   nil,
+    88,   328,   nil,    68,    71,    74,   nil,   nil,   nil,    84,
+   nil,    66,   nil,   nil,   nil,    79,    81,   nil,   nil,    88,
+    60,    68,    71,    72,    74,   100,   193,   103,    84,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    66,   nil,   nil,    60,
+    79,   253,    68,    71,    88,   nil,   100,   nil,   103,   139,
+   nil,   nil,   nil,    84,    66,   nil,   nil,   nil,    79,    81,
+   nil,   nil,    88,   nil,    60,   nil,   nil,    74,    68,    71,
+   nil,    84,   100,   nil,   103,    66,   nil,   nil,   nil,    79,
+    81,   nil,    60,    88,   nil,   nil,   nil,   nil,    74,   nil,
+    95,   nil,    84,   nil,    68,    71,   nil,   nil,   100,   nil,
+   103,    66,   nil,    60,   nil,    79,    81,   nil,   nil,    88,
+   nil,   nil,   nil,   nil,    74,    99,    95,   nil,    84,    68,
+    71,    90,   nil,   100,   nil,   103,   nil,    66,   nil,    60,
+   nil,    79,    81,    68,    71,    88,   nil,   nil,   nil,   nil,
+    74,    99,   nil,   nil,    84,   nil,   nil,    90,   nil,   nil,
+   nil,   nil,    66,   nil,   nil,    60,    79,    81,   nil,   nil,
+    88,   nil,   nil,   nil,   nil,    74,    66,   nil,   nil,    84,
+    79,    81,   nil,   nil,    88,   nil,   nil,   nil,    72,    74,
+    60,    68,    71,    84,   nil,   100,   nil,   103,   189,   172,
+   173,   174,   176,   178,    60,   183,   187,   nil,   189,   172,
+   173,   174,   175,    95,   nil,   183,   187,    68,    71,   nil,
+   nil,   100,   175,   103,    66,   nil,   nil,   nil,    79,    81,
+   nil,   nil,    88,   nil,   nil,   nil,   nil,    74,    99,    95,
+   nil,    84,   nil,   nil,    90,   nil,   nil,    68,    71,   nil,
+    66,   100,    60,   103,    79,    81,   nil,   nil,    88,   nil,
+   nil,   nil,   nil,    74,    99,   nil,   nil,    84,   nil,    95,
+    90,   nil,   nil,    68,    71,   nil,   nil,   100,    60,   103,
+    66,   nil,   nil,   nil,    79,    81,   nil,   nil,    88,   nil,
+   nil,   nil,   nil,    74,    99,    95,   nil,    84,   nil,   nil,
+    90,   nil,   nil,   nil,   nil,   nil,    66,   nil,    60,   nil,
+    79,    81,   188,   nil,    88,   nil,   nil,   nil,   nil,    74,
+    99,   181,   186,    84,   nil,   nil,    90,   nil,   nil,   nil,
+   177,   179,   182,   185,    60,   nil,   181,   186,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   177,   179,   182,   185,   nil,
+   nil,   nil,   nil,   nil,   180,   184,   nil,   nil,   189,   172,
+   173,   174,   176,   178,   nil,   183,   187,   nil,   nil,   180,
+   184,   nil,   175,   189,   172,   173,   174,   176,   178,   nil,
+   183,   187,   181,   186,   nil,   nil,   nil,   175,   nil,   nil,
+   283,   177,   179,   182,   185,   nil,   nil,   181,   186,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   177,   179,   182,   185,
+   nil,   nil,   nil,   nil,   nil,   180,   184,   nil,   nil,   189,
+   172,   173,   174,   176,   178,   nil,   183,   187,   nil,   nil,
+   nil,   184,   nil,   175,   189,   172,   173,   174,   176,   178,
+   nil,   183,   187,   181,   186,   nil,   nil,   nil,   175,   nil,
+   nil,   nil,   177,   179,   182,   185,   nil,   nil,   181,   186,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   177,   179,   182,
+   185,   nil,   nil,   nil,   nil,   nil,   180,   184,   nil,   nil,
+   189,   172,   173,   174,   176,   178,   nil,   183,   187,   nil,
+   nil,   180,   184,   nil,   175,   189,   172,   173,   174,   176,
+   178,   nil,   183,   187,   181,   186,   nil,   nil,   nil,   175,
+   nil,   nil,   nil,   177,   179,   182,   185,   nil,   nil,    26,
+   186,    32,     1,   nil,     8,    11,   nil,    18,   177,    23,
+   nil,    29,   nil,     2,   nil,   nil,    10,    15,   nil,   186,
+   nil,   189,   172,   173,   174,   176,   178,   177,   183,   187,
+   nil,   nil,   nil,   nil,   186,   175,   189,   172,   173,   174,
+   176,   178,   177,   183,   187,   nil,   nil,   nil,   nil,   nil,
+   175,   nil,   nil,   nil,   nil,   189,   172,   173,   174,   176,
+   178,   nil,   183,   187,   281,   nil,   nil,   nil,   nil,   175,
+   189,   172,   173,   174,   176,   178,   nil,   183,   187,   nil,
+   nil,   nil,   nil,   377,   175,    26,   nil,    32,     1,   nil,
+     8,    11,   nil,    18,   nil,    23,   nil,    29,   nil,     2,
+   nil,   nil,    10,    15,    26,   364,    32,     1,   nil,     8,
+    11,   nil,    18,   nil,    23,   nil,    29,   nil,     2,   nil,
+   nil,    10,    15,   nil,   383,   nil,    26,   nil,    32,     1,
+   nil,     8,    11,   nil,    18,   nil,    23,   nil,    29,   nil,
+     2,   nil,   nil,    10,    15,    26,   306,    32,     1,   nil,
+     8,    11,   nil,    18,   nil,    23,   nil,    29,   nil,     2,
+   nil,   nil,    10,    15,   nil,   381,   nil,    26,   nil,    32,
+     1,   nil,     8,    11,   nil,    18,   nil,    23,   nil,    29,
+   nil,     2,   nil,   nil,    10,    15,    26,   326,    32,     1,
+   nil,     8,    11,   nil,    18,   nil,    23,   nil,    29,   nil,
+     2,   nil,   nil,    10,    15,   nil,   nil,   nil,    26,   nil,
+    32,     1,   nil,     8,    11,   nil,    18,   nil,    23,   nil,
+    29,   nil,     2,   nil,   nil,    10,    15,    26,   nil,    32,
+     1,   nil,     8,    11,   nil,    18,   nil,    23,   nil,    29,
+   nil,     2,   nil,   nil,    10,    15,    26,   nil,    32,     1,
+   nil,     8,    11,   nil,    18,   nil,    23,   nil,    29,   nil,
+     2,   nil,   nil,    10,    15,   189,   172,   173,   174,   176,
+   178,   nil,   183,   187,   nil,   nil,   nil,   nil,   nil,   175 ]
 
 racc_action_check = [
-   180,   180,   152,    22,   243,    22,    55,    17,    86,   301,
-    81,   165,    96,   180,   180,   178,    12,   301,    22,   165,
-    12,    95,   180,   180,   180,   180,    86,    12,   178,   243,
-   243,    55,   156,   174,   208,   208,   106,   106,   208,   215,
-   208,    91,    22,   106,   152,    17,   180,   180,    17,   218,
-   180,   180,   180,   180,   180,   180,   208,   180,   180,   176,
-   176,   174,   174,   176,   180,   176,    62,   208,    17,   219,
-   156,   208,   208,   156,   106,   208,   158,    62,   369,   369,
-   208,   208,    62,   239,   208,   205,   205,   208,   220,   205,
-    65,   205,   176,   156,   239,   208,   176,   176,   211,   239,
-   176,    65,   224,   181,   181,   176,    65,   205,   273,   176,
-   350,   369,   143,   350,   158,   369,   369,   158,   205,   369,
-   176,   273,   205,   205,   369,   143,   205,    90,   369,   356,
-   356,   205,   205,   344,   344,   205,   181,   158,   205,   369,
-   181,   181,   221,   226,   181,   227,   205,   163,   181,   181,
-   352,   352,    87,   181,   352,   221,   352,   120,   163,   229,
-   309,   120,   356,   163,   181,   309,   356,   356,   120,   120,
-   356,    85,   352,   231,    43,   356,   342,   342,    43,   356,
-   342,   232,   342,   352,   122,    43,    43,   352,   352,   122,
-   356,   352,   182,   182,   278,   278,   352,   352,   182,   195,
-   352,   278,   195,   352,   297,   281,   281,   297,   233,   342,
-   103,   352,   281,   342,   342,   280,   280,   342,   184,   184,
-   280,   280,   342,    84,    30,   182,   342,   280,    30,   182,
-   182,   105,   278,   182,   101,    30,    30,   342,   182,   204,
-   204,   184,   182,   204,    80,   204,     1,   282,   282,    78,
-     1,   184,    77,   182,   282,   184,   184,     1,   250,   184,
-   252,   204,   253,   184,   184,    23,    23,   234,   184,    23,
-    71,   234,   204,     7,   234,    70,   204,   204,   234,   184,
-   204,   264,     7,     7,   269,   204,   204,    23,    68,   204,
-    26,    26,   204,   107,    26,   275,    26,    67,    23,    66,
-   204,   207,    23,    23,   160,   108,    23,   109,   160,   160,
-    23,    23,    26,   298,   298,    23,   196,   196,   298,   298,
-   196,   114,   196,    26,   115,   298,    23,    26,    26,   188,
-   119,    26,   121,   188,   188,    64,    26,    26,   196,   127,
-    26,    29,    29,    26,    52,    29,    51,    29,    50,   196,
-   132,    26,   133,   196,   196,   171,   192,   196,   135,   171,
-   171,    36,   196,   196,   136,   138,   196,   213,   213,   196,
-    33,   213,   139,   213,    29,   140,   183,   196,    29,    29,
-   183,   183,    29,    28,    28,    28,    28,    29,   316,   213,
-   142,    29,   306,   306,    16,   328,   306,   329,   306,   331,
-   213,   332,    29,   333,   213,   213,   338,   175,   213,    35,
-    35,    35,    35,   213,   213,   173,   172,   213,   197,   197,
-   213,     9,   197,   353,   197,   306,     8,   357,   213,   306,
-   306,   144,   368,   306,   157,   370,   299,   299,   306,     3,
-   197,     2,   306,   299,    34,    34,    34,    34,   153,   154,
-   nil,   197,   nil,   306,   nil,   197,   197,   nil,   nil,   197,
-     4,     4,     4,     4,   197,   197,    39,    39,   197,   299,
-    39,   197,    39,   299,   299,   nil,   nil,   299,   nil,   197,
-   nil,   nil,   299,   nil,   nil,   nil,   299,   nil,    39,   nil,
-   nil,   nil,   206,   206,   nil,   nil,   206,   299,   206,    39,
-   nil,   nil,   nil,    39,    39,   nil,   nil,    39,   nil,   nil,
-   nil,   nil,    39,    39,   206,   nil,    39,   nil,   nil,    39,
-   nil,   nil,    46,    46,   nil,   206,    46,    39,    46,   206,
-   206,   nil,   nil,   206,   nil,   nil,   nil,   nil,   206,   206,
-   nil,   nil,   206,   nil,    46,   206,   nil,   nil,    47,    47,
-   nil,   nil,    47,   206,    47,    46,   nil,   nil,   nil,    46,
-    46,   nil,   nil,    46,   nil,   nil,   270,   270,    46,    46,
-    47,   nil,    46,    48,    48,    46,   nil,    48,   nil,    48,
-   nil,    47,   nil,    46,   nil,    47,    47,    49,    49,    47,
-   nil,    49,   nil,   nil,    47,    47,   nil,   nil,    47,   270,
-   nil,    47,   nil,   270,   270,   nil,    48,   270,   nil,    47,
-    48,    48,   270,   nil,    48,   nil,   270,   nil,   nil,    48,
-    49,   nil,   nil,    48,    49,    49,   nil,   270,    49,   nil,
-   nil,   nil,   nil,    49,    48,   203,   203,    49,   nil,   203,
-   nil,   203,   294,   294,   294,   294,   294,   294,    49,   294,
-   294,   nil,   284,   284,   284,   284,   294,   203,   nil,   284,
-   284,   209,   209,   nil,   nil,   209,   284,   209,   203,   nil,
-   nil,   nil,   203,   203,   nil,   nil,   203,   nil,   nil,   nil,
-   nil,   203,   203,   209,   nil,   203,   nil,   nil,   203,   nil,
-   nil,   210,   210,   nil,   209,   210,   203,   210,   209,   209,
-   nil,   nil,   209,   nil,   nil,   nil,   nil,   209,   209,   nil,
-   nil,   209,   nil,   210,   209,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   209,   nil,   210,   nil,   nil,   nil,   210,   210,
-   102,   102,   210,   nil,   102,   102,   102,   210,   210,   nil,
-   nil,   210,   nil,   nil,   210,   nil,   nil,   nil,   nil,    63,
-    63,   nil,   210,    63,   nil,    63,   202,   202,   nil,   nil,
-   202,   nil,   202,   102,   nil,   nil,   nil,   102,   102,   nil,
-   nil,   102,   nil,   nil,   nil,   nil,   102,   nil,   202,   nil,
-   102,   nil,    63,   nil,   nil,   nil,    63,    63,   nil,   202,
-    63,   102,   nil,   202,   202,    63,   nil,   202,   nil,    63,
-   nil,   nil,   202,   202,   nil,   nil,   202,   100,   100,   202,
-    63,   100,   nil,   100,   nil,   nil,   nil,   202,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   277,   277,   nil,   100,
-   277,   nil,   277,   198,   198,   nil,   nil,   198,   nil,   198,
-   100,   nil,   nil,   nil,   100,   100,   nil,   nil,   100,   nil,
-   nil,   nil,   nil,   100,   100,   198,   nil,   100,   nil,   277,
-   100,   nil,   nil,   277,   277,   nil,   198,   277,   100,   nil,
-   198,   198,   277,   nil,   198,   nil,   277,   nil,   nil,   198,
-   198,   nil,   nil,   198,   256,   256,   198,   277,   256,   nil,
-   256,   nil,   nil,   nil,   198,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   254,   254,   nil,   256,   nil,   nil,    74,
-    74,   nil,   nil,   nil,   nil,   nil,   nil,   256,   nil,   nil,
-   nil,   256,   256,   nil,   nil,   256,   254,   nil,   nil,   nil,
-   256,   256,    74,   nil,   256,   nil,   254,   256,   nil,   nil,
-   254,   254,    74,   nil,   254,   256,    74,    74,   254,   254,
-    74,   nil,   nil,   254,    74,    74,    75,    75,   nil,    74,
-    75,   nil,    75,   nil,   254,   nil,   286,   286,   286,   286,
-    74,   nil,   nil,   286,   286,   248,   248,   nil,    75,   248,
-   286,   248,   245,   245,   nil,   nil,   nil,   nil,   nil,    75,
-   nil,   nil,   nil,    75,    75,   nil,   nil,    75,   nil,   nil,
-   244,   244,    75,    75,   nil,   nil,    75,   nil,   248,    75,
-   nil,   nil,   248,   248,   nil,   245,   248,    75,   nil,   245,
-   245,   248,   nil,   245,   nil,   248,   nil,   nil,   245,   nil,
-   nil,   nil,   245,   244,   nil,   nil,   248,   244,   244,   nil,
-   nil,   244,   nil,   245,   nil,   nil,   244,    97,    97,   nil,
-   244,    97,   nil,    97,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   244,   nil,   nil,   nil,   nil,    82,    82,   nil,    97,
-    82,   nil,    82,   199,   199,   nil,   nil,   199,   nil,   199,
-    97,   nil,   nil,   nil,    97,    97,   nil,   nil,    97,   nil,
-   nil,   nil,   nil,    97,    97,   214,   214,    97,   nil,    82,
-    97,   nil,   nil,    82,    82,   nil,   199,    82,    97,   nil,
-   199,   199,    82,   nil,   199,   nil,    82,   nil,   nil,   199,
-   230,   230,   nil,   199,   230,   nil,   230,    82,   214,   nil,
-   nil,   nil,   214,   214,   199,   nil,   214,   nil,   200,   200,
-   nil,   214,   200,   nil,   200,   214,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   230,   nil,   nil,   214,   230,   230,   nil,
-   200,   230,   nil,   228,   228,   nil,   230,   228,   nil,   228,
-   230,   200,   nil,   225,   225,   200,   200,   225,   nil,   200,
-   nil,   230,   nil,   nil,   200,   200,   nil,   nil,   200,   nil,
-   nil,   200,   nil,   nil,   nil,   nil,   228,   nil,   nil,   200,
-   228,   228,   nil,   nil,   228,   nil,   225,   nil,   nil,   228,
-   225,   225,   nil,   228,   225,   nil,   201,   201,   nil,   225,
-   201,   nil,   201,   225,   228,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   225,   308,   308,   nil,   201,   308,
-   nil,   308,    94,    94,   nil,   nil,    94,   nil,    94,   201,
-   nil,   nil,   nil,   201,   201,   nil,   nil,   201,   nil,   nil,
-   nil,   nil,   201,   201,    94,   nil,   201,   nil,   308,   201,
-   nil,   nil,   308,   308,   nil,    94,   308,   201,   nil,    94,
-    94,   308,   nil,    94,   nil,   308,   nil,   nil,    94,    94,
-   111,   nil,    94,   nil,   nil,    94,   308,   nil,   nil,   111,
-   111,   nil,   nil,    94,   nil,   nil,   nil,   nil,   111,   111,
-   111,   111,   nil,   nil,   186,   186,   nil,   nil,   nil,   nil,
-   nil,   nil,   186,   186,   186,   186,   186,   nil,   nil,   nil,
-   nil,   nil,   111,   111,   nil,   nil,   111,   111,   111,   111,
-   111,   111,   nil,   111,   111,   nil,   nil,   186,   186,   nil,
-   111,   186,   186,   186,   186,   186,   186,   nil,   186,   186,
-   288,   288,   nil,   nil,   nil,   186,   nil,   nil,   nil,   288,
-   288,   288,   288,   nil,   nil,   131,   131,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   131,   131,   131,   131,   nil,   nil,
-   nil,   nil,   nil,   nil,   288,   nil,   nil,   288,   288,   288,
-   288,   288,   288,   nil,   288,   288,   nil,   nil,   131,   131,
-   nil,   288,   131,   131,   131,   131,   131,   131,   nil,   131,
-   131,   130,   130,   nil,   nil,   nil,   131,   nil,   nil,   nil,
-   130,   130,   130,   130,   nil,   nil,   292,   292,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   292,   292,   292,   292,   nil,
-   nil,   nil,   nil,   nil,   130,   130,   nil,   nil,   130,   130,
-   130,   130,   130,   130,   nil,   130,   130,   nil,   nil,   nil,
-   nil,   nil,   130,   292,   292,   292,   292,   292,   292,   nil,
-   292,   292,   124,   124,   nil,   nil,   nil,   292,   nil,   nil,
-   nil,   124,   124,   124,   124,   nil,   nil,   nil,   293,   nil,
-   285,   285,   285,   285,   285,   285,   293,   285,   285,   nil,
-   nil,   nil,   nil,   nil,   285,   124,   124,   289,   nil,   124,
-   124,   124,   124,   124,   124,   289,   124,   124,   nil,   nil,
-   nil,   nil,   287,   124,   293,   293,   293,   293,   293,   293,
-   287,   293,   293,   nil,   nil,   nil,   nil,   nil,   293,   nil,
-   nil,   290,   nil,   289,   289,   289,   289,   289,   289,   290,
-   289,   289,   nil,   nil,   nil,   nil,   nil,   289,   287,   287,
-   287,   287,   287,   287,   nil,   287,   287,   nil,   nil,   381,
-   nil,   nil,   287,   nil,   nil,   nil,   nil,   290,   290,   290,
-   290,   290,   290,   nil,   290,   290,   nil,   nil,   212,   nil,
-   381,   290,   381,   381,   nil,   381,   381,   nil,   381,   nil,
-   381,   nil,   381,   nil,   381,   nil,   nil,   381,   381,   212,
-   217,   212,   212,   nil,   212,   212,   nil,   212,   nil,   212,
-   nil,   212,   nil,   212,   nil,   nil,   212,   212,   nil,   379,
-   nil,   217,   nil,   217,   217,   nil,   217,   217,   nil,   217,
-   nil,   217,   nil,   217,   nil,   217,   nil,   nil,   217,   217,
-   379,   237,   379,   379,   nil,   379,   379,   nil,   379,   nil,
-   379,   nil,   379,   nil,   379,   nil,   nil,   379,   379,   nil,
-   375,   nil,   237,   nil,   237,   237,   nil,   237,   237,   nil,
-   237,   nil,   237,   nil,   237,   nil,   237,   nil,   nil,   237,
-   237,   375,   373,   375,   375,   nil,   375,   375,   nil,   375,
-   nil,   375,   nil,   375,   nil,   375,   nil,   nil,   375,   375,
-   nil,   363,   nil,   373,   nil,   373,   373,   nil,   373,   373,
-   nil,   373,   nil,   373,   nil,   373,   nil,   373,   nil,   nil,
-   373,   373,   363,   296,   363,   363,   nil,   363,   363,   nil,
-   363,   nil,   363,   nil,   363,   nil,   363,   nil,   nil,   363,
-   363,   nil,   304,   nil,   296,   nil,   296,   296,   nil,   296,
-   296,   nil,   296,   nil,   296,   nil,   296,   nil,   296,   nil,
-   nil,   296,   296,   304,   324,   304,   304,   nil,   304,   304,
-   nil,   304,   nil,   304,   nil,   304,   nil,   304,   nil,   nil,
-   304,   304,   nil,   320,   nil,   324,   nil,   324,   324,   nil,
-   324,   324,   nil,   324,   nil,   324,   nil,   324,   nil,   324,
-   nil,   nil,   324,   324,   320,   nil,   320,   320,   nil,   320,
-   320,   nil,   320,   nil,   320,   nil,   320,   nil,   320,   nil,
-   nil,   320,   320,    19,   nil,    19,    19,   nil,    19,    19,
-   nil,    19,   nil,    19,   nil,    19,   nil,    19,   nil,   nil,
-    19,    19,     0,   nil,     0,     0,   nil,     0,     0,   nil,
-     0,   nil,     0,   nil,     0,   nil,     0,   nil,   nil,     0,
-     0 ]
+   164,   164,    18,   103,   103,   214,    56,   157,    81,    32,
+   103,   286,   286,   164,   164,   136,    11,    27,   286,    27,
+    11,   158,   164,   164,   164,   164,    81,    11,   300,   300,
+   154,    56,    27,   214,   214,   300,   332,   332,   189,   189,
+    18,   103,   189,    18,   189,   157,   164,   164,   157,   286,
+   164,   164,   164,   164,   164,   164,    27,   164,   164,   158,
+   189,   300,   158,    18,   164,   300,   300,   200,   157,   300,
+   294,   189,   154,   212,   300,   189,   189,   213,   300,   189,
+   369,   369,   158,   134,   189,   189,   186,   186,   189,   300,
+   186,   189,   186,   203,   291,   294,   294,   133,   206,   189,
+   111,   216,   144,   127,   203,   291,   206,   163,   186,   203,
+   291,   111,   262,   369,   273,   144,   111,   369,   369,   186,
+   163,   369,   273,   186,   186,   262,   369,   186,   357,   357,
+   369,   221,   186,   186,   185,   185,   186,   302,   185,   186,
+   185,   369,   264,   264,   221,   302,   218,   186,   219,   264,
+   273,   273,   273,   273,   273,   273,   185,   273,   273,     1,
+   220,   357,   197,     1,   273,   357,   357,   185,   122,   357,
+     1,   185,   185,   122,   357,   185,   281,   224,   357,   281,
+   185,   185,   176,   176,   185,   310,   176,   185,   176,   357,
+   310,   282,   282,   121,   192,   185,   282,   282,   192,   192,
+   114,   175,   175,   282,   176,   175,    46,   175,   336,   336,
+    46,   114,   336,   227,   336,   176,   114,    46,    46,   176,
+   176,   263,   263,   176,   265,   265,   263,   263,   176,   176,
+   336,   265,   176,   263,   175,   176,   119,   335,   175,   175,
+   335,   336,   175,   176,   229,   336,   336,   175,   230,   336,
+   116,   175,   215,   215,   336,   336,   232,     8,   336,   330,
+   330,   336,   175,   330,   115,   330,     8,     8,   194,   336,
+   234,   194,   267,   267,   267,   267,   235,   184,   184,   267,
+   267,   184,   113,   184,   225,   215,   267,   239,   225,   215,
+   215,   225,   330,   215,   110,   225,   330,   330,   215,   184,
+   330,   108,   215,    23,    23,   330,   250,    23,   253,   330,
+   184,   107,   169,   215,   184,   184,   169,   169,   184,   106,
+   330,   105,   102,   184,   184,    23,   140,   184,    26,    26,
+   184,    42,    26,   141,    26,    42,    23,   101,   184,    96,
+    23,    23,    42,    42,    23,    94,    89,   211,    23,    23,
+    26,   211,   211,    23,   228,   228,    33,    87,   228,    85,
+    33,    26,    83,    82,    23,    26,    26,    33,    33,    26,
+    31,    31,    31,    31,    26,    26,    29,    29,    26,   201,
+    29,    26,    29,   201,   201,    80,    77,   228,    75,    26,
+   280,   228,   228,   142,    74,   228,   284,   308,   308,    69,
+   228,   308,    66,   308,   228,     6,     6,     6,     6,    29,
+   289,    65,    64,    29,    29,   228,    53,    29,    52,   307,
+   307,   298,    29,   307,    50,   307,    29,    37,   305,   138,
+   308,   187,   143,    17,   308,   308,   321,    29,   308,   325,
+   174,   174,    13,   308,   174,   146,   174,   308,     3,     3,
+     3,     3,   307,   147,    12,   338,   307,   307,   308,   343,
+   307,   347,   174,   348,   350,   307,   179,   179,   351,   307,
+   179,   352,   179,   174,   183,   358,     5,   174,   174,   368,
+   307,   174,     4,     4,     4,     4,   174,   174,   179,   155,
+   174,   370,   159,   174,     2,   380,   173,   173,   382,   179,
+   173,   174,   173,   179,   179,   nil,   nil,   179,   nil,   nil,
+   nil,   nil,   179,   179,   nil,   nil,   179,   nil,   173,   179,
+   nil,   nil,    45,    45,   nil,   nil,    45,   179,    45,   173,
+   nil,   nil,   nil,   173,   173,   nil,   nil,   173,   nil,   nil,
+   nil,   nil,   173,   173,    45,   nil,   173,   nil,   nil,   173,
+   nil,   nil,   172,   172,   nil,    45,   172,   173,   172,    45,
+    45,   nil,   nil,    45,   nil,   nil,   nil,   nil,    45,    45,
+   nil,   nil,    45,   nil,   172,    45,   nil,   nil,    47,    47,
+   nil,   nil,    47,    45,    47,   172,   nil,   nil,   nil,   172,
+   172,   nil,   nil,   172,   nil,   nil,   nil,   nil,   172,   172,
+    47,   nil,   172,   nil,   nil,   172,   nil,   nil,    48,    48,
+   nil,    47,    48,   172,    48,    47,    47,   nil,   nil,    47,
+   nil,   nil,   nil,   nil,    47,    47,   nil,   nil,    47,   nil,
+    48,    47,   nil,   nil,    49,    49,   nil,   nil,    49,    47,
+    49,    48,   nil,   nil,   nil,    48,    48,   nil,   nil,    48,
+   296,   296,   nil,   nil,    48,    48,   177,   177,    48,   nil,
+   177,    48,   177,   nil,   nil,   nil,   nil,    49,   nil,    48,
+   nil,    49,    49,   nil,   nil,    49,   nil,   nil,   177,   nil,
+    49,    51,    51,   296,    49,    51,   nil,   296,   296,   177,
+   nil,   296,   nil,   177,   177,    49,   296,   177,   nil,   nil,
+   296,   nil,   177,   177,   nil,   nil,   177,   295,   295,   177,
+   nil,   296,   nil,   nil,    51,   nil,   nil,   177,    51,    51,
+   nil,   nil,    51,   nil,   nil,   nil,   nil,    51,   231,   231,
+   nil,    51,   231,   nil,   231,   nil,   nil,   nil,   nil,   nil,
+   295,   nil,    51,   nil,   295,   295,   233,   233,   295,   nil,
+   233,   nil,   233,   295,   nil,   nil,   nil,   295,   nil,   nil,
+   nil,   231,   nil,   nil,   nil,   231,   231,   nil,   295,   231,
+   nil,   170,   170,   nil,   231,   nil,   nil,   nil,   231,   233,
+   nil,   nil,   nil,   233,   233,   nil,   nil,   233,   nil,   231,
+   nil,   nil,   233,   nil,   170,   nil,   233,   288,   288,   nil,
+   nil,   288,   nil,   288,   170,   nil,   nil,   233,   170,   170,
+   nil,   nil,   170,   nil,   nil,   nil,   170,   170,   182,   182,
+   nil,   170,   182,   nil,   182,   nil,   nil,   nil,   nil,   nil,
+   288,   nil,   170,   nil,   288,   288,   nil,   nil,   288,   nil,
+   182,   nil,   nil,   288,    70,    70,   nil,   288,   nil,   nil,
+   nil,   182,   nil,   nil,   nil,   182,   182,   nil,   288,   182,
+   nil,   nil,   nil,   nil,   182,   182,   nil,    70,   182,    71,
+    71,   182,   nil,    71,   nil,    71,   nil,    70,   nil,   182,
+   nil,    70,    70,   nil,   nil,    70,   nil,   nil,   nil,    70,
+    70,    71,   nil,   nil,    70,   180,   180,   nil,   nil,   180,
+   nil,   180,    71,   nil,   nil,    70,    71,    71,   nil,   nil,
+    71,   nil,   nil,   nil,   nil,    71,    71,   180,   nil,    71,
+   112,   112,    71,   nil,   112,   nil,   112,   nil,   180,   nil,
+    71,   nil,   180,   180,   167,   167,   180,   nil,   nil,   nil,
+   167,   180,   180,   nil,   nil,   180,   nil,   nil,   180,   nil,
+   nil,   nil,   nil,   112,   nil,   nil,   180,   112,   112,    78,
+    78,   112,   nil,    78,   nil,    78,   112,   167,   nil,   nil,
+   112,   167,   167,   nil,   nil,   167,   nil,   nil,   240,   240,
+   167,   112,   nil,   nil,   167,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    78,   nil,   nil,   167,    78,    78,   nil,   nil,
+    78,   240,   nil,   255,   255,    78,   nil,   nil,   nil,    78,
+   nil,   240,   nil,   nil,   nil,   240,   240,   nil,   nil,   240,
+    78,   100,   100,   240,   240,   100,   100,   100,   240,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   255,   nil,   nil,   240,
+   255,   255,   260,   260,   255,   nil,   260,   nil,   260,   255,
+   nil,   nil,   nil,   255,   100,   nil,   nil,   nil,   100,   100,
+   nil,   nil,   100,   nil,   255,   nil,   nil,   100,   181,   181,
+   nil,   100,   181,   nil,   181,   260,   nil,   nil,   nil,   260,
+   260,   nil,   100,   260,   nil,   nil,   nil,   nil,   260,   nil,
+   181,   nil,   260,   nil,    90,    90,   nil,   nil,    90,   nil,
+    90,   181,   nil,   260,   nil,   181,   181,   nil,   nil,   181,
+   nil,   nil,   nil,   nil,   181,   181,    90,   nil,   181,   161,
+   161,   181,   nil,   161,   nil,   161,   nil,    90,   nil,   181,
+   nil,    90,    90,   166,   166,    90,   nil,   nil,   nil,   nil,
+    90,    90,   nil,   nil,    90,   nil,   nil,    90,   nil,   nil,
+   nil,   nil,   161,   nil,   nil,    90,   161,   161,   nil,   nil,
+   161,   nil,   nil,   nil,   nil,   161,   166,   nil,   nil,   161,
+   166,   166,   nil,   nil,   166,   nil,   nil,   nil,   166,   166,
+   161,    95,    95,   166,   nil,    95,   nil,    95,   277,   277,
+   277,   277,   277,   277,   166,   277,   277,   nil,   269,   269,
+   269,   269,   277,    95,   nil,   269,   269,   178,   178,   nil,
+   nil,   178,   269,   178,    95,   nil,   nil,   nil,    95,    95,
+   nil,   nil,    95,   nil,   nil,   nil,   nil,    95,    95,   178,
+   nil,    95,   nil,   nil,    95,   nil,   nil,    99,    99,   nil,
+   178,    99,    95,    99,   178,   178,   nil,   nil,   178,   nil,
+   nil,   nil,   nil,   178,   178,   nil,   nil,   178,   nil,    99,
+   178,   nil,   nil,   242,   242,   nil,   nil,   242,   178,   242,
+    99,   nil,   nil,   nil,    99,    99,   nil,   nil,    99,   nil,
+   nil,   nil,   nil,    99,    99,   242,   nil,    99,   nil,   nil,
+    99,   nil,   nil,   nil,   nil,   nil,   242,   nil,    99,   nil,
+   242,   242,    91,   nil,   242,   nil,   nil,   nil,   nil,   242,
+   242,    91,    91,   242,   nil,   nil,   242,   nil,   nil,   nil,
+    91,    91,    91,    91,   242,   nil,   129,   129,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   129,   129,   129,   129,   nil,
+   nil,   nil,   nil,   nil,    91,    91,   nil,   nil,    91,    91,
+    91,    91,    91,    91,   nil,    91,    91,   nil,   nil,   129,
+   129,   nil,    91,   129,   129,   129,   129,   129,   129,   nil,
+   129,   129,   190,   190,   nil,   nil,   nil,   129,   nil,   nil,
+   190,   190,   190,   190,   190,   nil,   nil,   271,   271,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   271,   271,   271,   271,
+   nil,   nil,   nil,   nil,   nil,   190,   190,   nil,   nil,   190,
+   190,   190,   190,   190,   190,   nil,   190,   190,   nil,   nil,
+   nil,   271,   nil,   190,   271,   271,   271,   271,   271,   271,
+   nil,   271,   271,   131,   131,   nil,   nil,   nil,   271,   nil,
+   nil,   nil,   131,   131,   131,   131,   nil,   nil,   132,   132,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   132,   132,   132,
+   132,   nil,   nil,   nil,   nil,   nil,   131,   131,   nil,   nil,
+   131,   131,   131,   131,   131,   131,   nil,   131,   131,   nil,
+   nil,   132,   132,   nil,   131,   132,   132,   132,   132,   132,
+   132,   nil,   132,   132,   275,   275,   nil,   nil,   nil,   132,
+   nil,   nil,   nil,   275,   275,   275,   275,   nil,   nil,   279,
+   276,   279,   279,   nil,   279,   279,   nil,   279,   276,   279,
+   nil,   279,   nil,   279,   nil,   nil,   279,   279,   nil,   270,
+   nil,   275,   275,   275,   275,   275,   275,   270,   275,   275,
+   nil,   nil,   nil,   nil,   272,   275,   276,   276,   276,   276,
+   276,   276,   272,   276,   276,   nil,   nil,   nil,   nil,   nil,
+   276,   nil,   nil,   nil,   nil,   270,   270,   270,   270,   270,
+   270,   nil,   270,   270,   188,   nil,   nil,   nil,   nil,   270,
+   272,   272,   272,   272,   272,   272,   nil,   272,   272,   nil,
+   nil,   nil,   nil,   363,   272,   188,   nil,   188,   188,   nil,
+   188,   188,   nil,   188,   nil,   188,   nil,   188,   nil,   188,
+   nil,   nil,   188,   188,   363,   312,   363,   363,   nil,   363,
+   363,   nil,   363,   nil,   363,   nil,   363,   nil,   363,   nil,
+   nil,   363,   363,   nil,   376,   nil,   312,   nil,   312,   312,
+   nil,   312,   312,   nil,   312,   nil,   312,   nil,   312,   nil,
+   312,   nil,   nil,   312,   312,   376,   217,   376,   376,   nil,
+   376,   376,   nil,   376,   nil,   376,   nil,   376,   nil,   376,
+   nil,   nil,   376,   376,   nil,   373,   nil,   217,   nil,   217,
+   217,   nil,   217,   217,   nil,   217,   nil,   217,   nil,   217,
+   nil,   217,   nil,   nil,   217,   217,   373,   238,   373,   373,
+   nil,   373,   373,   nil,   373,   nil,   373,   nil,   373,   nil,
+   373,   nil,   nil,   373,   373,   nil,   nil,   nil,   238,   nil,
+   238,   238,   nil,   238,   238,   nil,   238,   nil,   238,   nil,
+   238,   nil,   238,   nil,   nil,   238,   238,    20,   nil,    20,
+    20,   nil,    20,    20,   nil,    20,   nil,    20,   nil,    20,
+   nil,    20,   nil,   nil,    20,    20,     0,   nil,     0,     0,
+   nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
+     0,   nil,   nil,     0,     0,   268,   268,   268,   268,   268,
+   268,   nil,   268,   268,   nil,   nil,   nil,   nil,   nil,   268 ]
 
 racc_action_pointer = [
-  1832,   210,   426,   395,   396,   nil,   nil,   267,   418,   413,
-   nil,   nil,   -20,   nil,   nil,   nil,   394,     5,   nil,  1813,
-   nil,   nil,    -3,   263,   nil,   nil,   288,   nil,   319,   339,
-   188,   nil,   nil,   368,   380,   345,   337,   nil,   nil,   464,
-   nil,   nil,   nil,   138,   nil,   nil,   520,   546,   571,   585,
-   308,   322,   344,   nil,   nil,    -6,   nil,   nil,   nil,   nil,
-   nil,   nil,    42,   747,   295,    66,   291,   274,   265,   nil,
-   269,   264,   nil,   nil,   907,   954,   nil,   240,   243,   nil,
-   221,   -13,  1064,   nil,   200,   165,     2,   129,   nil,   nil,
-   104,    18,   nil,   nil,  1240,    -2,     6,  1045,   nil,   nil,
-   805,   211,   728,   187,   nil,   208,    34,   270,   282,   284,
-   nil,  1282,   nil,   nil,   313,   316,   nil,   nil,   nil,   318,
-   121,   324,   149,   nil,  1465,   nil,   nil,   333,   nil,   nil,
-  1404,  1358,   343,   329,   nil,   352,   323,   nil,   342,   360,
-   352,   nil,   367,   101,   411,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    -9,   436,   412,   nil,    30,   426,    74,   nil,
-   258,   nil,   nil,   123,   nil,    -7,   nil,   nil,   nil,   nil,
-   nil,   348,   404,   404,    11,   367,    57,   nil,     3,   nil,
-    -4,   101,   190,   369,   216,   nil,  1297,   nil,   322,   nil,
-   nil,   nil,   345,   nil,   nil,   190,   314,   416,   831,  1071,
-  1136,  1214,   754,   633,   237,    83,   490,   238,    32,   659,
-   689,    35,  1589,   365,  1093,    37,   nil,  1611,    34,    44,
-    73,   130,   nil,   nil,    93,  1171,   103,   136,  1161,   119,
-  1118,   133,   172,   200,   231,   nil,   nil,  1652,   nil,    59,
-   nil,   nil,   nil,   -21,   998,   980,   nil,   nil,   973,   nil,
-   249,   nil,   248,   255,   901,   nil,   882,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   270,   nil,   nil,   nil,   nil,   260,
-   564,   nil,   nil,    96,   nil,   288,   nil,   824,   192,   nil,
-   159,   144,   186,   nil,   598,  1446,   912,  1514,  1343,  1499,
-  1533,   nil,  1419,  1480,   588,   nil,  1734,   173,   257,   434,
-   nil,    -3,   nil,   nil,  1753,   nil,   390,   nil,  1233,   125,
-   nil,   nil,   nil,   nil,   nil,   nil,   376,   nil,   nil,   nil,
-  1794,   nil,   nil,   nil,  1775,   nil,   nil,   nil,   372,   374,
-   nil,   376,   378,   380,   nil,   nil,   nil,   nil,   397,   nil,
-   nil,   nil,   174,   nil,   122,   nil,   nil,   nil,   nil,   nil,
-    79,   nil,   148,   415,   nil,   nil,   127,   419,   nil,   nil,
-   nil,   nil,   nil,  1712,   nil,   nil,   nil,   nil,   423,    76,
-   426,   nil,   nil,  1693,   nil,  1671,   nil,   nil,   nil,  1630,
-   nil,  1570,   nil,   nil,   nil ]
+  1726,   123,   450,   384,   418,   461,   341,   nil,   251,   nil,
+   nil,   -20,   446,   434,   nil,   nil,   nil,   433,     0,   nil,
+  1707,   nil,   nil,   301,   nil,   nil,   326,    11,   nil,   374,
+   nil,   306,     7,   320,   nil,   nil,   nil,   403,   nil,   nil,
+   nil,   nil,   295,   nil,   nil,   520,   170,   576,   606,   632,
+   400,   679,   378,   416,   nil,   nil,    -6,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   389,   388,   396,   nil,   nil,   393,
+   842,   867,   nil,   nil,   388,   376,   nil,   363,   957,   nil,
+   362,     2,   340,   356,   nil,   336,   nil,   334,   nil,   323,
+  1092,  1294,   nil,   nil,   322,  1179,   333,   nil,   nil,  1235,
+  1019,   314,   299,     1,   nil,   298,   296,   288,   278,   nil,
+   286,    76,   918,   242,   176,   256,   238,   nil,   nil,   228,
+   nil,   185,   133,   nil,   nil,   nil,   nil,    97,   nil,  1309,
+   nil,  1416,  1431,    90,    46,   nil,    -8,   nil,   423,   nil,
+   285,   310,   381,   409,    91,   nil,   422,   433,   nil,   nil,
+   nil,   nil,   nil,   nil,    19,   477,   nil,     5,    19,   484,
+   nil,  1117,   nil,    95,    -4,   nil,  1131,   932,   nil,   305,
+   769,   nil,   550,   494,   438,   199,   180,   654,  1205,   464,
+   893,  1066,   816,   411,   275,   132,    84,   368,  1565,    36,
+  1355,   nil,   187,   nil,   259,   nil,   nil,   151,   nil,   nil,
+    27,   333,   nil,    69,   nil,   nil,    80,   nil,   nil,   nil,
+   nil,   340,    61,    66,   -17,   250,    99,  1647,   131,   133,
+   135,   119,   nil,   nil,   169,   248,   nil,   204,   352,   204,
+   239,   726,   216,   744,   230,   267,   nil,   nil,  1688,   280,
+   976,   nil,  1261,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   295,   nil,   nil,   284,   nil,  1001,   nil,   nil,   nil,   nil,
+  1040,   nil,   100,   165,    81,   163,   nil,   218,  1721,  1144,
+  1511,  1370,  1526,    96,   nil,  1477,  1492,  1134,   nil,  1479,
+   381,   145,   135,   nil,   389,   nil,     9,   nil,   795,   398,
+   nil,    70,   nil,   nil,    45,   705,   648,   nil,   412,   nil,
+    26,   nil,   125,   nil,   nil,   419,   nil,   417,   395,   nil,
+   150,   nil,  1606,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   424,   nil,   nil,   nil,   430,   nil,   nil,   nil,   nil,
+   257,   nil,    25,   nil,   nil,   206,   206,   nil,   447,   nil,
+   nil,   nil,   nil,   450,   nil,   nil,   nil,   438,   440,   nil,
+   441,   445,   448,   nil,   nil,   nil,   nil,   126,   467,   nil,
+   nil,   nil,   nil,  1584,   nil,   nil,   nil,   nil,   470,    78,
+   482,   nil,   nil,  1666,   nil,   nil,  1625,   nil,   nil,   nil,
+   486,   nil,   489,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -197,  -234,  -234,   -50,  -234,    -8,    -9,  -234,  -234,   -22,
-   -10,  -188,  -189,   -11,  -186,   -12,  -234,  -234,   -13,    -1,
-   -14,    -2,  -234,  -187,   -15,    -3,  -234,   -16,    -5,  -234,
-  -234,   -17,    -6,  -234,   -18,    -7,  -197,  -189,  -187,  -234,
-   -51,   -26,   -27,  -234,   -24,   -25,  -234,  -234,  -234,   -85,
-   -92,  -197,  -234,  -196,  -194,  -197,  -190,  -192,  -193,  -222,
-  -195,    -4,  -197,  -234,   -85,  -197,   -53,  -232,   -42,  -175,
-   -43,  -214,  -117,   -33,  -234,  -234,   -44,   -31,   -74,   -32,
-  -234,   -36,  -234,  -122,   -37,  -234,   -73,   -38,  -172,   -72,
-   -39,   -40,  -174,   -41,  -234,  -103,  -111,  -234,  -132,  -112,
-  -234,  -104,  -234,  -108,  -110,  -105,  -234,  -114,  -106,  -113,
-  -109,  -234,  -125,  -107,  -234,  -234,   -49,  -176,  -177,  -179,
-  -234,  -234,  -198,  -199,   -83,   -19,   -22,  -187,   -21,   -23,
-   -82,   -84,  -234,   -75,   -86,   -81,   -70,   -74,   -76,  -220,
-   -79,   -68,   -77,   -73,  -234,  -171,  -170,   -80,   -78,   -90,
-   -91,   -93,  -234,  -220,  -197,   385,  -234,  -234,  -234,  -208,
-  -234,   -57,  -214,  -197,   -59,  -234,   -66,   -65,   -56,   -73,
-   -95,  -234,  -220,  -234,  -234,   -92,  -234,   -30,  -234,  -118,
-  -234,  -234,  -234,  -234,  -234,  -142,  -234,  -149,  -234,  -217,
-  -230,  -226,  -234,  -229,  -225,  -234,  -234,  -234,  -234,  -234,
-  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-  -234,  -234,  -234,  -234,  -234,  -234,   -20,  -234,  -207,  -234,
-  -205,  -234,  -202,  -231,  -234,   -71,  -221,  -234,  -234,   -85,
-  -234,  -221,  -234,  -234,  -234,  -210,  -191,  -234,  -209,  -234,
-   -54,   -62,   -61,  -234,  -234,  -234,  -218,  -219,  -234,  -124,
-  -234,   -55,  -220,  -234,  -234,   -28,  -234,  -120,  -119,   -35,
-   -34,  -173,  -168,  -166,  -234,  -169,  -160,  -167,  -161,   -73,
-  -234,  -123,  -116,  -234,  -152,  -219,  -215,  -234,  -234,  -223,
-  -137,  -139,  -138,  -133,  -140,  -144,  -141,  -146,  -151,  -148,
-  -145,  -134,  -150,  -147,  -143,  -135,  -234,  -128,  -136,  -234,
-  -154,  -234,  -158,  -178,  -234,  -181,  -234,  -200,  -234,  -234,
-  -201,   -45,   -69,   -87,   -46,   -88,  -220,   -89,   -94,   -48,
-  -234,  -212,  -211,  -213,  -234,  -185,   -58,   -60,   -97,   -98,
-   -63,  -102,   -99,  -100,  -101,   -64,   -96,   -47,  -234,  -233,
-   -29,  -121,  -234,  -163,  -220,  -115,  -216,  -228,  -227,  -224,
-  -128,  -127,  -234,  -234,  -155,  -153,  -234,  -234,  -180,  -206,
-  -204,  -203,   -67,  -234,  -183,  -184,   -52,  -165,  -219,  -234,
-  -234,  -126,  -129,  -234,  -159,  -234,  -182,  -164,  -162,  -234,
-  -131,  -234,  -157,  -130,  -156 ]
+  -198,  -235,   -51,   -19,    -8,  -235,  -235,    -9,  -235,   -10,
+  -189,  -190,  -235,   -23,   -11,  -187,   -12,  -235,  -235,   -13,
+    -1,   -14,    -2,  -188,   -15,    -3,  -235,  -235,   -16,  -235,
+   -17,    -6,  -235,  -235,   -18,    -7,  -190,  -198,  -188,   -52,
+   -27,   -28,  -235,   -25,   -26,  -235,  -235,  -235,  -235,  -235,
+  -198,   -86,   -93,  -235,  -197,  -195,  -198,  -191,  -193,  -194,
+  -223,  -196,    -4,   -42,  -233,   -43,  -215,  -176,  -118,   -44,
+  -235,  -235,   -45,   -34,   -75,   -32,   -33,  -235,  -235,  -123,
+   -37,   -74,   -38,  -235,   -73,   -39,  -173,   -40,  -175,   -41,
+  -235,  -235,  -126,  -108,  -104,  -235,  -112,  -133,  -113,  -235,
+  -235,  -105,  -109,  -235,  -111,  -106,  -115,  -107,  -114,  -110,
+   -54,  -198,  -235,   -86,  -198,  -235,  -180,  -177,  -178,  -235,
+   -50,  -235,  -199,  -200,   -24,   -21,   -23,  -188,   -22,   -84,
+   -20,   -83,   -85,  -235,  -198,   -79,   -76,   -87,   -82,   -75,
+   -71,   -77,  -221,   -80,   -74,   -69,   -78,  -235,  -172,  -171,
+   -81,   -91,   -92,   -94,  -235,  -221,   386,  -235,  -235,  -235,
+  -209,  -235,   -31,  -235,  -235,  -119,  -235,  -235,   -96,  -235,
+  -235,  -143,  -235,  -235,  -235,  -235,  -235,  -235,  -235,  -235,
+  -235,  -235,  -235,  -235,  -235,  -235,  -235,  -235,  -235,  -235,
+  -235,  -150,  -235,  -218,  -235,  -231,  -227,  -235,  -230,  -226,
+   -93,  -235,  -215,  -198,   -58,   -60,  -235,   -67,   -57,   -74,
+   -66,  -235,  -221,  -235,  -235,  -235,  -235,  -235,  -208,  -206,
+  -235,  -235,  -203,  -232,  -235,  -235,  -211,  -235,   -72,  -222,
+  -235,  -235,   -86,  -235,  -222,  -235,  -192,  -210,  -235,  -235,
+  -235,   -29,  -235,  -121,  -120,   -36,   -35,  -174,  -169,  -167,
+  -235,  -170,  -161,   -74,  -168,  -235,  -162,  -219,  -220,  -124,
+  -235,  -117,  -235,  -138,  -140,  -139,  -134,  -141,  -145,  -142,
+  -147,  -152,  -149,  -146,  -135,  -151,  -148,  -144,  -136,    -5,
+  -235,  -129,  -137,  -153,  -220,  -216,  -235,  -224,  -235,  -221,
+   -55,  -235,   -63,   -62,  -235,  -235,  -235,  -125,  -235,   -56,
+  -235,  -155,  -235,  -159,  -179,  -235,  -182,  -235,  -235,  -201,
+  -235,  -202,  -235,  -213,  -214,  -212,   -46,   -70,   -88,   -47,
+   -89,  -221,   -90,   -95,   -49,  -235,  -186,  -234,   -30,  -122,
+  -235,  -164,  -221,   -97,  -116,  -129,  -235,  -128,  -235,  -217,
+  -228,  -225,  -229,  -235,   -59,   -61,  -102,   -98,   -99,   -64,
+  -103,  -100,  -101,   -65,   -48,  -156,  -154,  -235,  -235,  -181,
+  -207,  -205,  -204,  -235,  -184,   -68,  -185,  -166,  -220,  -235,
+  -235,  -127,  -130,  -235,   -53,  -160,  -235,  -183,  -165,  -163,
+  -235,  -132,  -235,  -158,  -131,  -157 ]
 
 racc_goto_table = [
-    22,     9,    68,   112,   222,   264,    61,    36,    53,   179,
-   268,   141,    70,    19,     2,    77,   191,   118,    51,    22,
-     9,   139,   116,    21,    73,    91,    56,   147,   133,   149,
-   115,   227,   153,     2,   300,   128,   172,   302,   135,   160,
-   125,   129,   174,    22,   126,   232,   351,    43,   171,   299,
-   260,   146,   369,    68,   121,   330,   335,   258,   266,   123,
-   318,   344,   136,    70,   250,   119,   178,   183,   224,   154,
-   233,    55,   157,    66,   123,    73,    91,   120,   159,   238,
-   219,   221,   326,   322,   195,   190,    16,   188,   nil,   nil,
-   nil,   nil,   nil,   264,   nil,   nil,   nil,   nil,   343,   371,
+    27,    13,    20,   222,    89,    92,   115,    37,    62,     5,
+    65,   196,   256,   145,   230,   150,   118,    50,   155,   301,
+    27,    13,   246,    75,    73,    57,   133,   235,   201,     5,
+   250,   214,   149,   119,   337,   165,   121,   344,   136,    69,
+   169,   120,    27,   126,   142,    22,    27,   126,   300,   134,
+   128,    89,    63,   151,   128,   168,   125,    65,   280,   124,
+   130,    42,   192,   124,    46,   349,   353,   138,   244,    87,
+   163,    73,   252,   369,   211,   332,   323,   168,   303,   116,
+   135,   140,   123,   224,   298,    56,    69,   305,   371,   168,
+   195,   159,   227,   237,   220,   123,   246,   148,   221,    63,
+   331,   160,   110,   315,   355,   194,   212,    17,   325,   nil,
+   nil,    86,   nil,   nil,   nil,   nil,    87,   nil,   250,   nil,
+   294,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   239,    86,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    89,   149,   nil,
+   nil,    89,   266,    65,   248,   nil,   nil,    65,    86,   nil,
+   nil,   343,   nil,   303,   236,   nil,   289,   245,   nil,   nil,
+   262,    73,   nil,   nil,   nil,    82,   247,   nil,   nil,   226,
+   nil,   nil,    69,   nil,   nil,   nil,    69,   nil,    27,    13,
+   317,   362,   150,   365,   340,    63,   149,     5,   nil,    63,
+   304,   151,   248,   143,   370,    85,   329,   nil,   320,   149,
+   322,   nil,    87,   148,   378,   136,    87,    27,    13,   nil,
+   375,    89,    82,   nil,   247,   321,     5,    65,   nil,    54,
+   318,   313,   250,   146,   nil,   151,   149,   333,    27,    13,
+   nil,   245,   248,   380,   138,   nil,   382,     5,   nil,   nil,
+   nil,   nil,    85,   nil,    86,    86,    69,   135,    86,   nil,
+   nil,   148,   nil,   210,   247,   342,   210,    62,   nil,    63,
+    80,   nil,   nil,   195,   148,   nil,   149,   149,   nil,    27,
+    13,   149,   347,   347,   360,   361,    87,   248,     5,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   141,   nil,
+   nil,   148,   nil,    86,   247,   247,   nil,   367,   nil,   247,
+   nil,   nil,    27,    13,   363,   372,    86,    80,    82,   251,
+   nil,     5,    82,   nil,   346,   346,   nil,   nil,    86,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   149,   nil,
+   nil,   352,   352,    86,   248,   nil,   148,   nil,    85,   254,
+   149,    62,    85,   nil,   nil,   210,   248,   nil,   207,   nil,
+   nil,   207,   nil,    27,    13,   nil,   247,   251,    54,    54,
+   nil,   nil,     5,    27,    13,   nil,    27,    13,   247,   nil,
+   143,   nil,     5,    86,    86,     5,   nil,   nil,    86,   nil,
+   nil,   nil,    82,   nil,   274,   nil,   nil,   254,   278,   nil,
+   nil,   nil,   nil,   148,   nil,   nil,   nil,   251,   nil,   nil,
+   146,   nil,   nil,    80,   249,   148,   nil,    80,   nil,   nil,
+   nil,   nil,    85,   nil,   nil,   nil,   nil,   nil,   nil,   129,
+   nil,   131,   132,   nil,   nil,   nil,   nil,   254,   nil,   nil,
+   nil,   nil,   nil,   210,   nil,    86,   nil,   350,   350,   nil,
+   207,   nil,   251,   nil,   nil,   164,   nil,    86,   nil,   nil,
+   nil,   nil,   249,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   171,   141,   nil,   351,   351,   190,
+   nil,   nil,   254,   191,   nil,   nil,   nil,    80,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   128,   nil,   nil,    88,   nil,   216,   129,   354,
-    22,   126,   302,   260,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   249,   nil,   nil,   nil,   nil,   nil,   nil,   251,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   243,    88,   nil,   nil,   338,   nil,   nil,    53,   nil,    53,
-   nil,   nil,   nil,   nil,   149,   nil,   nil,   252,   nil,   nil,
-    68,   262,   nil,    68,   nil,   236,    88,   nil,   nil,   nil,
-    70,   nil,   nil,    70,   nil,   nil,   273,   235,   nil,   374,
-   nil,   nil,   259,    91,   146,    73,    91,   312,   348,   nil,
-   341,   361,   264,   262,    87,   nil,   261,   377,   291,   303,
-   nil,   316,   295,   147,   133,   313,   nil,   nil,   362,   nil,
-   149,   nil,    22,     9,   135,   nil,   146,    22,     9,   nil,
-   142,   nil,   nil,   328,   328,   296,     2,   146,   261,   nil,
-   304,     2,   nil,    68,   nil,   nil,   370,    22,     9,   nil,
-   321,   nil,   nil,    70,   nil,    87,   146,   146,   nil,   262,
-   324,     2,   nil,   nil,   nil,   259,    91,   190,   261,   261,
-   nil,    81,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   146,    88,    88,   nil,    88,   nil,   262,   nil,
-   nil,   nil,   nil,    61,   261,   nil,   nil,   138,    84,   nil,
-   nil,    61,   nil,   nil,   nil,   nil,    22,     9,   nil,   nil,
-   166,   146,   nil,   166,    22,     9,    88,   nil,   nil,   nil,
-     2,    61,    81,   261,   140,   nil,   nil,    88,     2,   nil,
-    22,     9,   nil,   nil,    22,     9,   nil,   167,   nil,   372,
-   167,   nil,   nil,   363,     2,   262,    88,    88,     2,    84,
-   nil,    90,   nil,   nil,   nil,   nil,    88,   nil,   262,   nil,
-    61,   nil,    87,   267,   nil,    87,   nil,   nil,   146,   nil,
-   nil,   nil,    88,    22,     9,   nil,    61,   145,    61,   nil,
-   261,   146,   nil,    22,     9,    22,     9,     2,   114,    22,
-     9,    22,     9,   261,    93,   267,   379,     2,   381,     2,
-   nil,    88,    90,     2,   nil,     2,   142,   132,   nil,   nil,
-   nil,   166,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   148,   nil,   170,   nil,   nil,   332,   332,   nil,   nil,    81,
-   263,   nil,    81,   nil,   nil,    87,   nil,   nil,   167,   nil,
-   nil,   170,   nil,   nil,   nil,    93,   nil,   nil,   nil,   nil,
-   nil,   267,   nil,   nil,   nil,   nil,    84,   265,    88,    84,
-   nil,   170,   263,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    88,   nil,   138,   nil,   nil,   nil,   nil,   nil,   nil,
-   267,   nil,   nil,   nil,   nil,   nil,   nil,   166,   124,   265,
-   nil,   nil,   329,   329,   nil,   130,   131,   nil,   nil,   nil,
-   140,   nil,    81,   nil,   nil,   nil,   nil,   nil,   nil,    90,
-   145,   nil,    90,   nil,   167,   nil,   nil,   nil,   263,   331,
-   331,   nil,   nil,   nil,   180,   nil,   nil,   nil,   nil,    84,
-   nil,   nil,   nil,   nil,   nil,   253,   nil,   267,   nil,   nil,
-   nil,   nil,   145,   185,   nil,   265,   186,   263,   nil,   187,
-   267,   nil,    93,   145,   nil,    93,   nil,   nil,   283,   nil,
+   nil,   251,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   207,   254,
+   nil,   nil,   348,   348,   nil,   nil,   nil,   249,   nil,   nil,
+   nil,   254,   nil,   nil,   nil,   nil,   263,   264,   265,   nil,
+   267,   268,   269,   270,   271,   272,   273,   nil,   275,   276,
+   277,   nil,   nil,   282,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   333,   333,   265,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    90,   nil,   nil,   nil,   nil,   315,   nil,   317,
-   nil,   nil,   nil,   nil,   nil,   nil,   148,   nil,   145,   nil,
-   nil,   nil,   nil,   nil,   263,   nil,   nil,   336,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   334,   334,   263,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    93,   nil,   145,   nil,   nil,
-   nil,   265,   nil,   nil,   nil,   nil,   347,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   265,   280,   281,   282,   nil,   284,
-   285,   286,   287,   288,   289,   290,   nil,   292,   293,   294,
-   nil,   nil,   298,   nil,   nil,   359,   nil,   360,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   145,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   145,   nil,   nil,
-   nil,   367,   nil,   nil,   nil,   180 ]
+   nil,   nil,   nil,   nil,   249,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   249,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   164 ]
 
 racc_goto_check = [
-    37,    21,    30,    62,    82,    68,     4,    32,    64,    60,
-    70,    47,    31,     2,    52,    22,    85,    72,    32,    37,
-    21,    35,     5,     3,    21,    28,    78,    50,    30,    53,
-    37,    36,    38,    52,    66,     5,    35,    68,    31,    41,
-    19,     7,    41,    37,    21,    36,    63,    20,    57,    65,
-    23,    28,    58,    30,    74,    46,    46,    61,    69,     3,
-    56,    71,    33,    31,    36,    73,    22,    57,    34,    74,
-    75,    76,    77,    40,     3,    21,    28,    20,     3,    79,
-    80,    81,    42,    83,    84,    30,     1,    57,   nil,   nil,
-   nil,   nil,   nil,    68,   nil,   nil,   nil,   nil,    70,    63,
+    38,    22,     2,    83,    29,    63,    55,    33,     4,    53,
+    31,    86,    71,    48,    37,    51,    73,    33,    39,    67,
+    38,    22,    24,    23,    22,    79,    55,    37,    42,    53,
+    69,    42,    29,    38,    64,    61,    75,    43,    31,    32,
+    58,     6,    38,    22,    36,     3,    38,    22,    66,    75,
+     6,    29,    30,    54,     6,    55,    20,    31,     5,     8,
+    20,    21,    58,     8,    21,    47,    47,    32,    62,    28,
+    23,    22,    70,    59,    58,    72,    57,    55,    69,    74,
+    30,    34,     3,    76,    37,    77,    32,     5,    64,    55,
+    31,    78,    35,    80,    81,     3,    24,    28,    82,    30,
+    71,     3,    41,    84,    67,    85,    36,     1,     5,   nil,
+   nil,    50,   nil,   nil,   nil,   nil,    28,   nil,    69,   nil,
+    42,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    55,    50,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,    29,   nil,
+   nil,    29,    55,    31,    31,   nil,   nil,    31,    50,   nil,
+   nil,    37,   nil,    69,    79,   nil,    39,    22,   nil,   nil,
+    23,    22,   nil,   nil,   nil,    26,    53,   nil,   nil,     3,
+   nil,   nil,    32,   nil,   nil,   nil,    32,   nil,    38,    22,
+    48,    83,    51,    37,    86,    30,    29,    53,   nil,    30,
+    73,    54,    31,    26,    37,    27,    61,   nil,    55,    29,
+    55,   nil,    28,    28,    71,    31,    28,    38,    22,   nil,
+    69,    29,    26,   nil,    53,    36,    53,    31,   nil,    65,
+    54,    33,    69,    27,   nil,    54,    29,    55,    38,    22,
+   nil,    22,    31,     5,    32,   nil,     5,    53,   nil,   nil,
+   nil,   nil,    27,   nil,    50,    50,    32,    30,    50,   nil,
+   nil,    28,   nil,    26,    53,    55,    26,     4,   nil,    30,
+    25,   nil,   nil,    31,    28,   nil,    29,    29,   nil,    38,
+    22,    29,    31,    31,    55,    55,    28,    31,    53,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,
+   nil,    28,   nil,    50,    53,    53,   nil,    55,   nil,    53,
+   nil,   nil,    38,    22,     2,    63,    50,    25,    26,    26,
+   nil,    53,    26,   nil,    30,    30,   nil,   nil,    50,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,   nil,
+   nil,    28,    28,    50,    31,   nil,    28,   nil,    27,    27,
+    29,     4,    27,   nil,   nil,    26,    31,   nil,    25,   nil,
+   nil,    25,   nil,    38,    22,   nil,    53,    26,    65,    65,
+   nil,   nil,    53,    38,    22,   nil,    38,    22,    53,   nil,
+    26,   nil,    53,    50,    50,    53,   nil,   nil,    50,   nil,
+   nil,   nil,    26,   nil,    65,   nil,   nil,    27,    65,   nil,
+   nil,   nil,   nil,    28,   nil,   nil,   nil,    26,   nil,   nil,
+    27,   nil,   nil,    25,    25,    28,   nil,    25,   nil,   nil,
+   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,   nil,    52,
+   nil,    52,    52,   nil,   nil,   nil,   nil,    27,   nil,   nil,
+   nil,   nil,   nil,    26,   nil,    50,   nil,    26,    26,   nil,
+    25,   nil,    26,   nil,   nil,    52,   nil,    50,   nil,   nil,
+   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    52,    25,   nil,    27,    27,    52,
+   nil,   nil,    27,    52,   nil,   nil,   nil,    25,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     5,   nil,   nil,    49,   nil,    19,     7,    66,
-    37,    21,    68,    23,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,    26,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    41,    49,   nil,   nil,    36,   nil,   nil,    64,   nil,    64,
-   nil,   nil,   nil,   nil,    53,   nil,   nil,    38,   nil,   nil,
-    30,    30,   nil,    30,   nil,    78,    49,   nil,   nil,   nil,
-    31,   nil,   nil,    31,   nil,   nil,    22,     3,   nil,    68,
-   nil,   nil,    21,    28,    28,    21,    28,    47,    85,   nil,
-    60,    82,    68,    30,    26,   nil,    52,    70,    64,    72,
-   nil,    35,    64,    50,    30,    53,   nil,   nil,    36,   nil,
-    53,   nil,    37,    21,    31,   nil,    28,    37,    21,   nil,
-    26,   nil,   nil,    30,    30,     2,    52,    28,    52,   nil,
-     2,    52,   nil,    30,   nil,   nil,    36,    37,    21,   nil,
-    32,   nil,   nil,    31,   nil,    26,    28,    28,   nil,    30,
-     2,    52,   nil,   nil,   nil,    21,    28,    30,    52,    52,
-   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28,    49,    49,   nil,    49,   nil,    30,   nil,
-   nil,   nil,   nil,     4,    52,   nil,   nil,    24,    25,   nil,
-   nil,     4,   nil,   nil,   nil,   nil,    37,    21,   nil,   nil,
-    24,    28,   nil,    24,    37,    21,    49,   nil,   nil,   nil,
-    52,     4,    24,    52,    25,   nil,   nil,    49,    52,   nil,
-    37,    21,   nil,   nil,    37,    21,   nil,    25,   nil,    62,
-    25,   nil,   nil,     2,    52,    30,    49,    49,    52,    25,
-   nil,    27,   nil,   nil,   nil,   nil,    49,   nil,    30,   nil,
-     4,   nil,    26,    26,   nil,    26,   nil,   nil,    28,   nil,
-   nil,   nil,    49,    37,    21,   nil,     4,    27,     4,   nil,
-    52,    28,   nil,    37,    21,    37,    21,    52,    54,    37,
-    21,    37,    21,    52,    29,    26,     2,    52,     2,    52,
-   nil,    49,    27,    52,   nil,    52,    26,    54,   nil,   nil,
-   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    29,   nil,    54,   nil,   nil,    26,    26,   nil,   nil,    24,
-    24,   nil,    24,   nil,   nil,    26,   nil,   nil,    25,   nil,
-   nil,    54,   nil,   nil,   nil,    29,   nil,   nil,   nil,   nil,
-   nil,    26,   nil,   nil,   nil,   nil,    25,    25,    49,    25,
-   nil,    54,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    49,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,
-    26,   nil,   nil,   nil,   nil,   nil,   nil,    24,    51,    25,
-   nil,   nil,    24,    24,   nil,    51,    51,   nil,   nil,   nil,
-    25,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,    27,
-    27,   nil,    27,   nil,    25,   nil,   nil,   nil,    24,    25,
-    25,   nil,   nil,   nil,    51,   nil,   nil,   nil,   nil,    25,
-   nil,   nil,   nil,   nil,   nil,    54,   nil,    26,   nil,   nil,
-   nil,   nil,    27,    51,   nil,    25,    51,    24,   nil,    51,
-    26,   nil,    29,    27,   nil,    29,   nil,   nil,    54,   nil,
+   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,    27,
+   nil,   nil,    25,    25,   nil,   nil,   nil,    25,   nil,   nil,
+   nil,    27,   nil,   nil,   nil,   nil,    52,    52,    52,   nil,
+    52,    52,    52,    52,    52,    52,    52,   nil,    52,    52,
+    52,   nil,   nil,    52,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    27,    27,    25,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    27,   nil,   nil,   nil,   nil,    54,   nil,    54,
-   nil,   nil,   nil,   nil,   nil,   nil,    29,   nil,    27,   nil,
-   nil,   nil,   nil,   nil,    24,   nil,   nil,    54,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    29,    29,    24,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    29,   nil,    27,   nil,   nil,
-   nil,    25,   nil,   nil,   nil,   nil,    54,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    25,    51,    51,    51,   nil,    51,
-    51,    51,    51,    51,    51,    51,   nil,    51,    51,    51,
-   nil,   nil,    51,   nil,   nil,    54,   nil,    54,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,   nil,
-   nil,    54,   nil,   nil,   nil,    51 ]
+   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    52 ]
 
 racc_goto_pointer = [
-   nil,    86,    13,    23,   -13,    -8,   nil,    -2,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,
-    43,     1,    -8,  -131,   238,   265,   171,   318,     2,   361,
-   -21,   -11,     6,    13,   -68,   -28,  -108,     0,   -18,   nil,
-    51,   -23,  -157,   nil,   nil,   nil,  -189,   -38,   nil,    92,
-   -22,   439,    14,   -21,   349,   nil,  -171,   -15,  -292,   nil,
-   -66,  -123,   -23,  -251,    -9,  -165,  -180,   nil,  -177,  -124,
-  -172,  -209,   -16,    32,    18,   -84,    54,    17,     9,   -79,
-   -42,   -41,  -118,  -151,   -22,   -90,   nil ]
+   nil,   107,     2,    45,   -12,  -130,     8,   nil,    17,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    14,    58,     1,     0,  -144,   247,   152,   182,    46,   -19,
+    29,   -13,    16,     6,    30,   -48,    -7,  -128,     0,   -34,
+   nil,    75,   -83,  -254,   nil,   nil,   nil,  -230,   -38,   nil,
+    88,   -36,   384,     9,     1,   -23,   nil,  -158,   -38,  -259,
+   nil,   -36,   -96,   -21,  -247,   211,  -167,  -196,   nil,  -137,
+   -95,  -155,  -180,   -16,    47,    -1,   -51,    67,    35,     7,
+   -65,   -28,   -24,  -119,  -122,     2,   -92,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   168,    25,    28,    32,    35,     5,     6,
-    10,    13,    15,    18,    20,    24,    27,    31,    34,     4,
-   nil,    99,   nil,    79,   101,   103,   105,   108,   109,   113,
-    95,    96,     8,   nil,   nil,   nil,   nil,    85,   nil,    30,
-   nil,   nil,   161,   239,   164,   165,   nil,   nil,   144,   107,
-   110,   111,    67,   134,    98,   150,   151,   nil,   248,   104,
-   nil,   nil,   nil,   nil,    69,   nil,   nil,   301,    80,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    57,
-   nil,   nil,   nil,   nil,   nil,   nil,   192 ]
+   nil,   nil,   279,   208,    25,   nil,    31,    35,     4,     7,
+     9,    14,    16,    19,    21,    24,    28,    30,    34,     3,
+     6,   nil,    98,   nil,    76,   101,   102,   105,   107,   108,
+    93,    94,    96,    12,   nil,   nil,   nil,   nil,    83,   nil,
+    33,   nil,   nil,   204,   291,   205,   206,   nil,   nil,   147,
+   106,   109,    91,    64,   137,    97,   152,   153,   nil,   260,
+   104,   nil,   nil,   nil,   nil,    67,   nil,   nil,   302,    77,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    58,   nil,   nil,   nil,   nil,   nil,   nil,   197 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 70, :_reduce_1,
   1, 70, :_reduce_none,
-  1, 71, :_reduce_none,
+  1, 70, :_reduce_none,
+  1, 71, :_reduce_3,
   2, 71, :_reduce_4,
+  1, 74, :_reduce_5,
   1, 73, :_reduce_none,
   1, 73, :_reduce_none,
   1, 73, :_reduce_none,
@@ -685,225 +650,225 @@ racc_reduce_table = [
   1, 73, :_reduce_none,
   1, 73, :_reduce_none,
   1, 73, :_reduce_none,
-  3, 87, :_reduce_19,
-  3, 87, :_reduce_20,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
+  3, 88, :_reduce_20,
+  3, 88, :_reduce_21,
   1, 89, :_reduce_none,
   1, 89, :_reduce_none,
   1, 89, :_reduce_none,
-  1, 89, :_reduce_none,
-  4, 81, :_reduce_28,
-  5, 81, :_reduce_29,
-  3, 81, :_reduce_30,
-  2, 81, :_reduce_31,
-  1, 91, :_reduce_none,
-  1, 91, :_reduce_none,
-  3, 91, :_reduce_34,
-  3, 91, :_reduce_35,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_none,
-  1, 92, :_reduce_44,
-  5, 74, :_reduce_45,
-  5, 74, :_reduce_46,
-  5, 74, :_reduce_47,
-  5, 85, :_reduce_48,
-  2, 75, :_reduce_49,
-  1, 108, :_reduce_50,
-  2, 108, :_reduce_51,
-  6, 76, :_reduce_52,
-  2, 76, :_reduce_53,
-  3, 109, :_reduce_54,
-  3, 109, :_reduce_55,
-  1, 110, :_reduce_none,
-  1, 110, :_reduce_none,
-  3, 110, :_reduce_58,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  4, 82, :_reduce_29,
+  5, 82, :_reduce_30,
+  3, 82, :_reduce_31,
+  2, 82, :_reduce_32,
+  1, 92, :_reduce_33,
+  1, 92, :_reduce_34,
+  3, 92, :_reduce_35,
+  3, 92, :_reduce_36,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_45,
+  5, 75, :_reduce_46,
+  5, 75, :_reduce_47,
+  5, 75, :_reduce_48,
+  5, 86, :_reduce_49,
+  2, 76, :_reduce_50,
+  1, 109, :_reduce_51,
+  2, 109, :_reduce_52,
+  6, 77, :_reduce_53,
+  2, 77, :_reduce_54,
+  3, 110, :_reduce_55,
+  3, 110, :_reduce_56,
   1, 111, :_reduce_none,
-  3, 111, :_reduce_60,
-  1, 112, :_reduce_61,
-  1, 112, :_reduce_62,
-  3, 113, :_reduce_63,
-  3, 113, :_reduce_64,
-  1, 114, :_reduce_none,
-  1, 114, :_reduce_none,
-  4, 116, :_reduce_67,
-  1, 102, :_reduce_none,
-  3, 102, :_reduce_69,
-  0, 103, :_reduce_none,
-  1, 103, :_reduce_none,
-  1, 118, :_reduce_72,
-  1, 93, :_reduce_73,
-  1, 95, :_reduce_74,
-  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,
-  3, 77, :_reduce_82,
-  3, 77, :_reduce_83,
-  3, 86, :_reduce_84,
-  0, 104, :_reduce_85,
-  1, 104, :_reduce_86,
-  3, 104, :_reduce_87,
-  3, 122, :_reduce_88,
-  3, 124, :_reduce_89,
-  1, 125, :_reduce_none,
-  1, 125, :_reduce_none,
-  0, 107, :_reduce_92,
-  1, 107, :_reduce_93,
-  3, 107, :_reduce_94,
-  1, 126, :_reduce_none,
-  3, 126, :_reduce_96,
-  1, 115, :_reduce_none,
-  1, 115, :_reduce_none,
-  1, 115, :_reduce_none,
-  1, 115, :_reduce_none,
+  1, 111, :_reduce_none,
+  3, 111, :_reduce_59,
+  1, 112, :_reduce_none,
+  3, 112, :_reduce_61,
+  1, 113, :_reduce_62,
+  1, 113, :_reduce_63,
+  3, 114, :_reduce_64,
+  3, 114, :_reduce_65,
   1, 115, :_reduce_none,
   1, 115, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  1, 123, :_reduce_none,
-  4, 97, :_reduce_115,
-  3, 97, :_reduce_116,
-  1, 99, :_reduce_117,
-  2, 99, :_reduce_118,
-  2, 129, :_reduce_119,
-  1, 130, :_reduce_120,
-  2, 130, :_reduce_121,
-  1, 96, :_reduce_122,
-  4, 90, :_reduce_123,
-  4, 90, :_reduce_124,
-  2, 79, :_reduce_125,
-  5, 131, :_reduce_126,
-  4, 131, :_reduce_127,
-  0, 132, :_reduce_none,
-  2, 132, :_reduce_129,
-  4, 132, :_reduce_130,
-  3, 132, :_reduce_131,
-  1, 120, :_reduce_none,
-  3, 120, :_reduce_133,
-  3, 120, :_reduce_134,
-  3, 120, :_reduce_135,
-  3, 120, :_reduce_136,
-  3, 120, :_reduce_137,
-  3, 120, :_reduce_138,
-  3, 120, :_reduce_139,
-  3, 120, :_reduce_140,
-  3, 120, :_reduce_141,
-  2, 120, :_reduce_142,
-  3, 120, :_reduce_143,
-  3, 120, :_reduce_144,
-  3, 120, :_reduce_145,
-  3, 120, :_reduce_146,
-  3, 120, :_reduce_147,
-  3, 120, :_reduce_148,
-  2, 120, :_reduce_149,
-  3, 120, :_reduce_150,
-  3, 120, :_reduce_151,
-  3, 120, :_reduce_152,
-  5, 78, :_reduce_153,
-  1, 134, :_reduce_none,
-  2, 134, :_reduce_155,
-  5, 135, :_reduce_156,
-  4, 135, :_reduce_157,
-  1, 136, :_reduce_none,
-  3, 136, :_reduce_159,
-  3, 98, :_reduce_160,
+  4, 117, :_reduce_68,
+  1, 103, :_reduce_69,
+  3, 103, :_reduce_70,
+  0, 104, :_reduce_none,
+  1, 104, :_reduce_none,
+  1, 119, :_reduce_73,
+  1, 94, :_reduce_74,
+  1, 96, :_reduce_75,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  3, 78, :_reduce_83,
+  3, 78, :_reduce_84,
+  3, 87, :_reduce_85,
+  0, 105, :_reduce_86,
+  1, 105, :_reduce_87,
+  3, 105, :_reduce_88,
+  3, 123, :_reduce_89,
+  3, 125, :_reduce_90,
+  1, 126, :_reduce_none,
+  1, 126, :_reduce_none,
+  0, 108, :_reduce_93,
+  1, 108, :_reduce_94,
+  3, 108, :_reduce_95,
+  1, 127, :_reduce_96,
+  3, 127, :_reduce_97,
+  1, 116, :_reduce_none,
+  1, 116, :_reduce_none,
+  1, 116, :_reduce_none,
+  1, 116, :_reduce_none,
+  1, 116, :_reduce_none,
+  1, 116, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  4, 98, :_reduce_116,
+  3, 98, :_reduce_117,
+  1, 100, :_reduce_118,
+  2, 100, :_reduce_119,
+  2, 130, :_reduce_120,
+  1, 131, :_reduce_121,
+  2, 131, :_reduce_122,
+  1, 97, :_reduce_123,
+  4, 91, :_reduce_124,
+  4, 91, :_reduce_125,
+  2, 80, :_reduce_126,
+  5, 132, :_reduce_127,
+  4, 132, :_reduce_128,
+  0, 133, :_reduce_none,
+  2, 133, :_reduce_130,
+  4, 133, :_reduce_131,
+  3, 133, :_reduce_132,
+  1, 121, :_reduce_none,
+  3, 121, :_reduce_134,
+  3, 121, :_reduce_135,
+  3, 121, :_reduce_136,
+  3, 121, :_reduce_137,
+  3, 121, :_reduce_138,
+  3, 121, :_reduce_139,
+  3, 121, :_reduce_140,
+  3, 121, :_reduce_141,
+  3, 121, :_reduce_142,
+  2, 121, :_reduce_143,
+  3, 121, :_reduce_144,
+  3, 121, :_reduce_145,
+  3, 121, :_reduce_146,
+  3, 121, :_reduce_147,
+  3, 121, :_reduce_148,
+  3, 121, :_reduce_149,
+  2, 121, :_reduce_150,
+  3, 121, :_reduce_151,
+  3, 121, :_reduce_152,
+  3, 121, :_reduce_153,
+  5, 79, :_reduce_154,
+  1, 135, :_reduce_155,
+  2, 135, :_reduce_156,
+  5, 136, :_reduce_157,
+  4, 136, :_reduce_158,
+  1, 137, :_reduce_159,
+  3, 137, :_reduce_160,
+  3, 99, :_reduce_161,
+  1, 139, :_reduce_none,
+  4, 139, :_reduce_163,
+  1, 141, :_reduce_none,
+  3, 141, :_reduce_165,
+  3, 140, :_reduce_166,
   1, 138, :_reduce_none,
-  4, 138, :_reduce_162,
-  1, 140, :_reduce_none,
-  3, 140, :_reduce_164,
-  3, 139, :_reduce_165,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_none,
-  1, 137, :_reduce_174,
-  1, 137, :_reduce_none,
-  1, 141, :_reduce_176,
-  1, 142, :_reduce_none,
-  3, 142, :_reduce_178,
-  2, 80, :_reduce_179,
-  6, 82, :_reduce_180,
-  5, 82, :_reduce_181,
-  7, 83, :_reduce_182,
-  6, 83, :_reduce_183,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_175,
+  1, 138, :_reduce_none,
+  1, 142, :_reduce_177,
+  1, 143, :_reduce_none,
+  3, 143, :_reduce_179,
+  2, 81, :_reduce_180,
+  6, 83, :_reduce_181,
+  5, 83, :_reduce_182,
+  7, 84, :_reduce_183,
   6, 84, :_reduce_184,
-  5, 84, :_reduce_185,
-  1, 106, :_reduce_186,
-  1, 101, :_reduce_187,
-  1, 101, :_reduce_188,
-  1, 101, :_reduce_189,
-  1, 145, :_reduce_none,
-  3, 145, :_reduce_191,
-  1, 147, :_reduce_192,
+  6, 85, :_reduce_185,
+  5, 85, :_reduce_186,
+  1, 107, :_reduce_187,
+  1, 102, :_reduce_188,
+  1, 102, :_reduce_189,
+  1, 102, :_reduce_190,
+  1, 146, :_reduce_191,
+  3, 146, :_reduce_192,
   1, 148, :_reduce_193,
-  1, 148, :_reduce_194,
-  1, 148, :_reduce_195,
-  1, 148, :_reduce_none,
-  0, 72, :_reduce_197,
-  0, 149, :_reduce_198,
-  1, 143, :_reduce_none,
-  3, 143, :_reduce_200,
-  3, 143, :_reduce_201,
-  1, 150, :_reduce_none,
-  3, 150, :_reduce_203,
-  3, 151, :_reduce_204,
-  1, 151, :_reduce_205,
-  3, 151, :_reduce_206,
-  1, 151, :_reduce_207,
-  1, 146, :_reduce_none,
-  2, 146, :_reduce_209,
+  1, 149, :_reduce_194,
+  1, 149, :_reduce_195,
+  1, 149, :_reduce_196,
+  1, 149, :_reduce_none,
+  0, 72, :_reduce_198,
+  0, 150, :_reduce_199,
   1, 144, :_reduce_none,
-  2, 144, :_reduce_211,
-  1, 152, :_reduce_none,
-  1, 152, :_reduce_none,
-  1, 94, :_reduce_214,
-  3, 119, :_reduce_215,
-  4, 119, :_reduce_216,
-  2, 119, :_reduce_217,
-  1, 127, :_reduce_none,
-  1, 127, :_reduce_none,
-  0, 105, :_reduce_none,
-  1, 105, :_reduce_221,
-  1, 133, :_reduce_222,
-  3, 128, :_reduce_223,
-  4, 128, :_reduce_224,
-  2, 128, :_reduce_225,
+  3, 144, :_reduce_201,
+  3, 144, :_reduce_202,
+  1, 151, :_reduce_none,
+  3, 151, :_reduce_204,
+  3, 152, :_reduce_205,
+  1, 152, :_reduce_206,
+  3, 152, :_reduce_207,
+  1, 152, :_reduce_208,
+  1, 147, :_reduce_none,
+  2, 147, :_reduce_210,
+  1, 145, :_reduce_none,
+  2, 145, :_reduce_212,
   1, 153, :_reduce_none,
-  3, 153, :_reduce_227,
+  1, 153, :_reduce_none,
+  1, 95, :_reduce_215,
+  3, 120, :_reduce_216,
+  4, 120, :_reduce_217,
+  2, 120, :_reduce_218,
+  1, 128, :_reduce_none,
+  1, 128, :_reduce_none,
+  0, 106, :_reduce_none,
+  1, 106, :_reduce_222,
+  1, 134, :_reduce_223,
+  3, 129, :_reduce_224,
+  4, 129, :_reduce_225,
+  2, 129, :_reduce_226,
+  1, 154, :_reduce_none,
   3, 154, :_reduce_228,
-  1, 155, :_reduce_229,
-  1, 155, :_reduce_230,
-  4, 121, :_reduce_231,
-  1, 100, :_reduce_none,
-  4, 100, :_reduce_233 ]
+  3, 155, :_reduce_229,
+  1, 156, :_reduce_230,
+  1, 156, :_reduce_231,
+  4, 122, :_reduce_232,
+  1, 101, :_reduce_none,
+  4, 101, :_reduce_234 ]
 
-racc_reduce_n = 234
+racc_reduce_n = 235
 
-racc_shift_n = 385
+racc_shift_n = 386
 
 racc_token_table = {
   false => 0,
@@ -1068,9 +1033,10 @@ Racc_token_to_s_table = [
   "IN",
   "$start",
   "program",
-  "statements",
+  "statements_and_declarations",
   "nil",
-  "statement",
+  "statement_or_declaration",
+  "statements",
   "resource",
   "virtualresource",
   "collection",
@@ -1160,51 +1126,43 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 31)
-  def _reduce_1(val, _values, result)
-      if val[0]
-    # Make sure we always return an array.
-    if val[0].is_a?(AST::ASTArray)
-      if val[0].children.empty?
-        result = nil
-      else
-        result = val[0]
-      end
-    else
-      result = aryfy(val[0])
-    end
-  else
-    result = nil
-  end
+# reduce 1 omitted
 
+# reduce 2 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 34)
+  def _reduce_3(val, _values, result)
+        result = ast AST::ASTArray, :children => (val[0] ? [val[0]] : [])
+  
     result
   end
 .,.,
 
-# reduce 2 omitted
-
-# reduce 3 omitted
-
-module_eval(<<'.,.,', 'grammar.ra', 50)
+module_eval(<<'.,.,', 'grammar.ra', 37)
   def _reduce_4(val, _values, result)
-        if val[0] and val[1]
-    if val[0].instance_of?(AST::ASTArray)
+        if val[1]
       val[0].push(val[1])
-      result = val[0]
-    else
-      result = ast AST::ASTArray, :children => [val[0],val[1]]
     end
-  elsif obj = (val[0] || val[1])
-    result = obj
-  else result = nil
+    result = val[0]
+  
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 46)
+  def _reduce_5(val, _values, result)
+      val[0].each do |stmt|
+    if stmt.is_a?(AST::TopLevelConstruct)
+      error "Classes, definitions, and nodes may only appear at toplevel or inside other classes", \
+          :line => stmt.context[:line], :file => stmt.context[:file]
+    end
   end
+  result = val[0]
 
     result
   end
 .,.,
 
-# reduce 5 omitted
-
 # reduce 6 omitted
 
 # reduce 7 omitted
@@ -1231,24 +1189,24 @@ module_eval(<<'.,.,', 'grammar.ra', 50)
 
 # reduce 18 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 80)
-  def _reduce_19(val, _values, result)
+# reduce 19 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 72)
+  def _reduce_20(val, _values, result)
       result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 83)
-  def _reduce_20(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 75)
+  def _reduce_21(val, _values, result)
         result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
 
     result
   end
 .,.,
 
-# reduce 21 omitted
-
 # reduce 22 omitted
 
 # reduce 23 omitted
@@ -1261,34 +1219,34 @@ module_eval(<<'.,.,', 'grammar.ra', 83)
 
 # reduce 27 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 91)
-  def _reduce_28(val, _values, result)
-      args = aryfy(val[2])
-  result = ast AST::Function,
+# reduce 28 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 83)
+  def _reduce_29(val, _values, result)
+      result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[2],
     :ftype => :statement
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 99)
-  def _reduce_29(val, _values, result)
-      args = aryfy(val[2])
-  result = ast AST::Function,
+module_eval(<<'.,.,', 'grammar.ra', 90)
+  def _reduce_30(val, _values, result)
+      result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[2],
     :ftype => :statement
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 106)
-  def _reduce_30(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 96)
+  def _reduce_31(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1299,49 +1257,50 @@ module_eval(<<'.,.,', 'grammar.ra', 106)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 113)
-  def _reduce_31(val, _values, result)
-        args = aryfy(val[1])
-    result = ast AST::Function,
+module_eval(<<'.,.,', 'grammar.ra', 103)
+  def _reduce_32(val, _values, result)
+        result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[1],
     :ftype => :statement
 
     result
   end
 .,.,
 
-# reduce 32 omitted
-
-# reduce 33 omitted
+module_eval(<<'.,.,', 'grammar.ra', 110)
+  def _reduce_33(val, _values, result)
+     result = aryfy(val[0]) 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 124)
+module_eval(<<'.,.,', 'grammar.ra', 111)
   def _reduce_34(val, _values, result)
-        result = aryfy(val[0], val[2])
-    result.line = @lexer.line
-    result.file = @lexer.file
-
+     result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 129)
+module_eval(<<'.,.,', 'grammar.ra', 113)
   def _reduce_35(val, _values, result)
-        unless val[0].is_a?(AST::ASTArray)
-    val[0] = aryfy(val[0])
-  end
+        val[0].push(val[2])
+    result = val[0]
 
-  val[0].push(val[2])
+    result
+  end
+.,.,
 
-  result = val[0]
+module_eval(<<'.,.,', 'grammar.ra', 117)
+  def _reduce_36(val, _values, result)
+        val[0].push(val[2])
+    result = val[0]
 
     result
   end
 .,.,
 
-# reduce 36 omitted
-
 # reduce 37 omitted
 
 # reduce 38 omitted
@@ -1356,41 +1315,27 @@ module_eval(<<'.,.,', 'grammar.ra', 129)
 
 # reduce 43 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 149)
-  def _reduce_44(val, _values, result)
+# reduce 44 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 132)
+  def _reduce_45(val, _values, result)
         result = ast AST::Name, :value => val[0][:value]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 153)
-  def _reduce_45(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 136)
+  def _reduce_46(val, _values, result)
       @lexer.commentpop
-  array = val[2]
-  array = [array] if array.instance_of?(AST::ResourceInstance)
-  result = ast AST::ASTArray
-
-  # this iterates across each specified resourceinstance
-  array.each { |instance|
-    raise Puppet::Dev, "Got something that isn't an instance" unless instance.instance_of?(AST::ResourceInstance)
-    # now, i need to somehow differentiate between those things with
-    # arrays in their names, and normal things
-
-      result.push ast(
-        AST::Resource,
-      :type => val[0],
-      :title => instance[0],
-
-      :parameters => instance[1])
-  }
+  result = ast(AST::Resource, :type => val[0], :instances => val[2])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 172)
-  def _reduce_46(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 139)
+  def _reduce_47(val, _values, result)
       # This is a deprecated syntax.
   error "All resource specifications require names"
 
@@ -1398,8 +1343,8 @@ module_eval(<<'.,.,', 'grammar.ra', 172)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 175)
-  def _reduce_47(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 142)
+  def _reduce_48(val, _values, result)
       # a defaults setting for a type
   @lexer.commentpop
   result = ast(AST::ResourceDefaults, :type => val[0], :parameters => val[2])
@@ -1408,8 +1353,8 @@ module_eval(<<'.,.,', 'grammar.ra', 175)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 182)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 149)
+  def _reduce_49(val, _values, result)
       @lexer.commentpop
   result = ast AST::ResourceOverride, :object => val[0], :parameters => val[2]
 
@@ -1417,11 +1362,11 @@ module_eval(<<'.,.,', 'grammar.ra', 182)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 189)
-  def _reduce_49(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 156)
+  def _reduce_50(val, _values, result)
       type = val[0]
 
-  if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
+  if (type == :exported and ! Puppet[:storeconfigs])
     Puppet.warning addcontext("You cannot collect without storeconfigs being set")
   end
 
@@ -1429,14 +1374,8 @@ module_eval(<<'.,.,', 'grammar.ra', 189)
 
   method = type.to_s + "="
 
-  # Just mark our resources as exported and pass them through.
-  if val[1].instance_of?(AST::ASTArray)
-    val[1].each do |obj|
-      obj.send(method, true)
-    end
-  else
-    val[1].send(method, true)
-  end
+  # Just mark our resource as exported and pass it through.
+  val[1].send(method, true)
 
   result = val[1]
 
@@ -1444,22 +1383,22 @@ module_eval(<<'.,.,', 'grammar.ra', 189)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 211)
-  def _reduce_50(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 172)
+  def _reduce_51(val, _values, result)
      result = :virtual 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 212)
-  def _reduce_51(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 173)
+  def _reduce_52(val, _values, result)
      result = :exported 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 217)
-  def _reduce_52(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 178)
+  def _reduce_53(val, _values, result)
       @lexer.commentpop
   Puppet.warning addcontext("Collection names must now be capitalized") if val[0] =~ /^[a-z]/
   type = val[0].downcase
@@ -1472,7 +1411,7 @@ module_eval(<<'.,.,', 'grammar.ra', 217)
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   args[:override] = val[3]
@@ -1482,8 +1421,8 @@ module_eval(<<'.,.,', 'grammar.ra', 217)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 236)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 197)
+  def _reduce_54(val, _values, result)
         if val[0] =~ /^[a-z]/
     Puppet.warning addcontext("Collection names must now be capitalized")
   end
@@ -1497,7 +1436,7 @@ module_eval(<<'.,.,', 'grammar.ra', 236)
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   result = ast AST::Collection, args
@@ -1506,8 +1445,8 @@ module_eval(<<'.,.,', 'grammar.ra', 236)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 257)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 218)
+  def _reduce_55(val, _values, result)
       if val[1]
     result = val[1]
     result.form = :virtual
@@ -1519,8 +1458,8 @@ module_eval(<<'.,.,', 'grammar.ra', 257)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 265)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 226)
+  def _reduce_56(val, _values, result)
         if val[1]
     result = val[1]
     result.form = :exported
@@ -1532,22 +1471,22 @@ module_eval(<<'.,.,', 'grammar.ra', 265)
   end
 .,.,
 
-# reduce 56 omitted
-
 # reduce 57 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 278)
-  def _reduce_58(val, _values, result)
+# reduce 58 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 239)
+  def _reduce_59(val, _values, result)
         result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
 
     result
   end
 .,.,
 
-# reduce 59 omitted
+# reduce 60 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 283)
-  def _reduce_60(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 244)
+  def _reduce_61(val, _values, result)
         result = val[1]
     result.parens = true
 
@@ -1555,22 +1494,22 @@ module_eval(<<'.,.,', 'grammar.ra', 283)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 287)
-  def _reduce_61(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 248)
+  def _reduce_62(val, _values, result)
      result=val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 288)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 249)
+  def _reduce_63(val, _values, result)
      result=val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 291)
-  def _reduce_63(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 252)
+  def _reduce_64(val, _values, result)
       result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
   #result = ast AST::CollExpr
   #result.push *val
@@ -1579,8 +1518,8 @@ module_eval(<<'.,.,', 'grammar.ra', 291)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 296)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 257)
+  def _reduce_65(val, _values, result)
         result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1589,63 +1528,62 @@ module_eval(<<'.,.,', 'grammar.ra', 296)
   end
 .,.,
 
-# reduce 65 omitted
-
 # reduce 66 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 305)
-  def _reduce_67(val, _values, result)
-      result = ast AST::ResourceInstance, :children => [val[0],val[2]]
+# reduce 67 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 266)
+  def _reduce_68(val, _values, result)
+      result = ast AST::ResourceInstance, :title => val[0], :parameters => val[2]
 
     result
   end
 .,.,
 
-# reduce 68 omitted
-
-module_eval(<<'.,.,', 'grammar.ra', 310)
+module_eval(<<'.,.,', 'grammar.ra', 269)
   def _reduce_69(val, _values, result)
-        if val[0].instance_of?(AST::ResourceInstance)
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  else
-    val[0].push val[2]
-    result = val[0]
+     result = aryfy(val[0]) 
+    result
   end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 271)
+  def _reduce_70(val, _values, result)
+        val[0].push val[2]
+    result = val[0]
 
     result
   end
 .,.,
 
-# reduce 70 omitted
-
 # reduce 71 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 322)
-  def _reduce_72(val, _values, result)
+# reduce 72 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 279)
+  def _reduce_73(val, _values, result)
       result = ast AST::Undef, :value => :undef
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 326)
-  def _reduce_73(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 283)
+  def _reduce_74(val, _values, result)
       result = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 330)
-  def _reduce_74(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 287)
+  def _reduce_75(val, _values, result)
       result = ast AST::Type, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 75 omitted
-
 # reduce 76 omitted
 
 # reduce 77 omitted
@@ -1658,8 +1596,10 @@ module_eval(<<'.,.,', 'grammar.ra', 330)
 
 # reduce 81 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 342)
-  def _reduce_82(val, _values, result)
+# reduce 82 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 299)
+  def _reduce_83(val, _values, result)
       raise Puppet::ParseError, "Cannot assign to variables in other namespaces" if val[0][:value] =~ /::/
   # this is distinct from referencing a variable
   variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
@@ -1669,16 +1609,16 @@ module_eval(<<'.,.,', 'grammar.ra', 342)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 348)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 305)
+  def _reduce_84(val, _values, result)
         result = ast AST::VarDef, :name => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 352)
-  def _reduce_84(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 309)
+  def _reduce_85(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]
 
@@ -1686,44 +1626,40 @@ module_eval(<<'.,.,', 'grammar.ra', 352)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 358)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 315)
+  def _reduce_86(val, _values, result)
       result = ast AST::ASTArray
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 360)
-  def _reduce_86(val, _values, result)
-     result = val[0] 
+module_eval(<<'.,.,', 'grammar.ra', 317)
+  def _reduce_87(val, _values, result)
+     result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 362)
-  def _reduce_87(val, _values, result)
-        if val[0].instance_of?(AST::ASTArray)
-    val[0].push(val[2])
+module_eval(<<'.,.,', 'grammar.ra', 319)
+  def _reduce_88(val, _values, result)
+        val[0].push(val[2])
     result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  end
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 371)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 324)
+  def _reduce_89(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 375)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 328)
+  def _reduce_90(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2],
     :add => true
 
@@ -1731,54 +1667,48 @@ module_eval(<<'.,.,', 'grammar.ra', 375)
   end
 .,.,
 
-# reduce 90 omitted
-
 # reduce 91 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 384)
-  def _reduce_92(val, _values, result)
+# reduce 92 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 337)
+  def _reduce_93(val, _values, result)
       result = ast AST::ASTArray
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 386)
-  def _reduce_93(val, _values, result)
-     result = val[0] 
+module_eval(<<'.,.,', 'grammar.ra', 339)
+  def _reduce_94(val, _values, result)
+     result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 388)
-  def _reduce_94(val, _values, result)
-        if val[0].instance_of?(AST::ASTArray)
-    val[0].push(val[2])
+module_eval(<<'.,.,', 'grammar.ra', 341)
+  def _reduce_95(val, _values, result)
+        val[0].push(val[2])
     result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
-  end
 
     result
   end
 .,.,
 
-# reduce 95 omitted
-
-module_eval(<<'.,.,', 'grammar.ra', 398)
+module_eval(<<'.,.,', 'grammar.ra', 345)
   def _reduce_96(val, _values, result)
-        if val[0].instance_of?(AST::ASTArray)
-    result = val[0].push(val[2])
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
+     result = aryfy(val[0]) 
+    result
   end
+.,.,
 
+module_eval(<<'.,.,', 'grammar.ra', 346)
+  def _reduce_97(val, _values, result)
+     result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-# reduce 97 omitted
-
 # reduce 98 omitted
 
 # reduce 99 omitted
@@ -1813,20 +1743,21 @@ module_eval(<<'.,.,', 'grammar.ra', 398)
 
 # reduce 114 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 427)
-  def _reduce_115(val, _values, result)
-      args = aryfy(val[2])
-  result = ast AST::Function,
+# reduce 115 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 370)
+  def _reduce_116(val, _values, result)
+      result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
-    :arguments => args,
+    :arguments => val[2],
     :ftype => :rvalue
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 433)
-  def _reduce_116(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 375)
+  def _reduce_117(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
     :arguments => AST::ASTArray.new({}),
@@ -1836,51 +1767,51 @@ module_eval(<<'.,.,', 'grammar.ra', 433)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 439)
-  def _reduce_117(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 381)
+  def _reduce_118(val, _values, result)
      result = ast AST::String, :value => val[0][:value],                  :line => val[0][:line] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 440)
-  def _reduce_118(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 382)
+  def _reduce_119(val, _values, result)
      result = ast AST::Concat, :value => [ast(AST::String,val[0])]+val[1], :line => val[0][:line] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 442)
-  def _reduce_119(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 384)
+  def _reduce_120(val, _values, result)
      result = [val[0]] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 444)
-  def _reduce_120(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 386)
+  def _reduce_121(val, _values, result)
      result = [ast(AST::String,val[0])]          
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 445)
-  def _reduce_121(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 387)
+  def _reduce_122(val, _values, result)
      result = [ast(AST::String,val[0])] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 448)
-  def _reduce_122(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 390)
+  def _reduce_123(val, _values, result)
       result = ast AST::Boolean, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 452)
-  def _reduce_123(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 394)
+  def _reduce_124(val, _values, result)
       Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
   result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
 
@@ -1888,24 +1819,24 @@ module_eval(<<'.,.,', 'grammar.ra', 452)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 455)
-  def _reduce_124(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 397)
+  def _reduce_125(val, _values, result)
       result = ast AST::ResourceReference, :type => val[0], :title => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 459)
-  def _reduce_125(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 401)
+  def _reduce_126(val, _values, result)
       result = val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 463)
-  def _reduce_126(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 405)
+  def _reduce_127(val, _values, result)
       @lexer.commentpop
   args = {
     :test => val[0],
@@ -1920,8 +1851,8 @@ module_eval(<<'.,.,', 'grammar.ra', 463)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 474)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 416)
+  def _reduce_128(val, _values, result)
         @lexer.commentpop
     args = {
       :test => val[0],
@@ -1936,18 +1867,18 @@ module_eval(<<'.,.,', 'grammar.ra', 474)
   end
 .,.,
 
-# reduce 128 omitted
+# reduce 129 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 487)
-  def _reduce_129(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 429)
+  def _reduce_130(val, _values, result)
         result = ast AST::Else, :statements => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 490)
-  def _reduce_130(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 432)
+  def _reduce_131(val, _values, result)
         @lexer.commentpop
     result = ast AST::Else, :statements => val[2]
 
@@ -1955,8 +1886,8 @@ module_eval(<<'.,.,', 'grammar.ra', 490)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 494)
-  def _reduce_131(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 436)
+  def _reduce_132(val, _values, result)
         @lexer.commentpop
     result = ast AST::Else, :statements => ast(AST::Nop)
 
@@ -1964,25 +1895,17 @@ module_eval(<<'.,.,', 'grammar.ra', 494)
   end
 .,.,
 
-# reduce 132 omitted
+# reduce 133 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 512)
-  def _reduce_133(val, _values, result)
-        result = ast AST::InOperator, :lval => val[0], :rval => val[2]
-
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.ra', 515)
+module_eval(<<'.,.,', 'grammar.ra', 454)
   def _reduce_134(val, _values, result)
-        result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+        result = ast AST::InOperator, :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 518)
+module_eval(<<'.,.,', 'grammar.ra', 457)
   def _reduce_135(val, _values, result)
         result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -1990,15 +1913,15 @@ module_eval(<<'.,.,', 'grammar.ra', 518)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 521)
+module_eval(<<'.,.,', 'grammar.ra', 460)
   def _reduce_136(val, _values, result)
-        result = ast AST::ArithmeticOperator, :operator => val[1][:value], :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', 524)
+module_eval(<<'.,.,', 'grammar.ra', 463)
   def _reduce_137(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2006,7 +1929,7 @@ module_eval(<<'.,.,', 'grammar.ra', 524)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 527)
+module_eval(<<'.,.,', 'grammar.ra', 466)
   def _reduce_138(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2014,7 +1937,7 @@ module_eval(<<'.,.,', 'grammar.ra', 527)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 530)
+module_eval(<<'.,.,', 'grammar.ra', 469)
   def _reduce_139(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2022,7 +1945,7 @@ module_eval(<<'.,.,', 'grammar.ra', 530)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 533)
+module_eval(<<'.,.,', 'grammar.ra', 472)
   def _reduce_140(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2030,7 +1953,7 @@ module_eval(<<'.,.,', 'grammar.ra', 533)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 536)
+module_eval(<<'.,.,', 'grammar.ra', 475)
   def _reduce_141(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2038,23 +1961,23 @@ module_eval(<<'.,.,', 'grammar.ra', 536)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 539)
+module_eval(<<'.,.,', 'grammar.ra', 478)
   def _reduce_142(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', 542)
+module_eval(<<'.,.,', 'grammar.ra', 481)
   def _reduce_143(val, _values, result)
-        result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+        result = ast AST::Minus, :value => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 545)
+module_eval(<<'.,.,', 'grammar.ra', 484)
   def _reduce_144(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2062,7 +1985,7 @@ module_eval(<<'.,.,', 'grammar.ra', 545)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 548)
+module_eval(<<'.,.,', 'grammar.ra', 487)
   def _reduce_145(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2070,7 +1993,7 @@ module_eval(<<'.,.,', 'grammar.ra', 548)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 551)
+module_eval(<<'.,.,', 'grammar.ra', 490)
   def _reduce_146(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2078,7 +2001,7 @@ module_eval(<<'.,.,', 'grammar.ra', 551)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 554)
+module_eval(<<'.,.,', 'grammar.ra', 493)
   def _reduce_147(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2086,7 +2009,7 @@ module_eval(<<'.,.,', 'grammar.ra', 554)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 557)
+module_eval(<<'.,.,', 'grammar.ra', 496)
   def _reduce_148(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2094,23 +2017,23 @@ module_eval(<<'.,.,', 'grammar.ra', 557)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 560)
+module_eval(<<'.,.,', 'grammar.ra', 499)
   def _reduce_149(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', 563)
+module_eval(<<'.,.,', 'grammar.ra', 502)
   def _reduce_150(val, _values, result)
-        result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+        result = ast AST::Not, :value => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 566)
+module_eval(<<'.,.,', 'grammar.ra', 505)
   def _reduce_151(val, _values, result)
         result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
@@ -2118,42 +2041,49 @@ module_eval(<<'.,.,', 'grammar.ra', 566)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 569)
+module_eval(<<'.,.,', 'grammar.ra', 508)
   def _reduce_152(val, _values, result)
-        result = val[1]
+        result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 573)
+module_eval(<<'.,.,', 'grammar.ra', 511)
   def _reduce_153(val, _values, result)
-      @lexer.commentpop
-  options = val[3]
-  options = ast AST::ASTArray, :children => [val[3]] unless options.instance_of?(AST::ASTArray)
-  result = ast AST::CaseStatement, :test => val[1], :options => options
+        result = val[1]
 
     result
   end
 .,.,
 
-# reduce 154 omitted
+module_eval(<<'.,.,', 'grammar.ra', 515)
+  def _reduce_154(val, _values, result)
+      @lexer.commentpop
+  result = ast AST::CaseStatement, :test => val[1], :options => val[3]
 
-module_eval(<<'.,.,', 'grammar.ra', 581)
-  def _reduce_155(val, _values, result)
-        if val[0].instance_of?(AST::ASTArray)
-    val[0].push val[1]
-    result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0], val[1]]
+    result
   end
+.,.,
 
+module_eval(<<'.,.,', 'grammar.ra', 519)
+  def _reduce_155(val, _values, result)
+     result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 590)
+module_eval(<<'.,.,', 'grammar.ra', 521)
   def _reduce_156(val, _values, result)
+        val[0].push val[1]
+    result = val[0]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 526)
+  def _reduce_157(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
 
@@ -2161,8 +2091,8 @@ module_eval(<<'.,.,', 'grammar.ra', 590)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 593)
-  def _reduce_157(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 529)
+  def _reduce_158(val, _values, result)
       @lexer.commentpop
 
     result = ast(
@@ -2176,33 +2106,34 @@ module_eval(<<'.,.,', 'grammar.ra', 593)
   end
 .,.,
 
-# reduce 158 omitted
-
-module_eval(<<'.,.,', 'grammar.ra', 605)
+module_eval(<<'.,.,', 'grammar.ra', 539)
   def _reduce_159(val, _values, result)
-        if val[0].instance_of?(AST::ASTArray)
-    val[0].push(val[2])
-    result = val[0]
-  else
-    result = ast AST::ASTArray, :children => [val[0],val[2]]
+     result = aryfy(val[0]) 
+    result
   end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 541)
+  def _reduce_160(val, _values, result)
+        val[0].push(val[2])
+    result = val[0]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 614)
-  def _reduce_160(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 546)
+  def _reduce_161(val, _values, result)
       result = ast AST::Selector, :param => val[0], :values => val[2]
 
     result
   end
 .,.,
 
-# reduce 161 omitted
+# reduce 162 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 619)
-  def _reduce_162(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 551)
+  def _reduce_163(val, _values, result)
         @lexer.commentpop
     result = val[1]
 
@@ -2210,10 +2141,10 @@ module_eval(<<'.,.,', 'grammar.ra', 619)
   end
 .,.,
 
-# reduce 163 omitted
+# reduce 164 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 625)
-  def _reduce_164(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 557)
+  def _reduce_165(val, _values, result)
         if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
@@ -2225,16 +2156,14 @@ module_eval(<<'.,.,', 'grammar.ra', 625)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 634)
-  def _reduce_165(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 566)
+  def _reduce_166(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-# reduce 166 omitted
-
 # reduce 167 omitted
 
 # reduce 168 omitted
@@ -2249,50 +2178,53 @@ module_eval(<<'.,.,', 'grammar.ra', 634)
 
 # reduce 173 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 646)
-  def _reduce_174(val, _values, result)
+# reduce 174 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 578)
+  def _reduce_175(val, _values, result)
         result = ast AST::Default, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 175 omitted
+# reduce 176 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 651)
-  def _reduce_176(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 583)
+  def _reduce_177(val, _values, result)
      result = [val[0][:value]] 
     result
   end
 .,.,
 
-# reduce 177 omitted
+# reduce 178 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 653)
-  def _reduce_178(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 585)
+  def _reduce_179(val, _values, result)
      result = val[0] += val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 656)
-  def _reduce_179(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 588)
+  def _reduce_180(val, _values, result)
       val[1].each do |file|
     import(file)
   end
 
-  result = AST::ASTArray.new(:children => [])
+  result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 666)
-  def _reduce_180(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 598)
+  def _reduce_181(val, _values, result)
       @lexer.commentpop
-  newdefine classname(val[1]), :arguments => val[2], :code => val[4], :line => val[0][:line]
+  result = Puppet::Parser::AST::Definition.new(classname(val[1]),
+                                               ast_context(true).merge(:arguments => val[2], :code => val[4],
+                                                                       :line => val[0][:line]))
   @lexer.indefine = false
-  result = nil
 
 #}           | DEFINE NAME argumentlist parent LBRACE RBRACE {
 
@@ -2300,160 +2232,167 @@ module_eval(<<'.,.,', 'grammar.ra', 666)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 673)
-  def _reduce_181(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 606)
+  def _reduce_182(val, _values, result)
       @lexer.commentpop
-  newdefine classname(val[1]), :arguments => val[2], :line => val[0][:line]
+  result = Puppet::Parser::AST::Definition.new(classname(val[1]),
+                                               ast_context(true).merge(:arguments => val[2], :line => val[0][:line]))
   @lexer.indefine = false
-  result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 681)
-  def _reduce_182(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 614)
+  def _reduce_183(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
-  newclass classname(val[1]), :arguments => val[2], :parent => val[3], :code => val[5], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Hostclass.new(classname(val[1]),
+                                              ast_context(true).merge(:arguments => val[2], :parent => val[3],
+                                                                      :code => val[5], :line => val[0][:line]))
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 687)
-  def _reduce_183(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 621)
+  def _reduce_184(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
-  newclass classname(val[1]), :arguments => val[2], :parent => val[3], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Hostclass.new(classname(val[1]),
+                                              ast_context(true).merge(:arguments => val[2], :parent => val[3],
+                                                                      :line => val[0][:line]))
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 695)
-  def _reduce_184(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 630)
+  def _reduce_185(val, _values, result)
       @lexer.commentpop
-  newnode val[1], :parent => val[2], :code => val[4], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Node.new(val[1],
+                                         ast_context(true).merge(:parent => val[2], :code => val[4],
+                                                                 :line => val[0][:line]))
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 699)
-  def _reduce_185(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 635)
+  def _reduce_186(val, _values, result)
       @lexer.commentpop
-  newnode val[1], :parent => val[2], :line => val[0][:line]
-  result = nil
+  result = Puppet::Parser::AST::Node.new(val[1], ast_context(true).merge(:parent => val[2], :line => val[0][:line]))
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 704)
-  def _reduce_186(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 639)
+  def _reduce_187(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 706)
-  def _reduce_187(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 641)
+  def _reduce_188(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 707)
-  def _reduce_188(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 642)
+  def _reduce_189(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 708)
-  def _reduce_189(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 643)
+  def _reduce_190(val, _values, result)
      result = "class" 
     result
   end
 .,.,
 
-# reduce 190 omitted
-
-module_eval(<<'.,.,', 'grammar.ra', 714)
+module_eval(<<'.,.,', 'grammar.ra', 648)
   def _reduce_191(val, _values, result)
-        result = val[0]
-    result = [result] unless result.is_a?(Array)
-    result << val[2]
+        result = [result]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 720)
+module_eval(<<'.,.,', 'grammar.ra', 651)
   def _reduce_192(val, _values, result)
-      result = ast AST::HostName, :value => val[0]
+        result = val[0]
+    result << val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 723)
+module_eval(<<'.,.,', 'grammar.ra', 656)
   def _reduce_193(val, _values, result)
-     result = val[0][:value] 
+      result = ast AST::HostName, :value => val[0]
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 724)
+module_eval(<<'.,.,', 'grammar.ra', 659)
   def _reduce_194(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 725)
+module_eval(<<'.,.,', 'grammar.ra', 660)
   def _reduce_195(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-# reduce 196 omitted
+module_eval(<<'.,.,', 'grammar.ra', 661)
+  def _reduce_196(val, _values, result)
+     result = val[0][:value] 
+    result
+  end
+.,.,
+
+# reduce 197 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 729)
-  def _reduce_197(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 665)
+  def _reduce_198(val, _values, result)
       result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 733)
-  def _reduce_198(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 669)
+  def _reduce_199(val, _values, result)
       result = ast AST::ASTArray, :children => []
 
     result
   end
 .,.,
 
-# reduce 199 omitted
+# reduce 200 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 738)
-  def _reduce_200(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 674)
+  def _reduce_201(val, _values, result)
         result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 741)
-  def _reduce_201(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 677)
+  def _reduce_202(val, _values, result)
         result = val[1]
     result = [result] unless result[0].is_a?(Array)
 
@@ -2461,10 +2400,10 @@ module_eval(<<'.,.,', 'grammar.ra', 741)
   end
 .,.,
 
-# reduce 202 omitted
+# reduce 203 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 747)
-  def _reduce_203(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 683)
+  def _reduce_204(val, _values, result)
         result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -2473,8 +2412,8 @@ module_eval(<<'.,.,', 'grammar.ra', 747)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 753)
-  def _reduce_204(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 689)
+  def _reduce_205(val, _values, result)
       Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
   result = [val[0][:value], val[2]]
 
@@ -2482,8 +2421,8 @@ module_eval(<<'.,.,', 'grammar.ra', 753)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 757)
-  def _reduce_205(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 693)
+  def _reduce_206(val, _values, result)
         Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0][:value]]
 
@@ -2491,109 +2430,98 @@ module_eval(<<'.,.,', 'grammar.ra', 757)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 760)
-  def _reduce_206(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 696)
+  def _reduce_207(val, _values, result)
       result = [val[0][:value], val[2]]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 762)
-  def _reduce_207(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 698)
+  def _reduce_208(val, _values, result)
       result = [val[0][:value]]
 
     result
   end
 .,.,
 
-# reduce 208 omitted
+# reduce 209 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 767)
-  def _reduce_209(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 703)
+  def _reduce_210(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 210 omitted
+# reduce 211 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 772)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 708)
+  def _reduce_212(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 212 omitted
-
 # reduce 213 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 778)
-  def _reduce_214(val, _values, result)
-      result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
+# reduce 214 omitted
 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.ra', 782)
+module_eval(<<'.,.,', 'grammar.ra', 714)
   def _reduce_215(val, _values, result)
-      if val[1].instance_of?(AST::ASTArray)
-    result = val[1]
-  else
-    result = ast AST::ASTArray, :children => [val[1]]
-  end
+      result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 789)
+module_eval(<<'.,.,', 'grammar.ra', 717)
   def _reduce_216(val, _values, result)
-        if val[1].instance_of?(AST::ASTArray)
-    result = val[1]
-  else
-    result = ast AST::ASTArray, :children => [val[1]]
-  end
-
+     result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 795)
+module_eval(<<'.,.,', 'grammar.ra', 718)
   def _reduce_217(val, _values, result)
-      result = ast AST::ASTArray
-
+     result = val[1] 
     result
   end
 .,.,
 
-# reduce 218 omitted
+module_eval(<<'.,.,', 'grammar.ra', 719)
+  def _reduce_218(val, _values, result)
+     result = ast AST::ASTArray 
+    result
+  end
+.,.,
 
 # reduce 219 omitted
 
 # reduce 220 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 802)
-  def _reduce_221(val, _values, result)
+# reduce 221 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 725)
+  def _reduce_222(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 805)
-  def _reduce_222(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 728)
+  def _reduce_223(val, _values, result)
       result = ast AST::Regex, :value => val[0][:value]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 809)
-  def _reduce_223(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 732)
+  def _reduce_224(val, _values, result)
       if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2604,8 +2532,8 @@ module_eval(<<'.,.,', 'grammar.ra', 809)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 816)
-  def _reduce_224(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 739)
+  def _reduce_225(val, _values, result)
         if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2616,18 +2544,18 @@ module_eval(<<'.,.,', 'grammar.ra', 816)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 822)
-  def _reduce_225(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 745)
+  def _reduce_226(val, _values, result)
       result = ast AST::ASTHash
 
     result
   end
 .,.,
 
-# reduce 226 omitted
+# reduce 227 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 827)
-  def _reduce_227(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 750)
+  def _reduce_228(val, _values, result)
         if val[0].instance_of?(AST::ASTHash)
     result = val[0].merge(val[2])
   else
@@ -2639,40 +2567,40 @@ module_eval(<<'.,.,', 'grammar.ra', 827)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 836)
-  def _reduce_228(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 759)
+  def _reduce_229(val, _values, result)
       result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 839)
-  def _reduce_229(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 762)
+  def _reduce_230(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 840)
-  def _reduce_230(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 763)
+  def _reduce_231(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 843)
-  def _reduce_231(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 766)
+  def _reduce_232(val, _values, result)
       result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2]
 
     result
   end
 .,.,
 
-# reduce 232 omitted
+# reduce 233 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 848)
-  def _reduce_233(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 771)
+  def _reduce_234(val, _values, result)
         result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2]
 
     result