Fixing #343. Collections and definition evaluation both now happen on every iterative evaluation, with collections being evaluated first. This way collections can find resources that either are inside defined types or are the types themselves.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1967 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index 39fef8668..7f537eafc 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -81,6 +81,8 @@ module Puppet
                 array = []
 
                 self.scan { |token,str|
+                    # Ignore any definition nesting problems
+                    @indefine = false
                     #Puppet.debug("got token '%s' => '%s'" % [token,str])
                     if token.nil?
                         return array
@@ -252,12 +254,12 @@ module Puppet
 
                     if @lasttoken == :DEFINE
                         if indefine?
+                            msg = "Cannot nest definition %s inside %s" % [value, @indefine]
                             self.indefine = false
-                            raise Puppet::ParseError,
-                                "Definitions cannot nest"
+                            raise Puppet::ParseError, msg
                         end
 
-                        @indefine = true
+                        @indefine = value
                     end
 
                     @last = value