puppet 0.23.2 → 0.24.0

data/lib/puppet/parser/lexer.rb

@@ -49,8 +49,7 @@ module Puppet
                 %r{\+>} => :PARROW,
                 %r{[a-z][-\w]*} => :NAME,
                 %r{([a-z][-\w]*::)+[a-z][-\w]*} => :CLASSNAME,
-                %r{([A-Z][-\w]*::)+[A-Z][-\w]*} => :CLASSREF,
-                %r{[A-Z][-\w]*} => :TYPE,
+                %r{((::){0,1}[A-Z][-\w]*)+} => :CLASSREF,
                 %r{[0-9]+} => :NUMBER,
                 %r{\$(\w*::)*\w+} => :VARIABLE
             }
@@ -331,4 +330,3 @@ module Puppet
     end
 end
 
-# $Id: lexer.rb 2670 2007-07-10 15:31:19Z luke $

data/lib/puppet/parser/parser.rb

@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..idc5e5087e93', 'grammar.ra', 640
+module_eval <<'..end grammar.ra modeval..id9134b179f4', 'grammar.ra', 638
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -39,536 +39,518 @@ require 'puppet/parser/parser_support'
 # mode: ruby
 # End:
 
-# $Id: parser.rb 2742 2007-08-03 23:49:53Z luke $
 
-..end grammar.ra modeval..idc5e5087e93
+..end grammar.ra modeval..id9134b179f4
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 53, :_reduce_1,
+ 1, 52, :_reduce_1,
+ 1, 52, :_reduce_none,
  1, 53, :_reduce_none,
- 1, 54, :_reduce_none,
- 2, 54, :_reduce_4,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 4, 64, :_reduce_17,
- 3, 64, :_reduce_18,
- 2, 64, :_reduce_19,
+ 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,
  1, 69, :_reduce_none,
- 1, 69, :_reduce_none,
- 1, 70, :_reduce_none,
- 3, 70, :_reduce_23,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_31,
+ 3, 69, :_reduce_23,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
  1, 71, :_reduce_none,
- 3, 71, :_reduce_33,
- 5, 57, :_reduce_34,
- 5, 57, :_reduce_35,
- 5, 57, :_reduce_36,
- 5, 68, :_reduce_37,
- 2, 58, :_reduce_38,
- 1, 88, :_reduce_39,
- 2, 88, :_reduce_40,
- 2, 59, :_reduce_41,
+ 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, 87, :_reduce_39,
+ 2, 87, :_reduce_40,
+ 2, 58, :_reduce_41,
+ 3, 88, :_reduce_42,
+ 3, 88, :_reduce_43,
  1, 89, :_reduce_none,
  1, 89, :_reduce_none,
- 3, 90, :_reduce_44,
- 3, 90, :_reduce_45,
+ 3, 89, :_reduce_46,
+ 1, 90, :_reduce_none,
+ 3, 90, :_reduce_48,
  1, 91, :_reduce_none,
  1, 91, :_reduce_none,
- 3, 91, :_reduce_48,
- 1, 92, :_reduce_none,
- 3, 92, :_reduce_50,
+ 3, 92, :_reduce_51,
+ 3, 92, :_reduce_52,
  1, 93, :_reduce_none,
  1, 93, :_reduce_none,
- 3, 94, :_reduce_53,
- 3, 94, :_reduce_54,
- 1, 95, :_reduce_none,
- 1, 95, :_reduce_none,
- 4, 97, :_reduce_57,
+ 4, 95, :_reduce_55,
+ 1, 81, :_reduce_none,
+ 3, 81, :_reduce_57,
+ 0, 82, :_reduce_none,
  1, 82, :_reduce_none,
- 3, 82, :_reduce_59,
- 0, 83, :_reduce_none,
- 1, 83, :_reduce_none,
- 1, 99, :_reduce_62,
- 1, 73, :_reduce_63,
- 1, 75, :_reduce_64,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 3, 60, :_reduce_71,
- 0, 84, :_reduce_72,
- 1, 84, :_reduce_73,
- 3, 84, :_reduce_74,
- 3, 102, :_reduce_75,
- 3, 103, :_reduce_76,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 0, 87, :_reduce_79,
- 1, 87, :_reduce_80,
- 3, 87, :_reduce_81,
- 1, 105, :_reduce_none,
- 3, 105, :_reduce_83,
+ 1, 97, :_reduce_60,
+ 1, 72, :_reduce_61,
+ 1, 74, :_reduce_62,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 4, 77, :_reduce_100,
- 3, 77, :_reduce_101,
- 1, 79, :_reduce_102,
- 1, 79, :_reduce_103,
- 1, 76, :_reduce_104,
- 4, 80, :_reduce_105,
- 4, 80, :_reduce_106,
- 6, 62, :_reduce_107,
- 0, 108, :_reduce_none,
- 4, 108, :_reduce_109,
+ 3, 59, :_reduce_69,
+ 0, 83, :_reduce_70,
+ 1, 83, :_reduce_71,
+ 3, 83, :_reduce_72,
+ 3, 100, :_reduce_73,
+ 3, 101, :_reduce_74,
+ 1, 102, :_reduce_none,
+ 1, 102, :_reduce_none,
+ 0, 86, :_reduce_77,
+ 1, 86, :_reduce_78,
+ 3, 86, :_reduce_79,
+ 1, 103, :_reduce_none,
+ 3, 103, :_reduce_81,
+ 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, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 1, 99, :_reduce_none,
+ 4, 76, :_reduce_98,
+ 3, 76, :_reduce_99,
+ 1, 78, :_reduce_100,
+ 1, 78, :_reduce_101,
+ 1, 75, :_reduce_102,
+ 4, 79, :_reduce_103,
+ 4, 79, :_reduce_104,
+ 6, 61, :_reduce_105,
+ 0, 106, :_reduce_none,
+ 4, 106, :_reduce_107,
+ 1, 105, :_reduce_none,
+ 5, 60, :_reduce_109,
  1, 107, :_reduce_none,
- 5, 61, :_reduce_111,
+ 2, 107, :_reduce_111,
+ 5, 108, :_reduce_112,
+ 4, 108, :_reduce_113,
  1, 109, :_reduce_none,
- 2, 109, :_reduce_113,
- 5, 110, :_reduce_114,
- 4, 110, :_reduce_115,
+ 3, 109, :_reduce_115,
+ 3, 77, :_reduce_116,
  1, 111, :_reduce_none,
- 3, 111, :_reduce_117,
- 3, 78, :_reduce_118,
+ 4, 111, :_reduce_118,
  1, 113, :_reduce_none,
- 4, 113, :_reduce_120,
- 1, 115, :_reduce_none,
- 3, 115, :_reduce_122,
- 3, 114, :_reduce_123,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_none,
- 1, 112, :_reduce_131,
- 1, 116, :_reduce_132,
- 3, 116, :_reduce_133,
- 2, 63, :_reduce_134,
+ 3, 113, :_reduce_120,
+ 3, 112, :_reduce_121,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_129,
+ 1, 114, :_reduce_130,
+ 3, 114, :_reduce_131,
+ 2, 62, :_reduce_132,
+ 6, 64, :_reduce_133,
+ 5, 64, :_reduce_134,
  6, 65, :_reduce_135,
  5, 65, :_reduce_136,
  6, 66, :_reduce_137,
  5, 66, :_reduce_138,
- 6, 67, :_reduce_139,
- 5, 67, :_reduce_140,
- 1, 86, :_reduce_none,
- 1, 86, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
+ 1, 85, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 3, 117, :_reduce_143,
  1, 119, :_reduce_none,
- 3, 119, :_reduce_146,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
+ 1, 119, :_reduce_none,
+ 1, 119, :_reduce_none,
+ 1, 119, :_reduce_none,
+ 0, 54, :_reduce_148,
+ 0, 120, :_reduce_149,
+ 1, 115, :_reduce_none,
+ 3, 115, :_reduce_151,
+ 3, 115, :_reduce_152,
  1, 121, :_reduce_none,
- 0, 55, :_reduce_151,
- 0, 122, :_reduce_152,
- 1, 117, :_reduce_none,
- 3, 117, :_reduce_154,
- 3, 117, :_reduce_155,
- 1, 123, :_reduce_none,
- 3, 123, :_reduce_157,
- 3, 124, :_reduce_158,
- 1, 124, :_reduce_159,
- 3, 124, :_reduce_160,
- 1, 124, :_reduce_161,
- 1, 120, :_reduce_none,
- 2, 120, :_reduce_163,
+ 3, 121, :_reduce_154,
+ 3, 122, :_reduce_155,
+ 1, 122, :_reduce_156,
+ 3, 122, :_reduce_157,
+ 1, 122, :_reduce_158,
  1, 118, :_reduce_none,
- 2, 118, :_reduce_165,
- 1, 125, :_reduce_none,
- 1, 125, :_reduce_none,
- 1, 74, :_reduce_168,
- 3, 100, :_reduce_169,
- 2, 100, :_reduce_170,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 0, 85, :_reduce_none,
- 1, 85, :_reduce_174 ]
+ 2, 118, :_reduce_160,
+ 1, 116, :_reduce_none,
+ 2, 116, :_reduce_162,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 73, :_reduce_165,
+ 3, 98, :_reduce_166,
+ 2, 98, :_reduce_167,
+ 1, 104, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 0, 84, :_reduce_none,
+ 1, 84, :_reduce_171 ]
 
-racc_reduce_n = 175
+racc_reduce_n = 172
 
-racc_shift_n = 279
+racc_shift_n = 276
 
 racc_action_table = [
-    81,    60,    64,   103,   173,   165,    81,    60,    64,   145,
-    37,   167,    58,  -141,    51,    97,    70,  -141,   115,   107,
-   166,  -125,    70,    41,    81,    60,    64,    44,    45,    37,
-   196,    51,   142,   162,   163,    63,    66,    51,    10,    72,
-   130,    63,    66,   114,    10,    72,   172,    42,    68,    36,
-    10,    81,    60,    64,    68,    51,     5,    10,   217,    63,
-   127,   173,    46,    72,   180,    47,   251,    70,   207,    81,
-    60,    64,    68,   211,   142,    81,    60,    64,   103,   250,
-    44,    45,    51,   162,   163,    70,    63,    66,   197,    51,
-    72,    70,   199,   200,   107,    10,    81,    60,    64,    68,
-    51,   181,   245,    95,    63,    66,    51,    96,    72,   244,
-    63,    66,    70,    10,    72,    46,  -130,    68,    47,    10,
-    81,    60,    64,    68,   199,   262,    36,    51,   191,   159,
-    36,    63,    66,     5,  -129,    72,    70,     5,  -125,    36,
-    10,    58,    60,    64,    68,  -143,     5,    81,    60,    64,
-    95,    51,    44,    45,   179,    63,    66,    70,   103,    72,
-  -127,    54,  -124,    70,    10,    81,    60,    64,    68,    51,
-   207,  -124,    51,   176,   107,   211,    63,    66,    51,   212,
-    72,    70,    63,    66,    55,    10,    72,    46,   213,    68,
-    47,    10,    81,    60,    64,    68,    51,    60,    64,   173,
-    63,    66,   168,   103,    72,   179,   162,   163,    70,    10,
-    81,    60,    64,    68,    51,  -141,    81,    60,    64,   107,
-    60,    64,  -126,    51,   175,   143,    70,    63,    66,  -128,
-   141,    72,    70,  -126,   139,   231,    10,    81,    60,    64,
-    68,    51,   120,  -128,   234,    63,    66,    51,   235,    72,
-   154,    63,    66,   130,    10,    72,    60,    64,    68,   154,
-    10,   238,    60,    64,    68,   142,   120,   241,    51,   171,
-  -126,   130,    63,   186,  -124,   147,    72,   130,    60,    64,
-    60,    64,   101,   248,   249,    68,    51,   160,   252,    96,
-    63,   186,    51,   130,    72,   130,    63,   186,   255,  -127,
-    72,  -126,  -124,    68,    60,    64,    60,    64,    51,    68,
-    51,  -127,    63,   186,    63,   186,    72,  -125,    72,    70,
-  -129,   130,    60,    64,   193,    68,   247,    68,    60,    64,
-  -125,   187,   179,    94,    51,   156,    51,   130,    63,    66,
-    63,   186,    72,   130,    72,   263,    55,    10,   265,   154,
-  -127,    68,    51,    68,   150,   149,    63,   186,    51,    50,
-    72,    49,    63,   186,    60,    64,    72,   272,  -174,    68,
-    60,    64,   273,   148,  -129,    68,    34,    58,   nil,    70,
-    60,    64,   nil,   nil,   137,   130,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    51,   130,   nil,   nil,    63,    66,
-    51,   nil,    72,   nil,    63,   186,    55,    10,    72,   278,
-    51,    68,   nil,   nil,    63,   186,   nil,    68,    72,   nil,
-    23,   nil,    55,   nil,   nil,   nil,   nil,    68,   243,   nil,
-    20,   nil,    25,    27,   nil,     1,     6,   nil,    13,    23,
-    18,   nil,    22,   nil,    28,   nil,   nil,     5,    10,    20,
-   nil,    25,    27,   253,     1,     6,   nil,    13,   nil,    18,
-   nil,    22,   nil,    28,    23,   nil,     5,    10,   nil,   nil,
-   nil,   nil,   274,   nil,    20,   nil,    25,    27,   nil,     1,
-     6,   nil,    13,    23,    18,   nil,    22,   nil,    28,   nil,
-   nil,     5,    10,    20,   nil,    25,    27,   227,     1,     6,
-   nil,    13,   nil,    18,   nil,    22,   nil,    28,    23,   nil,
-     5,    10,   nil,   nil,   nil,   nil,   256,   nil,    20,   nil,
-    25,    27,   nil,     1,     6,   nil,    13,    23,    18,   nil,
-    22,   nil,    28,   nil,   nil,     5,    10,    20,   nil,    25,
-    27,   257,     1,     6,   nil,    13,   nil,    18,   nil,    22,
-   nil,    28,    23,   nil,     5,    10,   nil,   nil,   nil,   nil,
-   277,   nil,    20,   nil,    25,    27,   nil,     1,     6,   nil,
-    13,    23,    18,   nil,    22,   nil,    28,   nil,   nil,     5,
-    10,    20,   nil,    25,    27,   270,     1,     6,   nil,    13,
-   nil,    18,   nil,    22,   nil,    28,    23,   nil,     5,    10,
-   nil,   nil,   nil,   nil,   215,   nil,    20,   nil,    25,    27,
-   nil,     1,     6,   nil,    13,    23,    18,   nil,    22,   nil,
-    28,   nil,   nil,     5,    10,    20,   nil,    25,    27,   nil,
-     1,     6,   nil,    13,    23,    18,   nil,    22,   nil,    28,
-   nil,   nil,     5,    10,    20,   nil,    25,    27,   nil,     1,
-     6,   nil,    13,    23,    18,   nil,    22,   nil,    28,   nil,
-   nil,     5,    10,    20,   nil,    25,    27,   nil,     1,     6,
-   nil,    13,    23,    18,   nil,    22,   nil,    28,   nil,   nil,
-     5,    10,    20,   nil,    25,    27,   nil,     1,     6,   nil,
-    13,    23,    18,   nil,    22,   nil,    28,   nil,   nil,     5,
-    10,    20,   nil,    25,    27,   nil,     1,     6,   nil,    13,
-   nil,    18,   nil,    22,   nil,    28,   nil,   nil,     5,    10 ]
+    71,    51,    53,   184,   162,   102,    71,    51,    53,   132,
+   149,     5,   209,    47,  -127,    87,    71,    51,    53,    88,
+   208,    65,    71,    51,    53,   162,   144,    34,    35,    99,
+    65,    89,   126,  -127,    50,    54,    65,   126,    59,  -123,
+    50,    54,   207,    45,    59,   161,    65,    56,  -126,    45,
+    50,    54,    65,    56,    59,    90,    50,    54,   185,    45,
+    59,    36,   169,    56,    37,    45,    71,    51,    53,    56,
+   204,   206,    47,    51,    53,   200,   149,    51,    53,    33,
+   199,  -122,    71,    51,    53,   238,     1,    65,    71,    51,
+    53,    67,   144,    34,    35,    87,    65,   237,   234,  -123,
+    50,    54,    65,   200,    59,   233,    50,    54,   199,    45,
+    59,   252,    65,    56,    43,    45,    50,    54,    65,    56,
+    59,    33,    50,    54,   156,    45,    59,    36,     1,    56,
+    37,    45,    71,    51,    53,    56,   204,   206,    71,    51,
+    53,   149,   149,    34,    35,   188,   259,   196,    71,    51,
+    53,  -125,    65,    65,    71,    51,    53,   144,   144,    51,
+    53,   202,    65,   162,    33,   168,    50,    54,    65,   137,
+    59,     1,    50,    54,   168,    45,    59,    36,    65,    56,
+    37,    45,    50,   174,    65,    56,    59,  -122,    50,    54,
+   165,   111,    59,  -125,  -122,    56,   127,    45,    71,    51,
+    53,    56,    33,   211,    71,    51,    53,   204,   206,     1,
+     5,   135,   218,   186,    71,    51,    53,   188,   189,   106,
+   125,    51,    53,   221,   222,   231,   140,   140,    65,   225,
+   126,  -124,    50,    54,    65,   228,    59,    47,    50,    54,
+  -139,    45,    59,   123,    65,    56,   106,    45,    50,   112,
+    65,    56,    59,  -124,    50,   174,   134,   111,    59,    51,
+    53,    56,   164,   111,   239,    51,    53,    56,   240,   241,
+   242,  -124,    96,   140,  -126,    51,    53,    93,   179,   168,
+    91,    51,    53,   159,   181,   260,   262,    85,    65,   157,
+    88,   133,    50,   174,    65,    41,    59,  -124,    50,    54,
+   128,   111,    59,  -122,    65,    56,    43,    45,    50,   174,
+    65,    56,    59,  -125,    50,    54,  -123,   111,    59,    51,
+    53,    56,    43,    45,  -127,    51,    53,    56,   176,    40,
+   269,  -171,   270,  -128,  -123,    51,    53,   152,  -125,   nil,
+   nil,    51,    53,   nil,   nil,   nil,   nil,   nil,    65,   nil,
+   nil,   nil,    50,   174,    65,   nil,    59,   nil,    50,   174,
+    43,   111,    59,   nil,    65,    56,   nil,   111,    50,   174,
+    65,    56,    59,   254,    50,   174,   nil,   111,    59,    51,
+    53,    56,   nil,   111,   nil,    51,    53,    56,   nil,   nil,
+   nil,   nil,   nil,    15,   nil,    19,    21,   nil,    28,     2,
+   nil,     8,   nil,    13,   nil,    17,   nil,    22,    65,   nil,
+     1,     5,    50,   174,    65,   264,    59,   nil,    50,   174,
+   nil,   111,    59,   nil,   nil,    56,   nil,   111,   nil,   nil,
+   nil,    56,   nil,   nil,   271,    15,   nil,    19,    21,   nil,
+    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
+   nil,   nil,     1,     5,    15,   212,    19,    21,   nil,    28,
+     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
+   nil,     1,     5,   nil,   230,    15,   nil,    19,    21,   nil,
+    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
+   nil,   nil,     1,     5,    15,   253,    19,    21,   nil,    28,
+     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
+   nil,     1,     5,   nil,   214,    15,   nil,    19,    21,   nil,
+    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
+   nil,   nil,     1,     5,    15,   274,    19,    21,   nil,    28,
+     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
+   nil,     1,     5,   nil,   235,    15,   nil,    19,    21,   nil,
+    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
+   nil,   nil,     1,     5,    15,   275,    19,    21,   nil,    28,
+     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
+   nil,     1,     5,   nil,   nil,    15,   nil,    19,    21,   nil,
+    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
+   nil,   nil,     1,     5,    15,   nil,    19,    21,   nil,    28,
+     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
+   nil,     1,     5,    15,   nil,    19,    21,   nil,    28,     2,
+   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,   nil,
+     1,     5,    15,   nil,    19,    21,   nil,    28,     2,   nil,
+     8,   nil,    13,   nil,    17,   nil,    22,   nil,   nil,     1,
+     5,    15,   nil,    19,    21,   nil,    28,     2,   nil,     8,
+   nil,    13,   nil,    17,   nil,    22,   nil,   nil,     1,     5 ]
 
 racc_action_check = [
-    95,    95,    95,    41,   120,   105,    81,    81,    81,    81,
-   143,   110,    66,    23,    41,    31,    95,    23,    48,    41,
-   110,   133,    81,     7,    50,    50,    50,   115,   115,     2,
-   143,    95,    66,   105,   105,    95,    95,    81,   143,    95,
-    50,    81,    81,    48,    95,    81,   120,     7,    95,     2,
-    81,   198,   198,   198,    81,    50,     2,     2,   161,    50,
-    50,   127,   115,    50,   136,   115,   209,   198,   251,   173,
-   173,   173,    50,   251,   127,    58,    58,    58,    42,   209,
-    13,    13,   198,   161,   161,   173,   198,   198,   146,    42,
-   198,    58,   146,   146,    42,   198,    34,    34,    34,   198,
-   173,   138,   203,    29,   173,   173,    58,    29,   173,   203,
-    58,    58,    34,   173,    58,    13,    77,   173,    13,    58,
-   172,   172,   172,    58,   240,   240,   101,    34,   140,   101,
-     6,    34,    34,   101,    76,    34,   172,     6,    75,    27,
-    34,    18,    18,    18,    34,    18,    27,    20,    20,    20,
-    74,   172,   114,   114,   131,   172,   172,    18,   164,   172,
-    73,    18,    71,    20,   172,    22,    22,    22,   172,   164,
-   150,   129,    18,   128,   164,   150,    18,    18,    20,   152,
-    18,    22,    20,    20,    18,    18,    20,   114,   153,    18,
-   114,    20,   252,   252,   252,    20,    22,   149,   149,   154,
-    22,    22,   112,   103,    22,   155,   112,   112,   252,    22,
-   248,   248,   248,    22,   103,    70,   238,   238,   238,   103,
-    25,    25,   125,   252,   121,    67,   248,   252,   252,    78,
-    65,   252,   238,    59,    57,   174,   252,   176,   176,   176,
-   252,   248,   175,    53,   177,   248,   248,   238,   178,   248,
-   179,   238,   238,   176,   248,   238,   166,   166,   248,   180,
-   238,   183,   167,   167,   238,   186,    49,   194,   176,   116,
-    83,   166,   176,   176,    85,    86,   176,   167,   148,   148,
-   260,   260,    39,   207,   208,   176,   166,   102,   211,    38,
-   166,   166,   167,   148,   166,   260,   167,   167,   214,   132,
-   167,   220,   221,   166,   142,   142,   245,   245,   148,   167,
-   260,   222,   148,   148,   260,   260,   148,   224,   260,   142,
-   225,   245,   205,   205,   142,   148,   205,   260,   139,   139,
-    88,   139,   237,    28,   142,    97,   245,   205,   142,   142,
-   245,   245,   142,   139,   245,   243,   142,   142,   244,    96,
-    87,   142,   205,   245,    93,    92,   205,   205,   139,    16,
-   205,    14,   139,   139,    54,    54,   139,   261,   262,   205,
-   187,   187,   263,    90,    89,   139,     1,   196,   nil,    54,
-   141,   141,   nil,   nil,    54,   187,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    54,   141,   nil,   nil,    54,    54,
-   187,   nil,    54,   nil,   187,   187,    54,    54,   187,   276,
-   141,    54,   nil,   nil,   141,   141,   nil,   187,   141,   nil,
-   276,   nil,   141,   nil,   nil,   nil,   nil,   141,   201,   nil,
-   276,   nil,   276,   276,   nil,   276,   276,   nil,   276,   201,
-   276,   nil,   276,   nil,   276,   nil,   nil,   276,   276,   201,
-   nil,   201,   201,   212,   201,   201,   nil,   201,   nil,   201,
-   nil,   201,   nil,   201,   212,   nil,   201,   201,   nil,   nil,
-   nil,   nil,   265,   nil,   212,   nil,   212,   212,   nil,   212,
-   212,   nil,   212,   265,   212,   nil,   212,   nil,   212,   nil,
-   nil,   212,   212,   265,   nil,   265,   265,   171,   265,   265,
-   nil,   265,   nil,   265,   nil,   265,   nil,   265,   171,   nil,
-   265,   265,   nil,   nil,   nil,   nil,   216,   nil,   171,   nil,
-   171,   171,   nil,   171,   171,   nil,   171,   216,   171,   nil,
-   171,   nil,   171,   nil,   nil,   171,   171,   216,   nil,   216,
-   216,   228,   216,   216,   nil,   216,   nil,   216,   nil,   216,
-   nil,   216,   228,   nil,   216,   216,   nil,   nil,   nil,   nil,
-   275,   nil,   228,   nil,   228,   228,   nil,   228,   228,   nil,
-   228,   275,   228,   nil,   228,   nil,   228,   nil,   nil,   228,
-   228,   275,   nil,   275,   275,   254,   275,   275,   nil,   275,
-   nil,   275,   nil,   275,   nil,   275,   254,   nil,   275,   275,
-   nil,   nil,   nil,   nil,   160,   nil,   254,   nil,   254,   254,
-   nil,   254,   254,   nil,   254,   160,   254,   nil,   254,   nil,
-   254,   nil,   nil,   254,   254,   160,   nil,   160,   160,   nil,
-   160,   160,   nil,   160,   273,   160,   nil,   160,   nil,   160,
-   nil,   nil,   160,   160,   273,   nil,   273,   273,   nil,   273,
-   273,   nil,   273,   147,   273,   nil,   273,   nil,   273,   nil,
-   nil,   273,   273,   147,   nil,   147,   147,   nil,   147,   147,
-   nil,   147,    33,   147,   nil,   147,   nil,   147,   nil,   nil,
-   147,   147,    33,   nil,    33,    33,   nil,    33,    33,   nil,
-    33,     0,    33,   nil,    33,   nil,    33,   nil,   nil,    33,
-    33,     0,   nil,     0,     0,   nil,     0,     0,   nil,     0,
+    93,    93,    93,   127,   106,    38,    71,    71,    71,    71,
+    90,   127,   146,    54,    78,    23,    87,    87,    87,    23,
+   146,    90,   161,   161,   161,   112,    90,   102,   102,    38,
+    93,    23,    54,    64,    93,    93,    71,   112,    93,    62,
+    71,    71,   142,    93,    71,   106,    87,    93,    66,    71,
+    87,    87,   161,    71,    87,    23,   161,   161,   129,    87,
+   161,   102,   119,    87,   102,   161,   240,   240,   240,   161,
+   142,   142,    13,    13,    13,   238,   149,   135,   135,     2,
+   238,    74,    15,    15,    15,   197,     2,   149,    17,    17,
+    17,    13,   149,    99,    99,    61,   240,   197,   194,   118,
+   240,   240,    13,   137,   240,   194,    13,    13,   137,   240,
+    13,   210,    15,   240,    13,    13,    15,    15,    17,    13,
+    15,    96,    17,    17,    96,    15,    17,    99,    96,    15,
+    99,    17,   239,   239,   239,    17,   210,   210,   162,   162,
+   162,    89,   205,     8,     8,   227,   227,   136,   165,   165,
+   165,   116,    89,   205,    47,    47,    47,    89,   205,    19,
+    19,   139,   239,   140,    21,   141,   239,   239,   162,    84,
+   239,    21,   162,   162,   115,   239,   162,     8,   165,   239,
+     8,   162,   165,   165,    47,   162,   165,   114,    47,    47,
+   113,   165,    47,    60,    58,   165,    55,    47,   225,   225,
+   225,    47,    29,   151,   187,   187,   187,   151,   151,    29,
+    29,    83,   163,   131,    41,    41,    41,   131,   131,   164,
+    52,   192,   192,   166,   167,   192,   168,   169,   225,   170,
+   174,    46,   225,   225,   187,   182,   225,   184,   187,   187,
+    45,   225,   187,    42,    41,   225,    40,   187,    41,    41,
+   192,   187,    41,   110,   192,   192,    81,    41,   192,   208,
+   208,    41,   107,   192,   199,   126,   126,   192,   200,   201,
+   203,    70,    32,    88,    79,   209,   209,    28,   124,   224,
+    25,    67,    67,   100,   126,   230,   233,    22,   208,    97,
+    95,    73,   208,   208,   126,    11,   208,   245,   126,   126,
+    67,   208,   126,   246,   209,   208,   126,   126,   209,   209,
+    67,   126,   209,   248,    67,    67,   249,   209,    67,   125,
+   125,   209,    67,    67,   250,   123,   123,    67,   123,     9,
+   258,   259,   260,    77,    76,   176,   176,    91,    75,   nil,
+   nil,   134,   134,   nil,   nil,   nil,   nil,   nil,   125,   nil,
+   nil,   nil,   125,   125,   123,   nil,   125,   nil,   123,   123,
+   125,   125,   123,   nil,   176,   125,   nil,   123,   176,   176,
+   134,   123,   176,   215,   134,   134,   nil,   176,   134,   234,
+   234,   176,   nil,   134,   nil,   257,   257,   134,   nil,   nil,
+   nil,   nil,   nil,   215,   nil,   215,   215,   nil,   215,   215,
+   nil,   215,   nil,   215,   nil,   215,   nil,   215,   234,   nil,
+   215,   215,   234,   234,   257,   236,   234,   nil,   257,   257,
+   nil,   234,   257,   nil,   nil,   234,   nil,   257,   nil,   nil,
+   nil,   257,   nil,   nil,   262,   236,   nil,   236,   236,   nil,
+   236,   236,   nil,   236,   nil,   236,   nil,   236,   nil,   236,
+   nil,   nil,   236,   236,   262,   157,   262,   262,   nil,   262,
+   262,   nil,   262,   nil,   262,   nil,   262,   nil,   262,   nil,
+   nil,   262,   262,   nil,   190,   157,   nil,   157,   157,   nil,
+   157,   157,   nil,   157,   nil,   157,   nil,   157,   nil,   157,
+   nil,   nil,   157,   157,   190,   213,   190,   190,   nil,   190,
+   190,   nil,   190,   nil,   190,   nil,   190,   nil,   190,   nil,
+   nil,   190,   190,   nil,   159,   213,   nil,   213,   213,   nil,
+   213,   213,   nil,   213,   nil,   213,   nil,   213,   nil,   213,
+   nil,   nil,   213,   213,   159,   272,   159,   159,   nil,   159,
+   159,   nil,   159,   nil,   159,   nil,   159,   nil,   159,   nil,
+   nil,   159,   159,   nil,   196,   272,   nil,   272,   272,   nil,
+   272,   272,   nil,   272,   nil,   272,   nil,   272,   nil,   272,
+   nil,   nil,   272,   272,   196,   273,   196,   196,   nil,   196,
+   196,   nil,   196,   nil,   196,   nil,   196,   nil,   196,   nil,
+   nil,   196,   196,   nil,   nil,   273,   nil,   273,   273,   nil,
+   273,   273,   nil,   273,   nil,   273,   nil,   273,   nil,   273,
+   nil,   nil,   273,   273,   133,   nil,   133,   133,   nil,   133,
+   133,   nil,   133,   nil,   133,   nil,   133,   nil,   133,   nil,
+   nil,   133,   133,   270,   nil,   270,   270,   nil,   270,   270,
+   nil,   270,   nil,   270,   nil,   270,   nil,   270,   nil,   nil,
+   270,   270,    27,   nil,    27,    27,   nil,    27,    27,   nil,
+    27,   nil,    27,   nil,    27,   nil,    27,   nil,   nil,    27,
+    27,     0,   nil,     0,     0,   nil,     0,     0,   nil,     0,
    nil,     0,   nil,     0,   nil,     0,   nil,   nil,     0,     0 ]
 
 racc_action_pointer = [
-   673,   363,    11,   nil,   nil,   nil,    92,     4,   nil,   nil,
-   nil,   nil,   nil,    77,   355,   nil,   353,   nil,   139,   nil,
-   145,   nil,   163,    11,   nil,   217,   nil,   101,   291,   101,
-   nil,    15,   nil,   654,    94,   nil,   nil,   nil,   283,   247,
-   nil,   -19,    56,   nil,   nil,   nil,   nil,   nil,     8,   228,
-    22,   nil,   nil,   222,   361,   nil,   nil,   213,    73,   212,
-   nil,   nil,   nil,   nil,   nil,   220,    10,   215,   nil,   nil,
-   213,   141,   nil,   139,   148,   117,   113,    95,   208,   nil,
-   nil,     4,   nil,   249,   nil,   253,   269,   329,   309,   353,
-   367,   nil,   345,   332,   nil,    -2,   311,   335,   nil,   nil,
-   nil,    88,   281,   181,   nil,   -15,   nil,   nil,   nil,   nil,
-    -4,   nil,   158,   nil,   149,    24,   263,   nil,   nil,   nil,
-    -5,   214,   nil,   nil,   nil,   201,   nil,    52,   134,   150,
-   nil,   144,   278,     0,   nil,   nil,    47,   nil,    78,   325,
-   123,   377,   301,    -8,   nil,   nil,    83,   635,   275,   194,
-   137,   nil,   173,   183,   190,   195,   nil,   nil,   nil,   nil,
-   597,    35,   nil,   nil,   136,   nil,   253,   259,   nil,   nil,
-   nil,   490,   118,    67,   228,   204,   235,   237,   241,   212,
-   221,   nil,   nil,   252,   nil,   nil,   243,   367,   nil,   nil,
-   nil,   nil,   nil,   nil,   244,   nil,   375,   nil,    49,   nil,
-   nil,   421,   nil,    92,   nil,   319,   nil,   270,   261,    56,
-   nil,   275,   446,   nil,   291,   nil,   509,   nil,   nil,   nil,
-   280,   281,   290,   nil,   296,   299,   nil,   nil,   534,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   322,   214,   nil,
-   115,   nil,   nil,   316,   342,   303,   nil,   nil,   208,   nil,
-   nil,    35,   190,   nil,   578,   nil,   nil,   nil,   nil,   nil,
-   277,   360,   361,   366,   nil,   465,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   616,   nil,   553,   402,   nil,   nil ]
+   644,   nil,    42,   nil,   nil,   nil,   nil,   nil,   140,   323,
+   nil,   289,   nil,    70,   nil,    80,   nil,    86,   nil,   156,
+   nil,   127,   246,    13,   nil,   280,   nil,   625,   264,   165,
+   nil,   nil,   238,   nil,   nil,   nil,   nil,   nil,    -5,   nil,
+   209,   212,   223,   nil,   nil,   238,   211,   152,   nil,   nil,
+   nil,   nil,   210,   nil,    11,   186,   nil,   nil,   174,   nil,
+   173,    93,    19,   nil,    13,   nil,    28,   278,   nil,   nil,
+   251,     4,   nil,   285,    61,   318,   314,   313,    -6,   254,
+   nil,   250,   nil,   201,   148,   nil,   nil,    14,   236,   120,
+   -11,   337,   nil,    -2,   nil,   284,    84,   283,   nil,    90,
+   277,   nil,    24,   nil,   nil,   nil,    -5,   252,   nil,   nil,
+   233,   nil,    16,   152,   167,   164,   131,   nil,    79,    45,
+   nil,   nil,   nil,   322,   273,   316,   262,   -34,   nil,    36,
+   nil,   208,   nil,   587,   338,    74,   141,    71,   nil,   156,
+   154,   155,    23,   nil,   nil,   nil,    -3,   nil,   nil,    55,
+   nil,   160,   nil,   nil,   nil,   nil,   nil,   448,   nil,   507,
+   nil,    20,   136,   205,   182,   146,   216,   217,   189,   190,
+   220,   nil,   nil,   nil,   209,   nil,   332,   nil,   nil,   nil,
+   nil,   nil,   213,   nil,   235,   nil,   nil,   202,   nil,   nil,
+   467,   nil,   218,   nil,    88,   nil,   547,    75,   nil,   251,
+   255,   247,   nil,   263,   nil,   121,   nil,   nil,   256,   272,
+    89,   nil,   nil,   488,   nil,   366,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   269,   196,   nil,   136,   nil,   nil,
+   257,   nil,   nil,   280,   376,   nil,   408,   nil,    43,   130,
+    64,   nil,   nil,   nil,   nil,   277,   283,   nil,   293,   296,
+   304,   nil,   nil,   nil,   nil,   nil,   nil,   382,   323,   324,
+   326,   nil,   427,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   606,   nil,   528,   568,   nil,   nil ]
 
 racc_action_default = [
-  -151,  -175,  -175,   -14,    -2,  -144,  -175,  -175,   -15,    -3,
-  -142,   -16,    -5,  -175,  -175,    -6,  -175,    -7,   -43,    -8,
-  -175,    -9,  -175,   -42,   -10,  -175,   -11,  -175,   -39,  -175,
-   -12,  -175,   -13,    -1,  -175,   -38,  -143,  -141,  -175,  -151,
-   -41,  -151,  -151,  -145,  -149,  -148,  -147,  -150,  -151,   -79,
-   -72,  -168,  -130,   -28,  -175,   -31,   -29,  -175,  -175,   -30,
-  -102,   -32,   -19,  -104,  -103,   -20,   -63,   -21,   -62,   -22,
-   -64,   -24,  -131,   -25,  -175,   -26,   -27,   -99,   -98,   -96,
-   -94,  -175,  -110,   -90,   -97,   -91,  -175,   -95,   -92,   -93,
-  -175,  -132,  -134,  -151,   -40,  -175,   -72,  -175,    -4,   -71,
-  -164,  -175,  -175,  -151,   -46,  -175,   -47,   -63,   -49,   -56,
-  -175,   -55,  -175,  -162,  -175,  -175,  -175,   -77,   -78,   -80,
-  -175,  -173,  -128,   -70,   -68,   -65,   -73,   -63,   -60,   -66,
-   -64,  -173,   -69,   -67,   -58,  -129,  -175,   -18,  -175,  -175,
-  -175,  -175,  -175,  -175,   -82,  -170,  -175,  -175,  -175,  -175,
-  -152,  -153,  -175,  -175,  -175,  -173,   279,  -166,  -165,  -167,
-  -175,  -175,   -52,   -51,  -175,   -45,  -175,  -175,   -44,  -163,
-  -146,  -175,  -175,  -175,  -175,  -174,   -61,  -175,  -175,  -174,
-   -72,   -17,  -126,  -175,  -118,  -119,   -63,  -175,  -124,  -127,
-  -125,  -105,   -23,  -101,  -175,   -33,  -175,  -169,  -175,  -171,
-  -172,  -175,  -112,  -175,  -116,  -175,  -133,  -161,  -175,  -175,
-  -156,  -159,  -175,  -106,  -175,  -138,  -175,   -50,   -48,   -88,
-   -84,   -85,   -89,   -53,   -86,   -87,   -54,  -140,  -175,   -76,
-   -75,   -37,   -81,   -59,   -34,   -35,   -74,  -173,  -175,  -121,
-  -173,  -100,   -83,  -108,  -175,  -175,  -113,  -111,  -175,  -154,
-  -155,  -175,  -175,  -136,  -175,   -36,  -137,  -139,   -57,  -123,
-  -175,  -175,  -172,  -175,  -107,  -175,  -117,  -160,  -157,  -158,
-  -135,  -122,  -120,  -175,  -115,  -175,  -175,  -114,  -109 ]
+  -148,  -141,  -172,   -15,    -3,  -139,   -16,    -5,  -172,  -172,
+    -6,  -172,    -7,  -140,    -8,  -172,    -9,  -172,   -10,  -172,
+   -11,  -172,   -39,  -172,   -12,  -172,   -13,    -1,  -172,  -172,
+   -14,    -2,  -148,  -140,  -146,  -145,  -144,  -147,  -148,  -142,
+   -77,   -70,  -172,   -31,   -29,   -62,   -30,  -172,   -32,   -19,
+  -102,  -100,   -20,  -101,   -61,   -21,   -60,   -22,   -24,  -129,
+   -25,  -172,   -26,  -128,   -27,  -165,   -28,  -172,  -108,   -92,
+   -88,  -172,   -95,  -172,   -89,   -93,   -90,   -97,   -91,   -96,
+   -94,  -172,  -130,  -132,  -148,   -40,   -41,  -172,   -70,  -148,
+  -148,  -172,    -4,  -172,   -38,  -172,  -172,  -172,  -161,  -172,
+  -172,  -159,  -172,   -75,   -76,   -78,  -172,  -170,   -66,   -71,
+   -63,   -62,   -61,   -58,   -64,  -170,   -67,   -56,   -65,  -172,
+  -127,  -126,   -68,  -172,  -172,  -172,  -172,  -172,   -18,  -172,
+   -80,  -172,  -167,  -172,  -172,  -172,  -172,  -149,  -150,  -172,
+  -172,  -170,  -172,   -45,   -61,   -47,  -172,   -54,   -53,  -148,
+   -44,  -172,   276,   -69,  -162,  -163,  -164,  -172,  -160,  -172,
+  -143,  -172,  -172,  -172,  -171,   -59,  -172,  -172,  -171,   -70,
+  -172,  -124,  -116,  -117,   -61,  -122,  -172,  -125,  -123,  -103,
+   -23,   -99,  -172,   -33,  -172,   -17,  -166,  -172,  -168,  -169,
+  -172,  -114,  -172,  -110,  -172,  -131,  -172,  -172,  -153,  -156,
+  -158,  -172,  -104,  -172,   -50,  -172,   -49,   -43,  -172,  -172,
+  -172,   -42,  -136,  -172,  -138,  -172,   -74,   -73,   -37,   -79,
+   -57,   -34,   -35,   -72,  -170,  -172,  -119,  -170,   -98,   -81,
+  -106,  -109,  -111,  -172,  -172,  -134,  -172,  -152,  -172,  -172,
+  -172,  -151,   -36,   -46,   -86,   -82,   -83,   -51,   -87,   -84,
+   -85,   -52,   -48,  -135,  -137,   -55,  -121,  -172,  -172,  -169,
+  -172,  -105,  -172,  -115,  -133,  -154,  -155,  -157,  -120,  -118,
+  -172,  -113,  -172,  -172,  -112,  -107 ]
 
 racc_goto_table = [
-    29,    33,    38,   131,   185,    98,   117,    53,   123,   119,
-   174,    43,   134,    31,   210,    62,    39,   105,   112,   202,
-   178,   218,   198,   223,   226,     4,   146,    40,    86,   264,
-   205,   121,    77,    29,    77,   177,   184,    93,   128,   122,
-   240,    92,   152,    53,   214,   102,    77,    48,   183,   155,
-   116,   138,   239,   192,   208,   209,    59,   204,    35,   158,
-   nil,   nil,   nil,    91,   100,   nil,   nil,   nil,   nil,    76,
-    77,   nil,   nil,   113,   nil,   nil,   246,   nil,   nil,   161,
-   nil,   nil,   nil,   nil,    82,   nil,    90,   nil,   125,   nil,
-   nil,   nil,    59,    77,   nil,   nil,   183,   nil,    99,   nil,
-   nil,   135,   nil,   nil,   nil,    76,   nil,    77,   nil,   nil,
-   nil,   157,   169,   170,   204,   268,   260,   nil,   151,   nil,
-   nil,    75,   140,   nil,   nil,   271,   258,   nil,   122,   261,
-    53,    53,   117,   237,   123,   232,   236,   122,   233,   194,
-   nil,   nil,   nil,   nil,   nil,   144,   nil,    29,   201,   nil,
-   nil,   nil,   nil,   133,   266,   122,   122,    75,   nil,   153,
-    29,   216,   nil,   nil,   nil,   122,   nil,   nil,   nil,   183,
-   nil,    29,   228,    98,   nil,   nil,   122,   182,   nil,    59,
-    59,   nil,   nil,    71,    77,    77,   182,   206,    98,   nil,
-   135,   nil,    76,    76,   122,   nil,   nil,    73,   nil,   135,
-    98,    29,   nil,   nil,   220,   220,   109,   109,   nil,   nil,
-    77,   nil,    29,   254,   125,   129,    29,   225,   225,    71,
-   111,   111,   nil,   nil,   nil,   182,    98,   135,    29,   132,
-   nil,   nil,   nil,    73,   122,   nil,   229,   230,   135,   nil,
-   nil,   nil,   190,   182,    75,    75,   nil,    98,    98,   122,
-    77,   190,   nil,    56,    29,   nil,   135,   nil,   nil,   nil,
-    77,   nil,   242,   nil,    77,    29,   275,   nil,   109,   224,
-   224,   nil,   nil,    29,   276,    29,    29,   nil,   nil,   133,
-   nil,   nil,   111,   182,   nil,   124,   nil,   nil,   nil,    56,
-   190,   nil,   nil,   nil,   nil,   nil,   135,   nil,   182,   nil,
-   nil,   nil,   259,   nil,   188,   nil,    71,    71,   190,   nil,
-   nil,   135,   267,   188,   nil,   nil,   269,   nil,   189,   nil,
-    73,    73,    61,   nil,    84,   nil,    84,   189,   nil,   109,
-   nil,   221,   221,   nil,   nil,   nil,   nil,   nil,    84,   nil,
-   nil,   129,   nil,   111,   nil,   222,   222,   nil,   190,   nil,
-   nil,   nil,   188,   nil,   nil,   132,   nil,   nil,    61,   nil,
-   nil,   nil,    84,   190,   nil,   nil,   189,   nil,   nil,   nil,
-   188,   nil,   nil,   nil,   nil,   nil,    56,    56,   nil,   nil,
-   nil,   nil,   nil,   nil,   189,    84,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    84,
-   nil,   219,   219,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   188,   124,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   189,   188,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   189,
-   nil,   nil,   nil,   nil,   nil,   nil,    61,   195,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    84,    84,   nil,   nil,
+    23,    27,   122,    92,   173,   105,   198,    49,   117,    46,
+   187,    39,    31,   170,    32,    82,   193,   103,   115,    25,
+   142,   151,   243,    44,   191,   247,   251,    23,   131,    95,
+    64,    86,    73,    84,   261,   192,   107,   110,   166,   172,
+   113,   227,    83,    62,    98,   163,   136,    97,    38,   100,
+   101,   108,   180,   167,   201,   197,    94,   226,   120,   154,
+   nil,   129,   nil,    46,    66,   141,   170,   nil,   nil,   nil,
+   nil,   118,   nil,   nil,   232,   nil,   nil,    44,   nil,   203,
+   210,   nil,   191,   nil,    64,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   121,   nil,   nil,   nil,   138,    62,   nil,   nil,
+   nil,   nil,   158,   nil,   nil,   160,   257,   265,   155,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    66,   171,
+   182,    46,    46,   nil,   263,   nil,   122,   nil,   nil,   219,
+   171,   195,   220,    23,   190,    44,    44,   nil,   268,   nil,
+   120,   103,    64,    64,   nil,   223,   224,   170,   nil,   nil,
+   nil,   120,   nil,   178,   nil,    62,    62,    23,   213,    23,
+   215,   110,   255,   nil,   178,   258,    92,   nil,   nil,   nil,
+    60,   nil,   171,   nil,   121,   108,    66,    66,   nil,   nil,
+    58,   nil,   120,   nil,   nil,   121,   nil,   nil,   171,    92,
+    23,    92,   nil,   120,   nil,   118,    23,   236,   116,   nil,
+   nil,   nil,   nil,   nil,   245,   245,   178,   nil,   114,   120,
+   nil,   nil,    92,    23,   nil,    23,   121,   nil,   244,   244,
+   nil,   nil,   178,   nil,    60,   250,   250,   121,   nil,   nil,
+   171,   nil,   nil,   nil,    58,   nil,    23,   nil,   249,   249,
+   nil,   nil,   nil,   121,   nil,   nil,   148,   148,    92,    92,
+   nil,   120,   nil,   171,   nil,   nil,   147,   147,   nil,   121,
+   121,   nil,    23,   272,   178,   nil,   nil,   nil,   nil,   nil,
+    23,   273,    23,    23,   120,    68,   nil,    81,   nil,    77,
+   177,    77,    60,    60,    48,   121,    72,   178,    72,   nil,
+   175,   177,    58,    58,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   175,   nil,   nil,   nil,   nil,   148,   124,   121,   nil,
+   nil,    77,   nil,   nil,   nil,   nil,   147,   nil,    72,   nil,
+   nil,   nil,   116,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   130,   114,   177,   nil,    77,   nil,   nil,    48,   nil,
+   nil,   nil,    72,   175,   nil,   nil,   nil,   139,   nil,   177,
+   nil,    77,   nil,   153,   nil,   nil,   nil,    77,    72,   175,
+   nil,   nil,   148,   nil,    72,   248,   248,   nil,   nil,   nil,
+   nil,   nil,   147,   nil,   nil,   246,   246,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   177,   nil,   nil,   nil,   nil,   nil,    48,   183,   nil,
+   nil,   175,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   177,   nil,   nil,   nil,   nil,   nil,
+   nil,   216,   217,   nil,   175,    77,    77,   nil,   nil,   nil,
+   nil,   nil,    72,    72,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   229,   nil,   nil,
+   nil,    77,   nil,   nil,   nil,   nil,   nil,   nil,    72,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    84,   nil,   nil,   nil,    84 ]
+   nil,   nil,   nil,   nil,   nil,   256,   nil,   nil,   nil,    77,
+   nil,   nil,   nil,   nil,   nil,   nil,    72,   nil,   nil,   266,
+   267,   nil,   nil,    77,    77,   nil,   nil,   nil,   nil,   nil,
+    72,    72 ]
 
 racc_goto_check = [
-    34,     2,    34,    32,    62,     4,    50,    25,    48,    52,
-    33,    69,    45,     1,    72,    17,    29,    39,    39,    58,
-    33,    40,    54,    44,    44,     3,    53,    38,    55,    56,
-    57,    35,    47,    34,    47,    31,    61,    29,    30,    25,
-    63,    64,    65,    25,    33,    66,    47,    67,    60,    32,
-    68,    17,    62,    20,    70,    71,    27,    60,     5,    73,
-   nil,   nil,   nil,    27,     3,   nil,   nil,   nil,   nil,    24,
-    47,   nil,   nil,     3,   nil,   nil,    58,   nil,   nil,    39,
-   nil,   nil,   nil,   nil,    49,   nil,    49,   nil,    27,   nil,
-   nil,   nil,    27,    47,   nil,   nil,    60,   nil,    49,   nil,
-   nil,    24,   nil,   nil,   nil,    24,   nil,    47,   nil,   nil,
-   nil,    29,    69,    69,    60,    72,    54,   nil,     3,   nil,
-   nil,    23,    49,   nil,   nil,    62,    33,   nil,    25,    33,
-    25,    25,    50,    32,    48,    52,    50,    25,    45,    17,
-   nil,   nil,   nil,   nil,   nil,    49,   nil,    34,     2,   nil,
-   nil,   nil,   nil,    23,    60,    25,    25,    23,   nil,    49,
-    34,     2,   nil,   nil,   nil,    25,   nil,   nil,   nil,    60,
-   nil,    34,     2,     4,   nil,   nil,    25,    27,   nil,    27,
-    27,   nil,   nil,    21,    47,    47,    27,    27,     4,   nil,
-    24,   nil,    24,    24,    25,   nil,   nil,    22,   nil,    24,
-     4,    34,   nil,   nil,    27,    27,    21,    21,   nil,   nil,
-    47,   nil,    34,     2,    27,    21,    34,    24,    24,    21,
-    22,    22,   nil,   nil,   nil,    27,     4,    24,    34,    22,
-   nil,   nil,   nil,    22,    25,   nil,    49,    49,    24,   nil,
-   nil,   nil,    23,    27,    23,    23,   nil,     4,     4,    25,
-    47,    23,   nil,    26,    34,   nil,    24,   nil,   nil,   nil,
-    47,   nil,    49,   nil,    47,    34,     2,   nil,    21,    23,
-    23,   nil,   nil,    34,     2,    34,    34,   nil,   nil,    23,
-   nil,   nil,    22,    27,   nil,    26,   nil,   nil,   nil,    26,
-    23,   nil,   nil,   nil,   nil,   nil,    24,   nil,    27,   nil,
-   nil,   nil,    49,   nil,    21,   nil,    21,    21,    23,   nil,
-   nil,    24,    49,    21,   nil,   nil,    49,   nil,    22,   nil,
-    22,    22,    28,   nil,    28,   nil,    28,    22,   nil,    21,
-   nil,    21,    21,   nil,   nil,   nil,   nil,   nil,    28,   nil,
-   nil,    21,   nil,    22,   nil,    22,    22,   nil,    23,   nil,
-   nil,   nil,    21,   nil,   nil,    22,   nil,   nil,    28,   nil,
-   nil,   nil,    28,    23,   nil,   nil,    22,   nil,   nil,   nil,
-    21,   nil,   nil,   nil,   nil,   nil,    26,    26,   nil,   nil,
-   nil,   nil,   nil,   nil,    22,    28,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,
-   nil,    26,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    22,    21,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
-   nil,   nil,   nil,   nil,   nil,   nil,    28,    28,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    28,    28,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    34,     2,    47,     4,    61,    51,    71,    17,    44,    27,
+    53,    68,     3,    59,    29,    27,    57,    49,    32,     1,
+    38,    38,    39,    26,    59,    43,    43,    34,    52,    34,
+    24,    37,    54,    29,    55,    56,    35,    27,    31,    60,
+    30,    62,    63,    23,     3,    33,    64,    65,    66,    67,
+     3,    26,    20,    33,    69,    70,     5,    61,    24,    72,
+   nil,    17,   nil,    27,    25,    32,    59,   nil,   nil,   nil,
+   nil,    23,   nil,   nil,    57,   nil,   nil,    26,   nil,    33,
+    38,   nil,    59,   nil,    24,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    25,   nil,   nil,   nil,     3,    23,   nil,   nil,
+   nil,   nil,    68,   nil,   nil,    68,    53,    71,    29,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,    27,
+    17,    27,    27,   nil,    59,   nil,    47,   nil,   nil,    51,
+    27,    27,    44,    34,     2,    26,    26,   nil,    61,   nil,
+    24,    49,    24,    24,   nil,    49,    32,    59,   nil,   nil,
+   nil,    24,   nil,    23,   nil,    23,    23,    34,     2,    34,
+     2,    27,    33,   nil,    23,    33,     4,   nil,   nil,   nil,
+    22,   nil,    27,   nil,    25,    26,    25,    25,   nil,   nil,
+    21,   nil,    24,   nil,   nil,    25,   nil,   nil,    27,     4,
+    34,     4,   nil,    24,   nil,    23,    34,     2,    22,   nil,
+   nil,   nil,   nil,   nil,    27,    27,    23,   nil,    21,    24,
+   nil,   nil,     4,    34,   nil,    34,    25,   nil,    26,    26,
+   nil,   nil,    23,   nil,    22,    24,    24,    25,   nil,   nil,
+    27,   nil,   nil,   nil,    21,   nil,    34,   nil,    23,    23,
+   nil,   nil,   nil,    25,   nil,   nil,    22,    22,     4,     4,
+   nil,    24,   nil,    27,   nil,   nil,    21,    21,   nil,    25,
+    25,   nil,    34,     2,    23,   nil,   nil,   nil,   nil,   nil,
+    34,     2,    34,    34,    24,    48,   nil,    48,   nil,    46,
+    22,    46,    22,    22,    28,    25,    28,    23,    28,   nil,
+    21,    22,    21,    21,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    21,   nil,   nil,   nil,   nil,    22,    48,    25,   nil,
+   nil,    46,   nil,   nil,   nil,   nil,    21,   nil,    28,   nil,
+   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    48,    21,    22,   nil,    46,   nil,   nil,    28,   nil,
+   nil,   nil,    28,    21,   nil,   nil,   nil,    48,   nil,    22,
+   nil,    46,   nil,    48,   nil,   nil,   nil,    46,    28,    21,
+   nil,   nil,    22,   nil,    28,    22,    22,   nil,   nil,   nil,
+   nil,   nil,    21,   nil,   nil,    21,    21,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    22,   nil,   nil,   nil,   nil,   nil,    28,    28,   nil,
+   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,
+   nil,    48,    48,   nil,    21,    46,    46,   nil,   nil,   nil,
+   nil,   nil,    28,    28,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,
+   nil,    46,   nil,   nil,   nil,   nil,   nil,   nil,    28,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28,   nil,   nil,   nil,    28 ]
+   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,    46,
+   nil,   nil,   nil,   nil,   nil,   nil,    28,   nil,   nil,    48,
+    48,   nil,   nil,    46,    46,   nil,   nil,   nil,   nil,   nil,
+    28,    28 ]
 
 racc_goto_pointer = [
-   nil,    13,     1,    25,   -28,    56,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,   nil,   nil,
-   -88,   165,   179,   103,    51,   -11,   235,    38,   304,    10,
-   -12,   -93,   -47,  -111,     0,   -18,   nil,   nil,    20,   -24,
-  -143,   nil,   nil,   nil,  -143,   -38,   nil,    12,   -42,    64,
-   -43,   nil,   -40,   -55,  -124,     8,  -214,  -118,  -129,   nil,
-   -91,  -103,  -135,  -147,    16,   -51,     6,    34,     2,    -2,
-   -96,   -95,  -136,   -42 ]
+   nil,    19,     1,    12,   -24,    27,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -6,   nil,   nil,
+   -73,   167,   157,    30,    17,    51,    10,    -4,   271,    12,
+    -1,   -75,   -23,   -62,     0,    -4,   nil,     8,   -69,  -183,
+   nil,   nil,   nil,  -183,   -33,   nil,   264,   -39,   260,   -23,
+   nil,   -35,   -43,  -121,    17,  -196,   -99,  -118,   nil,  -110,
+   -84,  -119,  -135,    23,   -38,    15,    40,    11,     3,   -83,
+   -82,  -131,   -37 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   104,     9,    12,    15,    17,    19,    21,
-    24,    26,    30,    32,     3,     8,    11,   nil,    65,    67,
-    69,    85,    87,    88,    89,    78,    80,    83,    14,    16,
-   nil,   nil,   nil,   nil,    74,   nil,     2,     7,   nil,   nil,
-   106,   164,   108,   110,   nil,   nil,   136,    52,    79,   nil,
-   126,   118,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   203,
-    57,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   150,     4,     7,    10,    12,    14,    16,
+    18,    20,    24,    26,    30,     3,     6,   nil,    52,    55,
+    57,    74,    75,    76,    78,    79,    69,    70,     9,    11,
+   nil,   nil,   nil,   nil,    61,   nil,    29,   nil,   nil,   143,
+   205,   145,   146,   nil,   nil,   119,    63,    80,   nil,   109,
+   104,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   194,    42,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -589,44 +571,43 @@ racc_token_table = {
  :NOTEQUAL => 15,
  :DOT => 16,
  :COLON => 17,
- :TYPE => 18,
- :LLCOLLECT => 19,
- :RRCOLLECT => 20,
- :QMARK => 21,
- :LPAREN => 22,
- :RPAREN => 23,
- :ISEQUAL => 24,
- :GREATEREQUAL => 25,
- :GREATERTHAN => 26,
- :LESSTHAN => 27,
- :IF => 28,
- :ELSE => 29,
- :IMPORT => 30,
- :DEFINE => 31,
- :ELSIF => 32,
- :VARIABLE => 33,
- :CLASS => 34,
- :INHERITS => 35,
- :NODE => 36,
- :BOOLEAN => 37,
- :NAME => 38,
- :SEMIC => 39,
- :CASE => 40,
- :DEFAULT => 41,
- :AT => 42,
- :LCOLLECT => 43,
- :RCOLLECT => 44,
- :CLASSNAME => 45,
- :CLASSREF => 46,
- :NOT => 47,
- :OR => 48,
- :AND => 49,
- :UNDEF => 50,
- :PARROW => 51 }
+ :LLCOLLECT => 18,
+ :RRCOLLECT => 19,
+ :QMARK => 20,
+ :LPAREN => 21,
+ :RPAREN => 22,
+ :ISEQUAL => 23,
+ :GREATEREQUAL => 24,
+ :GREATERTHAN => 25,
+ :LESSTHAN => 26,
+ :IF => 27,
+ :ELSE => 28,
+ :IMPORT => 29,
+ :DEFINE => 30,
+ :ELSIF => 31,
+ :VARIABLE => 32,
+ :CLASS => 33,
+ :INHERITS => 34,
+ :NODE => 35,
+ :BOOLEAN => 36,
+ :NAME => 37,
+ :SEMIC => 38,
+ :CASE => 39,
+ :DEFAULT => 40,
+ :AT => 41,
+ :LCOLLECT => 42,
+ :RCOLLECT => 43,
+ :CLASSNAME => 44,
+ :CLASSREF => 45,
+ :NOT => 46,
+ :OR => 47,
+ :AND => 48,
+ :UNDEF => 49,
+ :PARROW => 50 }
 
 racc_use_result_var = true
 
-racc_nt_base = 52
+racc_nt_base = 51
 
 Racc_arg = [
  racc_action_table,
@@ -663,7 +644,6 @@ Racc_token_to_s_table = [
 'NOTEQUAL',
 'DOT',
 'COLON',
-'TYPE',
 'LLCOLLECT',
 'RRCOLLECT',
 'QMARK',
@@ -734,7 +714,6 @@ Racc_token_to_s_table = [
 'classref',
 'anyparams',
 'at',
-'collectname',
 'collectrhand',
 'collstatements',
 'collstatement',
@@ -929,19 +908,19 @@ module_eval <<'.,.,', 'grammar.ra', 115
 module_eval <<'.,.,', 'grammar.ra', 136
   def _reduce_34( val, _values, result )
     array = val[2]
-    if array.instance_of?(AST::ResourceInst)
+    if array.instance_of?(AST::ResourceInstance)
         array = [array]
     end
     result = ast AST::ASTArray
 
     # this iterates across each specified resourceinstance
     array.each { |instance|
-        unless instance.instance_of?(AST::ResourceInst)
+        unless instance.instance_of?(AST::ResourceInstance)
             raise Puppet::Dev, "Got something that isn't an instance"
         end
         # now, i need to somehow differentiate between those things with
         # arrays in their names, and normal things
-        result.push ast(AST::ResourceDef,
+        result.push ast(AST::Resource,
             :type => val[0],
             :title => instance[0],
             :params => instance[1])
@@ -1038,12 +1017,8 @@ module_eval <<'.,.,', 'grammar.ra', 199
   end
 .,.,
 
- # reduce 42 omitted
-
- # reduce 43 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 210
-  def _reduce_44( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 209
+  def _reduce_42( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :virtual
@@ -1054,8 +1029,8 @@ module_eval <<'.,.,', 'grammar.ra', 210
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 218
-  def _reduce_45( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 217
+  def _reduce_43( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :exported
@@ -1066,33 +1041,33 @@ module_eval <<'.,.,', 'grammar.ra', 218
   end
 .,.,
 
- # reduce 46 omitted
+ # reduce 44 omitted
 
- # reduce 47 omitted
+ # reduce 45 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 226
-  def _reduce_48( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 225
+  def _reduce_46( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
   end
 .,.,
 
- # reduce 49 omitted
+ # reduce 47 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 232
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 231
+  def _reduce_48( val, _values, result )
     result = val[1]
     result.parens = true
    result
   end
 .,.,
 
- # reduce 51 omitted
+ # reduce 49 omitted
 
- # reduce 52 omitted
+ # reduce 50 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 240
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 239
+  def _reduce_51( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1100,8 +1075,8 @@ module_eval <<'.,.,', 'grammar.ra', 240
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 245
-  def _reduce_54( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 244
+  def _reduce_52( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1109,22 +1084,22 @@ module_eval <<'.,.,', 'grammar.ra', 245
   end
 .,.,
 
- # reduce 55 omitted
+ # reduce 53 omitted
 
- # reduce 56 omitted
+ # reduce 54 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 252
-  def _reduce_57( val, _values, result )
-    result = ast AST::ResourceInst, :children => [val[0],val[2]]
+module_eval <<'.,.,', 'grammar.ra', 251
+  def _reduce_55( val, _values, result )
+    result = ast AST::ResourceInstance, :children => [val[0],val[2]]
    result
   end
 .,.,
 
- # reduce 58 omitted
+ # reduce 56 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 262
-  def _reduce_59( val, _values, result )
-    if val[0].instance_of?(AST::ResourceInst)
+module_eval <<'.,.,', 'grammar.ra', 261
+  def _reduce_57( 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]
@@ -1134,31 +1109,35 @@ module_eval <<'.,.,', 'grammar.ra', 262
   end
 .,.,
 
- # reduce 60 omitted
+ # reduce 58 omitted
 
- # reduce 61 omitted
+ # reduce 59 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 269
-  def _reduce_62( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 268
+  def _reduce_60( val, _values, result )
     result = ast AST::Undef, :value => :undef
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 273
-  def _reduce_63( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 272
+  def _reduce_61( val, _values, result )
     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 277
-  def _reduce_64( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 276
+  def _reduce_62( val, _values, result )
     result = ast AST::Type, :value => val[0]
    result
   end
 .,.,
 
+ # reduce 63 omitted
+
+ # reduce 64 omitted
+
  # reduce 65 omitted
 
  # reduce 66 omitted
@@ -1167,12 +1146,8 @@ module_eval <<'.,.,', 'grammar.ra', 277
 
  # reduce 68 omitted
 
- # reduce 69 omitted
-
- # reduce 70 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 293
-  def _reduce_71( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 292
+  def _reduce_69( val, _values, result )
     if val[0] =~ /::/
         raise Puppet::ParseError, "Cannot assign to variables in other namespaces"
     end
@@ -1183,22 +1158,22 @@ module_eval <<'.,.,', 'grammar.ra', 293
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 298
-  def _reduce_72( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 297
+  def _reduce_70( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 298
-  def _reduce_73( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 297
+  def _reduce_71( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 307
-  def _reduce_74( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 306
+  def _reduce_72( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1209,41 +1184,41 @@ module_eval <<'.,.,', 'grammar.ra', 307
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 311
-  def _reduce_75( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 310
+  def _reduce_73( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 316
-  def _reduce_76( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 315
+  def _reduce_74( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2],
                                      :add => true
    result
   end
 .,.,
 
- # reduce 77 omitted
+ # reduce 75 omitted
 
- # reduce 78 omitted
+ # reduce 76 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 324
-  def _reduce_79( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 323
+  def _reduce_77( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 324
-  def _reduce_80( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 323
+  def _reduce_78( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 333
-  def _reduce_81( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 332
+  def _reduce_79( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1254,10 +1229,10 @@ module_eval <<'.,.,', 'grammar.ra', 333
   end
 .,.,
 
- # reduce 82 omitted
+ # reduce 80 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 342
-  def _reduce_83( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 341
+  def _reduce_81( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -1267,6 +1242,10 @@ module_eval <<'.,.,', 'grammar.ra', 342
   end
 .,.,
 
+ # reduce 82 omitted
+
+ # reduce 83 omitted
+
  # reduce 84 omitted
 
  # reduce 85 omitted
@@ -1295,12 +1274,8 @@ module_eval <<'.,.,', 'grammar.ra', 342
 
  # reduce 97 omitted
 
- # reduce 98 omitted
-
- # reduce 99 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 369
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 368
+  def _reduce_98( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0],
@@ -1310,8 +1285,8 @@ module_eval <<'.,.,', 'grammar.ra', 369
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 374
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 373
+  def _reduce_99( val, _values, result )
     result = ast AST::Function,
         :name => val[0],
         :arguments => AST::ASTArray.new({}),
@@ -1320,44 +1295,44 @@ module_eval <<'.,.,', 'grammar.ra', 374
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 378
-  def _reduce_102( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 377
+  def _reduce_100( val, _values, result )
     result = ast AST::String, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 380
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 379
+  def _reduce_101( val, _values, result )
     result = ast AST::FlatString, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 384
-  def _reduce_104( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 383
+  def _reduce_102( val, _values, result )
     result = ast AST::Boolean, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 389
-  def _reduce_105( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 388
+  def _reduce_103( 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 = ast AST::ResourceReference, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 391
-  def _reduce_106( val, _values, result )
-    result = ast AST::ResourceRef, :type => val[0], :title => val[2]
+module_eval <<'.,.,', 'grammar.ra', 390
+  def _reduce_104( val, _values, result )
+    result = ast AST::ResourceReference, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 404
-  def _reduce_107( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 403
+  def _reduce_105( val, _values, result )
     args = {
         :test => val[1],
         :statements => val[3]
@@ -1372,19 +1347,19 @@ module_eval <<'.,.,', 'grammar.ra', 404
   end
 .,.,
 
- # reduce 108 omitted
+ # reduce 106 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 409
-  def _reduce_109( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 408
+  def _reduce_107( val, _values, result )
     result = ast AST::Else, :statements => val[2]
    result
   end
 .,.,
 
- # reduce 110 omitted
+ # reduce 108 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 421
-  def _reduce_111( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 420
+  def _reduce_109( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = ast AST::ASTArray, :children => [val[3]]
@@ -1394,10 +1369,10 @@ module_eval <<'.,.,', 'grammar.ra', 421
   end
 .,.,
 
- # reduce 112 omitted
+ # reduce 110 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 431
-  def _reduce_113( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 430
+  def _reduce_111( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1408,15 +1383,15 @@ module_eval <<'.,.,', 'grammar.ra', 431
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 435
-  def _reduce_114( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 434
+  def _reduce_112( val, _values, result )
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 440
-  def _reduce_115( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 439
+  def _reduce_113( val, _values, result )
     result = ast(AST::CaseOpt,
         :value => val[0],
         :statements => ast(AST::ASTArray)
@@ -1425,10 +1400,10 @@ module_eval <<'.,.,', 'grammar.ra', 440
   end
 .,.,
 
- # reduce 116 omitted
+ # reduce 114 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 450
-  def _reduce_117( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 449
+  def _reduce_115( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1439,26 +1414,26 @@ module_eval <<'.,.,', 'grammar.ra', 450
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 454
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 453
+  def _reduce_116( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
 
- # reduce 119 omitted
+ # reduce 117 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 456
-  def _reduce_120( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 455
+  def _reduce_118( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 121 omitted
+ # reduce 119 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 467
-  def _reduce_122( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 466
+  def _reduce_120( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1469,13 +1444,17 @@ module_eval <<'.,.,', 'grammar.ra', 467
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 471
-  def _reduce_123( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 470
+  def _reduce_121( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
+ # reduce 122 omitted
+
+ # reduce 123 omitted
+
  # reduce 124 omitted
 
  # reduce 125 omitted
@@ -1486,33 +1465,29 @@ module_eval <<'.,.,', 'grammar.ra', 471
 
  # reduce 128 omitted
 
- # reduce 129 omitted
-
- # reduce 130 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 482
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 481
+  def _reduce_129( val, _values, result )
     result = ast AST::Default, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 484
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 483
+  def _reduce_130( val, _values, result )
  result = [val[0].value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 488
-  def _reduce_133( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 487
+  def _reduce_131( val, _values, result )
     results = val[0] << val[2].value
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 496
-  def _reduce_134( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 495
+  def _reduce_132( val, _values, result )
     val[1].each do |file|
         import(file)
     end
@@ -1522,8 +1497,8 @@ module_eval <<'.,.,', 'grammar.ra', 496
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 506
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 505
+  def _reduce_133( val, _values, result )
     newdefine classname(val[1]), :arguments => val[2], :code => val[4]
     @lexer.indefine = false
     result = nil
@@ -1533,8 +1508,8 @@ module_eval <<'.,.,', 'grammar.ra', 506
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 510
-  def _reduce_136( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 509
+  def _reduce_134( val, _values, result )
     newdefine classname(val[1]), :arguments => val[2]
     @lexer.indefine = false
     result = nil
@@ -1542,8 +1517,8 @@ module_eval <<'.,.,', 'grammar.ra', 510
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 518
-  def _reduce_137( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 517
+  def _reduce_135( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     newclass classname(val[1]), :code => val[4], :parent => val[2]
@@ -1552,8 +1527,8 @@ module_eval <<'.,.,', 'grammar.ra', 518
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 523
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 522
+  def _reduce_136( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     newclass classname(val[1]), :parent => val[2]
@@ -1562,34 +1537,32 @@ module_eval <<'.,.,', 'grammar.ra', 523
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 528
-  def _reduce_139( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 527
+  def _reduce_137( val, _values, result )
     newnode val[1], :parent => val[2], :code => val[4]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 531
-  def _reduce_140( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 530
+  def _reduce_138( val, _values, result )
     newnode val[1], :parent => val[2]
     result = nil
    result
   end
 .,.,
 
- # reduce 141 omitted
-
- # reduce 142 omitted
+ # reduce 139 omitted
 
- # reduce 143 omitted
+ # reduce 140 omitted
 
- # reduce 144 omitted
+ # reduce 141 omitted
 
- # reduce 145 omitted
+ # reduce 142 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 546
-  def _reduce_146( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 544
+  def _reduce_143( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -1597,49 +1570,49 @@ module_eval <<'.,.,', 'grammar.ra', 546
   end
 .,.,
 
- # reduce 147 omitted
+ # reduce 144 omitted
 
- # reduce 148 omitted
+ # reduce 145 omitted
 
- # reduce 149 omitted
+ # reduce 146 omitted
 
- # reduce 150 omitted
+ # reduce 147 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 555
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 553
+  def _reduce_148( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 559
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 557
+  def _reduce_149( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 153 omitted
+ # reduce 150 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 564
-  def _reduce_154( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 562
+  def _reduce_151( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 568
-  def _reduce_155( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 566
+  def _reduce_152( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 156 omitted
+ # reduce 153 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 575
-  def _reduce_157( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 573
+  def _reduce_154( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1647,67 +1620,67 @@ module_eval <<'.,.,', 'grammar.ra', 575
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 580
-  def _reduce_158( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 578
+  def _reduce_155( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 584
-  def _reduce_159( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 582
+  def _reduce_156( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 586
-  def _reduce_160( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 584
+  def _reduce_157( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 588
-  def _reduce_161( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 586
+  def _reduce_158( val, _values, result )
     result = [val[0]]
    result
   end
 .,.,
 
- # reduce 162 omitted
+ # reduce 159 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 593
-  def _reduce_163( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 591
+  def _reduce_160( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 164 omitted
+ # reduce 161 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 598
-  def _reduce_165( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 596
+  def _reduce_162( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 166 omitted
+ # reduce 163 omitted
 
- # reduce 167 omitted
+ # reduce 164 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 604
-  def _reduce_168( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 602
+  def _reduce_165( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 612
-  def _reduce_169( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 610
+  def _reduce_166( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1717,21 +1690,21 @@ module_eval <<'.,.,', 'grammar.ra', 612
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 614
-  def _reduce_170( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 612
+  def _reduce_167( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 171 omitted
+ # reduce 168 omitted
 
- # reduce 172 omitted
+ # reduce 169 omitted
 
- # reduce 173 omitted
+ # reduce 170 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 619
-  def _reduce_174( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 617
+  def _reduce_171( val, _values, result )
  result = nil
    result
   end