puppet 0.22.4 → 0.23.0

data/lib/puppet/parser/lexer.rb

@@ -54,6 +54,16 @@ module Puppet
                 %r{\$(\w*::)*\w+} => :VARIABLE
             }
 
+            @@pairs = {
+                "{" => "}",
+                "(" => ")",
+                "[" => "]",
+                "<|" => "|>",
+                "<<|" => "|>>"
+            }
+
+            @@reverse_pairs = @@pairs.inject({}) { |hash, pair| hash[pair[1]] = pair[0]; hash }
+
             @@keywords = {
                 "case" => :CASE,
                 "class" => :CLASS,
@@ -68,13 +78,28 @@ module Puppet
                 "node" => :NODE,
                 "true" => :BOOLEAN,
                 "and"  => :AND,
-                "or"   => :OR
+                "or"   => :OR,
+                "undef"   => :UNDEF
             }
 
             def clear
                 initvars
             end
 
+            def expected
+                if @expected.empty?
+                    nil
+                else
+                    token = @expected[-1]
+                    @@tokens.each do |value, name|
+                        if token == name
+                            return value
+                        end
+                    end
+                    return token
+                end
+            end
+
             # scan the whole file
             # basically just used for testing
             def fullscan
@@ -129,6 +154,8 @@ module Puppet
 
                 @namestack = []
                 @indefine = false
+
+                @expected = []
             end
 
             # Go up one in the namespace.
@@ -246,6 +273,12 @@ module Puppet
                         value = value.sub(/^\$/, '')
                     end
 
+                    if match = @@pairs[value] and ptoken != :DQUOTE and ptoken != :SQUOTE
+                        @expected << match
+                    elsif exp = @expected[-1] and exp == value and ptoken != :DQUOTE and ptoken != :SQUOTE
+                        @expected.pop
+                    end
+
                     yield [ptoken, value]
 
                     if @lasttoken == :CLASS
@@ -297,4 +330,4 @@ module Puppet
     end
 end
 
-# $Id: lexer.rb 2393 2007-04-19 18:34:03Z luke $
+# $Id: lexer.rb 2531 2007-05-25 00:31:28Z luke $

data/lib/puppet/parser/parser.rb

@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id2ea020a302', 'grammar.ra', 606
+module_eval <<'..end grammar.ra modeval..id8685abbbb8', 'grammar.ra', 614
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -80,6 +80,9 @@ end
 
 # Raise a Parse error.
 def error(message)
+    if brace = @lexer.expected
+        message += "; expected '%s'"
+    end
     except = Puppet::ParseError.new(message)
     except.line = @lexer.line
     if @lexer.file
@@ -173,7 +176,7 @@ def initvars
 end
 
 # The fully qualifed name, with the full namespace.
-def fqname(name)
+def classname(name)
     [@lexer.namespace, name].join("::").sub(/^::/, '')
 end
 
@@ -183,6 +186,10 @@ def on_error(token,value,stack)
     #    [@lexer.line,@lexer.last]
     error = "Syntax error at '%s'" % [value]
 
+    if brace = @lexer.expected
+        error += "; expected '%s'" % brace
+    end
+
     except = Puppet::ParseError.new(error)
     except.line = @lexer.line
     if @lexer.file
@@ -252,433 +259,502 @@ end
 # mode: ruby
 # End:
 
-# $Id: parser.rb 2393 2007-04-19 18:34:03Z luke $
+# $Id: parser.rb 2599 2007-06-18 06:26:01Z luke $
 
-..end grammar.ra modeval..id2ea020a302
+..end grammar.ra modeval..id8685abbbb8
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 51, :_reduce_1,
- 1, 51, :_reduce_none,
+ 1, 52, :_reduce_1,
  1, 52, :_reduce_none,
- 2, 52, :_reduce_4,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 4, 62, :_reduce_17,
- 3, 62, :_reduce_18,
- 2, 62, :_reduce_19,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 2, 53, :_reduce_4,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 1, 55, :_reduce_none,
+ 4, 63, :_reduce_17,
+ 3, 63, :_reduce_18,
+ 2, 63, :_reduce_19,
+ 1, 68, :_reduce_none,
  1, 68, :_reduce_none,
- 3, 68, :_reduce_23,
- 1, 70, :_reduce_none,
- 1, 70, :_reduce_none,
- 1, 70, :_reduce_none,
- 1, 70, :_reduce_27,
  1, 69, :_reduce_none,
- 3, 69, :_reduce_29,
- 5, 55, :_reduce_30,
- 5, 55, :_reduce_31,
- 5, 55, :_reduce_32,
- 5, 66, :_reduce_33,
- 2, 56, :_reduce_34,
- 1, 80, :_reduce_35,
- 2, 80, :_reduce_36,
- 2, 57, :_reduce_37,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 3, 82, :_reduce_40,
- 3, 82, :_reduce_41,
- 1, 83, :_reduce_none,
- 1, 83, :_reduce_none,
- 3, 83, :_reduce_44,
- 1, 84, :_reduce_none,
- 3, 84, :_reduce_46,
- 1, 85, :_reduce_none,
- 1, 85, :_reduce_none,
- 3, 86, :_reduce_49,
- 3, 86, :_reduce_50,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 4, 89, :_reduce_53,
- 1, 76, :_reduce_none,
- 3, 76, :_reduce_55,
- 0, 77, :_reduce_none,
- 1, 77, :_reduce_none,
- 1, 71, :_reduce_58,
- 1, 91, :_reduce_59,
- 1, 90, :_reduce_none,
- 1, 90, :_reduce_none,
- 1, 90, :_reduce_none,
- 1, 90, :_reduce_none,
- 1, 90, :_reduce_none,
- 1, 90, :_reduce_none,
- 3, 58, :_reduce_66,
- 0, 78, :_reduce_67,
- 1, 78, :_reduce_68,
- 3, 78, :_reduce_69,
- 3, 95, :_reduce_70,
- 1, 96, :_reduce_none,
- 3, 96, :_reduce_72,
- 1, 88, :_reduce_none,
- 1, 88, :_reduce_none,
- 1, 88, :_reduce_none,
- 1, 88, :_reduce_none,
+ 3, 69, :_reduce_23,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_31,
+ 1, 70, :_reduce_none,
+ 3, 70, :_reduce_33,
+ 5, 56, :_reduce_34,
+ 5, 56, :_reduce_35,
+ 5, 56, :_reduce_36,
+ 5, 67, :_reduce_37,
+ 2, 57, :_reduce_38,
+ 1, 85, :_reduce_39,
+ 2, 85, :_reduce_40,
+ 2, 58, :_reduce_41,
+ 1, 86, :_reduce_none,
+ 1, 86, :_reduce_none,
+ 3, 87, :_reduce_44,
+ 3, 87, :_reduce_45,
  1, 88, :_reduce_none,
  1, 88, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 4, 99, :_reduce_88,
- 3, 99, :_reduce_89,
- 1, 73, :_reduce_90,
- 1, 73, :_reduce_91,
- 1, 98, :_reduce_92,
- 4, 74, :_reduce_93,
- 4, 74, :_reduce_94,
- 6, 60, :_reduce_95,
- 0, 101, :_reduce_none,
- 4, 101, :_reduce_97,
+ 3, 88, :_reduce_48,
+ 1, 89, :_reduce_none,
+ 3, 89, :_reduce_50,
+ 1, 90, :_reduce_none,
+ 1, 90, :_reduce_none,
+ 3, 91, :_reduce_53,
+ 3, 91, :_reduce_54,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 4, 94, :_reduce_57,
+ 1, 81, :_reduce_none,
+ 3, 81, :_reduce_59,
+ 0, 82, :_reduce_none,
+ 1, 82, :_reduce_none,
+ 1, 96, :_reduce_62,
+ 1, 72, :_reduce_63,
+ 1, 74, :_reduce_64,
+ 1, 95, :_reduce_none,
+ 1, 95, :_reduce_none,
+ 1, 95, :_reduce_none,
+ 1, 95, :_reduce_none,
+ 1, 95, :_reduce_none,
+ 1, 95, :_reduce_none,
+ 3, 59, :_reduce_71,
+ 0, 83, :_reduce_72,
+ 1, 83, :_reduce_73,
+ 3, 83, :_reduce_74,
+ 3, 99, :_reduce_75,
  1, 100, :_reduce_none,
- 5, 59, :_reduce_99,
- 1, 102, :_reduce_none,
- 2, 102, :_reduce_101,
- 5, 103, :_reduce_102,
+ 3, 100, :_reduce_77,
+ 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, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 4, 76, :_reduce_94,
+ 3, 76, :_reduce_95,
+ 1, 78, :_reduce_96,
+ 1, 78, :_reduce_97,
+ 1, 75, :_reduce_98,
+ 4, 79, :_reduce_99,
+ 4, 79, :_reduce_100,
+ 6, 61, :_reduce_101,
+ 0, 103, :_reduce_none,
  4, 103, :_reduce_103,
+ 1, 102, :_reduce_none,
+ 5, 60, :_reduce_105,
  1, 104, :_reduce_none,
- 3, 104, :_reduce_105,
- 3, 92, :_reduce_106,
+ 2, 104, :_reduce_107,
+ 5, 105, :_reduce_108,
+ 4, 105, :_reduce_109,
  1, 106, :_reduce_none,
- 4, 106, :_reduce_108,
+ 3, 106, :_reduce_111,
+ 3, 77, :_reduce_112,
  1, 108, :_reduce_none,
- 3, 108, :_reduce_110,
- 3, 107, :_reduce_111,
- 1, 105, :_reduce_none,
- 1, 105, :_reduce_none,
- 1, 105, :_reduce_none,
- 1, 105, :_reduce_none,
- 1, 105, :_reduce_none,
- 1, 105, :_reduce_none,
- 1, 105, :_reduce_118,
- 1, 109, :_reduce_119,
- 3, 109, :_reduce_120,
- 2, 61, :_reduce_121,
- 6, 63, :_reduce_122,
- 5, 63, :_reduce_123,
- 6, 64, :_reduce_124,
- 5, 64, :_reduce_125,
- 6, 65, :_reduce_126,
- 5, 65, :_reduce_127,
- 1, 75, :_reduce_none,
- 1, 75, :_reduce_none,
- 1, 112, :_reduce_none,
- 3, 112, :_reduce_131,
- 1, 114, :_reduce_none,
- 1, 114, :_reduce_none,
- 1, 114, :_reduce_none,
- 0, 53, :_reduce_135,
- 0, 115, :_reduce_136,
+ 4, 108, :_reduce_114,
  1, 110, :_reduce_none,
- 3, 110, :_reduce_138,
- 3, 110, :_reduce_139,
+ 3, 110, :_reduce_116,
+ 3, 109, :_reduce_117,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_125,
+ 1, 111, :_reduce_126,
+ 3, 111, :_reduce_127,
+ 2, 62, :_reduce_128,
+ 6, 64, :_reduce_129,
+ 5, 64, :_reduce_130,
+ 6, 65, :_reduce_131,
+ 5, 65, :_reduce_132,
+ 6, 66, :_reduce_133,
+ 5, 66, :_reduce_134,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 114, :_reduce_none,
+ 3, 114, :_reduce_138,
  1, 116, :_reduce_none,
- 3, 116, :_reduce_141,
- 3, 117, :_reduce_142,
- 1, 117, :_reduce_143,
- 3, 117, :_reduce_144,
- 1, 117, :_reduce_145,
- 1, 113, :_reduce_none,
- 2, 113, :_reduce_147,
- 1, 111, :_reduce_none,
- 2, 111, :_reduce_149,
- 1, 118, :_reduce_none,
+ 1, 116, :_reduce_none,
+ 1, 116, :_reduce_none,
+ 0, 54, :_reduce_142,
+ 0, 117, :_reduce_143,
+ 1, 112, :_reduce_none,
+ 3, 112, :_reduce_145,
+ 3, 112, :_reduce_146,
  1, 118, :_reduce_none,
- 1, 119, :_reduce_none,
- 1, 119, :_reduce_none,
- 1, 72, :_reduce_154,
- 3, 93, :_reduce_155,
- 2, 93, :_reduce_156,
- 1, 97, :_reduce_none,
- 1, 97, :_reduce_none,
- 0, 79, :_reduce_none,
- 1, 79, :_reduce_160 ]
+ 3, 118, :_reduce_148,
+ 3, 119, :_reduce_149,
+ 1, 119, :_reduce_150,
+ 3, 119, :_reduce_151,
+ 1, 119, :_reduce_152,
+ 1, 115, :_reduce_none,
+ 2, 115, :_reduce_154,
+ 1, 113, :_reduce_none,
+ 2, 113, :_reduce_156,
+ 1, 120, :_reduce_none,
+ 1, 120, :_reduce_none,
+ 1, 73, :_reduce_159,
+ 3, 97, :_reduce_160,
+ 2, 97, :_reduce_161,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 0, 84, :_reduce_none,
+ 1, 84, :_reduce_165 ]
 
-racc_reduce_n = 161
+racc_reduce_n = 166
 
-racc_shift_n = 263
+racc_shift_n = 267
 
 racc_action_table = [
-    49,    51,    53,    41,  -128,    51,    53,    51,    53,    51,
-    53,   188,    58,    96,    49,   110,    58,    63,    51,    53,
-    46,    43,    58,    33,   116,   170,   156,   107,   217,    88,
-     4,    45,   163,    74,   116,    45,    55,    45,    93,    45,
-    98,   191,    55,    47,    98,    44,   192,    47,    45,    47,
-    36,    47,    65,    69,   153,   154,    75,    63,    51,    53,
-    33,   233,   187,    63,    51,    53,   113,     4,    79,    63,
-    51,    53,    80,    74,   232,    63,    51,    53,   187,    74,
-   158,    63,    51,    53,    38,    74,   196,    39,    45,   157,
-   191,    74,    65,    69,    45,   192,    75,    74,    65,    69,
-    45,   187,    75,   198,    65,    69,    45,  -113,    75,  -112,
-    65,    69,    45,   185,    75,    97,    65,    69,    51,    53,
-    75,    63,    51,    53,  -115,   205,    45,    63,    51,    53,
-  -114,    98,   200,    63,    51,    53,  -112,    74,  -113,    63,
-    51,    53,   117,    74,  -115,    63,    51,    53,   112,    74,
-   153,   154,    45,   167,   247,    74,    65,    69,    45,  -116,
-    75,   140,    65,    69,    45,    49,    75,    79,    65,    69,
-    45,    49,    75,  -114,    65,    69,    45,   116,    75,   241,
-    65,   174,    33,   218,    75,    63,    51,    53,   224,     4,
-    18,    63,    51,    53,   111,   223,   110,    36,    51,    53,
-    15,    74,    21,    25,    79,     1,     5,   140,     8,   225,
-    13,   121,    17,   140,    26,   161,    45,     4,   240,   228,
-    65,    69,    45,   160,    75,   230,    65,   137,    45,    18,
-    75,    38,    65,   174,    39,   147,    75,   234,   148,    15,
-   231,    21,    25,    97,     1,     5,  -117,     8,    18,    13,
-    80,    17,   236,    26,    45,   121,     4,   238,    15,    98,
-    21,    25,   262,     1,     5,   118,     8,    91,    13,   188,
-    17,    97,    26,    18,   166,     4,  -113,    33,   167,   169,
-   144,   253,    45,    15,     4,    21,    25,    98,     1,     5,
-    97,     8,    18,    13,  -112,    17,  -115,    26,    51,    53,
-     4,    45,    15,  -114,    21,    25,    98,     1,     5,  -117,
-     8,   243,    13,   140,    17,    87,    26,   150,   258,     4,
-    51,    53,   159,   248,   222,   123,   153,   154,    45,    18,
-    51,    53,    65,   174,    84,   140,    75,    51,    53,    15,
-   143,    21,    25,   121,     1,     5,    81,     8,   187,    13,
-    45,    17,   140,    26,    65,   174,     4,   261,    75,   255,
-   256,   126,  -160,   121,   124,    32,   229,    45,    18,   nil,
-   nil,    65,   174,   nil,   nil,    75,   215,   nil,    15,   nil,
-    21,    25,   nil,     1,     5,   nil,     8,    18,    13,   nil,
-    17,   nil,    26,    51,    53,     4,   nil,    15,   nil,    21,
-    25,   nil,     1,     5,   nil,     8,   nil,    13,   140,    17,
-   nil,    26,   nil,   nil,     4,    51,    53,    51,    53,   nil,
-   177,   nil,   nil,    45,   nil,   nil,   nil,    65,   174,   nil,
-   140,    75,   140,   203,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    18,    45,   nil,    45,   nil,    65,
-   174,    65,   174,    75,    15,    75,    21,    25,   201,     1,
-     5,   nil,     8,   nil,    13,   nil,    17,   nil,    26,    18,
-   nil,     4,   nil,    51,    53,   nil,   nil,   nil,   nil,    15,
-   nil,    21,    25,   nil,     1,     5,   nil,     8,   140,    13,
-   nil,    17,   nil,    26,   nil,   nil,     4,   nil,   nil,   nil,
-    18,   nil,   nil,    45,   nil,   nil,   nil,    65,   174,   nil,
-    15,    75,    21,    25,   nil,     1,     5,   nil,     8,    18,
-    13,   nil,    17,   nil,    26,   nil,   nil,     4,   nil,    15,
-   nil,    21,    25,   nil,     1,     5,   nil,     8,    18,    13,
-   nil,    17,   nil,    26,   nil,   nil,     4,   nil,    15,   nil,
-    21,    25,   nil,     1,     5,   nil,     8,    18,    13,   nil,
-    17,   nil,    26,   nil,   nil,     4,   nil,    15,   nil,    21,
-    25,   nil,     1,     5,   nil,     8,   nil,    13,   nil,    17,
-   nil,    26,   nil,   nil,     4 ]
+    69,    50,    53,    86,   201,    89,    69,    50,    53,    36,
+    36,   203,   191,   104,    47,   152,   113,   192,    92,    36,
+   202,   163,    59,    34,    69,    50,    53,  -124,   124,    90,
+     4,    42,   199,   200,   124,    52,   108,    42,   101,    61,
+    59,    52,    55,    38,    38,    61,    40,    40,    57,    69,
+    50,    53,   234,    38,    57,    42,    40,   225,    81,    52,
+    55,   168,    82,    61,   224,    59,   231,    69,    50,    53,
+   127,   138,    57,    69,    50,    53,  -119,   199,   200,   230,
+    42,   167,    42,    59,    52,    55,  -121,   143,    61,    59,
+  -118,    47,    50,    53,   138,  -135,   204,    57,    42,   161,
+   199,   200,    52,    55,    42,    42,    61,    59,    52,    55,
+   143,    44,    61,   138,   191,    57,    69,    50,    53,   192,
+   138,    57,    42,   129,    42,  -120,    52,    55,    34,   143,
+    61,    42,    59,   188,    45,     4,   143,    34,   154,    57,
+    69,    50,    53,    34,     4,  -121,   149,    42,   154,   180,
+     4,    52,    55,   181,   182,    61,    59,   196,    69,    50,
+    53,    50,    53,  -118,    57,    69,    50,    53,    50,    53,
+  -122,    42,   181,   249,   113,    52,    55,   159,  -120,    61,
+  -123,    59,  -119,    69,    50,    53,   208,    99,    57,    42,
+   125,   212,  -121,    52,   164,   214,    42,    61,    99,    59,
+    52,    55,    50,    53,    61,   124,    57,    69,    50,    53,
+    47,    81,   216,    57,    42,    81,   219,   113,    52,    55,
+  -118,  -119,    61,    59,   123,    69,    50,    53,   156,   122,
+   227,    57,    42,    50,    53,   228,    52,   164,    42,   229,
+    61,    59,    52,    55,    50,    53,    61,  -123,   113,    57,
+  -120,    50,    53,   154,   152,    57,    42,   151,    99,   113,
+    52,    55,    95,    42,    61,   162,   113,    52,   164,    50,
+    53,    61,   173,    57,    42,    50,    53,   154,    52,   164,
+    57,    42,    61,   130,   113,    52,   164,   135,   252,    61,
+   113,    57,   253,    50,    53,   134,    87,    82,    57,    42,
+   133,    99,  -120,    52,   164,    42,  -118,    61,   113,    52,
+   164,    50,    53,    61,  -121,   223,    57,    50,    53,  -119,
+  -123,    41,    57,    42,   260,  -165,   113,    52,   164,   261,
+    35,    61,    59,    50,    53,    50,    53,   119,  -122,    32,
+    57,    42,   226,   nil,   nil,    52,   164,    42,    59,    61,
+   113,    52,    55,   169,   nil,    61,   nil,   nil,    57,    45,
+   nil,   nil,   nil,    42,    57,    42,   nil,    52,    55,    52,
+   164,    61,   266,    61,   nil,    45,   nil,    45,   nil,   nil,
+    57,   nil,    57,    19,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   232,   nil,    16,   nil,    21,    25,   nil,     1,     5,
+   nil,    10,    19,    14,   nil,    18,   nil,    27,   nil,   nil,
+     4,   nil,    16,   nil,    21,    25,   221,     1,     5,   nil,
+    10,   nil,    14,   nil,    18,   nil,    27,    19,   nil,     4,
+   nil,   nil,   nil,   nil,   nil,   244,   nil,    16,   nil,    21,
+    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,
+   nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,
+   258,     1,     5,   nil,    10,   nil,    14,   nil,    18,   nil,
+    27,    19,   nil,     4,   nil,   nil,   nil,   nil,   nil,   245,
+   nil,    16,   nil,    21,    25,   nil,     1,     5,   nil,    10,
+    19,    14,   nil,    18,   nil,    27,   nil,   nil,     4,   nil,
+    16,   nil,    21,    25,   262,     1,     5,   nil,    10,   nil,
+    14,   nil,    18,   nil,    27,    19,   nil,     4,   nil,   nil,
+   nil,   nil,   nil,   265,   nil,    16,   nil,    21,    25,   nil,
+     1,     5,   nil,    10,    19,    14,   nil,    18,   nil,    27,
+   nil,   nil,     4,   nil,    16,   nil,    21,    25,   205,     1,
+     5,   nil,    10,   nil,    14,   nil,    18,   nil,    27,    19,
+   nil,     4,   nil,   nil,   nil,   nil,   nil,   210,   nil,    16,
+   nil,    21,    25,   nil,     1,     5,   nil,    10,    19,    14,
+   nil,    18,   nil,    27,   nil,   nil,     4,   nil,    16,   nil,
+    21,    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,
+    18,   nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,
+    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,
+   nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,
+   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,   nil,
+    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,   nil,
+     1,     5,   nil,    10,    19,    14,   nil,    18,   nil,    27,
+   nil,   nil,     4,   nil,    16,   nil,    21,    25,   nil,     1,
+     5,   nil,    10,   nil,    14,   nil,    18,   nil,    27,   nil,
+   nil,     4 ]
 
 racc_action_check = [
-    13,    13,    13,     9,    13,   116,   116,    46,    46,   110,
-   110,   137,   111,    35,    69,   171,    13,    17,    17,    17,
-    13,    11,    46,     9,   137,   116,   101,    46,   171,    27,
-     9,    13,   111,    17,    69,   116,    13,    46,    35,   110,
-   116,   126,    46,    13,   110,    11,   126,   116,    17,    46,
-     8,   110,    17,    17,   101,   101,    17,    49,    49,    49,
-    25,   194,   125,    63,    63,    63,    63,    25,    18,    15,
-    15,    15,    18,    49,   194,   168,   168,   168,   120,    63,
-   105,    79,    79,    79,     8,    15,   127,     8,    49,   105,
-   233,   168,    49,    49,    63,   233,    49,    79,    63,    63,
-    15,   131,    63,   132,    15,    15,   168,   133,    15,   136,
-   168,   168,    79,   119,   168,    44,    79,    79,    21,    21,
-    79,   188,   188,   188,   138,   152,    44,   230,   230,   230,
-   139,    44,   142,   229,   229,   229,    68,   188,    64,    32,
-    32,    32,    70,   230,    72,   200,   200,   200,    62,   229,
-   152,   152,   188,   220,   220,    32,   188,   188,   230,    61,
-   188,   200,   230,   230,   229,   163,   230,    58,   229,   229,
-    32,    55,   229,    73,    32,    32,   200,   174,    32,   204,
-   200,   200,     5,   176,   200,   218,   218,   218,   183,     5,
-   204,    88,    88,    88,    52,   183,    50,    96,   224,   224,
-   204,   218,   204,   204,    74,   204,   204,    88,   204,   186,
-   204,   187,   204,   224,   204,   109,   218,   204,   202,   190,
-   218,   218,    88,   108,   218,   192,    88,    88,   224,   202,
-    88,    96,   224,   224,    96,    93,   224,   196,    93,   202,
-   193,   202,   202,   155,   202,   202,    77,   202,   196,   202,
-    41,   202,   197,   202,   155,   198,   202,   199,   196,   155,
-   196,   196,   260,   196,   196,    78,   196,    34,   196,   121,
-   196,    97,   196,   260,   115,   196,   208,    91,   115,   115,
-    91,   235,    97,   260,    91,   260,   260,    97,   260,   260,
-    43,   260,   235,   260,   210,   260,   211,   260,   246,   246,
-   260,    43,   235,   212,   235,   235,    43,   235,   235,   213,
-   235,   215,   235,   246,   235,    26,   235,    94,   248,   235,
-   181,   181,   106,   223,   181,    81,   106,   106,   246,   248,
-   124,   124,   246,   246,    22,   181,   246,   177,   177,   248,
-    90,   248,   248,    80,   248,   248,    20,   248,   237,   248,
-   181,   248,   177,   248,   181,   181,   248,   259,   181,   243,
-   245,    86,   247,    84,    83,     1,   191,   177,   259,   nil,
-   nil,   177,   177,   nil,   nil,   177,   165,   nil,   259,   nil,
-   259,   259,   nil,   259,   259,   nil,   259,   165,   259,   nil,
-   259,   nil,   259,   118,   118,   259,   nil,   165,   nil,   165,
-   165,   nil,   165,   165,   nil,   165,   nil,   165,   118,   165,
-   nil,   165,   nil,   nil,   165,   157,   157,   117,   117,   nil,
-   117,   nil,   nil,   118,   nil,   nil,   nil,   118,   118,   nil,
-   157,   118,   117,   150,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   150,   157,   nil,   117,   nil,   157,
-   157,   117,   117,   157,   150,   117,   150,   150,   143,   150,
-   150,   nil,   150,   nil,   150,   nil,   150,   nil,   150,   143,
-   nil,   150,   nil,   158,   158,   nil,   nil,   nil,   nil,   143,
-   nil,   143,   143,   nil,   143,   143,   nil,   143,   158,   143,
-   nil,   143,   nil,   143,   nil,   nil,   143,   nil,   nil,   nil,
-   112,   nil,   nil,   158,   nil,   nil,   nil,   158,   158,   nil,
-   112,   158,   112,   112,   nil,   112,   112,   nil,   112,   255,
-   112,   nil,   112,   nil,   112,   nil,   nil,   112,   nil,   255,
-   nil,   255,   255,   nil,   255,   255,   nil,   255,    24,   255,
-   nil,   255,   nil,   255,   nil,   nil,   255,   nil,    24,   nil,
-    24,    24,   nil,    24,    24,   nil,    24,     0,    24,   nil,
-    24,   nil,    24,   nil,   nil,    24,   nil,     0,   nil,     0,
-     0,   nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,
-   nil,     0,   nil,   nil,     0 ]
+    41,    41,    41,    22,   139,    26,    47,    47,    47,   104,
+    10,   142,   135,    37,    55,   108,    41,   135,    27,   101,
+   142,   121,    47,    22,    81,    81,    81,    74,   108,    26,
+    22,    41,   139,   139,    55,    41,    41,    47,    37,    41,
+    81,    47,    47,   104,    10,    47,   104,    10,    41,   179,
+   179,   179,   197,   101,    47,    81,   101,   186,    19,    81,
+    81,   123,    19,    81,   186,   179,   194,    69,    69,    69,
+    69,    89,    81,    32,    32,    32,   115,   197,   197,   194,
+   179,   123,    89,    69,   179,   179,    73,    89,   179,    32,
+    72,    14,    14,    14,   138,    14,   147,   179,    69,   114,
+   147,   147,    69,    69,    32,   138,    69,    14,    32,    32,
+   138,    14,    32,   198,   231,    69,    16,    16,    16,   231,
+    90,    32,    14,    71,   198,    68,    14,    14,    25,   198,
+    14,    90,    16,   131,    14,    25,    90,     5,   132,    14,
+    18,    18,    18,    95,     5,   112,    95,    16,   111,   126,
+    95,    16,    16,   126,   126,    16,    18,   136,   159,   159,
+   159,    21,    21,   109,    16,   228,   228,   228,   133,   133,
+    66,    18,   217,   217,   159,    18,    18,   107,   106,    18,
+    65,   228,    64,   152,   152,   152,   153,   154,    18,   159,
+    63,   158,    60,   159,   159,   160,   228,   159,   161,   152,
+   228,   228,   225,   225,   228,   164,   159,   219,   219,   219,
+   167,   168,   170,   228,   152,    59,   176,   225,   152,   152,
+    58,    75,   152,   219,    54,   227,   227,   227,   102,    51,
+   191,   152,   225,   130,   130,   192,   225,   225,   219,   193,
+   225,   227,   219,   219,   173,   173,   219,    77,   130,   225,
+    46,   247,   247,   100,    99,   219,   227,    96,    35,   173,
+   227,   227,    33,   130,   227,   120,   247,   130,   130,   125,
+   125,   130,   125,   227,   173,   203,   203,   215,   173,   173,
+   130,   247,   173,    80,   125,   247,   247,    88,   221,   247,
+   203,   173,   224,   202,   202,    87,    24,    86,   247,   125,
+    83,    82,   237,   125,   125,   203,   239,   125,   202,   203,
+   203,   184,   184,   203,   240,   184,   125,    44,    44,   241,
+   242,    11,   203,   202,   248,   249,   184,   202,   202,   252,
+     8,   202,    44,   124,   124,   122,   122,    44,    79,     1,
+   202,   184,   189,   nil,   nil,   184,   184,    44,   124,   184,
+   122,    44,    44,   124,   nil,    44,   nil,   nil,   184,    44,
+   nil,   nil,   nil,   124,    44,   122,   nil,   124,   124,   122,
+   122,   124,   264,   122,   nil,   124,   nil,   122,   nil,   nil,
+   124,   nil,   122,   264,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   196,   nil,   264,   nil,   264,   264,   nil,   264,   264,
+   nil,   264,   196,   264,   nil,   264,   nil,   264,   nil,   nil,
+   264,   nil,   196,   nil,   196,   196,   183,   196,   196,   nil,
+   196,   nil,   196,   nil,   196,   nil,   196,   183,   nil,   196,
+   nil,   nil,   nil,   nil,   nil,   206,   nil,   183,   nil,   183,
+   183,   nil,   183,   183,   nil,   183,   206,   183,   nil,   183,
+   nil,   183,   nil,   nil,   183,   nil,   206,   nil,   206,   206,
+   233,   206,   206,   nil,   206,   nil,   206,   nil,   206,   nil,
+   206,   233,   nil,   206,   nil,   nil,   nil,   nil,   nil,   211,
+   nil,   233,   nil,   233,   233,   nil,   233,   233,   nil,   233,
+   211,   233,   nil,   233,   nil,   233,   nil,   nil,   233,   nil,
+   211,   nil,   211,   211,   253,   211,   211,   nil,   211,   nil,
+   211,   nil,   211,   nil,   211,   253,   nil,   211,   nil,   nil,
+   nil,   nil,   nil,   263,   nil,   253,   nil,   253,   253,   nil,
+   253,   253,   nil,   253,   263,   253,   nil,   253,   nil,   253,
+   nil,   nil,   253,   nil,   263,   nil,   263,   263,   151,   263,
+   263,   nil,   263,   nil,   263,   nil,   263,   nil,   263,   151,
+   nil,   263,   nil,   nil,   nil,   nil,   nil,   156,   nil,   151,
+   nil,   151,   151,   nil,   151,   151,   nil,   151,   156,   151,
+   nil,   151,   nil,   151,   nil,   nil,   151,   nil,   156,   nil,
+   156,   156,   nil,   156,   156,   nil,   156,   261,   156,   nil,
+   156,   nil,   156,   nil,   nil,   156,   nil,   261,   nil,   261,
+   261,   nil,   261,   261,   nil,   261,    29,   261,   nil,   261,
+   nil,   261,   nil,   nil,   261,   nil,    29,   nil,    29,    29,
+   nil,    29,    29,   nil,    29,   129,    29,   nil,    29,   nil,
+    29,   nil,   nil,    29,   nil,   129,   nil,   129,   129,   nil,
+   129,   129,   nil,   129,     0,   129,   nil,   129,   nil,   129,
+   nil,   nil,   129,   nil,     0,   nil,     0,     0,   nil,     0,
+     0,   nil,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
+   nil,     0 ]
 
 racc_action_pointer = [
-   539,   352,   nil,   nil,   nil,   144,   nil,   nil,    46,   -15,
-   nil,     2,   nil,    -2,   nil,    67,   nil,    15,    66,   nil,
-   346,   115,   328,   nil,   520,    22,   273,    23,   nil,   nil,
-   nil,   nil,   137,   nil,   232,     3,   nil,   nil,   nil,   nil,
-   nil,   244,   nil,   268,    93,   nil,     4,   nil,   nil,    55,
-   186,   nil,   184,   nil,   nil,   169,   nil,   nil,   165,   nil,
-   nil,   138,   142,    61,   117,   nil,   nil,   nil,   115,    12,
-   121,   nil,   123,   152,   202,   nil,   nil,   225,   259,    79,
-   305,   325,   nil,   354,   325,   nil,   339,   nil,   189,   nil,
-   334,   239,   nil,   197,   311,   nil,   193,   249,   nil,   nil,
-   nil,     6,   nil,   nil,   nil,    65,   278,   nil,   200,   210,
-     6,    -6,   482,   nil,   nil,   269,     2,   414,   390,   108,
-    68,   260,   nil,   nil,   327,    52,     8,    80,   nil,   nil,
-   nil,    91,    86,    86,   nil,   nil,    88,     2,   103,   109,
-   nil,   nil,    93,   451,   nil,   nil,   nil,   nil,   nil,   nil,
-   426,   nil,   102,   nil,   nil,   221,   nil,   412,   470,   nil,
-   nil,   nil,   nil,   163,   nil,   369,   nil,   nil,    73,   nil,
-   nil,     5,   nil,   nil,   155,   nil,   174,   334,   nil,   nil,
-   nil,   317,   nil,   178,   nil,   nil,   202,   173,   119,   nil,
-   212,   353,   212,   217,    51,   nil,   230,   245,   217,   250,
-   143,   nil,   211,   nil,   172,   nil,   nil,   nil,   255,   nil,
-   273,   275,   282,   288,   nil,   282,   nil,   nil,   183,   nil,
-   144,   nil,   nil,   317,   195,   nil,   nil,   nil,   nil,   131,
-   125,   nil,   nil,    57,   nil,   274,   nil,   338,   nil,   nil,
-   nil,   nil,   nil,   353,   nil,   353,   295,   355,   311,   nil,
-   nil,   nil,   nil,   nil,   nil,   501,   nil,   nil,   nil,   350,
-   255,   nil,   nil ]
+   636,   326,   nil,   nil,   nil,    99,   nil,   nil,   324,   nil,
+     6,   315,   nil,   nil,    89,   nil,   114,   nil,   138,    56,
+   nil,   158,   -15,   nil,   296,    90,   -14,   -24,   nil,   598,
+   nil,   nil,    71,   227,   nil,   220,   nil,     3,   nil,   nil,
+   nil,    -2,   nil,   nil,   314,   nil,   229,     4,   nil,   nil,
+   nil,   219,   nil,   nil,   214,    12,   nil,   nil,   199,   213,
+   171,   nil,   nil,   169,   161,   159,   149,   nil,   104,    65,
+   nil,   117,    69,    65,     6,   200,   nil,   226,   nil,   317,
+   277,    22,   263,   290,   nil,   nil,   291,   295,   265,    49,
+    98,   nil,   nil,   nil,   nil,   105,   251,   nil,   nil,   245,
+   243,    15,   222,   nil,     5,   nil,   157,   138,     6,   142,
+   nil,   138,   124,   nil,    82,    55,   nil,   nil,   nil,   nil,
+   242,    16,   332,    43,   330,   266,   144,   nil,   nil,   617,
+   230,   128,   128,   165,   nil,   -21,   151,   nil,    72,   -16,
+   nil,   nil,    -4,   nil,   nil,   nil,   nil,    52,   nil,   nil,
+   nil,   541,   181,   179,   149,   nil,   560,   nil,   184,   156,
+   188,   160,   nil,   nil,   183,   nil,   nil,   208,   209,   nil,
+   189,   nil,   nil,   241,   nil,   nil,   207,   nil,   nil,    47,
+   nil,   nil,   nil,   409,   308,   nil,    47,   nil,   nil,   335,
+   nil,   217,   222,   216,    56,   nil,   384,    29,    91,   nil,
+   nil,   nil,   290,   272,   nil,   nil,   428,   nil,   nil,   nil,
+   nil,   472,   nil,   nil,   nil,   267,   nil,   163,   nil,   205,
+   nil,   259,   nil,   nil,   286,   199,   nil,   223,   163,   nil,
+   nil,    81,   nil,   453,   nil,   nil,   nil,   281,   nil,   285,
+   293,   298,   299,   nil,   nil,   nil,   nil,   248,   317,   318,
+   nil,   nil,   323,   497,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   579,   nil,   516,   365,   nil,   nil ]
 
 racc_action_default = [
-  -135,  -161,   -16,    -5,  -129,  -161,    -6,    -7,  -161,  -161,
-    -8,  -161,    -9,   -39,   -10,  -161,   -11,  -161,   -38,   -12,
-  -161,  -161,  -161,   -13,    -1,  -161,   -35,  -161,   -14,    -2,
-   -15,    -3,  -161,  -128,  -135,  -135,  -133,  -130,  -132,  -134,
-   -34,  -161,   -37,  -135,  -135,  -154,  -161,   -27,   -19,  -161,
-   -20,   -90,   -21,   -91,   -22,   -58,   -24,   -25,  -161,   -26,
-   -28,   -87,  -161,  -161,   -81,   -92,   -83,   -85,   -80,   -58,
-  -161,   -98,   -84,   -79,   -59,  -118,   -86,   -82,  -161,  -161,
-   -67,  -161,  -119,  -121,   -67,    -4,  -135,   -36,   -67,   -66,
-  -161,  -161,  -148,  -161,  -161,  -146,  -161,  -135,   -58,   -52,
-   -51,  -161,   -43,   -45,   -42,  -161,  -161,   -18,  -161,  -161,
-  -161,  -161,  -161,  -156,   -71,  -161,  -161,  -161,  -161,  -161,
-  -159,  -161,   -68,   263,  -161,  -159,  -136,  -161,  -137,  -116,
-   -54,  -159,  -161,   -62,   -63,   -65,   -61,   -58,   -64,   -60,
-   -59,  -117,   -56,  -161,  -153,  -152,  -149,  -150,  -151,  -147,
-  -161,  -131,  -161,   -48,   -47,  -161,   -41,  -161,  -161,   -40,
-   -17,   -93,   -23,  -161,   -29,  -161,  -155,  -157,  -161,  -158,
-   -89,  -161,  -113,  -112,   -58,  -115,  -161,  -161,  -114,  -106,
-  -107,  -161,  -100,  -161,  -104,   -94,  -161,  -160,  -161,  -120,
-  -161,  -145,  -143,  -161,  -161,  -140,  -161,  -161,   -67,  -161,
-   -57,  -125,  -161,  -127,  -161,   -46,   -44,   -49,   -75,   -77,
-   -74,   -78,   -73,   -76,   -50,   -96,   -72,   -88,  -161,  -109,
-  -159,  -101,   -99,  -161,  -161,   -32,   -69,   -70,   -33,  -161,
-  -161,  -138,  -139,  -161,  -123,  -161,   -31,  -159,   -30,   -55,
-  -124,  -126,   -95,  -161,  -111,  -161,  -161,  -158,  -161,  -105,
-  -144,  -142,  -141,  -122,   -53,  -161,  -108,  -110,  -103,  -161,
-  -161,  -102,   -97 ]
+  -142,  -166,   -15,    -3,  -136,  -166,   -16,    -5,  -166,    -6,
+  -166,  -166,    -7,    -8,   -43,    -9,  -166,   -10,  -166,   -42,
+   -11,  -166,  -166,   -12,  -166,  -166,  -166,   -39,   -13,    -1,
+   -14,    -2,  -166,  -142,  -135,   -72,  -140,  -142,  -139,  -137,
+  -141,   -72,  -159,   -29,  -166,   -31,   -30,  -166,   -32,   -19,
+   -96,   -20,   -98,   -97,   -21,   -63,   -22,   -62,   -24,   -64,
+   -25,  -125,  -124,  -166,   -26,   -27,   -28,   -88,   -84,  -166,
+   -91,  -166,   -85,   -89,   -93,   -86,   -90,   -87,  -104,   -92,
+  -166,  -166,   -72,  -128,  -126,   -38,  -166,  -166,  -142,  -142,
+  -142,   -41,   -40,    -4,   -71,  -166,  -166,  -155,   -73,  -166,
+  -164,  -166,  -166,  -153,  -166,   -68,   -65,   -60,   -63,   -66,
+   -58,  -164,   -69,   -64,  -166,   -67,  -123,   -70,  -122,   -18,
+  -166,  -166,  -166,  -166,  -166,  -166,  -166,  -161,   -76,  -166,
+  -166,  -166,  -164,  -166,   267,  -143,  -166,  -144,  -142,  -166,
+   -47,   -49,  -166,   -63,   -56,   -55,   -46,  -166,  -157,  -158,
+  -156,  -166,  -166,  -166,  -165,  -154,  -166,  -138,  -166,   -61,
+  -166,   -72,   -17,   -99,   -63,   -23,   -33,  -166,  -166,   -95,
+  -166,  -120,  -118,  -166,  -121,  -119,  -166,  -112,  -113,  -166,
+  -160,  -162,  -163,  -166,  -166,  -106,  -166,  -110,  -100,  -166,
+  -127,  -152,  -150,  -166,  -166,  -147,  -166,  -166,  -166,   -52,
+   -51,   -45,  -166,  -166,   -44,  -132,  -166,   -75,   -37,   -74,
+  -134,  -166,   -34,   -59,   -35,  -164,   -94,  -164,  -115,  -166,
+   -77,  -102,  -107,  -105,  -166,  -166,   -36,  -166,  -166,  -145,
+  -146,  -166,  -130,  -166,   -50,   -48,   -82,   -78,   -53,   -79,
+   -83,   -80,   -81,   -54,  -131,  -133,   -57,  -166,  -166,  -163,
+  -117,  -101,  -166,  -166,  -111,  -151,  -149,  -148,  -129,  -116,
+  -114,  -166,  -109,  -166,  -166,  -108,  -103 ]
 
 racc_goto_table = [
-    24,    85,    59,    60,    37,    76,   180,    76,   135,   120,
-    82,   182,    57,   125,    71,    20,    78,   131,   195,   176,
-   184,   115,    76,   186,   130,   129,    48,    56,   190,   207,
-   214,    89,   226,   168,   197,    59,    60,   101,   106,    76,
-   206,    42,   100,   100,    62,    57,   242,   181,   109,   199,
-   142,   179,   141,    76,   129,   129,   162,    99,    99,   108,
-    56,   220,   114,    29,    83,    34,   219,   127,    90,    76,
-    35,    94,   171,   193,   221,   194,    40,   139,   119,   176,
-   149,   141,   141,   184,   146,    86,   nil,   138,   nil,   nil,
-   134,   152,   151,   nil,   129,   129,   100,    92,    95,    59,
-   nil,   164,   136,   nil,   133,    59,   178,   178,   nil,    57,
-   nil,    99,   165,   189,   129,    57,   175,   175,   129,   nil,
-   135,   213,   213,   245,    56,   252,   249,   237,   nil,   nil,
-    56,   173,   173,   172,   172,   257,   239,   129,   246,   nil,
-   254,   141,    85,   202,   nil,   141,   212,   212,   176,   128,
-   204,   145,   nil,   nil,   100,   nil,   211,   211,    76,   209,
-   209,   129,   nil,   nil,   141,   nil,   178,   216,   nil,    99,
-   178,   210,   210,   208,   208,   nil,   175,   nil,    76,    85,
-   175,    85,   nil,   129,   nil,   nil,   nil,   227,   141,   139,
-   nil,   173,   nil,   172,   nil,   173,   235,   172,   nil,   138,
-   nil,   nil,   134,   nil,   nil,   nil,   nil,   nil,    76,   nil,
-   141,   nil,    85,   178,   136,   nil,   133,   244,   nil,    76,
-    76,   nil,   nil,   175,   nil,   nil,   nil,   nil,   250,   251,
-   nil,   nil,   nil,   nil,   nil,   178,    85,    85,   173,   nil,
-   172,   nil,   nil,   nil,   nil,   175,   nil,   nil,   259,   nil,
-   nil,   nil,   nil,   nil,   nil,   260,   nil,   nil,   nil,   nil,
-   173,   nil,   172 ]
+    29,    93,   100,   110,    46,   178,   195,    39,   111,    43,
+   176,    84,   179,   117,    66,   187,    49,    33,   153,   185,
+    24,   139,   147,   238,   243,   209,   126,   235,    71,   160,
+    65,   106,   251,   184,    46,    91,   105,    88,   158,    43,
+   177,   118,   107,   217,    66,    83,   120,   136,    96,   132,
+   189,    37,   102,   218,    64,   165,    31,   116,   176,   193,
+    65,    60,   194,    85,   150,   nil,   nil,   nil,   nil,   187,
+   197,   nil,   nil,   222,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   115,   nil,   nil,    64,   nil,   nil,   nil,   112,    97,
+   nil,    60,   nil,   103,   nil,   nil,   nil,   nil,   155,   nil,
+   nil,   157,   257,   247,   nil,   nil,   nil,   148,   nil,   nil,
+   254,   nil,    46,   nil,    46,   171,   nil,    43,   nil,    43,
+   171,   213,    66,   190,    66,   118,   170,   259,   215,   183,
+   118,   117,   176,   246,   nil,   248,   145,   145,    65,   nil,
+    65,   116,   nil,   nil,   137,   nil,   116,   nil,   nil,   106,
+   nil,   206,   nil,   nil,   105,    93,   211,   nil,   nil,   118,
+   nil,   nil,    64,   171,    64,   175,   nil,   nil,   nil,    60,
+   175,    60,   174,   118,   171,   116,   nil,   174,    93,   nil,
+    58,   nil,   nil,    93,   118,   145,   nil,   nil,   nil,   116,
+   nil,   nil,   237,   237,   nil,   nil,   233,   236,   236,   115,
+   116,   nil,   118,   118,   nil,    93,   112,   109,   nil,   nil,
+    58,   nil,   nil,   175,   nil,   171,   nil,   nil,   242,   242,
+   174,   nil,   nil,   nil,   175,   118,   nil,   nil,   nil,   nil,
+   nil,   174,   nil,   nil,   nil,    93,    93,   171,   nil,   nil,
+   nil,   116,   241,   241,    48,   145,    70,   118,    70,   240,
+   240,   nil,    78,   263,    80,   144,   144,   nil,   nil,   nil,
+   nil,   264,    70,   116,   nil,   175,   nil,   nil,    94,    74,
+   nil,    74,   174,   nil,    48,   nil,   nil,    70,   nil,   nil,
+   nil,   nil,   nil,   121,   nil,    74,   nil,   175,    58,   nil,
+    58,   172,   nil,   nil,   174,   nil,   172,   nil,   nil,    70,
+    74,   nil,   nil,   nil,   144,   128,   nil,   nil,   nil,   nil,
+   nil,    70,   nil,   nil,   nil,   nil,   nil,   131,   nil,   nil,
+   nil,   nil,    74,   nil,   nil,   109,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,   nil,   172,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   172,   nil,   nil,   166,    48,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   144,   nil,   nil,   nil,   239,   239,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    70,   nil,   nil,   nil,   nil,   nil,   207,   nil,
+   nil,   172,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,    70,
+   nil,   nil,   nil,   172,   nil,   220,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    70,
+   nil,   nil,   nil,   nil,   nil,   250,   nil,    70,    70,   nil,
+   nil,   nil,   nil,   255,   256,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    74,    74 ]
 
 racc_goto_check = [
-     2,     4,    23,    24,    64,    24,    57,    24,    43,    28,
-    23,    53,    22,    28,    44,     1,    44,    28,    67,    55,
-    55,    46,    24,    29,    39,    49,    17,    21,    29,    38,
-    38,    44,    45,    47,    29,    23,    24,    33,    33,    24,
-    34,    32,    22,    22,    50,    22,    51,    52,    44,    27,
-    26,    56,    48,    24,    49,    49,    20,    21,    21,    17,
-    21,    58,    44,     3,    59,    25,    57,    60,    61,    24,
-    62,    63,    18,    65,    53,    66,     5,    23,    44,    55,
-    68,    48,    48,    55,    69,    25,   nil,    22,   nil,   nil,
-    42,    33,    64,   nil,    49,    49,    22,     3,     3,    23,
-   nil,    24,    21,   nil,    41,    23,    23,    23,   nil,    22,
-   nil,    21,     2,    23,    49,    22,    22,    22,    49,   nil,
-    43,    48,    48,    29,    21,    67,    55,    28,   nil,   nil,
-    21,    21,    21,    41,    41,    57,    39,    49,    47,   nil,
-    29,    48,     4,     2,   nil,    48,    23,    23,    55,     3,
-     2,    25,   nil,   nil,    22,   nil,    22,    22,    24,    42,
-    42,    49,   nil,   nil,    48,   nil,    23,    44,   nil,    21,
-    23,    21,    21,    41,    41,   nil,    22,   nil,    24,     4,
-    22,     4,   nil,    49,   nil,   nil,   nil,    44,    48,    23,
-   nil,    21,   nil,    41,   nil,    21,     2,    41,   nil,    22,
-   nil,   nil,    42,   nil,   nil,   nil,   nil,   nil,    24,   nil,
-    48,   nil,     4,    23,    21,   nil,    41,    44,   nil,    24,
-    24,   nil,   nil,    22,   nil,   nil,   nil,   nil,    44,    44,
-   nil,   nil,   nil,   nil,   nil,    23,     4,     4,    21,   nil,
-    41,   nil,   nil,   nil,   nil,    22,   nil,   nil,     2,   nil,
-   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
-    21,   nil,    41 ]
+     2,     4,    32,    43,    27,    58,    68,    65,    32,    26,
+    56,    27,    50,    46,    25,    56,    17,    29,    33,    54,
+     1,    37,    37,    42,    42,    48,    49,    38,    51,    33,
+    24,    27,    52,    53,    27,    36,    26,    29,    31,    26,
+    57,    25,    30,    59,    25,    60,    17,    61,    62,    32,
+    33,    63,    64,    58,    23,    20,     3,    24,    56,    66,
+    24,    22,    67,     5,    69,   nil,   nil,   nil,   nil,    56,
+    37,   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    23,   nil,   nil,    23,   nil,   nil,   nil,    22,     3,
+   nil,    22,   nil,     3,   nil,   nil,   nil,   nil,    65,   nil,
+   nil,    65,    68,    50,   nil,   nil,   nil,    29,   nil,   nil,
+    56,   nil,    27,   nil,    27,    27,   nil,    26,   nil,    26,
+    27,    43,    25,    27,    25,    25,    17,    58,    32,     2,
+    25,    46,    56,    33,   nil,    33,    22,    22,    24,   nil,
+    24,    24,   nil,   nil,     3,   nil,    24,   nil,   nil,    27,
+   nil,     2,   nil,   nil,    26,     4,     2,   nil,   nil,    25,
+   nil,   nil,    23,    27,    23,    23,   nil,   nil,   nil,    22,
+    23,    22,    22,    25,    27,    24,   nil,    22,     4,   nil,
+    21,   nil,   nil,     4,    25,    22,   nil,   nil,   nil,    24,
+   nil,   nil,    27,    27,   nil,   nil,     2,    26,    26,    23,
+    24,   nil,    25,    25,   nil,     4,    22,    21,   nil,   nil,
+    21,   nil,   nil,    23,   nil,    27,   nil,   nil,    24,    24,
+    22,   nil,   nil,   nil,    23,    25,   nil,   nil,   nil,   nil,
+   nil,    22,   nil,   nil,   nil,     4,     4,    27,   nil,   nil,
+   nil,    24,    23,    23,    28,    22,    28,    25,    28,    22,
+    22,   nil,    47,     2,    47,    21,    21,   nil,   nil,   nil,
+   nil,     2,    28,    24,   nil,    23,   nil,   nil,    47,    45,
+   nil,    45,    22,   nil,    28,   nil,   nil,    28,   nil,   nil,
+   nil,   nil,   nil,    47,   nil,    45,   nil,    23,    21,   nil,
+    21,    21,   nil,   nil,    22,   nil,    21,   nil,   nil,    28,
+    45,   nil,   nil,   nil,    21,    47,   nil,   nil,   nil,   nil,
+   nil,    28,   nil,   nil,   nil,   nil,   nil,    47,   nil,   nil,
+   nil,   nil,    45,   nil,   nil,    21,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,   nil,    21,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    21,   nil,   nil,    28,    28,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,    21,    21,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    28,   nil,   nil,   nil,   nil,   nil,    47,   nil,
+   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,    28,
+   nil,   nil,   nil,    21,   nil,    47,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,
+   nil,   nil,   nil,   nil,   nil,    47,   nil,    28,    28,   nil,
+   nil,   nil,   nil,    47,    47,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    45,    45 ]
 
 racc_goto_pointer = [
-   nil,    15,     0,    63,   -23,    67,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,   -44,   nil,
-   -54,    14,    -1,   -11,   -10,    60,   -38,   -93,   -71,   -97,
-   nil,   nil,    30,    -6,  -115,   nil,   nil,   nil,  -128,   -64,
-   nil,    16,     2,   -80,    -1,  -155,   -42,   -82,   -36,   -63,
-    29,  -169,   -71,  -107,   nil,   -98,   -66,  -111,  -116,    43,
-   -19,    34,    62,    36,    -4,   -53,   -51,  -108,   -13,    -7 ]
+   nil,    20,     0,    56,   -28,    41,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
+   -67,   166,    47,    40,    16,     0,    -5,   -10,   230,    12,
+     1,   -69,   -33,   -82,   nil,   nil,     9,   -68,  -171,   nil,
+   nil,   nil,  -179,   -38,   nil,   253,   -28,   236,  -129,   -43,
+  -114,    12,  -189,   -97,  -111,   nil,  -115,   -85,  -120,  -130,
+    24,   -41,    15,    41,    15,    -3,   -76,   -73,  -129,   -31 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   104,    31,     3,     6,     7,    10,    12,
-    14,    16,    19,    23,    28,    30,     2,   nil,    50,    52,
-    54,    68,    72,    73,    22,    27,   nil,   nil,   nil,   nil,
-     9,    11,   nil,   nil,   102,   155,   103,   105,   nil,   nil,
-   132,    64,    66,    67,   nil,   122,   nil,   nil,    77,    61,
-   nil,   nil,   nil,   nil,   183,    70,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   146,     3,     7,     9,    12,    13,    15,
+    17,    20,    23,    28,    30,     2,     6,   nil,    51,    54,
+    56,    72,    73,    75,    77,    79,    67,    68,     8,    11,
+   nil,   nil,   nil,   nil,    22,    26,   nil,   nil,   140,   198,
+   141,   142,   nil,   nil,   114,    62,    76,   nil,    98,   nil,
+   nil,   nil,   nil,   nil,   nil,   186,    63,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
@@ -731,11 +807,12 @@ racc_token_table = {
  :CLASSREF => 46,
  :NOT => 47,
  :OR => 48,
- :AND => 49 }
+ :AND => 49,
+ :UNDEF => 50 }
 
 racc_use_result_var = true
 
-racc_nt_base = 50
+racc_nt_base = 51
 
 Racc_arg = [
  racc_action_table,
@@ -804,6 +881,7 @@ Racc_token_to_s_table = [
 'NOT',
 'OR',
 'AND',
+'UNDEF',
 '$start',
 'program',
 'statements',
@@ -827,9 +905,13 @@ Racc_token_to_s_table = [
 'namestring',
 'name',
 'variable',
+'type',
+'boolean',
+'funcrvalue',
+'selector',
 'quotedtext',
 'resourceref',
-'fqname',
+'classname',
 'resourceinstances',
 'endsemi',
 'params',
@@ -845,15 +927,12 @@ Racc_token_to_s_table = [
 'simplervalue',
 'resourceinst',
 'resourcename',
-'type',
-'selector',
+'undef',
 'array',
 'rvalue',
 'param',
 'rvalues',
 'comma',
-'boolean',
-'funcrvalue',
 'iftest',
 'else',
 'caseopts',
@@ -872,8 +951,7 @@ Racc_token_to_s_table = [
 'nothing',
 'arguments',
 'argument',
-'nameordefault',
-'fqnameordefault']
+'classnameordefault']
 
 Racc_debug_parser = false
 
@@ -881,7 +959,7 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 33
+module_eval <<'.,.,', 'grammar.ra', 30
   def _reduce_1( val, _values, result )
     if val[0]
         # Make sure we always return an array.
@@ -905,7 +983,7 @@ module_eval <<'.,.,', 'grammar.ra', 33
 
  # reduce 3 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 49
+module_eval <<'.,.,', 'grammar.ra', 46
   def _reduce_4( val, _values, result )
     if val[0] and val[1]
         if val[0].instance_of?(AST::ASTArray)
@@ -946,7 +1024,7 @@ module_eval <<'.,.,', 'grammar.ra', 49
 
  # reduce 16 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 71
+module_eval <<'.,.,', 'grammar.ra', 68
   def _reduce_17( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
@@ -957,7 +1035,7 @@ module_eval <<'.,.,', 'grammar.ra', 71
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 77
+module_eval <<'.,.,', 'grammar.ra', 74
   def _reduce_18( val, _values, result )
     result = ast AST::Function,
         :name => val[0],
@@ -967,7 +1045,7 @@ module_eval <<'.,.,', 'grammar.ra', 77
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 84
+module_eval <<'.,.,', 'grammar.ra', 81
   def _reduce_19( val, _values, result )
     args = aryfy(val[1])
     result = ast AST::Function,
@@ -984,7 +1062,7 @@ module_eval <<'.,.,', 'grammar.ra', 84
 
  # reduce 22 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 94
+module_eval <<'.,.,', 'grammar.ra', 91
   def _reduce_23( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
@@ -999,17 +1077,25 @@ module_eval <<'.,.,', 'grammar.ra', 94
 
  # reduce 26 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 101
-  def _reduce_27( val, _values, result )
+ # reduce 27 omitted
+
+ # reduce 28 omitted
+
+ # reduce 29 omitted
+
+ # reduce 30 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 104
+  def _reduce_31( val, _values, result )
                     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
- # reduce 28 omitted
+ # reduce 32 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 112
-  def _reduce_29( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 115
+  def _reduce_33( val, _values, result )
     unless val[0].is_a?(AST::ASTArray)
         val[0] = aryfy(val[0])
     end
@@ -1021,8 +1107,8 @@ module_eval <<'.,.,', 'grammar.ra', 112
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 133
-  def _reduce_30( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 136
+  def _reduce_34( val, _values, result )
     array = val[2]
     if array.instance_of?(AST::ResourceInst)
         array = [array]
@@ -1045,31 +1131,31 @@ module_eval <<'.,.,', 'grammar.ra', 133
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 136
-  def _reduce_31( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 139
+  def _reduce_35( val, _values, result )
     # This is a deprecated syntax.
     error "All resource specifications require names"
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 139
-  def _reduce_32( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 142
+  def _reduce_36( val, _values, result )
     # a defaults setting for a type
     result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 144
-  def _reduce_33( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 147
+  def _reduce_37( val, _values, result )
     result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 171
-  def _reduce_34( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 174
+  def _reduce_38( val, _values, result )
     type = val[0]
 
     if type == :exported and ! Puppet[:storeconfigs]
@@ -1096,22 +1182,22 @@ module_eval <<'.,.,', 'grammar.ra', 171
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 172
-  def _reduce_35( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 175
+  def _reduce_39( val, _values, result )
  result = :virtual
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 173
-  def _reduce_36( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 176
+  def _reduce_40( val, _values, result )
  result = :exported
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 196
-  def _reduce_37( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 199
+  def _reduce_41( val, _values, result )
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
     end
@@ -1133,12 +1219,12 @@ module_eval <<'.,.,', 'grammar.ra', 196
   end
 .,.,
 
- # reduce 38 omitted
+ # reduce 42 omitted
 
- # reduce 39 omitted
+ # reduce 43 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 207
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 210
+  def _reduce_44( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :virtual
@@ -1149,8 +1235,8 @@ module_eval <<'.,.,', 'grammar.ra', 207
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 215
-  def _reduce_41( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 218
+  def _reduce_45( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :exported
@@ -1161,33 +1247,33 @@ module_eval <<'.,.,', 'grammar.ra', 215
   end
 .,.,
 
- # reduce 42 omitted
+ # reduce 46 omitted
 
- # reduce 43 omitted
+ # reduce 47 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 223
-  def _reduce_44( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 226
+  def _reduce_48( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
   end
 .,.,
 
- # reduce 45 omitted
+ # reduce 49 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 229
-  def _reduce_46( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 232
+  def _reduce_50( val, _values, result )
     result = val[1]
     result.parens = true
    result
   end
 .,.,
 
- # reduce 47 omitted
+ # reduce 51 omitted
 
- # reduce 48 omitted
+ # reduce 52 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 237
-  def _reduce_49( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 240
+  def _reduce_53( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1195,8 +1281,8 @@ module_eval <<'.,.,', 'grammar.ra', 237
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 242
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 245
+  def _reduce_54( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1204,21 +1290,21 @@ module_eval <<'.,.,', 'grammar.ra', 242
   end
 .,.,
 
- # reduce 51 omitted
+ # reduce 55 omitted
 
- # reduce 52 omitted
+ # reduce 56 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 249
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 252
+  def _reduce_57( val, _values, result )
     result = ast AST::ResourceInst, :children => [val[0],val[2]]
    result
   end
 .,.,
 
- # reduce 54 omitted
+ # reduce 58 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 259
-  def _reduce_55( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 262
+  def _reduce_59( val, _values, result )
     if val[0].instance_of?(AST::ResourceInst)
         result = ast AST::ASTArray, :children => [val[0],val[2]]
     else
@@ -1229,38 +1315,45 @@ module_eval <<'.,.,', 'grammar.ra', 259
   end
 .,.,
 
- # reduce 56 omitted
+ # reduce 60 omitted
 
- # reduce 57 omitted
+ # reduce 61 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 269
+  def _reduce_62( val, _values, result )
+    result = ast AST::Undef, :value => :undef
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'grammar.ra', 266
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 273
+  def _reduce_63( val, _values, result )
     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 270
-  def _reduce_59( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 277
+  def _reduce_64( val, _values, result )
     result = ast AST::Type, :value => val[0]
    result
   end
 .,.,
 
- # reduce 60 omitted
+ # reduce 65 omitted
 
- # reduce 61 omitted
+ # reduce 66 omitted
 
- # reduce 62 omitted
+ # reduce 67 omitted
 
- # reduce 63 omitted
+ # reduce 68 omitted
 
- # reduce 64 omitted
+ # reduce 69 omitted
 
- # reduce 65 omitted
+ # reduce 70 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 286
-  def _reduce_66( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 293
+  def _reduce_71( val, _values, result )
     if val[0] =~ /::/
         raise Puppet::ParseError, "Cannot assign to variables in other namespaces"
     end
@@ -1271,22 +1364,22 @@ module_eval <<'.,.,', 'grammar.ra', 286
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 291
-  def _reduce_67( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 298
+  def _reduce_72( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 291
-  def _reduce_68( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 298
+  def _reduce_73( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 300
-  def _reduce_69( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 307
+  def _reduce_74( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1297,17 +1390,17 @@ module_eval <<'.,.,', 'grammar.ra', 300
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 304
-  def _reduce_70( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 311
+  def _reduce_75( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 71 omitted
+ # reduce 76 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 313
-  def _reduce_72( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 320
+  def _reduce_77( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -1317,16 +1410,6 @@ module_eval <<'.,.,', 'grammar.ra', 313
   end
 .,.,
 
- # reduce 73 omitted
-
- # reduce 74 omitted
-
- # reduce 75 omitted
-
- # reduce 76 omitted
-
- # reduce 77 omitted
-
  # reduce 78 omitted
 
  # reduce 79 omitted
@@ -1347,8 +1430,20 @@ module_eval <<'.,.,', 'grammar.ra', 313
 
  # reduce 87 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 339
-  def _reduce_88( val, _values, result )
+ # reduce 88 omitted
+
+ # reduce 89 omitted
+
+ # reduce 90 omitted
+
+ # reduce 91 omitted
+
+ # reduce 92 omitted
+
+ # reduce 93 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 347
+  def _reduce_94( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0],
@@ -1358,8 +1453,8 @@ module_eval <<'.,.,', 'grammar.ra', 339
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 344
-  def _reduce_89( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 352
+  def _reduce_95( val, _values, result )
     result = ast AST::Function,
         :name => val[0],
         :arguments => AST::ASTArray.new({}),
@@ -1368,44 +1463,44 @@ module_eval <<'.,.,', 'grammar.ra', 344
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 348
-  def _reduce_90( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 356
+  def _reduce_96( val, _values, result )
     result = ast AST::String, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 350
-  def _reduce_91( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 358
+  def _reduce_97( val, _values, result )
     result = ast AST::FlatString, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 354
-  def _reduce_92( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 362
+  def _reduce_98( val, _values, result )
     result = ast AST::Boolean, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 359
-  def _reduce_93( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 367
+  def _reduce_99( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 361
-  def _reduce_94( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 369
+  def _reduce_100( val, _values, result )
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 374
-  def _reduce_95( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 382
+  def _reduce_101( val, _values, result )
     args = {
         :test => val[1],
         :statements => val[3]
@@ -1420,19 +1515,19 @@ module_eval <<'.,.,', 'grammar.ra', 374
   end
 .,.,
 
- # reduce 96 omitted
+ # reduce 102 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 379
-  def _reduce_97( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 387
+  def _reduce_103( val, _values, result )
     result = ast AST::Else, :statements => val[2]
    result
   end
 .,.,
 
- # reduce 98 omitted
+ # reduce 104 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 391
-  def _reduce_99( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 399
+  def _reduce_105( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = ast AST::ASTArray, :children => [val[3]]
@@ -1442,10 +1537,10 @@ module_eval <<'.,.,', 'grammar.ra', 391
   end
 .,.,
 
- # reduce 100 omitted
+ # reduce 106 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 401
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 409
+  def _reduce_107( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1456,15 +1551,15 @@ module_eval <<'.,.,', 'grammar.ra', 401
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 405
-  def _reduce_102( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 413
+  def _reduce_108( val, _values, result )
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 410
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 418
+  def _reduce_109( val, _values, result )
     result = ast(AST::CaseOpt,
         :value => val[0],
         :statements => ast(AST::ASTArray)
@@ -1473,10 +1568,10 @@ module_eval <<'.,.,', 'grammar.ra', 410
   end
 .,.,
 
- # reduce 104 omitted
+ # reduce 110 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 420
-  def _reduce_105( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 428
+  def _reduce_111( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1487,26 +1582,26 @@ module_eval <<'.,.,', 'grammar.ra', 420
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 424
-  def _reduce_106( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 432
+  def _reduce_112( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
 
- # reduce 107 omitted
+ # reduce 113 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 426
-  def _reduce_108( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 434
+  def _reduce_114( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 109 omitted
+ # reduce 115 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 437
-  def _reduce_110( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 445
+  def _reduce_116( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1517,48 +1612,50 @@ module_eval <<'.,.,', 'grammar.ra', 437
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 441
-  def _reduce_111( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 449
+  def _reduce_117( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 112 omitted
+ # reduce 118 omitted
 
- # reduce 113 omitted
+ # reduce 119 omitted
 
- # reduce 114 omitted
+ # reduce 120 omitted
 
- # reduce 115 omitted
+ # reduce 121 omitted
+
+ # reduce 122 omitted
 
- # reduce 116 omitted
+ # reduce 123 omitted
 
- # reduce 117 omitted
+ # reduce 124 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 451
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 460
+  def _reduce_125( val, _values, result )
     result = ast AST::Default, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 453
-  def _reduce_119( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 462
+  def _reduce_126( val, _values, result )
  result = [val[0].value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 457
-  def _reduce_120( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 466
+  def _reduce_127( val, _values, result )
     results = val[0] << val[2].value
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 465
-  def _reduce_121( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 474
+  def _reduce_128( val, _values, result )
     val[1].each do |file|
         import(file)
     end
@@ -1568,9 +1665,9 @@ module_eval <<'.,.,', 'grammar.ra', 465
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 475
-  def _reduce_122( val, _values, result )
-    interp.newdefine fqname(val[1]), :arguments => val[2], :code => val[4]
+module_eval <<'.,.,', 'grammar.ra', 484
+  def _reduce_129( val, _values, result )
+    interp.newdefine classname(val[1]), :arguments => val[2], :code => val[4]
     @lexer.indefine = false
     result = nil
 
@@ -1579,59 +1676,59 @@ module_eval <<'.,.,', 'grammar.ra', 475
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 479
-  def _reduce_123( val, _values, result )
-    interp.newdefine fqname(val[1]), :arguments => val[2]
+module_eval <<'.,.,', 'grammar.ra', 488
+  def _reduce_130( val, _values, result )
+    interp.newdefine classname(val[1]), :arguments => val[2]
     @lexer.indefine = false
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 487
-  def _reduce_124( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 496
+  def _reduce_131( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
-    interp.newclass fqname(val[1]), :code => val[4], :parent => val[2]
+    interp.newclass classname(val[1]), :code => val[4], :parent => val[2]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 492
-  def _reduce_125( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 501
+  def _reduce_132( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
-    interp.newclass fqname(val[1]), :parent => val[2]
+    interp.newclass classname(val[1]), :parent => val[2]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 497
-  def _reduce_126( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 506
+  def _reduce_133( val, _values, result )
     interp.newnode val[1], :parent => val[2], :code => val[4]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 500
-  def _reduce_127( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 509
+  def _reduce_134( val, _values, result )
     interp.newnode val[1], :parent => val[2]
     result = nil
    result
   end
 .,.,
 
- # reduce 128 omitted
+ # reduce 135 omitted
 
- # reduce 129 omitted
+ # reduce 136 omitted
 
- # reduce 130 omitted
+ # reduce 137 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 512
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 521
+  def _reduce_138( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -1639,47 +1736,47 @@ module_eval <<'.,.,', 'grammar.ra', 512
   end
 .,.,
 
- # reduce 132 omitted
+ # reduce 139 omitted
 
- # reduce 133 omitted
+ # reduce 140 omitted
 
- # reduce 134 omitted
+ # reduce 141 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 520
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 529
+  def _reduce_142( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 524
-  def _reduce_136( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 533
+  def _reduce_143( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 137 omitted
+ # reduce 144 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 529
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 538
+  def _reduce_145( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 533
-  def _reduce_139( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 542
+  def _reduce_146( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 140 omitted
+ # reduce 147 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 540
-  def _reduce_141( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 549
+  def _reduce_148( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1687,71 +1784,67 @@ module_eval <<'.,.,', 'grammar.ra', 540
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 545
-  def _reduce_142( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 554
+  def _reduce_149( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 549
-  def _reduce_143( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 558
+  def _reduce_150( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 551
-  def _reduce_144( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 560
+  def _reduce_151( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 553
-  def _reduce_145( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 562
+  def _reduce_152( val, _values, result )
     result = [val[0]]
    result
   end
 .,.,
 
- # reduce 146 omitted
+ # reduce 153 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 558
-  def _reduce_147( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 567
+  def _reduce_154( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 148 omitted
+ # reduce 155 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 563
-  def _reduce_149( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 572
+  def _reduce_156( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 150 omitted
-
- # reduce 151 omitted
-
- # reduce 152 omitted
+ # reduce 157 omitted
 
- # reduce 153 omitted
+ # reduce 158 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 570
-  def _reduce_154( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 578
+  def _reduce_159( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 578
-  def _reduce_155( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 586
+  def _reduce_160( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1761,21 +1854,21 @@ module_eval <<'.,.,', 'grammar.ra', 578
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 580
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 588
+  def _reduce_161( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 157 omitted
+ # reduce 162 omitted
 
- # reduce 158 omitted
+ # reduce 163 omitted
 
- # reduce 159 omitted
+ # reduce 164 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 585
-  def _reduce_160( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 593
+  def _reduce_165( val, _values, result )
  result = nil
    result
   end