puppet 0.16.0 → 0.18.4

data/lib/puppet/parser/lexer.rb

@@ -34,6 +34,9 @@ module Puppet
                 %r{,} => :COMMA,
                 %r{\.} => :DOT,
                 %r{:} => :COLON,
+                %r{@} => :AT,
+                %r{<\|} => :LCOLLECT,
+                %r{\|>} => :RCOLLECT,
                 %r{;} => :SEMIC,
                 %r{\?} => :QMARK,
                 %r{\\} => :BACKSLASH,
@@ -51,10 +54,8 @@ module Puppet
                 "define" => :DEFINE,
                 "false" => :BOOLEAN,
                 "import" => :IMPORT,
-                "include" => :INCLUDE,
                 "inherits" => :INHERITS,
                 "node" => :NODE,
-                "tag" => :TAG,
                 "true" => :BOOLEAN
             }
 
@@ -193,9 +194,9 @@ module Puppet
                         #stoken = :DQTEXT
                         #Puppet.debug("got string '%s' => '%s'" % [:DQTEXT,value])
                     else
+                        #Puppet.debug("got token '%s' => '%s'" % [stoken,value])
                         yield [stoken,value]
                         @last = value
-                        #Puppet.debug("got token '%s' => '%s'" % [stoken,value])
                     end
                     @scanner.skip(@skip)
                 end
@@ -229,4 +230,4 @@ module Puppet
     end
 end
 
-# $Id: lexer.rb 1106 2006-04-11 22:32:51Z luke $
+# $Id: lexer.rb 1245 2006-06-08 20:06:41Z luke $

data/lib/puppet/parser/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.4
+# This file is automatically generated by racc 1.4.5
 # from racc grammer file "grammar.ra".
 #
 
@@ -29,7 +29,9 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..idb478f6db18', 'grammar.ra', 745
+module_eval <<'..end grammar.ra modeval..id99c9ad765d', 'grammar.ra', 787
+require 'puppet/parser/functions'
+
 attr_reader :file
 attr_accessor :files
 
@@ -51,7 +53,12 @@ end
 
 def file=(file)
     unless FileTest.exists?(file)
-        raise Puppet::Error, "Could not find file %s" % file
+        unless file =~ /\.pp$/
+            file = file + ".pp"
+        end
+        unless FileTest.exists?(file)
+            raise Puppet::Error, "Could not find file %s" % file
+        end
     end
     if @files.detect { |f| f.file == file }
         raise Puppet::ImportError.new("Import loop detected")
@@ -148,298 +155,325 @@ end
 # mode: ruby
 # End:
 
-# $Id: parser.rb 1106 2006-04-11 22:32:51Z luke $
+# $Id: parser.rb 1418 2006-07-21 19:38:29Z luke $
 
-..end grammar.ra modeval..idb478f6db18
+..end grammar.ra modeval..id99c9ad765d
 
-##### racc 1.4.4 generates ###
+##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 43, :_reduce_1,
+ 1, 44, :_reduce_1,
  1, 44, :_reduce_none,
- 2, 44, :_reduce_3,
- 1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
  1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
- 1, 45, :_reduce_none,
- 2, 50, :_reduce_13,
- 2, 51, :_reduce_14,
- 1, 55, :_reduce_none,
- 3, 55, :_reduce_16,
- 1, 56, :_reduce_none,
- 1, 56, :_reduce_none,
- 5, 46, :_reduce_19,
- 5, 46, :_reduce_20,
- 5, 46, :_reduce_21,
- 4, 64, :_reduce_22,
+ 2, 45, :_reduce_4,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 1, 47, :_reduce_none,
+ 4, 54, :_reduce_15,
+ 2, 54, :_reduce_16,
+ 1, 58, :_reduce_none,
+ 3, 58, :_reduce_18,
  1, 59, :_reduce_none,
- 3, 59, :_reduce_24,
- 0, 60, :_reduce_none,
- 1, 60, :_reduce_none,
- 1, 57, :_reduce_27,
- 1, 63, :_reduce_28,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 3, 47, :_reduce_35,
- 0, 61, :_reduce_36,
- 1, 61, :_reduce_37,
- 3, 61, :_reduce_38,
- 3, 70, :_reduce_39,
- 1, 71, :_reduce_none,
- 3, 71, :_reduce_41,
- 1, 69, :_reduce_none,
- 1, 69, :_reduce_none,
- 1, 69, :_reduce_none,
+ 1, 59, :_reduce_none,
+ 1, 59, :_reduce_none,
+ 5, 48, :_reduce_22,
+ 5, 48, :_reduce_23,
+ 5, 48, :_reduce_24,
+ 2, 49, :_reduce_25,
+ 3, 50, :_reduce_26,
+ 4, 68, :_reduce_27,
+ 1, 63, :_reduce_none,
+ 3, 63, :_reduce_29,
+ 0, 64, :_reduce_none,
+ 1, 64, :_reduce_none,
+ 1, 60, :_reduce_32,
+ 1, 67, :_reduce_33,
  1, 69, :_reduce_none,
  1, 69, :_reduce_none,
  1, 69, :_reduce_none,
  1, 69, :_reduce_none,
  1, 69, :_reduce_none,
  1, 69, :_reduce_none,
- 1, 66, :_reduce_51,
- 1, 66, :_reduce_52,
- 1, 73, :_reduce_53,
- 4, 74, :_reduce_54,
- 5, 48, :_reduce_55,
- 1, 75, :_reduce_none,
- 2, 75, :_reduce_57,
- 5, 76, :_reduce_58,
- 4, 76, :_reduce_59,
- 1, 77, :_reduce_none,
- 3, 77, :_reduce_61,
- 3, 67, :_reduce_62,
+ 3, 51, :_reduce_40,
+ 0, 65, :_reduce_41,
+ 1, 65, :_reduce_42,
+ 3, 65, :_reduce_43,
+ 3, 73, :_reduce_44,
+ 1, 74, :_reduce_none,
+ 3, 74, :_reduce_46,
+ 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_none,
+ 1, 72, :_reduce_none,
+ 4, 78, :_reduce_56,
+ 1, 62, :_reduce_57,
+ 1, 62, :_reduce_58,
+ 1, 76, :_reduce_59,
+ 4, 77, :_reduce_60,
+ 5, 52, :_reduce_61,
  1, 79, :_reduce_none,
- 3, 79, :_reduce_64,
+ 2, 79, :_reduce_63,
+ 5, 80, :_reduce_64,
+ 4, 80, :_reduce_65,
  1, 81, :_reduce_none,
- 3, 81, :_reduce_66,
- 3, 80, :_reduce_67,
- 1, 78, :_reduce_68,
- 1, 78, :_reduce_69,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_72,
- 1, 78, :_reduce_none,
- 2, 49, :_reduce_74,
- 6, 52, :_reduce_75,
- 5, 52, :_reduce_76,
- 6, 53, :_reduce_77,
- 5, 53, :_reduce_78,
- 6, 54, :_reduce_79,
- 5, 54, :_reduce_80,
- 1, 84, :_reduce_none,
- 2, 84, :_reduce_82,
- 1, 85, :_reduce_83,
- 1, 85, :_reduce_84,
- 0, 86, :_reduce_85,
+ 3, 81, :_reduce_67,
+ 3, 70, :_reduce_68,
+ 1, 83, :_reduce_none,
+ 3, 83, :_reduce_70,
+ 1, 85, :_reduce_none,
+ 3, 85, :_reduce_72,
+ 3, 84, :_reduce_73,
  1, 82, :_reduce_none,
- 3, 82, :_reduce_87,
- 3, 82, :_reduce_88,
+ 1, 82, :_reduce_none,
+ 1, 82, :_reduce_none,
+ 1, 82, :_reduce_none,
+ 1, 82, :_reduce_none,
+ 1, 82, :_reduce_none,
+ 1, 82, :_reduce_80,
+ 2, 53, :_reduce_81,
+ 6, 55, :_reduce_82,
+ 5, 55, :_reduce_83,
+ 6, 56, :_reduce_84,
+ 5, 56, :_reduce_85,
+ 6, 57, :_reduce_86,
+ 5, 57, :_reduce_87,
+ 1, 88, :_reduce_none,
+ 3, 88, :_reduce_89,
+ 1, 89, :_reduce_90,
+ 1, 89, :_reduce_91,
+ 1, 89, :_reduce_92,
+ 0, 46, :_reduce_93,
+ 1, 86, :_reduce_none,
+ 3, 86, :_reduce_95,
+ 3, 86, :_reduce_96,
+ 1, 90, :_reduce_none,
+ 3, 90, :_reduce_98,
+ 3, 91, :_reduce_99,
+ 1, 91, :_reduce_100,
  1, 87, :_reduce_none,
- 3, 87, :_reduce_90,
- 3, 88, :_reduce_91,
- 1, 88, :_reduce_92,
- 1, 83, :_reduce_none,
- 2, 83, :_reduce_94,
- 1, 58, :_reduce_95,
- 3, 68, :_reduce_96,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 0, 62, :_reduce_none,
- 1, 62, :_reduce_100 ]
+ 2, 87, :_reduce_102,
+ 1, 61, :_reduce_103,
+ 3, 71, :_reduce_104,
+ 2, 71, :_reduce_105,
+ 1, 75, :_reduce_none,
+ 1, 75, :_reduce_none,
+ 0, 66, :_reduce_none,
+ 1, 66, :_reduce_109 ]
 
-racc_reduce_n = 101
+racc_reduce_n = 110
 
-racc_shift_n = 166
+racc_shift_n = 181
 
 racc_action_table = [
-    34,    28,    29,   143,    92,    34,    28,    29,   134,   -68,
-    34,    28,    29,    87,   133,    34,    28,    29,   102,    57,
-    34,    28,    29,    86,    42,    84,    42,   142,    54,    57,
-    47,    42,     7,    37,    41,    47,    42,    43,    37,    41,
-    47,    42,    43,    37,    41,    47,    42,    43,    37,    41,
-    47,    56,    43,    37,    66,    84,   -73,    43,    34,    28,
-    29,    56,   111,    34,    28,    29,   113,   114,    34,    28,
-    29,   120,    80,    34,    28,    29,    26,    42,    34,    28,
-    29,   121,    42,    97,    42,     7,    28,    29,    47,    42,
-     7,    37,    41,    47,    42,    43,    37,    41,    47,    42,
-    43,    37,    41,    47,    42,    43,    37,    41,    47,    92,
-    43,    37,    41,    28,    29,    43,   110,    96,    28,    29,
-   124,   -68,   -71,    28,    29,   127,   128,    87,    28,    29,
-     7,   131,   132,    28,    29,    96,    81,   157,    42,   113,
-   114,   137,    47,    42,    93,   105,   108,    47,    42,    43,
-   105,   108,    47,    42,    43,   105,   108,    47,    42,    43,
-   105,   108,    47,   -69,    43,   105,   108,    28,    29,    43,
-   141,   144,    77,   -70,     6,     9,    74,    13,    15,   148,
-    21,    60,    96,   147,     3,     7,   -71,    11,     7,    16,
-    19,    54,    42,   -70,    91,   158,    47,    49,    48,   105,
-   108,     6,     9,    43,    13,    15,   165,    21,    30,    87,
-    26,     3,     7,    86,    11,   nil,    16,    19,   nil,   nil,
-   nil,   nil,   nil,   150,     6,     9,   nil,    13,    15,   nil,
-    21,   nil,   nil,   nil,     3,     7,   nil,    11,   nil,    16,
-    19,     6,     9,   164,    13,    15,   nil,    21,   nil,   nil,
-   nil,     3,     7,   nil,    11,   nil,    16,    19,   nil,   nil,
-   136,     6,     9,   nil,    13,    15,   nil,    21,   nil,   nil,
-   nil,     3,     7,   nil,    11,   nil,    16,    19,     6,     9,
-   154,    13,    15,   nil,    21,   nil,   nil,   nil,     3,     7,
-   nil,    11,   nil,    16,    19,   nil,   nil,   161,     6,     9,
-   nil,    13,    15,   nil,    21,   nil,   nil,   nil,     3,     7,
-   nil,    11,   nil,    16,    19,     6,     9,   160,    13,    15,
-   nil,    21,   nil,   nil,   nil,     3,     7,   nil,    11,   nil,
-    16,    19,   nil,   nil,   nil,     6,     9,   nil,    13,    15,
-   nil,    21,   nil,   nil,   nil,     3,     7,   nil,    11,   nil,
-    16,    19,     6,     9,   nil,    13,    15,   nil,    21,   nil,
-   nil,   nil,     3,     7,   nil,    11,   nil,    16,    19 ]
+    47,    34,    37,   153,   149,    18,    47,    34,    37,    59,
+   152,   -76,    47,    34,    37,    77,    18,    34,    37,    70,
+    34,    37,    18,    35,   -75,    59,    34,    37,    18,    42,
+    82,   129,   -74,    48,    49,    42,    30,    54,    30,    48,
+    49,    42,    68,    54,    60,    48,    49,   -74,    42,    54,
+    47,    34,    37,    35,    42,   -77,    47,    34,    37,    35,
+   -76,   130,    47,    34,    37,    75,    18,   108,    29,   158,
+    29,    31,    18,    31,    35,    75,   110,   106,    18,    42,
+   159,   137,   138,    48,    49,    42,   145,    54,    80,    48,
+    87,    42,   -77,    54,    83,    48,    49,    34,    37,    54,
+    47,    34,    37,    34,    37,   111,    47,    34,    37,   112,
+   114,   142,    47,    34,    37,   168,    18,   112,   114,    72,
+    43,   108,    18,   106,   146,    42,    81,   -79,    18,    42,
+    35,    42,    80,    48,    49,    42,    35,    54,   -75,    48,
+    49,    42,    72,    54,   -78,    48,    49,   156,   157,    54,
+    47,    34,    37,    34,    37,   105,   160,   161,    75,    72,
+    34,    37,    34,    37,    67,   120,    18,    66,    18,    97,
+   170,    65,   108,    35,    68,    18,    62,    18,    99,    42,
+    32,    42,    26,    48,    49,    48,    49,    54,    42,    54,
+    42,   103,    48,    49,    48,    49,    54,   nil,    54,    34,
+    37,    34,    37,   nil,   nil,   151,   nil,   nil,    34,    37,
+   nil,   nil,   nil,   nil,    18,   nil,    18,   nil,   nil,   nil,
+   nil,   nil,   nil,    18,   nil,   nil,   nil,    42,   163,    42,
+   nil,    48,    49,    48,    49,    54,    42,    54,   nil,    18,
+    48,    49,   nil,   165,    54,   nil,   nil,   nil,   nil,    15,
+    17,   nil,    22,    24,    18,     3,   nil,     9,   180,    12,
+   nil,    19,   nil,   nil,    15,    17,   nil,    22,    24,    18,
+     3,   nil,     9,   166,    12,   nil,    19,   nil,   nil,    15,
+    17,   nil,    22,    24,    18,     3,   nil,     9,   175,    12,
+   nil,    19,   nil,   nil,    15,    17,   nil,    22,    24,    18,
+     3,   nil,     9,   140,    12,   nil,    19,   nil,   nil,    15,
+    17,   nil,    22,    24,    18,     3,   nil,     9,   179,    12,
+   nil,    19,   nil,   nil,    15,    17,   nil,    22,    24,    18,
+     3,   nil,     9,   176,    12,   nil,    19,   nil,   nil,    15,
+    17,   nil,    22,    24,    18,     3,   nil,     9,   nil,    12,
+   nil,    19,   nil,   nil,    15,    17,   nil,    22,    24,    18,
+     3,   nil,     9,   nil,    12,   nil,    19,   nil,   nil,    15,
+    17,   nil,    22,    24,    18,     3,   nil,     9,   nil,    12,
+   nil,    19,   nil,   nil,    15,    17,   nil,    22,    24,   nil,
+     3,   nil,     9,   nil,    12,   nil,    19 ]
 
 racc_action_check = [
-   137,   137,   137,   116,    66,    48,    48,    48,   101,    66,
-    80,    80,    80,    97,   101,    34,    34,    34,    75,    21,
-    26,    26,    26,    50,    86,    49,   137,   116,    46,    58,
-   137,    48,    86,   137,   137,    48,    80,   137,    48,    48,
-    80,    34,    48,    80,    80,    34,    26,    80,    34,    34,
-    26,    21,    34,    26,    26,    58,    44,    26,    11,    11,
-    11,    58,    79,    92,    92,    92,    79,    79,   112,   112,
-   112,    83,    38,   131,   131,   131,    38,    16,    93,    93,
-    93,    84,    19,    73,    11,    16,     6,     6,    11,    92,
-    19,    11,    11,    92,   112,    11,    92,    92,   112,   131,
-    92,   112,   112,   131,    93,   112,   131,   131,    93,    87,
-   131,    93,    93,    77,    77,    93,    77,    88,   110,   110,
-    89,    41,    40,   143,   143,    94,    95,    96,    81,    81,
-    74,    99,   100,   156,   156,    69,    39,   139,    77,   139,
-   139,   104,    77,   110,    68,    77,    77,   110,   143,    77,
-   110,   110,   143,    81,   110,   143,   143,    81,   156,   143,
-    81,    81,   156,    37,    81,   156,   156,   118,   118,   156,
-   115,   118,    32,    31,     1,     1,    30,     1,     1,   123,
-     1,    24,   130,   120,     1,     1,    65,     1,   134,     1,
-     1,    18,   118,    61,    60,   142,   118,    15,    13,   118,
-   118,   120,   120,   118,   120,   120,   163,   120,     9,    54,
-     4,   120,   120,    55,   120,   nil,   120,   120,   nil,   nil,
-   nil,   nil,   nil,   124,   163,   163,   nil,   163,   163,   nil,
-   163,   nil,   nil,   nil,   163,   163,   nil,   163,   nil,   163,
-   163,   124,   124,   158,   124,   124,   nil,   124,   nil,   nil,
-   nil,   124,   124,   nil,   124,   nil,   124,   124,   nil,   nil,
-   102,   158,   158,   nil,   158,   158,   nil,   158,   nil,   nil,
-   nil,   158,   158,   nil,   158,   nil,   158,   158,   102,   102,
-   135,   102,   102,   nil,   102,   nil,   nil,   nil,   102,   102,
-   nil,   102,   nil,   102,   102,   nil,   nil,   149,   135,   135,
-   nil,   135,   135,   nil,   135,   nil,   nil,   nil,   135,   135,
-   nil,   135,   nil,   135,   135,   149,   149,   146,   149,   149,
-   nil,   149,   nil,   nil,   nil,   149,   149,   nil,   149,   nil,
-   149,   149,   nil,   nil,   nil,   146,   146,   nil,   146,   146,
-   nil,   146,   nil,   nil,   nil,   146,   146,   nil,   146,   nil,
-   146,   146,     0,     0,   nil,     0,     0,   nil,     0,   nil,
-   nil,   nil,     0,     0,   nil,     0,   nil,     0,     0 ]
+    65,    65,    65,   127,   124,    19,   130,   130,   130,    13,
+   127,    57,    47,    47,    47,    47,    65,    15,    15,    27,
+    43,    43,   130,    19,    85,    64,    80,    80,    47,    65,
+    53,    88,    91,    65,    65,   130,     3,    65,    70,   130,
+   130,    47,    27,   130,    13,    47,    47,    53,    43,    47,
+   113,   113,   113,    43,    80,    92,    59,    59,    59,    80,
+    93,    94,    82,    82,    82,    76,   113,    96,     3,   133,
+    70,     3,    59,    70,    99,   115,    76,    87,    82,   113,
+   133,   100,   102,   113,   113,    59,   115,   113,    87,    59,
+    59,    82,    56,    59,    55,    82,    82,    75,    75,    82,
+    12,    12,    12,     9,     9,    79,   146,   146,   146,    79,
+    79,   107,   161,   161,   161,   148,    12,   148,   148,   108,
+     9,    74,   146,    72,   118,    75,    51,    58,   161,    12,
+    75,     9,    49,    12,    12,   146,     9,    12,    46,   146,
+   146,   161,   129,   146,    45,   161,   161,   131,   132,   161,
+   106,   106,   106,    83,    83,    71,   134,   136,    36,    32,
+   153,   153,    81,    81,    26,    81,   106,    24,    83,    60,
+   152,    22,   154,   158,    66,   153,    17,    81,    62,   106,
+     4,    83,     2,   106,   106,    83,    83,   106,   153,    83,
+    81,    68,   153,   153,    81,    81,   153,   nil,    81,   169,
+   169,   125,   125,   nil,   nil,   125,   nil,   nil,   120,   120,
+   nil,   nil,   nil,   nil,   169,   nil,   125,   nil,   nil,   nil,
+   nil,   nil,   nil,   120,   nil,   nil,   nil,   169,   137,   125,
+   nil,   169,   169,   125,   125,   169,   120,   125,   nil,   137,
+   120,   120,   nil,   138,   120,   nil,   nil,   nil,   nil,   137,
+   137,   nil,   137,   137,   138,   137,   nil,   137,   178,   137,
+   nil,   137,   nil,   nil,   138,   138,   nil,   138,   138,   178,
+   138,   nil,   138,   139,   138,   nil,   138,   nil,   nil,   178,
+   178,   nil,   178,   178,   139,   178,   nil,   178,   162,   178,
+   nil,   178,   nil,   nil,   139,   139,   nil,   139,   139,   162,
+   139,   nil,   139,   105,   139,   nil,   139,   nil,   nil,   162,
+   162,   nil,   162,   162,   105,   162,   nil,   162,   170,   162,
+   nil,   162,   nil,   nil,   105,   105,   nil,   105,   105,   170,
+   105,   nil,   105,   164,   105,   nil,   105,   nil,   nil,   170,
+   170,   nil,   170,   170,   164,   170,   nil,   170,   nil,   170,
+   nil,   170,   nil,   nil,   164,   164,   nil,   164,   164,     6,
+   164,   nil,   164,   nil,   164,   nil,   164,   nil,   nil,     6,
+     6,   nil,     6,     6,     0,     6,   nil,     6,   nil,     6,
+   nil,     6,   nil,   nil,     0,     0,   nil,     0,     0,   nil,
+     0,   nil,     0,   nil,     0,   nil,     0 ]
 
 racc_action_pointer = [
-   327,   149,   nil,   nil,   204,   nil,    83,   nil,   nil,   172,
-   nil,    56,   nil,   185,   nil,   161,    49,   nil,   185,    54,
-   nil,    15,   nil,   nil,   181,   nil,    18,   nil,   nil,   nil,
-   161,   159,   158,   nil,    13,   nil,   nil,   149,    70,   130,
-   108,   107,   nil,   nil,    42,   nil,    22,   nil,     3,    -5,
-    13,   nil,   nil,   nil,   173,   203,   nil,   nil,    25,   nil,
-   194,   179,   nil,   nil,   nil,   172,    -5,   nil,   107,   125,
-   nil,   nil,   nil,    49,    94,    12,   nil,   110,   nil,    57,
-     8,   125,   nil,    65,    45,   nil,    -4,   100,   107,   114,
-   nil,   nil,    61,    76,   118,   119,    91,   -23,   nil,   118,
-   116,    -2,   253,   nil,   132,   nil,   nil,   nil,   nil,   nil,
-   115,   nil,    66,   nil,   nil,   165,    -7,   nil,   164,   nil,
-   176,   nil,   nil,   172,   216,   nil,   nil,   nil,   nil,   nil,
-   172,    71,   nil,   nil,   152,   273,   nil,    -2,   nil,   130,
-   nil,   nil,   189,   120,   nil,   nil,   310,   nil,   nil,   290,
-   nil,   nil,   nil,   nil,   nil,   nil,   130,   nil,   236,   nil,
-   nil,   nil,   nil,   199,   nil,   nil ]
+   356,   nil,   182,    32,   174,   nil,   341,   nil,   nil,   100,
+   nil,   nil,    98,     3,   nil,    14,   nil,   140,   nil,   -13,
+   nil,   nil,   158,   nil,   131,   nil,   164,     9,   nil,   nil,
+   nil,   nil,   123,   nil,   nil,   nil,   148,   nil,   nil,   nil,
+   nil,   nil,   nil,    17,   nil,   125,   119,    10,   nil,   112,
+   nil,   107,   nil,    28,   nil,    88,    73,    -8,   108,    54,
+   127,   nil,   158,   nil,    19,    -2,   141,   nil,   155,   nil,
+    34,   149,   114,   nil,   111,    94,    55,   nil,   nil,   100,
+    23,   159,    60,   150,   nil,     5,   nil,    68,    14,   nil,
+   nil,    13,    36,    41,    24,   nil,    57,   nil,   nil,    38,
+    75,   nil,    76,   nil,   nil,   296,   148,   104,    83,   nil,
+   nil,   nil,   nil,    48,   nil,    65,   nil,   nil,   115,   nil,
+   205,   nil,   nil,   nil,    -1,   198,   nil,    -7,   nil,   106,
+     4,   140,   141,    59,   135,   nil,   144,   221,   236,   266,
+   nil,   nil,   nil,   nil,   nil,   nil,   104,   nil,   108,   nil,
+   nil,   nil,   164,   157,   162,   nil,   nil,   nil,   137,   nil,
+   nil,   110,   281,   nil,   326,   nil,   nil,   nil,   nil,   196,
+   311,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   251,   nil,
+   nil ]
 
 racc_action_default = [
-  -101,    -1,    -2,   -28,  -101,    -4,  -101,   -27,    -5,  -101,
-    -6,  -101,    -7,  -101,    -8,  -101,  -101,    -9,  -101,  -101,
-   -10,  -101,   -11,   -12,  -101,    -3,   -36,   -74,   -51,   -52,
-   -85,   -42,  -101,   -46,  -101,   -49,   -47,   -28,   -43,  -101,
-   -48,   -27,   -95,   -72,   -45,   -50,   -44,   -53,  -101,   -85,
-   -13,   -15,   -17,   -18,   -36,   -14,   -83,   -84,   -85,   -81,
-  -101,   -29,   -32,   -34,   -30,   -33,   -27,   -37,   -25,   -99,
-   -73,   -31,   -23,  -101,   -85,  -101,   -86,  -101,   -40,  -101,
-  -101,  -101,   -35,  -101,  -101,   -93,  -101,  -101,   -99,  -101,
-   -82,   166,  -101,   -26,  -101,  -101,  -100,   -36,   -89,   -92,
-  -101,  -101,  -101,   -70,  -101,   -69,   -62,   -71,   -68,   -63,
-  -101,   -96,  -101,   -97,   -98,  -101,  -101,   -60,  -101,   -56,
-  -101,   -94,   -16,  -101,  -101,   -39,   -24,   -19,   -20,   -38,
-   -99,  -101,   -87,   -88,  -101,  -101,   -76,  -101,   -65,  -101,
-   -41,   -54,  -101,  -101,   -55,   -57,  -101,   -78,   -21,  -101,
-   -80,   -22,   -91,   -90,   -75,   -67,  -101,   -64,  -101,   -61,
-   -77,   -79,   -66,  -101,   -59,   -58 ]
+   -93,   -12,  -110,  -110,  -110,   -13,    -1,   -14,    -2,   -32,
+    -3,    -5,  -110,  -110,    -6,  -110,    -7,  -110,   -33,  -110,
+    -8,    -9,  -110,   -10,  -110,   -11,  -110,   -93,   -88,   -90,
+   -91,   -92,   -41,    -4,   -57,   -32,   -16,   -58,   -17,   -19,
+   -20,   -21,  -103,  -110,   -54,   -55,   -49,  -110,   -59,   -32,
+   -51,  -110,   -53,   -48,   -80,  -110,   -52,   -47,   -50,   -41,
+  -110,   -81,   -93,   -25,  -110,  -110,   -93,   181,  -110,  -101,
+  -110,  -110,  -110,   -42,  -108,  -110,  -110,  -105,   -45,  -110,
+  -110,  -110,  -110,  -110,   -78,   -36,   -28,   -32,  -110,   -37,
+   -39,   -35,   -38,   -34,   -30,   -79,  -108,   -26,   -94,   -93,
+  -110,   -40,  -110,  -102,   -89,  -110,  -110,  -110,  -109,   -18,
+   -15,  -104,  -106,  -110,  -107,  -110,   -75,   -74,  -110,   -77,
+  -110,   -68,   -76,   -69,  -110,  -110,   -62,  -110,   -66,   -41,
+   -31,  -110,  -110,  -110,  -110,   -97,  -100,  -110,  -110,  -110,
+   -87,   -44,   -24,   -43,   -46,   -56,  -110,   -71,  -110,   -60,
+   -63,   -61,  -110,  -110,  -108,   -29,   -22,   -23,  -110,   -96,
+   -95,  -110,  -110,   -83,  -110,   -85,   -86,   -73,   -70,  -110,
+  -110,   -67,   -27,   -98,   -99,   -82,   -84,   -72,  -110,   -65,
+   -64 ]
 
 racc_goto_table = [
-    25,     1,    27,    39,    95,   119,    53,    70,    69,    53,
-   112,    62,    38,   109,    59,   129,    65,    52,    72,    63,
-    52,    83,    61,   123,    76,   122,    78,    64,    98,    46,
-    89,    50,   106,   118,    55,    38,    88,   139,    75,    68,
-    82,    58,   145,    94,    71,    79,   138,   101,    24,    38,
-   nil,    90,    46,   nil,   nil,   nil,   nil,   nil,    70,    36,
-   nil,   nil,    70,   nil,   nil,   151,    46,   107,   100,   nil,
-   156,   107,   115,   103,    70,    99,    53,   103,    62,   130,
-   nil,    38,    36,    65,   125,   126,    63,    52,   153,    61,
-   nil,    70,   162,    38,    64,   nil,    36,   nil,    46,    70,
-   107,   nil,   nil,   135,   140,   nil,   103,   nil,   107,   nil,
-    46,    71,   nil,    38,   103,   nil,   nil,   nil,   nil,   nil,
-   nil,   146,   nil,   152,    70,   149,   nil,   nil,    36,   155,
-    46,   nil,    38,   107,    25,    99,   nil,    70,    38,   103,
-    36,   nil,   nil,   104,   nil,    25,   107,   117,    25,    46,
-   nil,   nil,   103,   nil,   nil,    46,   nil,   nil,   nil,   163,
-    36,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   104,   nil,   nil,    36,
-   nil,   nil,   nil,   nil,   117,    36,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   159,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   104 ]
+    33,     6,    74,    39,     8,   107,    53,    89,   135,   123,
+   126,    86,    36,    64,   109,    40,    71,    90,   125,    79,
+    94,   121,   113,   131,   148,    28,   100,   132,   143,    96,
+    41,    27,    63,   133,     2,   nil,    61,    39,   nil,   nil,
+   118,    53,   128,   nil,   nil,   nil,    76,   nil,   147,    40,
+   nil,   nil,   150,    91,   nil,   102,   nil,   nil,   nil,    53,
+   nil,   nil,   nil,   nil,    41,    92,    98,   173,   nil,    39,
+   nil,   nil,   nil,   nil,    39,   117,    53,   117,    89,   118,
+    93,    40,   155,   115,   128,   172,    40,   119,    90,   119,
+    55,   169,   104,   136,   nil,    46,    41,   177,   nil,   154,
+    53,    41,   122,   134,   122,   nil,   139,    53,   nil,   nil,
+   nil,   nil,   171,   nil,   117,   nil,   nil,   nil,   nil,   117,
+   nil,   nil,   nil,   nil,    91,    78,   119,   nil,   118,   nil,
+    46,   119,   nil,    33,   nil,   nil,    92,   nil,   162,   164,
+    53,   122,    85,   101,   nil,   nil,   122,   117,    46,   nil,
+   nil,    93,   136,   nil,    84,    53,    33,    95,    33,   119,
+   124,   nil,   nil,   117,   116,    46,   116,   nil,   nil,   nil,
+   nil,   178,    33,   nil,   122,   119,    84,   nil,    84,    95,
+   nil,    95,   nil,   nil,   141,   nil,   nil,   nil,   nil,    46,
+   122,   144,   nil,   nil,   nil,   nil,    46,   nil,   nil,   nil,
+   nil,   nil,   nil,   116,   nil,   nil,   nil,   nil,   116,   nil,
+   nil,   nil,   nil,    85,   nil,    84,   nil,   nil,    95,   nil,
+    84,   nil,   nil,    95,   167,    84,   nil,   nil,    95,    46,
+   nil,   nil,   nil,   nil,   nil,   nil,   116,   nil,   nil,   174,
+   nil,   nil,   nil,   nil,    46,   nil,   nil,   nil,    84,   nil,
+   nil,    95,   116,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    84,   nil,   nil,    95 ]
 
 racc_goto_check = [
-     3,     2,    24,    27,    20,    34,    16,    31,    19,    16,
-    30,    25,    15,    38,    43,    28,    16,    15,    22,    26,
-    15,    41,    24,    20,    44,    14,    27,    15,    46,    21,
-    41,    13,    37,    33,    13,    15,    19,    39,    40,    17,
-    27,    42,    34,    18,    21,    29,    38,    45,     1,    15,
-   nil,    43,    21,   nil,   nil,   nil,   nil,   nil,    31,     4,
-   nil,   nil,    31,   nil,   nil,    20,    21,    16,    44,   nil,
-    30,    16,    27,    24,    31,    15,    16,    24,    25,    19,
-   nil,    15,     4,    16,    27,    22,    26,    15,    46,    24,
-   nil,    31,    38,    15,    15,   nil,     4,   nil,    21,    31,
-    16,   nil,   nil,     2,    27,   nil,    24,   nil,    16,   nil,
-    21,    21,   nil,    15,    24,   nil,   nil,   nil,   nil,   nil,
-   nil,     2,   nil,    27,    31,     2,   nil,   nil,     4,    27,
-    21,   nil,    15,    16,     3,    15,   nil,    31,    15,    24,
-     4,   nil,   nil,    36,   nil,     3,    16,    36,     3,    21,
-   nil,   nil,    24,   nil,   nil,    21,   nil,   nil,   nil,     2,
-     4,   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    36,   nil,   nil,     4,
-   nil,   nil,   nil,   nil,    36,     4,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    36,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    36 ]
+     4,     2,    22,    17,     3,    23,    17,    27,    48,    41,
+    37,    25,    15,    17,    16,    18,    44,    28,    36,    31,
+    20,    40,    32,    21,    42,    46,    43,    23,    30,    22,
+    19,    45,     5,    47,     1,   nil,    19,    17,   nil,   nil,
+    39,    17,    39,   nil,   nil,   nil,    15,   nil,    41,    18,
+   nil,   nil,    37,    17,   nil,    44,   nil,   nil,   nil,    17,
+   nil,   nil,   nil,   nil,    19,    18,     3,    48,   nil,    17,
+   nil,   nil,   nil,   nil,    17,    17,    17,    17,    27,    39,
+    19,    18,    25,    15,    39,    23,    18,    18,    28,    18,
+    29,    32,    46,    17,   nil,    24,    19,    41,   nil,    22,
+    17,    19,    19,     3,    19,   nil,     2,    17,   nil,   nil,
+   nil,   nil,    39,   nil,    17,   nil,   nil,   nil,   nil,    17,
+   nil,   nil,   nil,   nil,    17,    29,    18,   nil,    39,   nil,
+    24,    18,   nil,     4,   nil,   nil,    18,   nil,     2,     2,
+    17,    19,    24,    29,   nil,   nil,    19,    17,    24,   nil,
+   nil,    19,    17,   nil,    35,    17,     4,    33,     4,    18,
+    29,   nil,   nil,    17,    24,    24,    24,   nil,   nil,   nil,
+   nil,     2,     4,   nil,    19,    18,    35,   nil,    35,    33,
+   nil,    33,   nil,   nil,    29,   nil,   nil,   nil,   nil,    24,
+    19,    29,   nil,   nil,   nil,   nil,    24,   nil,   nil,   nil,
+   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,    24,   nil,
+   nil,   nil,   nil,    24,   nil,    35,   nil,   nil,    33,   nil,
+    35,   nil,   nil,    33,    29,    35,   nil,   nil,    33,    24,
+   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,   nil,    29,
+   nil,   nil,   nil,   nil,    24,   nil,   nil,   nil,    35,   nil,
+   nil,    33,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    35,   nil,   nil,    33 ]
 
 racc_goto_pointer = [
-   nil,    48,     1,    -1,    48,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    15,   -61,     1,   -10,    13,   -25,   -18,
-   -65,    18,    -8,   nil,    -4,   -15,    -7,    -8,   -81,    11,
-   -69,   -19,   nil,   -48,   -76,   nil,    66,   -45,   -64,   -73,
-     8,   -28,    20,    -7,    -6,   -27,   -46 ]
+   nil,    34,     1,     4,    -6,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     3,   -61,    -6,     6,    21,
+   -39,   -71,   -30,   -69,    83,   -48,   nil,   -52,   -42,    78,
+   -80,   -28,   -57,    98,   nil,    95,   -65,   -73,   nil,   -41,
+   -60,   -72,   -96,   -36,   -11,    28,    22,   -66,   -91 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     2,     5,     8,    10,    12,    14,    17,
-    20,    22,    23,   nil,    51,     4,    40,   nil,   nil,   nil,
-   nil,    18,   nil,    73,    31,    33,    35,   nil,    67,   nil,
-   nil,    44,    45,   nil,   nil,   116,    32,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    85,   nil,   nil ]
+   nil,   nil,   nil,    69,    10,    11,    14,    16,    20,    21,
+    23,    25,     1,     5,     7,   nil,    38,    13,    56,    57,
+   nil,   nil,   nil,   nil,     4,   nil,    88,    50,    52,   nil,
+    73,   nil,   nil,    58,    44,    45,   nil,   nil,   127,    51,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -456,38 +490,39 @@ racc_token_table = {
  :TRUE => 11,
  :FALSE => 12,
  :EQUALS => 13,
- :QMARK => 14,
- :LPAREN => 15,
- :RPAREN => 16,
- :ISEQUAL => 17,
- :GREATEREQUAL => 18,
- :GREATERTHAN => 19,
- :LESSTHAN => 20,
- :LESSEQUAL => 21,
- :NOTEQUAL => 22,
- :IF => 23,
- :ELSE => 24,
- :IMPORT => 25,
- :DEFINE => 26,
- :ELSIF => 27,
- :VARIABLE => 28,
- :CLASS => 29,
- :INHERITS => 30,
- :NODE => 31,
- :BOOLEAN => 32,
- :DOT => 33,
- :COLON => 34,
- :TYPE => 35,
+ :LESSEQUAL => 14,
+ :NOTEQUAL => 15,
+ :DOT => 16,
+ :COLON => 17,
+ :TYPE => 18,
+ :QMARK => 19,
+ :LPAREN => 20,
+ :RPAREN => 21,
+ :ISEQUAL => 22,
+ :GREATEREQUAL => 23,
+ :GREATERTHAN => 24,
+ :LESSTHAN => 25,
+ :IF => 26,
+ :ELSE => 27,
+ :IMPORT => 28,
+ :DEFINE => 29,
+ :ELSIF => 30,
+ :VARIABLE => 31,
+ :CLASS => 32,
+ :INHERITS => 33,
+ :NODE => 34,
+ :BOOLEAN => 35,
  :NAME => 36,
  :SEMIC => 37,
  :CASE => 38,
  :DEFAULT => 39,
- :INCLUDE => 40,
- :TAG => 41 }
+ :AT => 40,
+ :LCOLLECT => 41,
+ :RCOLLECT => 42 }
 
 racc_use_result_var = true
 
-racc_nt_base = 42
+racc_nt_base = 43
 
 Racc_arg = [
  racc_action_table,
@@ -520,6 +555,11 @@ Racc_token_to_s_table = [
 'TRUE',
 'FALSE',
 'EQUALS',
+'LESSEQUAL',
+'NOTEQUAL',
+'DOT',
+'COLON',
+'TYPE',
 'QMARK',
 'LPAREN',
 'RPAREN',
@@ -527,8 +567,6 @@ Racc_token_to_s_table = [
 'GREATEREQUAL',
 'GREATERTHAN',
 'LESSTHAN',
-'LESSEQUAL',
-'NOTEQUAL',
 'IF',
 'ELSE',
 'IMPORT',
@@ -539,25 +577,25 @@ Racc_token_to_s_table = [
 'INHERITS',
 'NODE',
 'BOOLEAN',
-'DOT',
-'COLON',
-'TYPE',
 'NAME',
 'SEMIC',
 'CASE',
 'DEFAULT',
-'INCLUDE',
-'TAG',
+'AT',
+'LCOLLECT',
+'RCOLLECT',
 '$start',
 'program',
 'statements',
+'nothing',
 'statement',
 'object',
+'collectable',
+'collection',
 'assignment',
 'casestatement',
 'import',
-'include',
-'tag',
+'fstatement',
 'definition',
 'hostclass',
 'nodedef',
@@ -565,6 +603,7 @@ Racc_token_to_s_table = [
 'classname',
 'name',
 'variable',
+'quotedtext',
 'objectinstances',
 'endsemi',
 'params',
@@ -572,7 +611,6 @@ Racc_token_to_s_table = [
 'type',
 'objectinst',
 'objectname',
-'quotedtext',
 'selector',
 'array',
 'rvalue',
@@ -581,6 +619,7 @@ Racc_token_to_s_table = [
 'comma',
 'boolean',
 'objectref',
+'funcrvalue',
 'caseopts',
 'caseopt',
 'casevalues',
@@ -592,7 +631,6 @@ Racc_token_to_s_table = [
 'parent',
 'hostnames',
 'hostname',
-'nothing',
 'arguments',
 'argument']
 
@@ -602,7 +640,7 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 40
+module_eval <<'.,.,', 'grammar.ra', 26
   def _reduce_1( val, _values, result )
     if val[0].is_a?(AST::ASTArray)
         result = val[0]
@@ -612,29 +650,16 @@ module_eval <<'.,.,', 'grammar.ra', 40
             :children => [val[0]]
         )
     end
-
-    # this is mainly so we can test the parser separately from the
-    # interpreter
-#    if Puppet[:parseonly]
-#        begin
-#            if Puppet[:debug]
-#                puts result.tree(0)
-#            end
-#        rescue NoMethodError => detail
-#            Puppet.err detail
-#            #exit(78)
-#        end
-#        #require 'puppet/parser/interpreter'
-#        #result = Puppet::Server.new(result)
-#    end
    result
   end
 .,.,
 
  # reduce 2 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 54
-  def _reduce_3( val, _values, result )
+ # reduce 3 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 41
+  def _reduce_4( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[1])
         result = val[0]
@@ -649,8 +674,6 @@ module_eval <<'.,.,', 'grammar.ra', 54
   end
 .,.,
 
- # reduce 4 omitted
-
  # reduce 5 omitted
 
  # reduce 6 omitted
@@ -667,51 +690,42 @@ module_eval <<'.,.,', 'grammar.ra', 54
 
  # reduce 12 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 92
-  def _reduce_13( val, _values, result )
-    classnames = aryfy(val[1])
-
-    klasses = []
-    
-    # Now just iterate over each of the class names and create a new
-    # object instance.  FIXME This should probably eventually include
-    # some kind of checking that the asked-for class is a defined class.
-    classnames.each { |classname|
-        emptyary = AST::ASTArray.new(:children => [])
-        klasses << AST::ObjectDef.new(
-            :pin => "{}",
-            :line => @lexer.line,
-            :file => @lexer.file,
-            :type => classname,
-            :params => emptyary
-        )
-    }
-    result = AST::ASTArray.new(
+ # reduce 13 omitted
+
+ # reduce 14 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 64
+  def _reduce_15( val, _values, result )
+    args = aryfy(val[2])
+    result = AST::Function.new(
         :line => @lexer.line,
         :file => @lexer.file,
-        :children => klasses
+        :name => val[0],
+        :arguments => args,
+        :ftype => :statement
     )
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 102
-  def _reduce_14( val, _values, result )
-    classnames = aryfy(val[1])
-
-    result = AST::Tag.new(
+module_eval <<'.,.,', 'grammar.ra', 74
+  def _reduce_16( val, _values, result )
+    args = aryfy(val[1])
+    result = AST::Function.new(
         :line => @lexer.line,
         :file => @lexer.file,
-        :type => val[1]
+        :name => val[0],
+        :arguments => args,
+        :ftype => :statement
     )
    result
   end
 .,.,
 
- # reduce 15 omitted
+ # reduce 17 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 109
-  def _reduce_16( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 93
+  def _reduce_18( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
     result.file = @lexer.file
@@ -719,12 +733,14 @@ module_eval <<'.,.,', 'grammar.ra', 109
   end
 .,.,
 
- # reduce 17 omitted
+ # reduce 19 omitted
+
+ # reduce 20 omitted
 
- # reduce 18 omitted
+ # reduce 21 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 143
-  def _reduce_19( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 128
+  def _reduce_22( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         raise Puppet::ParseError, "Invalid name"
     end
@@ -756,8 +772,8 @@ module_eval <<'.,.,', 'grammar.ra', 143
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 157
-  def _reduce_20( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 142
+  def _reduce_23( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         Puppet.notice "invalid name"
         raise Puppet::ParseError, "Invalid name"
@@ -775,8 +791,8 @@ module_eval <<'.,.,', 'grammar.ra', 157
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 169
-  def _reduce_21( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 154
+  def _reduce_24( val, _values, result )
     # a template setting for a type
     if val[0].instance_of?(AST::ASTArray)
         raise Puppet::ParseError, "Invalid type"
@@ -793,7 +809,45 @@ module_eval <<'.,.,', 'grammar.ra', 169
 .,.,
 
 module_eval <<'.,.,', 'grammar.ra', 177
-  def _reduce_22( val, _values, result )
+  def _reduce_25( val, _values, result )
+    unless Puppet[:storeconfigs]
+        raise Puppet::ParseError, "You cannot collect without storeconfigs being set"
+    end
+
+    if val[1].is_a? AST::TypeDefaults
+        raise Puppet::ParseError, "Defaults are not collectable"
+    end
+
+    # Just mark our objects as collectable and pass them through.
+    if val[1].instance_of?(AST::ASTArray)
+        val[1].each do |obj|
+            obj.collectable = true
+        end
+    else
+        val[1].collectable = true
+    end
+
+    result = val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 190
+  def _reduce_26( val, _values, result )
+    unless Puppet[:storeconfigs]
+        raise Puppet::ParseError, "You cannot collect without storeconfigs being set"
+    end
+    result = AST::Collection.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :type => val[0]
+    )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 198
+  def _reduce_27( val, _values, result )
     result = AST::ObjectInst.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -803,10 +857,10 @@ module_eval <<'.,.,', 'grammar.ra', 177
   end
 .,.,
 
- # reduce 23 omitted
+ # reduce 28 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 191
-  def _reduce_24( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 212
+  def _reduce_29( val, _values, result )
     if val[0].instance_of?(AST::ObjectInst)
         result = AST::ASTArray.new(
             :line => @lexer.line,
@@ -821,12 +875,12 @@ module_eval <<'.,.,', 'grammar.ra', 191
   end
 .,.,
 
- # reduce 25 omitted
+ # reduce 30 omitted
 
- # reduce 26 omitted
+ # reduce 31 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 202
-  def _reduce_27( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 223
+  def _reduce_32( val, _values, result )
     result = AST::Name.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -836,8 +890,8 @@ module_eval <<'.,.,', 'grammar.ra', 202
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 210
-  def _reduce_28( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 231
+  def _reduce_33( val, _values, result )
     result = AST::Type.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -847,20 +901,20 @@ module_eval <<'.,.,', 'grammar.ra', 210
   end
 .,.,
 
- # reduce 29 omitted
+ # reduce 34 omitted
 
- # reduce 30 omitted
+ # reduce 35 omitted
 
- # reduce 31 omitted
+ # reduce 36 omitted
 
- # reduce 32 omitted
+ # reduce 37 omitted
 
- # reduce 33 omitted
+ # reduce 38 omitted
 
- # reduce 34 omitted
+ # reduce 39 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 233
-  def _reduce_35( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 254
+  def _reduce_40( val, _values, result )
     # this is distinct from referencing a variable
     variable = AST::Name.new(
         :line => @lexer.line,
@@ -878,8 +932,8 @@ module_eval <<'.,.,', 'grammar.ra', 233
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 242
-  def _reduce_36( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 263
+  def _reduce_41( val, _values, result )
     result = AST::ASTArray.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -889,15 +943,15 @@ module_eval <<'.,.,', 'grammar.ra', 242
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 242
-  def _reduce_37( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 263
+  def _reduce_42( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 255
-  def _reduce_38( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 276
+  def _reduce_43( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -912,8 +966,8 @@ module_eval <<'.,.,', 'grammar.ra', 255
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 270
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 291
+  def _reduce_44( val, _values, result )
     leaf = AST::String.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -930,10 +984,10 @@ module_eval <<'.,.,', 'grammar.ra', 270
   end
 .,.,
 
- # reduce 40 omitted
+ # reduce 45 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 283
-  def _reduce_41( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 304
+  def _reduce_46( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -947,26 +1001,40 @@ module_eval <<'.,.,', 'grammar.ra', 283
   end
 .,.,
 
- # reduce 42 omitted
+ # reduce 47 omitted
 
- # reduce 43 omitted
+ # reduce 48 omitted
 
- # reduce 44 omitted
+ # reduce 49 omitted
 
- # reduce 45 omitted
+ # reduce 50 omitted
 
- # reduce 46 omitted
+ # reduce 51 omitted
 
- # reduce 47 omitted
+ # reduce 52 omitted
 
- # reduce 48 omitted
+ # reduce 53 omitted
 
- # reduce 49 omitted
+ # reduce 54 omitted
 
- # reduce 50 omitted
+ # reduce 55 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 326
+  def _reduce_56( val, _values, result )
+    args = aryfy(val[2])
+    result = AST::Function.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :name => val[0],
+        :arguments => args,
+        :ftype => :rvalue
+    )
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'grammar.ra', 301
-  def _reduce_51( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 334
+  def _reduce_57( val, _values, result )
     result = AST::String.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -976,8 +1044,8 @@ module_eval <<'.,.,', 'grammar.ra', 301
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 307
-  def _reduce_52( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 340
+  def _reduce_58( val, _values, result )
     result = AST::FlatString.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -987,8 +1055,8 @@ module_eval <<'.,.,', 'grammar.ra', 307
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 315
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 348
+  def _reduce_59( val, _values, result )
     result = AST::Boolean.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -998,8 +1066,8 @@ module_eval <<'.,.,', 'grammar.ra', 315
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 325
-  def _reduce_54( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 358
+  def _reduce_60( val, _values, result )
     result = AST::ObjectRef.new(
         :pin => '[]',
         :line => @lexer.line,
@@ -1011,8 +1079,8 @@ module_eval <<'.,.,', 'grammar.ra', 325
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 342
-  def _reduce_55( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 375
+  def _reduce_61( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = AST::ASTArray.new(
@@ -1031,10 +1099,10 @@ module_eval <<'.,.,', 'grammar.ra', 342
   end
 .,.,
 
- # reduce 56 omitted
+ # reduce 62 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 356
-  def _reduce_57( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 389
+  def _reduce_63( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1049,8 +1117,8 @@ module_eval <<'.,.,', 'grammar.ra', 356
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 366
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 399
+  def _reduce_64( val, _values, result )
     result = AST::CaseOpt.new(
         :pin => ":",
         :value => val[0],
@@ -1062,8 +1130,8 @@ module_eval <<'.,.,', 'grammar.ra', 366
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 378
-  def _reduce_59( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 411
+  def _reduce_65( val, _values, result )
     result = AST::CaseOpt.new(
         :pin => ":",
         :value => val[0],
@@ -1079,10 +1147,10 @@ module_eval <<'.,.,', 'grammar.ra', 378
   end
 .,.,
 
- # reduce 60 omitted
+ # reduce 66 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 392
-  def _reduce_61( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 425
+  def _reduce_67( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1097,8 +1165,8 @@ module_eval <<'.,.,', 'grammar.ra', 392
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 402
-  def _reduce_62( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 435
+  def _reduce_68( val, _values, result )
     result = AST::Selector.new(
         :pin => "?",
         :line => @lexer.line,
@@ -1110,19 +1178,19 @@ module_eval <<'.,.,', 'grammar.ra', 402
   end
 .,.,
 
- # reduce 63 omitted
+ # reduce 69 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 404
-  def _reduce_64( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 437
+  def _reduce_70( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 65 omitted
+ # reduce 71 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 419
-  def _reduce_66( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 452
+  def _reduce_72( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1137,8 +1205,8 @@ module_eval <<'.,.,', 'grammar.ra', 419
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 429
-  def _reduce_67( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 462
+  def _reduce_73( val, _values, result )
     result = AST::ObjectParam.new(
         :pin => "=>",
         :line => @lexer.line,
@@ -1150,34 +1218,20 @@ module_eval <<'.,.,', 'grammar.ra', 429
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 437
-  def _reduce_68( val, _values, result )
-    result = AST::String.new(
-        :line => @lexer.line,
-        :file => @lexer.file,
-        :value => val[0]
-    )
-   result
-  end
-.,.,
+ # reduce 74 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 444
-  def _reduce_69( val, _values, result )
-    result = AST::String.new(
-        :line => @lexer.line,
-        :file => @lexer.file,
-        :value => val[0]
-    )
-   result
-  end
-.,.,
+ # reduce 75 omitted
 
- # reduce 70 omitted
+ # reduce 76 omitted
 
- # reduce 71 omitted
+ # reduce 77 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 453
-  def _reduce_72( val, _values, result )
+ # reduce 78 omitted
+
+ # reduce 79 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 476
+  def _reduce_80( val, _values, result )
     result = AST::Default.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1187,10 +1241,8 @@ module_eval <<'.,.,', 'grammar.ra', 453
   end
 .,.,
 
- # reduce 73 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 506
-  def _reduce_74( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 535
+  def _reduce_81( val, _values, result )
     # importing files
     # yuk, i hate keywords
     # we'll probably have to have some kind of search path eventually
@@ -1203,6 +1255,7 @@ module_eval <<'.,.,', 'grammar.ra', 506
         :file => @lexer.file,
         :line => @lexer.line
     )
+
     Dir.chdir(dir) {
         # We can't interpolate at this point since we don't have any 
         # scopes set up. Warn the user if they use a variable reference
@@ -1213,39 +1266,45 @@ module_eval <<'.,.,', 'grammar.ra', 506
                  " variables are not interpolated for imports " +
                  "in file #{@lexer.file} at line #{@lexer.line}"
              )
-        end         
+        end
         files = Dir.glob(pat)
         if files.size == 0
-            raise Puppet::ImportError.new("No file(s) found for import " + 
-                                          "of '#{pat}'")
+            files = Dir.glob(pat + ".pp")
+            if files.size == 0
+                raise Puppet::ImportError.new("No file(s) found for import " + 
+                                              "of '#{pat}'")
+            end
         end
+
         files.each { |file|
             parser = Puppet::Parser::Parser.new()
             parser.files = self.files
             Puppet.debug("importing '%s'" % file)
+
+            unless file =~ /^#{File::SEPARATOR}/
+                file = File.join(dir, file)
+            end
             begin
-                parser.file = File.join(dir, file)
+                parser.file = file
             rescue Puppet::ImportError
                 Puppet.warning(
                     "Importing %s would result in an import loop" %
                         File.join(dir, file)
                 )
-                result = AST::ASTArray.new(
-                    :file => @lexer.file,
-                    :line => @lexer.line
-                )
                 next
             end
             # push the results into the main result array
-            result.push parser.parse
+            parser.parse.each do |child|
+                result.push child
+            end
         }
     }
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 517
-  def _reduce_75( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 546
+  def _reduce_82( val, _values, result )
     result = AST::CompDef.new(
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
         :args => val[2],
@@ -1258,8 +1317,8 @@ module_eval <<'.,.,', 'grammar.ra', 517
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 530
-  def _reduce_76( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 559
+  def _reduce_83( val, _values, result )
     result = AST::CompDef.new(
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
         :args => val[2],
@@ -1276,8 +1335,8 @@ module_eval <<'.,.,', 'grammar.ra', 530
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 547
-  def _reduce_77( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 576
+  def _reduce_84( val, _values, result )
         #:args => val[2],
     args = {
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
@@ -1295,8 +1354,8 @@ module_eval <<'.,.,', 'grammar.ra', 547
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 564
-  def _reduce_78( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 593
+  def _reduce_85( val, _values, result )
     args = {
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
         :file => @lexer.file,
@@ -1317,8 +1376,8 @@ module_eval <<'.,.,', 'grammar.ra', 564
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 585
-  def _reduce_79( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 614
+  def _reduce_86( val, _values, result )
     unless val[1].instance_of?(AST::ASTArray)
         val[1] = AST::ASTArray.new(
             :line => val[1].line,
@@ -1341,8 +1400,8 @@ module_eval <<'.,.,', 'grammar.ra', 585
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 608
-  def _reduce_80( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 637
+  def _reduce_87( val, _values, result )
     unless val[1].instance_of?(AST::ASTArray)
         val[1] = AST::ASTArray.new(
             :line => val[1].line,
@@ -1369,26 +1428,26 @@ module_eval <<'.,.,', 'grammar.ra', 608
   end
 .,.,
 
- # reduce 81 omitted
+ # reduce 88 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 622
-  def _reduce_82( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 652
+  def _reduce_89( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0]
-        result.push val[1]
+        result.push val[2]
     else
         result = AST::ASTArray.new(
             :line => @lexer.line,
             :file => @lexer.file,
-            :children => [val[0], val[1]]
+            :children => [val[0], val[2]]
         )
     end
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 630
-  def _reduce_83( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 660
+  def _reduce_90( val, _values, result )
    result = AST::HostName.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1398,8 +1457,8 @@ module_eval <<'.,.,', 'grammar.ra', 630
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 636
-  def _reduce_84( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 666
+  def _reduce_91( val, _values, result )
    result = AST::HostName.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1409,8 +1468,19 @@ module_eval <<'.,.,', 'grammar.ra', 636
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 644
-  def _reduce_85( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 672
+  def _reduce_92( val, _values, result )
+    result = AST::Default.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :value => val[0]
+    )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 680
+  def _reduce_93( val, _values, result )
     result = AST::ASTArray.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1420,17 +1490,17 @@ module_eval <<'.,.,', 'grammar.ra', 644
   end
 .,.,
 
- # reduce 86 omitted
+ # reduce 94 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 649
-  def _reduce_87( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 685
+  def _reduce_95( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 660
-  def _reduce_88( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 696
+  def _reduce_96( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1444,10 +1514,10 @@ module_eval <<'.,.,', 'grammar.ra', 660
   end
 .,.,
 
- # reduce 89 omitted
+ # reduce 97 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 674
-  def _reduce_90( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 710
+  def _reduce_98( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1462,8 +1532,8 @@ module_eval <<'.,.,', 'grammar.ra', 674
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 682
-  def _reduce_91( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 718
+  def _reduce_99( val, _values, result )
     result = AST::CompArgument.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1473,8 +1543,8 @@ module_eval <<'.,.,', 'grammar.ra', 682
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 689
-  def _reduce_92( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 725
+  def _reduce_100( val, _values, result )
     result = AST::CompArgument.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1484,10 +1554,10 @@ module_eval <<'.,.,', 'grammar.ra', 689
   end
 .,.,
 
- # reduce 93 omitted
+ # reduce 101 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 698
-  def _reduce_94( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 734
+  def _reduce_102( val, _values, result )
     result = AST::Name.new(
         :value => val[1],
         :file => @lexer.file,
@@ -1497,8 +1567,8 @@ module_eval <<'.,.,', 'grammar.ra', 698
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 707
-  def _reduce_95( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 743
+  def _reduce_103( val, _values, result )
     name = val[0].sub(/^\$/,'')
     result = AST::Variable.new(
         :line => @lexer.line,
@@ -1509,8 +1579,8 @@ module_eval <<'.,.,', 'grammar.ra', 707
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 719
-  def _reduce_96( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 755
+  def _reduce_104( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1524,14 +1594,25 @@ module_eval <<'.,.,', 'grammar.ra', 719
   end
 .,.,
 
- # reduce 97 omitted
+module_eval <<'.,.,', 'grammar.ra', 761
+  def _reduce_105( val, _values, result )
+    result = AST::ASTArray.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :children => []
+    )
+   result
+  end
+.,.,
 
- # reduce 98 omitted
+ # reduce 106 omitted
 
- # reduce 99 omitted
+ # reduce 107 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 724
-  def _reduce_100( val, _values, result )
+ # reduce 108 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 766
+  def _reduce_109( val, _values, result )
  result = nil
    result
   end