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/external/pson/pure/parser.rb b/lib/puppet/external/pson/pure/parser.rb
index ef05637e4..2d0a03066 100644
--- a/lib/puppet/external/pson/pure/parser.rb
+++ b/lib/puppet/external/pson/pure/parser.rb
@@ -144,9 +144,7 @@ module PSON
                             PSON::UTF16toUTF8.iconv(bytes)
                         end
                     end
-                    if string.respond_to?(:force_encoding)
-                        string.force_encoding(Encoding::UTF_8)
-                    end
+                    string.force_encoding(Encoding::UTF_8) if string.respond_to?(:force_encoding)
                     string
                 else
                     UNPARSED
@@ -209,9 +207,7 @@ module PSON
                             raise ParserError, "expected ',' or ']' in array at '#{peek(20)}'!"
                         end
                     when scan(ARRAY_CLOSE)
-                        if delim
-                            raise ParserError, "expected next element in array at '#{peek(20)}'!"
-                        end
+                        raise ParserError, "expected next element in array at '#{peek(20)}'!" if delim
                         break
                     when skip(IGNORE)
                         ;
@@ -231,9 +227,7 @@ module PSON
                     case
                     when (string = parse_string) != UNPARSED
                         skip(IGNORE)
-                        unless scan(PAIR_DELIMITER)
-                            raise ParserError, "expected ':' in object at '#{peek(20)}'!"
-                        end
+                        raise ParserError, "expected ':' in object at '#{peek(20)}'!" unless scan(PAIR_DELIMITER)
                         skip(IGNORE)
                         unless (value = parse_value).equal? UNPARSED
                             result[string] = value
@@ -250,9 +244,7 @@ module PSON
                             raise ParserError, "expected value in object at '#{peek(20)}'!"
                         end
                     when scan(OBJECT_CLOSE)
-                        if delim
-                            raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
-                        end
+                        raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!" if delim
                         if @create_id and klassname = result[@create_id]
                             klass = PSON.deep_const_get klassname
                             break unless klass and klass.pson_creatable?