diff options
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/ast/ifstatement.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/match_operator.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resource_override.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resource_reference.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/parser/compiler.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/parser/scope.rb | 6 |
6 files changed, 6 insertions, 21 deletions
diff --git a/lib/puppet/parser/ast/ifstatement.rb b/lib/puppet/parser/ast/ifstatement.rb index 36da50c7a..cbb61bf9c 100644 --- a/lib/puppet/parser/ast/ifstatement.rb +++ b/lib/puppet/parser/ast/ifstatement.rb @@ -24,11 +24,7 @@ class Puppet::Parser::AST if Puppet::Parser::Scope.true?(value) return @statements.safeevaluate(scope) else - if defined?(@else) - return @else.safeevaluate(scope) - else - return nil - end + return defined?(@else) ? @else.safeevaluate(scope) : nil end ensure scope.unset_ephemeral_var(level) diff --git a/lib/puppet/parser/ast/match_operator.rb b/lib/puppet/parser/ast/match_operator.rb index 9a12351b9..2ab2befd4 100644 --- a/lib/puppet/parser/ast/match_operator.rb +++ b/lib/puppet/parser/ast/match_operator.rb @@ -16,8 +16,7 @@ class Puppet::Parser::AST def evaluate(scope) lval = @lval.safeevaluate(scope) - return @operator == "=~" if rval.evaluate_match(lval, scope) - return @operator == "!~" + return(rval.evaluate_match(lval, scope) ? @operator == "=~" : @operator == "!~") end def initialize(hash) diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb index f9071fe96..7f7047dd9 100644 --- a/lib/puppet/parser/ast/resource_override.rb +++ b/lib/puppet/parser/ast/resource_override.rb @@ -54,8 +54,7 @@ class Puppet::Parser::AST res end # decapsulate array in case of only one item - return resource.pop if resource.length == 1 - return resource + return(resource.length == 1 ? resource.pop : resource) end # Create our ResourceDef. Handles type checking for us. diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb index d2f9b2ce4..37e82d568 100644 --- a/lib/puppet/parser/ast/resource_reference.rb +++ b/lib/puppet/parser/ast/resource_reference.rb @@ -8,8 +8,7 @@ class Puppet::Parser::AST::ResourceReference < Puppet::Parser::AST::Branch # and name. def evaluate(scope) titles = Array(title.safeevaluate(scope)).collect { |t| Puppet::Resource.new(type, t, :namespaces => scope.namespaces) } - return titles.pop if titles.length == 1 - return titles + return(titles.length == 1 ? titles.pop : titles) end def to_s diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index 121dae1b1..7ed000e19 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -120,11 +120,7 @@ class Puppet::Parser::Compiler # Return the node's environment. def environment unless defined?(@environment) - if node.environment and node.environment != "" - @environment = node.environment - else - @environment = nil - end + @environment = (node.environment and node.environment != "") ? node.environment : nil end Puppet::Node::Environment.current = @environment @environment diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 5a0dbfeba..f0c7d77bd 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -65,11 +65,7 @@ class Puppet::Parser::Scope # Is the value true? This allows us to control the definition of truth # in one place. def self.true?(value) - if value == false or value == "" or value == :undef - return false - else - return true - end + return (value != false and value != "" and value != :undef) end # Is the value a number?, return the correct object or nil if not a number |