Applying patch by DavidS from #522, along with test code and a small bit of code cleanup.

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

3 files changed, 14 insertions, 38 deletions

diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index d8d421c47..055559e1c 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -120,25 +120,6 @@ class Puppet::Parser::AST
     @autoloader.loadall
 end
 
-#require 'puppet/parser/ast/astarray'
-#require 'puppet/parser/ast/branch'
-#require 'puppet/parser/ast/collection'
-#require 'puppet/parser/ast/caseopt'
-#require 'puppet/parser/ast/casestatement'
-#require 'puppet/parser/ast/component'
-#require 'puppet/parser/ast/else'
-#require 'puppet/parser/ast/hostclass'
-#require 'puppet/parser/ast/ifstatement'
-#require 'puppet/parser/ast/leaf'
-#require 'puppet/parser/ast/node'
-#require 'puppet/parser/ast/resourcedef'
-#require 'puppet/parser/ast/resourceparam'
-#require 'puppet/parser/ast/resourceref'
-#require 'puppet/parser/ast/resourceoverride'
-#require 'puppet/parser/ast/selector'
-#require 'puppet/parser/ast/resourcedefaults'
-#require 'puppet/parser/ast/vardef'
-#require 'puppet/parser/ast/tag'
-#require 'puppet/parser/ast/function'
+require 'puppet/parser/ast/leaf'
 
 # $Id$
diff --git a/lib/puppet/parser/ast/caseopt.rb b/lib/puppet/parser/ast/caseopt.rb
index 1c712e896..8d578a10b 100644
--- a/lib/puppet/parser/ast/caseopt.rb
+++ b/lib/puppet/parser/ast/caseopt.rb
@@ -44,18 +44,10 @@ class Puppet::Parser::AST
         def eachvalue(scope)
             if @value.is_a?(AST::ASTArray)
                 @value.each { |subval|
-                    if scope
-                        yield subval.evaluate(:scope => scope)
-                    elsif subval.is_a? AST::Leaf
-                        yield subval.value
-                    end
+                    yield subval.evaluate(:scope => scope)
                 }
             else
-                if scope
-                    yield @value.evaluate(:scope => scope)
-                elsif @value.is_a? AST::Leaf
-                    yield @value.value
-                end
+                yield @value.evaluate(:scope => scope)
             end
         end
 
@@ -76,3 +68,5 @@ class Puppet::Parser::AST
         end
     end
 end
+
+# $Id$
diff --git a/lib/puppet/parser/ast/casestatement.rb b/lib/puppet/parser/ast/casestatement.rb
index b4197d9b4..760a1095c 100644
--- a/lib/puppet/parser/ast/casestatement.rb
+++ b/lib/puppet/parser/ast/casestatement.rb
@@ -19,16 +19,17 @@ class Puppet::Parser::AST
             
             # Iterate across the options looking for a match.
             @options.each { |option|
-                if option.eachvalue(scope) { |opval|
-                        opval = opval.downcase if ! sensitive and opval.respond_to?(:downcase)
-                        # break true if opval == value
-                        if opval == value
-                            break true
-                        end
-                    }
+                option.eachvalue(scope) { |opval|
+                    opval = opval.downcase if ! sensitive and opval.respond_to?(:downcase)
+                    if opval == value
+                        found = true
+                        break
+                    end
+                }
+
+                if found
                     # we found a matching option
                     retvalue = option.safeevaluate(:scope => scope)
-                    found = true
                     break
                 end
             }