From abd688ea1a0ebd555eac20185d82cc6430507edf Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 28 Feb 2008 15:55:39 -0600
Subject: Fixing #1092 by no longer using the resource reference to look
 resources up, which means there's no concern about not finding the resource,
 which is where the nil was coming from.  We now just iterate over the
 vertices.

---
 lib/puppet/parser/compiler.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib/puppet/parser')

diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index 132ec15db..70cd6e11a 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -366,9 +366,8 @@ class Puppet::Parser::Compiler
     # Make sure all of our resources and such have done any last work
     # necessary.
     def finish
-        @catalog.resources.each do |name|
-            resource = @catalog.resource(name)
-
+        #@catalog.resources.each do |name|
+        @catalog.vertices.each do |resource|
             # Add in any resource overrides.
             if overrides = resource_overrides(resource)
                 overrides.each do |over|
-- 
cgit 


From 9d6e926d8196294afe6b5a03c20a9035056575f1 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 28 Feb 2008 16:12:48 -0600
Subject: Fixed #1063 -- the master correctly logs syntax errors when reparsing
 during a single run.

---
 lib/puppet/parser/interpreter.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/puppet/parser')

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index d4655c403..f27c1c5c8 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -61,7 +61,11 @@ class Puppet::Parser::Interpreter
                 # If a parser already exists, than assume that we logged the
                 # exception elsewhere and reuse the parser.  If one doesn't
                 # exist, then reraise.
-                raise detail unless @parsers[environment]
+                if @parsers[environment]
+                    Puppet.err detail
+                else
+                    raise detail
+                end
             end
         end
         @parsers[environment]
-- 
cgit 


From fd1573fdb696803deb7a220d6bfd06b8afff55fb Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 28 Feb 2008 17:21:35 -0600
Subject: Fixed #1047 -- Puppet's parser no longer changes the order in which
 statements are evaluated, which means that case statements can now set
 variables that are used by other variables.

---
 lib/puppet/parser/ast/astarray.rb | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'lib/puppet/parser')

diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb
index b66fd6bba..8f09aa922 100644
--- a/lib/puppet/parser/ast/astarray.rb
+++ b/lib/puppet/parser/ast/astarray.rb
@@ -16,16 +16,6 @@ class Puppet::Parser::AST
 
         # Evaluate our children.
         def evaluate(scope)
-            rets = nil
-            # We basically always operate declaratively, and when we
-            # do we need to evaluate the settor-like statements first.  This
-            # is basically variable and type-default declarations.
-            # This is such a stupid hack.  I've no real idea how to make a
-            # "real" declarative language, so I hack it so it looks like
-            # one, yay.
-            settors = []
-            others = []
-
             # Make a new array, so we don't have to deal with the details of
             # flattening and such
             items = []
@@ -34,22 +24,14 @@ class Puppet::Parser::AST
             @children.each { |child|
                 if child.instance_of?(AST::ASTArray)
                     child.each do |ac|
-                        if ac.class.settor?
-                            settors << ac
-                        else
-                            others << ac
-                        end
+                        items << ac
                     end
                 else
-                    if child.class.settor?
-                        settors << child
-                    else
-                        others << child
-                    end
+                    items << child
                 end
             }
 
-            rets = [settors, others].flatten.collect { |child|
+            rets = items.flatten.collect { |child|
                 child.safeevaluate(scope)
             }
             return rets.reject { |o| o.nil? }
-- 
cgit 


From 65b72676aef2d58314f546eb31780d1b9925b9b3 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Fri, 29 Feb 2008 12:04:42 -0600
Subject: Fixing the fact that resources that model defined resources were
 getting finished multiple times, which meant they got multiple copies of
 metaparams.

---
 lib/puppet/parser/resource.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/puppet/parser')

diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 46be89ca2..b001e165b 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -82,12 +82,19 @@ class Puppet::Parser::Resource
     # Do any finishing work on this object, called before evaluation or
     # before storage/translation.
     def finish
+        return if finished?
+        @finished = true
         add_defaults()
         add_metaparams()
         add_scope_tags()
         validate()
     end
 
+    # Has this resource already been finished?
+    def finished?
+        defined?(@finished) and @finished
+    end
+
     def initialize(options)
         # Set all of the options we can.
         options.each do |option, value|
-- 
cgit