puppet 0.13.6 → 0.16.0

data/lib/puppet/parser/ast/selector.rb

@@ -19,6 +19,8 @@ class Puppet::Parser::AST
 
             default = nil
 
+            @values = [@values] unless @values.instance_of? AST::ASTArray
+
             # Then look for a match in the options.
             @values.each { |obj|
                 param = obj.param.safeevaluate(:scope => scope)

data/lib/puppet/parser/ast/tag.rb

@@ -0,0 +1,26 @@
+class Puppet::Parser::AST
+    # The code associated with a class.  This is different from components
+    # in that each class is a singleton -- only one will exist for a given
+    # node.
+    class Tag < AST::Branch
+        @name = :class
+        attr_accessor :type
+
+        def evaluate(hash)
+            scope = hash[:scope]
+
+            types = @type.safeevaluate(:scope => scope)
+
+            types = [types] unless types.is_a? Array
+
+            types.each do |type|
+                # Now set our class.  We don't have to worry about checking
+                # whether we've been evaluated because we're not evaluating
+                # any code.
+                scope.setclass(self.object_id, type)
+            end
+        end
+    end
+end
+
+# $Id: tag.rb 1113 2006-04-17 16:15:33Z luke $

data/lib/puppet/parser/interpreter.rb

@@ -10,6 +10,8 @@ require 'puppet/parser/scope'
 module Puppet
     module Parser
         class Interpreter
+            include Puppet::Util
+
             Puppet.setdefaults("ldap",
                 :ldapnodes => [false,
                     "Whether to search for node configurations in LDAP."],
@@ -42,11 +44,11 @@ module Puppet
 
             # create our interpreter
             def initialize(hash)
-                unless hash.include?(:Manifest)
-                    raise Puppet::DevError, "Interpreter was not passed a manifest"
+                if @code = hash[:Code]
+                    @file = nil # to avoid warnings
+                elsif ! @file = hash[:Manifest]
+                    raise Puppet::DevError, "You must provide code or a manifest"
                 end
-
-                @file = hash[:Manifest]
                 @filetimeout = hash[:ParseCheck] || 15
 
                 @lastchecked = 0
@@ -75,10 +77,10 @@ module Puppet
                 # by the cfengine module.
                 @classes = hash[:Classes] || []
 
+                @local = hash[:Local] || false
+
                 # Create our parser object
                 parsefiles
-
-                evaluate
             end
 
             # Connect to the LDAP Server
@@ -87,6 +89,7 @@ module Puppet
                     require 'ldap'
                 rescue LoadError
                     @ldap = nil
+                    return
                 end
                 begin
                     @ldap = LDAP::Conn.new(Puppet[:ldapserver], Puppet[:ldapport])
@@ -97,6 +100,25 @@ module Puppet
                 end
             end
 
+            # Search for our node in the various locations.
+            def nodesearch(node)
+                # At this point, stop at the first source that defines
+                # the node
+                @nodesources.each do |source|
+                    method = "nodesearch_%s" % source
+                    if self.respond_to? method
+                        parent, nodeclasses = self.send(method, node)
+                    end
+
+                    if nodeclasses
+                        Puppet.info "Found %s in %s" % [node, source]
+                        return parent, nodeclasses
+                    end
+                end
+
+                return nil, nil
+            end
+
             # Find the ldap node and extra the info, returning just
             # the critical data.
             def nodesearch_ldap(node)
@@ -165,69 +187,49 @@ module Puppet
                 # but for now just make a simple array
                 names = [client]
 
-                # if the client name is fully qualied (which is normally will be)
-                # add the short name
+                # Make sure both the fqdn and the short name of the
+                # host can be used in the manifest
                 if client =~ /\./
                     names << client.sub(/\..+/,'')
+                else
+                    names << "#{client}.#{facts['domain']}"
                 end
 
-                begin
-                    if @usenodes
-                        unless client
-                            raise Puppet::Error,
-                                "Cannot evaluate nodes with a nil client"
-                        end
+                scope = Puppet::Parser::Scope.new() # no parent scope
+                scope.name = "top"
+                scope.type = "puppet"
+                scope.interp = self
 
-                        classes = nil
-                        parent = nil
-                        # At this point, stop at the first source that defines
-                        # the node
-                        @nodesources.each do |source|
-                            method = "nodesearch_%s" % source
-                            if self.respond_to? method
-                                parent, classes = self.send(method, client)
-                            end
+                classes = @classes.dup
 
-                            if classes
-                                Puppet.info "Found %s in %s" % [client, source]
-                                break
-                            end
-                        end
+                args = {:ast => @ast, :facts => facts, :classes => classes}
 
-                        # We've already evaluated the AST, in this case
-                        #return @scope.evalnode(names, facts, classes, parent)
-                        return @scope.evalnode(
-                            :name => names,
-                            :facts => facts,
-                            :classes => classes,
-                            :parent => parent
-                        )
-                    else
-                        # We've already evaluated the AST, in this case
-                        @scope = Puppet::Parser::Scope.new() # no parent scope
-                        @scope.interp = self
-                        #return @scope.evaluate(@ast, facts, @classes)
-                        return @scope.evaluate(
-                            :ast => @ast,
-                            :facts => facts,
-                            :classes => @classes
-                        )
+                if @usenodes
+                    unless client
+                        raise Puppet::Error,
+                            "Cannot evaluate nodes with a nil client"
                     end
-                    #@ast.evaluate(@scope)
+
+                    args[:names] = names
+
+                    parent, nodeclasses = nodesearch(client)
+
+                    args[:classes] += nodeclasses if nodeclasses
+
+                    args[:parentnode] = parent if parent
+                end
+
+                begin
+                    return scope.evaluate(args)
                 rescue Puppet::DevError, Puppet::Error, Puppet::ParseError => except
-                    #Puppet.err "File %s, line %s: %s" %
-                    #    [except.file, except.line, except.message]
-                    if Puppet[:debug]
-                        puts except.backtrace
-                    end
-                    #exit(1)
                     raise
                 rescue => except
                     error = Puppet::DevError.new("%s: %s" %
                         [except.class, except.message])
-                    if Puppet[:debug]
-                        puts except.backtrace
-                    end
+                    error.backtrace = except.backtrace
+                    #if Puppet[:debug]
+                    #    puts except.backtrace
+                    #end
                     raise error
                 end
             end
@@ -258,24 +260,26 @@ module Puppet
             end
 
             def parsefiles
-                if defined? @parser
-                    # Only check the files every 15 seconds or so, not on
-                    # every single connection
-                    if (Time.now - @lastchecked).to_i >= @filetimeout.to_i
-                        unless @parser.reparse?
-                            @lastchecked = Time.now
-                            return false
+                if @file
+                    if defined? @parser
+                        # Only check the files every 15 seconds or so, not on
+                        # every single connection
+                        if (Time.now - @lastchecked).to_i >= @filetimeout.to_i
+                            unless @parser.reparse?
+                                @lastchecked = Time.now
+                                return false
+                            end
+                        else
+                            return
                         end
-                    else
-                        return
                     end
-                end
 
-                unless FileTest.exists?(@file)
-                    if @ast
-                        return
-                    else
-                        raise Puppet::Error, "Manifest %s must exist" % @file
+                    unless FileTest.exists?(@file)
+                        if @ast
+                            return
+                        else
+                            raise Puppet::Error, "Manifest %s must exist" % @file
+                        end
                     end
                 end
 
@@ -284,8 +288,19 @@ module Puppet
                 end
                 # should i be creating a new parser each time...?
                 @parser = Puppet::Parser::Parser.new()
-                @parser.file = @file
-                @ast = @parser.parse
+                if @code
+                    @parser.string = @code
+                else
+                    @parser.file = @file
+                end
+
+                if @local
+                    @ast = @parser.parse
+                else
+                    @ast = benchmark(:info, "Parsed manifest") do
+                        @parser.parse
+                    end
+                end
 
                 # Mark when we parsed, so we can check freshness
                 @parsedate = Time.now.to_i
@@ -299,4 +314,4 @@ module Puppet
     end
 end
 
-# $Id: interpreter.rb 962 2006-03-01 22:28:27Z luke $
+# $Id: interpreter.rb 1103 2006-04-11 17:33:36Z luke $

data/lib/puppet/parser/lexer.rb

@@ -21,9 +21,9 @@ module Puppet
                 %r{\}} => :RBRACE,
                 %r{\(} => :LPAREN,
                 %r{\)} => :RPAREN,
-                %r{"} => :DQUOTE,
+                %r{\"} => :DQUOTE,
                 %r{\n} => :RETURN,
-                %r{'} => :SQUOTE,
+                %r{\'} => :SQUOTE,
                 %r{=} => :EQUALS,
                 %r{==} => :ISEQUAL,
                 %r{>=} => :GREATEREQUAL,
@@ -54,6 +54,7 @@ module Puppet
                 "include" => :INCLUDE,
                 "inherits" => :INHERITS,
                 "node" => :NODE,
+                "tag" => :TAG,
                 "true" => :BOOLEAN
             }
 
@@ -228,4 +229,4 @@ module Puppet
     end
 end
 
-# $Id: lexer.rb 923 2006-02-16 20:15:41Z luke $
+# $Id: lexer.rb 1106 2006-04-11 22:32:51Z luke $

data/lib/puppet/parser/parser.rb

@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id466d6c46dd', 'grammar.ra', 716
+module_eval <<'..end grammar.ra modeval..idb478f6db18', 'grammar.ra', 745
 attr_reader :file
 attr_accessor :files
 
@@ -143,284 +143,303 @@ def string=(string)
     @lexer.string = string
 end
 
-# $Id: parser.rb 954 2006-02-27 22:49:48Z luke $
-..end grammar.ra modeval..id466d6c46dd
+# Make emacs happy
+# Local Variables:
+# mode: ruby
+# End:
+
+# $Id: parser.rb 1106 2006-04-11 22:32:51Z luke $
+
+..end grammar.ra modeval..idb478f6db18
 
 ##### racc 1.4.4 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 42, :_reduce_1,
- 1, 43, :_reduce_none,
- 2, 43, :_reduce_3,
- 1, 44, :_reduce_none,
- 1, 44, :_reduce_none,
- 1, 44, :_reduce_none,
+ 1, 43, :_reduce_1,
  1, 44, :_reduce_none,
- 1, 44, :_reduce_none,
- 1, 44, :_reduce_none,
- 1, 44, :_reduce_none,
- 1, 44, :_reduce_none,
- 2, 49, :_reduce_12,
- 1, 53, :_reduce_none,
- 3, 53, :_reduce_14,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 5, 45, :_reduce_17,
- 5, 45, :_reduce_18,
- 5, 45, :_reduce_19,
- 4, 62, :_reduce_20,
- 1, 57, :_reduce_none,
- 3, 57, :_reduce_22,
- 0, 58, :_reduce_none,
- 1, 58, :_reduce_none,
- 1, 55, :_reduce_25,
- 1, 61, :_reduce_26,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 3, 46, :_reduce_33,
- 0, 59, :_reduce_34,
- 1, 59, :_reduce_35,
- 3, 59, :_reduce_36,
- 3, 68, :_reduce_37,
+ 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,
+ 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,
- 3, 69, :_reduce_39,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 67, :_reduce_none,
- 1, 64, :_reduce_49,
- 1, 64, :_reduce_50,
- 1, 71, :_reduce_51,
- 4, 72, :_reduce_52,
- 5, 47, :_reduce_53,
- 1, 73, :_reduce_none,
- 2, 73, :_reduce_55,
- 5, 74, :_reduce_56,
- 4, 74, :_reduce_57,
+ 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, 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,
- 3, 75, :_reduce_59,
- 3, 65, :_reduce_60,
+ 2, 75, :_reduce_57,
+ 5, 76, :_reduce_58,
+ 4, 76, :_reduce_59,
  1, 77, :_reduce_none,
- 3, 77, :_reduce_62,
+ 3, 77, :_reduce_61,
+ 3, 67, :_reduce_62,
  1, 79, :_reduce_none,
  3, 79, :_reduce_64,
- 3, 78, :_reduce_65,
- 1, 76, :_reduce_66,
- 1, 76, :_reduce_67,
- 1, 76, :_reduce_none,
- 1, 76, :_reduce_69,
- 1, 76, :_reduce_none,
- 2, 48, :_reduce_71,
- 6, 50, :_reduce_72,
- 5, 50, :_reduce_73,
- 6, 51, :_reduce_74,
- 5, 51, :_reduce_75,
- 6, 52, :_reduce_76,
- 5, 52, :_reduce_77,
- 1, 82, :_reduce_none,
- 2, 82, :_reduce_79,
- 0, 83, :_reduce_80,
- 1, 80, :_reduce_none,
- 3, 80, :_reduce_82,
- 3, 80, :_reduce_83,
- 1, 84, :_reduce_none,
- 3, 84, :_reduce_85,
- 3, 85, :_reduce_86,
- 1, 85, :_reduce_87,
  1, 81, :_reduce_none,
- 2, 81, :_reduce_89,
- 1, 56, :_reduce_90,
- 3, 66, :_reduce_91,
- 1, 70, :_reduce_none,
- 1, 70, :_reduce_none,
- 0, 60, :_reduce_none,
- 1, 60, :_reduce_95 ]
-
-racc_reduce_n = 96
-
-racc_shift_n = 157
+ 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,
+ 1, 82, :_reduce_none,
+ 3, 82, :_reduce_87,
+ 3, 82, :_reduce_88,
+ 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 ]
+
+racc_reduce_n = 101
+
+racc_shift_n = 166
 
 racc_action_table = [
-    24,    25,    24,    25,   132,    24,    25,    35,    24,    25,
-   127,   105,    35,    24,    25,     7,   126,   129,    24,    25,
-     7,    77,    67,    24,    25,   125,    23,     7,   131,    39,
-    84,    39,    94,    95,    94,    95,    97,    39,    97,    81,
-    94,    95,    39,   112,    97,    94,    95,    39,   113,    97,
-    94,    95,    39,   108,    97,    94,    95,   109,   110,    97,
-    33,    24,    25,    33,    24,    25,    69,   115,   116,    33,
-    24,    25,    78,    77,    33,    24,    25,   119,    73,    33,
-    24,    25,   149,    73,   109,   110,    35,    73,   124,    35,
-    39,    84,    83,     4,     7,    35,     4,     7,   128,    39,
-    35,    42,     4,     7,    39,    35,    69,     4,     7,    39,
-    68,   135,     4,     7,    33,    24,    25,    33,    24,    25,
-     7,   137,    65,    33,    24,    25,    50,    86,    33,    24,
-    25,     7,    88,    33,    24,    25,     7,   146,    43,    87,
-    35,    42,    41,    35,    39,    27,    86,     4,     7,    35,
-     4,    57,   138,    39,    35,    23,     4,     7,    39,    35,
-    86,     4,     7,    39,   nil,   nil,     4,     7,   156,   nil,
-     6,     9,   nil,    13,    16,   nil,    20,   nil,   nil,   nil,
-     4,     7,   nil,    11,   153,    17,     6,     9,   nil,    13,
-    16,   nil,    20,   nil,   nil,   nil,     4,     7,   nil,    11,
-   140,    17,     6,     9,   nil,    13,    16,   nil,    20,   nil,
-   nil,   nil,     4,     7,   nil,    11,   122,    17,     6,     9,
-   nil,    13,    16,   nil,    20,   nil,   nil,   nil,     4,     7,
-   nil,    11,   152,    17,     6,     9,   nil,    13,    16,   nil,
-    20,   nil,   nil,   nil,     4,     7,   nil,    11,   151,    17,
-     6,     9,   nil,    13,    16,   nil,    20,   nil,   nil,   nil,
-     4,     7,   nil,    11,   143,    17,     6,     9,   nil,    13,
-    16,   nil,    20,   nil,   nil,   nil,     4,     7,   nil,    11,
-   nil,    17,     6,     9,   nil,    13,    16,   nil,    20,   nil,
-   nil,   nil,     4,     7,   nil,    11,   nil,    17,     6,     9,
-   nil,    13,    16,   nil,    20,   nil,   nil,   nil,     4,     7,
-   nil,    11,   nil,    17,     6,     9,   nil,    13,    16,   nil,
-    20,   nil,   nil,   nil,     4,     7,   nil,    11,   nil,    17 ]
+    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 ]
 
 racc_action_check = [
-    68,    68,   148,   148,   101,     6,     6,    17,    69,    69,
-    91,    69,    78,    98,    98,    17,    91,    98,   132,   132,
-    78,    49,    29,   105,   105,    90,    29,    49,   101,    68,
-    73,   148,    68,    68,   148,   148,    68,    69,   148,    50,
-    69,    69,    98,    75,    69,    98,    98,   132,    77,    98,
-   132,   132,   105,    71,   132,   105,   105,    71,    71,   105,
-   135,   135,   135,    83,    83,    83,    54,    80,    82,    11,
-    11,    11,    46,    43,    84,    84,    84,    85,    86,    41,
-    41,    41,   134,    87,   134,   134,   135,    42,    89,    83,
-   135,    57,    56,   135,   135,    11,    83,    83,    93,    11,
-    84,    37,    11,    11,    84,    41,    31,    84,    84,    41,
-    30,   106,    41,    41,    67,    67,    67,    23,    23,    23,
-    65,   111,    27,    33,    33,    33,    21,   121,   107,   107,
-   107,    20,    64,   124,   124,   124,   127,   131,    16,    61,
-    67,    14,    13,    23,    67,     9,    58,    67,    67,    33,
-    23,    23,   112,    33,   107,     1,    33,    33,   107,   124,
-    74,   107,   107,   124,   nil,   nil,   124,   124,   154,   nil,
-   112,   112,   nil,   112,   112,   nil,   112,   nil,   nil,   nil,
-   112,   112,   nil,   112,   146,   112,   154,   154,   nil,   154,
-   154,   nil,   154,   nil,   nil,   nil,   154,   154,   nil,   154,
-   115,   154,   146,   146,   nil,   146,   146,   nil,   146,   nil,
-   nil,   nil,   146,   146,   nil,   146,    88,   146,   115,   115,
-   nil,   115,   115,   nil,   115,   nil,   nil,   nil,   115,   115,
-   nil,   115,   141,   115,    88,    88,   nil,    88,    88,   nil,
-    88,   nil,   nil,   nil,    88,    88,   nil,    88,   139,    88,
-   141,   141,   nil,   141,   141,   nil,   141,   nil,   nil,   nil,
-   141,   141,   nil,   141,   123,   141,   139,   139,   nil,   139,
-   139,   nil,   139,   nil,   nil,   nil,   139,   139,   nil,   139,
-   nil,   139,   123,   123,   nil,   123,   123,   nil,   123,   nil,
-   nil,   nil,   123,   123,   nil,   123,   nil,   123,    22,    22,
-   nil,    22,    22,   nil,    22,   nil,   nil,   nil,    22,    22,
-   nil,    22,   nil,    22,     0,     0,   nil,     0,     0,   nil,
-     0,   nil,   nil,   nil,     0,     0,   nil,     0,   nil,     0 ]
+   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 ]
 
 racc_action_pointer = [
-   289,   149,   nil,   nil,   nil,   nil,     2,   nil,   nil,   109,
-   nil,    67,   nil,   129,   135,   nil,   102,   -21,   nil,   nil,
-    95,   126,   273,   115,   nil,   nil,   nil,   107,   nil,    20,
-   104,    92,   nil,   121,   nil,   nil,   nil,    95,   nil,   nil,
-   nil,    77,    51,    43,   nil,   nil,    62,   nil,   nil,    -9,
-    39,   nil,   nil,   nil,    52,   nil,    55,    82,   136,   nil,
-   nil,   105,   nil,   nil,   126,    84,   nil,   112,    -3,     5,
-   nil,    48,   nil,    21,   150,    37,   nil,    12,   -16,   nil,
-    61,   nil,    61,    61,    72,    70,    42,    47,   209,    75,
-     9,     0,   nil,    93,   nil,   nil,   nil,   nil,    10,   nil,
-   nil,    -6,   nil,   nil,   nil,    20,   102,   126,   nil,   nil,
-   nil,   114,   145,   nil,   nil,   193,   nil,   nil,   nil,   nil,
-   nil,   117,   nil,   257,   131,   nil,   nil,   100,   nil,   nil,
-   nil,   131,    15,   nil,    75,    58,   nil,   nil,   nil,   241,
-   nil,   225,   nil,   nil,   nil,   nil,   177,   nil,    -1,   nil,
-   nil,   nil,   nil,   nil,   161,   nil,   nil ]
+   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 ]
 
 racc_action_default = [
-   -96,   -96,    -2,    -4,   -26,    -5,   -96,   -25,    -6,   -96,
-    -7,   -96,    -8,   -96,   -96,    -9,   -96,   -96,   -10,   -11,
-   -96,   -96,    -1,   -34,   -49,   -50,   -71,   -80,   -47,   -41,
-   -96,   -46,   -45,   -96,   -43,   -90,   -48,   -42,   -40,   -51,
-   -44,   -96,   -34,   -80,   -15,   -16,   -12,   -13,   -78,   -80,
-   -96,    -3,   -32,   -28,   -31,   -35,   -23,   -25,   -94,   -29,
-   -21,   -96,   -27,   -30,   -96,   -80,   -81,   -96,   -96,   -96,
-   -38,   -96,   -33,   -96,   -94,   -96,   -88,   -96,   -96,   -79,
-   -96,   157,   -96,   -24,   -96,   -96,   -95,   -34,   -96,   -87,
-   -96,   -96,   -84,   -96,   -67,   -66,   -70,   -69,   -96,   -54,
-   -68,   -96,   -58,   -60,   -61,   -96,   -96,   -96,   -91,   -92,
-   -93,   -96,   -96,   -89,   -14,   -96,   -17,   -22,   -37,   -18,
-   -36,   -94,   -73,   -96,   -96,   -82,   -83,   -96,   -52,   -53,
-   -55,   -96,   -96,   -63,   -96,   -96,   -39,   -19,   -75,   -96,
-   -77,   -96,   -20,   -72,   -86,   -85,   -96,   -59,   -96,   -62,
-   -65,   -74,   -76,   -57,   -96,   -64,   -56 ]
+  -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 ]
 
 racc_goto_table = [
-    22,    26,    51,   107,   102,    58,    96,    96,   104,    32,
-    45,    37,    85,    47,    66,    92,    54,    99,    62,    63,
-    60,    52,   103,    59,    74,    56,    75,    82,   111,    30,
-    98,    32,    80,    37,   102,    46,    96,   134,    64,    32,
-    71,    37,    49,    96,   133,   120,    91,   130,    21,   nil,
-   nil,    70,    90,   nil,   nil,   nil,   nil,   nil,   nil,    72,
-   nil,   nil,   nil,   100,   100,    32,   148,    37,   147,   121,
-    96,    45,   nil,   nil,   114,   142,    54,   145,    62,    63,
-   117,    52,    32,    59,    37,    93,    96,   155,   123,   nil,
-   nil,   nil,   nil,   100,   nil,   nil,   nil,   nil,   nil,   nil,
-   100,   nil,   118,    51,   nil,    32,   nil,    37,   nil,   nil,
-   nil,   nil,   139,   nil,    29,   141,   nil,   nil,   nil,    51,
-    44,    51,    32,    48,    37,   136,    53,   100,   nil,   nil,
-   nil,   nil,   nil,    32,    51,    37,    29,   nil,   nil,   nil,
-   nil,   nil,   144,   100,    29,   nil,   154,   nil,   nil,   nil,
-   nil,   nil,    79,   150,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    89,   nil,
-    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    44,   nil,   nil,   nil,   nil,    53,    29,   nil,   nil,
+    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,
-    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,   nil,   nil,
-    89,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29 ]
+   nil,   nil,   104 ]
 
 racc_goto_check = [
-     2,    23,     3,    29,    35,    18,    30,    30,    37,     4,
-    15,    20,    19,    13,    42,    44,    15,    33,    23,    24,
-    21,    25,    36,    20,    18,    16,    40,    17,    19,    26,
-    32,     4,    40,    20,    35,    12,    30,    38,    39,     4,
-    28,    20,    41,    30,    37,    27,    43,    33,     1,   nil,
-   nil,    26,    42,   nil,   nil,   nil,   nil,   nil,   nil,    26,
-   nil,   nil,   nil,    23,    23,     4,    29,    20,    35,    18,
-    30,    15,   nil,   nil,    13,    19,    15,    44,    23,    24,
-    21,    25,     4,    20,    20,    26,    30,    37,     2,   nil,
-   nil,   nil,   nil,    23,   nil,   nil,   nil,   nil,   nil,   nil,
-    23,   nil,    26,     3,   nil,     4,   nil,    20,   nil,   nil,
-   nil,   nil,     2,   nil,    14,     2,   nil,   nil,   nil,     3,
-    14,     3,     4,    14,    20,    26,    14,    23,   nil,   nil,
-   nil,   nil,   nil,     4,     3,    20,    14,   nil,   nil,   nil,
-   nil,   nil,    26,    23,    14,   nil,     2,   nil,   nil,   nil,
-   nil,   nil,    14,    26,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,
-    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    14,   nil,   nil,   nil,   nil,    14,    14,   nil,   nil,
+     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,
-    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,   nil,
-    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14 ]
+   nil,   nil,    36 ]
 
 racc_goto_pointer = [
-   nil,    48,     0,   -20,    -2,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    18,    -4,   103,    -7,     2,   -29,   -18,   -46,
-     0,    -3,   nil,    -5,    -4,    -2,    18,   -41,     7,   -68,
-   -62,   nil,   -38,   -51,   nil,   -64,   -47,   -61,   -68,    11,
-   -17,    22,   -13,   -19,   -50 ]
+   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 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     2,     3,     5,     8,    10,    12,    15,
-    18,    19,   nil,   nil,     1,    31,   nil,   nil,   nil,   nil,
-    14,   nil,    61,    38,    40,    28,   nil,    55,   nil,   nil,
-    34,    36,   nil,   nil,   101,   106,   nil,   nil,   nil,   nil,
-   nil,   nil,    76,   nil,   nil ]
+   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 ]
 
 racc_token_table = {
  false => 0,
@@ -463,11 +482,12 @@ racc_token_table = {
  :SEMIC => 37,
  :CASE => 38,
  :DEFAULT => 39,
- :INCLUDE => 40 }
+ :INCLUDE => 40,
+ :TAG => 41 }
 
 racc_use_result_var = true
 
-racc_nt_base = 41
+racc_nt_base = 42
 
 Racc_arg = [
  racc_action_table,
@@ -527,6 +547,7 @@ Racc_token_to_s_table = [
 'CASE',
 'DEFAULT',
 'INCLUDE',
+'TAG',
 '$start',
 'program',
 'statements',
@@ -536,6 +557,7 @@ Racc_token_to_s_table = [
 'casestatement',
 'import',
 'include',
+'tag',
 'definition',
 'hostclass',
 'nodedef',
@@ -568,7 +590,8 @@ Racc_token_to_s_table = [
 'sintvalues',
 'argumentlist',
 'parent',
-'names',
+'hostnames',
+'hostname',
 'nothing',
 'arguments',
 'argument']
@@ -579,7 +602,7 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 37
+module_eval <<'.,.,', 'grammar.ra', 40
   def _reduce_1( val, _values, result )
     if val[0].is_a?(AST::ASTArray)
         result = val[0]
@@ -610,7 +633,7 @@ module_eval <<'.,.,', 'grammar.ra', 37
 
  # reduce 2 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 51
+module_eval <<'.,.,', 'grammar.ra', 54
   def _reduce_3( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[1])
@@ -642,8 +665,10 @@ module_eval <<'.,.,', 'grammar.ra', 51
 
  # reduce 11 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 88
-  def _reduce_12( val, _values, result )
+ # reduce 12 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 92
+  def _reduce_13( val, _values, result )
     classnames = aryfy(val[1])
 
     klasses = []
@@ -670,10 +695,23 @@ module_eval <<'.,.,', 'grammar.ra', 88
   end
 .,.,
 
- # reduce 13 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 95
+module_eval <<'.,.,', 'grammar.ra', 102
   def _reduce_14( val, _values, result )
+    classnames = aryfy(val[1])
+
+    result = AST::Tag.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :type => val[1]
+    )
+   result
+  end
+.,.,
+
+ # reduce 15 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 109
+  def _reduce_16( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
     result.file = @lexer.file
@@ -681,12 +719,12 @@ module_eval <<'.,.,', 'grammar.ra', 95
   end
 .,.,
 
- # reduce 15 omitted
+ # reduce 17 omitted
 
- # reduce 16 omitted
+ # reduce 18 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 129
-  def _reduce_17( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 143
+  def _reduce_19( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         raise Puppet::ParseError, "Invalid name"
     end
@@ -718,8 +756,8 @@ module_eval <<'.,.,', 'grammar.ra', 129
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 143
-  def _reduce_18( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 157
+  def _reduce_20( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         Puppet.notice "invalid name"
         raise Puppet::ParseError, "Invalid name"
@@ -737,8 +775,8 @@ module_eval <<'.,.,', 'grammar.ra', 143
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 155
-  def _reduce_19( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 169
+  def _reduce_21( val, _values, result )
     # a template setting for a type
     if val[0].instance_of?(AST::ASTArray)
         raise Puppet::ParseError, "Invalid type"
@@ -754,8 +792,8 @@ module_eval <<'.,.,', 'grammar.ra', 155
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 163
-  def _reduce_20( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 177
+  def _reduce_22( val, _values, result )
     result = AST::ObjectInst.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -765,10 +803,10 @@ module_eval <<'.,.,', 'grammar.ra', 163
   end
 .,.,
 
- # reduce 21 omitted
+ # reduce 23 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 177
-  def _reduce_22( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 191
+  def _reduce_24( val, _values, result )
     if val[0].instance_of?(AST::ObjectInst)
         result = AST::ASTArray.new(
             :line => @lexer.line,
@@ -783,12 +821,12 @@ module_eval <<'.,.,', 'grammar.ra', 177
   end
 .,.,
 
- # reduce 23 omitted
+ # reduce 25 omitted
 
- # reduce 24 omitted
+ # reduce 26 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 188
-  def _reduce_25( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 202
+  def _reduce_27( val, _values, result )
     result = AST::Name.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -798,8 +836,8 @@ module_eval <<'.,.,', 'grammar.ra', 188
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 196
-  def _reduce_26( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 210
+  def _reduce_28( val, _values, result )
     result = AST::Type.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -809,10 +847,6 @@ module_eval <<'.,.,', 'grammar.ra', 196
   end
 .,.,
 
- # reduce 27 omitted
-
- # reduce 28 omitted
-
  # reduce 29 omitted
 
  # reduce 30 omitted
@@ -821,8 +855,12 @@ module_eval <<'.,.,', 'grammar.ra', 196
 
  # reduce 32 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 219
-  def _reduce_33( val, _values, result )
+ # reduce 33 omitted
+
+ # reduce 34 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 233
+  def _reduce_35( val, _values, result )
     # this is distinct from referencing a variable
     variable = AST::Name.new(
         :line => @lexer.line,
@@ -840,8 +878,8 @@ module_eval <<'.,.,', 'grammar.ra', 219
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 228
-  def _reduce_34( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 242
+  def _reduce_36( val, _values, result )
     result = AST::ASTArray.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -851,15 +889,15 @@ module_eval <<'.,.,', 'grammar.ra', 228
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 228
-  def _reduce_35( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 242
+  def _reduce_37( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 241
-  def _reduce_36( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 255
+  def _reduce_38( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -874,8 +912,8 @@ module_eval <<'.,.,', 'grammar.ra', 241
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 256
-  def _reduce_37( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 270
+  def _reduce_39( val, _values, result )
     leaf = AST::String.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -892,10 +930,10 @@ module_eval <<'.,.,', 'grammar.ra', 256
   end
 .,.,
 
- # reduce 38 omitted
+ # reduce 40 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 269
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 283
+  def _reduce_41( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -909,10 +947,6 @@ module_eval <<'.,.,', 'grammar.ra', 269
   end
 .,.,
 
- # reduce 40 omitted
-
- # reduce 41 omitted
-
  # reduce 42 omitted
 
  # reduce 43 omitted
@@ -927,8 +961,12 @@ module_eval <<'.,.,', 'grammar.ra', 269
 
  # reduce 48 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 287
-  def _reduce_49( val, _values, result )
+ # reduce 49 omitted
+
+ # reduce 50 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 301
+  def _reduce_51( val, _values, result )
     result = AST::String.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -938,8 +976,8 @@ module_eval <<'.,.,', 'grammar.ra', 287
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 293
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 307
+  def _reduce_52( val, _values, result )
     result = AST::FlatString.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -949,8 +987,8 @@ module_eval <<'.,.,', 'grammar.ra', 293
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 301
-  def _reduce_51( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 315
+  def _reduce_53( val, _values, result )
     result = AST::Boolean.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -960,8 +998,8 @@ module_eval <<'.,.,', 'grammar.ra', 301
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 311
-  def _reduce_52( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 325
+  def _reduce_54( val, _values, result )
     result = AST::ObjectRef.new(
         :pin => '[]',
         :line => @lexer.line,
@@ -973,8 +1011,8 @@ module_eval <<'.,.,', 'grammar.ra', 311
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 328
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 342
+  def _reduce_55( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = AST::ASTArray.new(
@@ -993,10 +1031,10 @@ module_eval <<'.,.,', 'grammar.ra', 328
   end
 .,.,
 
- # reduce 54 omitted
+ # reduce 56 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 342
-  def _reduce_55( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 356
+  def _reduce_57( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1011,8 +1049,8 @@ module_eval <<'.,.,', 'grammar.ra', 342
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 352
-  def _reduce_56( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 366
+  def _reduce_58( val, _values, result )
     result = AST::CaseOpt.new(
         :pin => ":",
         :value => val[0],
@@ -1024,8 +1062,8 @@ module_eval <<'.,.,', 'grammar.ra', 352
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 364
-  def _reduce_57( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 378
+  def _reduce_59( val, _values, result )
     result = AST::CaseOpt.new(
         :pin => ":",
         :value => val[0],
@@ -1041,10 +1079,10 @@ module_eval <<'.,.,', 'grammar.ra', 364
   end
 .,.,
 
- # reduce 58 omitted
+ # reduce 60 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 378
-  def _reduce_59( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 392
+  def _reduce_61( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1059,8 +1097,8 @@ module_eval <<'.,.,', 'grammar.ra', 378
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 388
-  def _reduce_60( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 402
+  def _reduce_62( val, _values, result )
     result = AST::Selector.new(
         :pin => "?",
         :line => @lexer.line,
@@ -1072,19 +1110,19 @@ module_eval <<'.,.,', 'grammar.ra', 388
   end
 .,.,
 
- # reduce 61 omitted
+ # reduce 63 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 390
-  def _reduce_62( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 404
+  def _reduce_64( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 63 omitted
+ # reduce 65 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 405
-  def _reduce_64( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 419
+  def _reduce_66( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1099,8 +1137,8 @@ module_eval <<'.,.,', 'grammar.ra', 405
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 415
-  def _reduce_65( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 429
+  def _reduce_67( val, _values, result )
     result = AST::ObjectParam.new(
         :pin => "=>",
         :line => @lexer.line,
@@ -1112,8 +1150,8 @@ module_eval <<'.,.,', 'grammar.ra', 415
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 423
-  def _reduce_66( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 437
+  def _reduce_68( val, _values, result )
     result = AST::String.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1123,8 +1161,8 @@ module_eval <<'.,.,', 'grammar.ra', 423
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 430
-  def _reduce_67( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 444
+  def _reduce_69( val, _values, result )
     result = AST::String.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1134,10 +1172,12 @@ module_eval <<'.,.,', 'grammar.ra', 430
   end
 .,.,
 
- # reduce 68 omitted
+ # reduce 70 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 438
-  def _reduce_69( val, _values, result )
+ # reduce 71 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 453
+  def _reduce_72( val, _values, result )
     result = AST::Default.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1147,10 +1187,10 @@ module_eval <<'.,.,', 'grammar.ra', 438
   end
 .,.,
 
- # reduce 70 omitted
+ # reduce 73 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 491
-  def _reduce_71( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 506
+  def _reduce_74( val, _values, result )
     # importing files
     # yuk, i hate keywords
     # we'll probably have to have some kind of search path eventually
@@ -1204,8 +1244,8 @@ module_eval <<'.,.,', 'grammar.ra', 491
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 502
-  def _reduce_72( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 517
+  def _reduce_75( val, _values, result )
     result = AST::CompDef.new(
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
         :args => val[2],
@@ -1218,8 +1258,8 @@ module_eval <<'.,.,', 'grammar.ra', 502
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 515
-  def _reduce_73( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 530
+  def _reduce_76( val, _values, result )
     result = AST::CompDef.new(
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
         :args => val[2],
@@ -1236,8 +1276,8 @@ module_eval <<'.,.,', 'grammar.ra', 515
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 532
-  def _reduce_74( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 547
+  def _reduce_77( val, _values, result )
         #:args => val[2],
     args = {
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
@@ -1255,8 +1295,8 @@ module_eval <<'.,.,', 'grammar.ra', 532
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 549
-  def _reduce_75( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 564
+  def _reduce_78( val, _values, result )
     args = {
         :type => AST::Name.new(:value => val[1], :line => @lexer.line),
         :file => @lexer.file,
@@ -1277,8 +1317,8 @@ module_eval <<'.,.,', 'grammar.ra', 549
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 570
-  def _reduce_76( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 585
+  def _reduce_79( val, _values, result )
     unless val[1].instance_of?(AST::ASTArray)
         val[1] = AST::ASTArray.new(
             :line => val[1].line,
@@ -1301,8 +1341,8 @@ module_eval <<'.,.,', 'grammar.ra', 570
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 593
-  def _reduce_77( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 608
+  def _reduce_80( val, _values, result )
     unless val[1].instance_of?(AST::ASTArray)
         val[1] = AST::ASTArray.new(
             :line => val[1].line,
@@ -1329,10 +1369,10 @@ module_eval <<'.,.,', 'grammar.ra', 593
   end
 .,.,
 
- # reduce 78 omitted
+ # reduce 81 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 607
-  def _reduce_79( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 622
+  def _reduce_82( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0]
         result.push val[1]
@@ -1347,8 +1387,30 @@ module_eval <<'.,.,', 'grammar.ra', 607
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 615
-  def _reduce_80( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 630
+  def _reduce_83( val, _values, result )
+   result = AST::HostName.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :value => val[0]
+    )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 636
+  def _reduce_84( val, _values, result )
+   result = AST::HostName.new(
+        :line => @lexer.line,
+        :file => @lexer.file,
+        :value => val[0]
+    )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 644
+  def _reduce_85( val, _values, result )
     result = AST::ASTArray.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1358,17 +1420,17 @@ module_eval <<'.,.,', 'grammar.ra', 615
   end
 .,.,
 
- # reduce 81 omitted
+ # reduce 86 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 620
-  def _reduce_82( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 649
+  def _reduce_87( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 631
-  def _reduce_83( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 660
+  def _reduce_88( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1382,10 +1444,10 @@ module_eval <<'.,.,', 'grammar.ra', 631
   end
 .,.,
 
- # reduce 84 omitted
+ # reduce 89 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 645
-  def _reduce_85( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 674
+  def _reduce_90( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1400,8 +1462,8 @@ module_eval <<'.,.,', 'grammar.ra', 645
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 653
-  def _reduce_86( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 682
+  def _reduce_91( val, _values, result )
     result = AST::CompArgument.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1411,8 +1473,8 @@ module_eval <<'.,.,', 'grammar.ra', 653
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 660
-  def _reduce_87( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 689
+  def _reduce_92( val, _values, result )
     result = AST::CompArgument.new(
         :line => @lexer.line,
         :file => @lexer.file,
@@ -1422,10 +1484,10 @@ module_eval <<'.,.,', 'grammar.ra', 660
   end
 .,.,
 
- # reduce 88 omitted
+ # reduce 93 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 669
-  def _reduce_89( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 698
+  def _reduce_94( val, _values, result )
     result = AST::Name.new(
         :value => val[1],
         :file => @lexer.file,
@@ -1435,8 +1497,8 @@ module_eval <<'.,.,', 'grammar.ra', 669
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 678
-  def _reduce_90( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 707
+  def _reduce_95( val, _values, result )
     name = val[0].sub(/^\$/,'')
     result = AST::Variable.new(
         :line => @lexer.line,
@@ -1447,8 +1509,8 @@ module_eval <<'.,.,', 'grammar.ra', 678
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 690
-  def _reduce_91( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 719
+  def _reduce_96( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1462,14 +1524,14 @@ module_eval <<'.,.,', 'grammar.ra', 690
   end
 .,.,
 
- # reduce 92 omitted
+ # reduce 97 omitted
 
- # reduce 93 omitted
+ # reduce 98 omitted
 
- # reduce 94 omitted
+ # reduce 99 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 695
-  def _reduce_95( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 724
+  def _reduce_100( val, _values, result )
  result = nil
    result
   end