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, 4 insertions, 12 deletions

diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb
index f2fd710cf..e63483050 100644
--- a/lib/puppet/parser/parser_support.rb
+++ b/lib/puppet/parser/parser_support.rb
@@ -74,9 +74,7 @@ class Puppet::Parser::Parser
         end
         except = Puppet::ParseError.new(message)
         except.line = @lexer.line
-        if @lexer.file
-            except.file = @lexer.file
-        end
+        except.file = @lexer.file if @lexer.file
 
         raise except
     end
@@ -90,9 +88,7 @@ class Puppet::Parser::Parser
             unless file =~ /\.pp$/
                 file = file + ".pp"
             end
-            unless FileTest.exist?(file)
-                raise Puppet::Error, "Could not find file #{file}"
-            end
+            raise Puppet::Error, "Could not find file #{file}" unless FileTest.exist?(file)
         end
         raise Puppet::AlreadyImportedError, "Import loop detected" if known_resource_types.watching_file?(file)
 
@@ -171,9 +167,7 @@ class Puppet::Parser::Parser
 
         except = Puppet::ParseError.new(error)
         except.line = @lexer.line
-        if @lexer.file
-            except.file = @lexer.file
-        end
+        except.file = @lexer.file if @lexer.file
 
         raise except
     end
@@ -181,9 +175,7 @@ class Puppet::Parser::Parser
     # how should I do error handling here?
     def parse(string = nil)
         return parse_ruby_file if self.file =~ /\.rb$/
-        if string
-            self.string = string
-        end
+        self.string = string if string
         begin
             @yydebug = false
             main = yyparse(@lexer,:scan)