Code smell: Line modifiers are preferred to one-line blocks.

* Replaced 6 occurances of (while .*?) *do$ with

  The do is unneeded in the block header form and causes problems
  with the block-to-one-line transformation.

  3 Examples:

      The code:
          while line = f.gets do
      becomes:
          while line = f.gets
      The code:
          while line = shadow.gets do
      becomes:
          while line = shadow.gets
      The code:
          while wrapper = zeros.pop do
      becomes:
          while wrapper = zeros.pop

* Replaced 19 occurances of ((if|unless) .*?) *then$ with

  The then is unneeded in the block header form and causes problems
  with the block-to-one-line transformation.

  3 Examples:

      The code:
          if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
      becomes:
          if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
      The code:
          unless defined?(@spec_command) then
      becomes:
          unless defined?(@spec_command)
      The code:
          if c == ?\n then
      becomes:
          if c == ?\n

* Replaced 758 occurances of

      ((?:if|unless|while|until) .*)
          (.*)
      end

  with

  The one-line form is preferable provided:

      * The condition is not used to assign a variable
      * The body line is not already modified
      * The resulting line is not too long

  3 Examples:

      The code:
          if Puppet.features.libshadow?
              has_feature :manages_passwords
          end
      becomes:
          has_feature :manages_passwords if Puppet.features.libshadow?
      The code:
          unless (defined?(@current_pool) and @current_pool)
              @current_pool = process_zpool_data(get_pool_data)
          end
      becomes:
          @current_pool = process_zpool_data(get_pool_data) unless (defined?(@current_pool) and @current_pool)
      The code:
          if Puppet[:trace]
              puts detail.backtrace
          end
      becomes:
          puts detail.backtrace if Puppet[:trace]

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 5b07a9c09..c86548bfb 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -40,9 +40,7 @@ module Puppet::Parser::Functions
     def self.newfunction(name, options = {}, &block)
         name = symbolize(name)
 
-        if functions.include?(name)
-            raise Puppet::DevError, "Function #{name} already defined"
-        end
+        raise Puppet::DevError, "Function #{name} already defined" if functions.include?(name)
 
         ftype = options[:type] || :statement
 
@@ -56,18 +54,14 @@ module Puppet::Parser::Functions
         # Someday we'll support specifying an arity, but for now, nope
         #functions[name] = {:arity => arity, :type => ftype}
         functions[name] = {:type => ftype, :name => fname}
-        if options[:doc]
-            functions[name][:doc] = options[:doc]
-        end
+        functions[name][:doc] = options[:doc] if options[:doc]
     end
 
     # Remove a function added by newfunction
     def self.rmfunction(name)
         name = symbolize(name)
 
-        unless functions.include? name
-            raise Puppet::DevError, "Function #{name} is not defined"
-        end
+        raise Puppet::DevError, "Function #{name} is not defined" unless functions.include? name
 
         functions.delete name