diff options
| author | Ian Taylor <ian@lorf.org> | 2009-06-05 12:39:04 -0400 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-06-06 09:12:00 +1000 |
| commit | 4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch) | |
| tree | 126540beec3c65448e01e1b48d27275ec4ee6ea4 /lib/puppet/parser/ast | |
| parent | 97e6975d69f239e24993315a25a3117b1daa48c3 (diff) | |
| download | puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip | |
Removed extra whitespace from end of lines
Diffstat (limited to 'lib/puppet/parser/ast')
| -rw-r--r-- | lib/puppet/parser/ast/astarray.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/boolean_operator.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/casestatement.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/collexpr.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/comparison_operator.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resource_defaults.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resource_override.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resource_reference.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/selector.rb | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb index 8f09aa922..9b59d196a 100644 --- a/lib/puppet/parser/ast/astarray.rb +++ b/lib/puppet/parser/ast/astarray.rb @@ -19,7 +19,7 @@ class Puppet::Parser::AST # Make a new array, so we don't have to deal with the details of # flattening and such items = [] - + # First clean out any AST::ASTArrays @children.each { |child| if child.instance_of?(AST::ASTArray) diff --git a/lib/puppet/parser/ast/boolean_operator.rb b/lib/puppet/parser/ast/boolean_operator.rb index c3b5c7d41..160e0e69e 100644 --- a/lib/puppet/parser/ast/boolean_operator.rb +++ b/lib/puppet/parser/ast/boolean_operator.rb @@ -16,7 +16,7 @@ class Puppet::Parser::AST def evaluate(scope) # evaluate the first operand, should return a boolean value lval = @lval.safeevaluate(scope) - + # return result # lazy evaluate right operand case @operator @@ -27,8 +27,8 @@ class Puppet::Parser::AST else # false and false == false false end - when "or"; - if Puppet::Parser::Scope.true?(lval) + when "or"; + if Puppet::Parser::Scope.true?(lval) true else rval = @rval.safeevaluate(scope) diff --git a/lib/puppet/parser/ast/casestatement.rb b/lib/puppet/parser/ast/casestatement.rb index 73fbdcf1e..072747932 100644 --- a/lib/puppet/parser/ast/casestatement.rb +++ b/lib/puppet/parser/ast/casestatement.rb @@ -17,7 +17,7 @@ class Puppet::Parser::AST retvalue = nil found = false - + # Iterate across the options looking for a match. default = nil @options.each { |option| diff --git a/lib/puppet/parser/ast/collexpr.rb b/lib/puppet/parser/ast/collexpr.rb index 6ade58b7e..85bca583f 100644 --- a/lib/puppet/parser/ast/collexpr.rb +++ b/lib/puppet/parser/ast/collexpr.rb @@ -67,7 +67,7 @@ class CollExpr < AST::Branch else str = "(%s) %s (%s)" % [str1, oper, str2] end - + return str, code end diff --git a/lib/puppet/parser/ast/comparison_operator.rb b/lib/puppet/parser/ast/comparison_operator.rb index 3af86efea..0d2f8b16d 100644 --- a/lib/puppet/parser/ast/comparison_operator.rb +++ b/lib/puppet/parser/ast/comparison_operator.rb @@ -21,7 +21,7 @@ class Puppet::Parser::AST # convert to number if operands are number lval = Puppet::Parser::Scope.number?(lval) || lval rval = Puppet::Parser::Scope.number?(rval) || rval - + # return result unless @operator == '!=' lval.send(@operator,rval) diff --git a/lib/puppet/parser/ast/resource_defaults.rb b/lib/puppet/parser/ast/resource_defaults.rb index ed83d3573..3fde7ade2 100644 --- a/lib/puppet/parser/ast/resource_defaults.rb +++ b/lib/puppet/parser/ast/resource_defaults.rb @@ -2,7 +2,7 @@ require 'puppet/parser/ast/branch' class Puppet::Parser::AST # A statement syntactically similar to an ResourceDef, but uses a - # capitalized object type and cannot have a name. + # capitalized object type and cannot have a name. class ResourceDefaults < AST::Branch attr_accessor :type, :params diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb index f8cf3a81e..5eac50982 100644 --- a/lib/puppet/parser/ast/resource_override.rb +++ b/lib/puppet/parser/ast/resource_override.rb @@ -34,7 +34,7 @@ class Puppet::Parser::AST # Now we just create a normal resource, but we call a very different # method on the scope. resource = [resource] unless resource.is_a?(Array) - + resource = resource.collect do |r| res = Puppet::Parser::Resource.new( :type => r.type, diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb index e5e2dce99..5a521494f 100644 --- a/lib/puppet/parser/ast/resource_reference.rb +++ b/lib/puppet/parser/ast/resource_reference.rb @@ -25,7 +25,7 @@ class Puppet::Parser::AST def evaluate(scope) title = @title.safeevaluate(scope) title = [title] unless title.is_a?(Array) - + if @type.to_s.downcase == "class" resource_type = "class" title = title.collect { |t| qualified_class(scope, t) } diff --git a/lib/puppet/parser/ast/selector.rb b/lib/puppet/parser/ast/selector.rb index 399d405a3..ecad163d4 100644 --- a/lib/puppet/parser/ast/selector.rb +++ b/lib/puppet/parser/ast/selector.rb @@ -17,9 +17,9 @@ class Puppet::Parser::AST # Get our parameter. paramvalue = @param.safeevaluate(scope) - + sensitive = Puppet[:casesensitive] - + if ! sensitive and paramvalue.respond_to?(:downcase) paramvalue = paramvalue.downcase end |
