diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-20 13:31:34 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-20 13:31:34 -0700 |
| commit | 94edd404130b4236f0c65a579857e3a25c5ee17f (patch) | |
| tree | efbdb3b3f64d1e362b3c8c78c352a9340e914361 /lib/puppet/parser/ast | |
| parent | 2af27160b94efa4755187efd99c86d1659683b29 (diff) | |
| parent | db0b30dbde94d16ab1d7580be4dd32e18cff23dc (diff) | |
| download | puppet-94edd404130b4236f0c65a579857e3a25c5ee17f.tar.gz puppet-94edd404130b4236f0c65a579857e3a25c5ee17f.tar.xz puppet-94edd404130b4236f0c65a579857e3a25c5ee17f.zip | |
Merge commit 'tags/2.6.0' into next
Diffstat (limited to 'lib/puppet/parser/ast')
| -rw-r--r-- | lib/puppet/parser/ast/leaf.rb | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/lib/puppet/parser/ast/leaf.rb b/lib/puppet/parser/ast/leaf.rb index 49f430278..49cde63ca 100644 --- a/lib/puppet/parser/ast/leaf.rb +++ b/lib/puppet/parser/ast/leaf.rb @@ -10,20 +10,6 @@ class Puppet::Parser::AST @value end - # evaluate ourselves, and match - def evaluate_match(value, scope) - obj = self.safeevaluate(scope) - - obj = obj.downcase if obj.respond_to?(:downcase) - value = value.downcase if value.respond_to?(:downcase) - - obj = Puppet::Parser::Scope.number?(obj) || obj - value = Puppet::Parser::Scope.number?(value) || value - - # "" == undef for case/selector/if - obj == value or (obj == "" and value == :undef) - end - def match(value) @value == value end @@ -77,7 +63,7 @@ class Puppet::Parser::AST class Concat < AST::Leaf def evaluate(scope) - @value.collect { |x| x.evaluate(scope) }.join + @value.collect { |x| x.evaluate(scope) }.collect{ |x| x == :undef ? '' : x }.join end def to_s |