Remove redundant return statements (#266)

Very slight behavior change here in `REXML::Valdiation::Event#matches?`,
which is to align the predicate method's return value with the expected behavior
of a predicate method (which is to return one of true or false).

Author: pboling

lib/rexml/attribute.rb

@@ -199,9 +199,7 @@ def inspect
     end
 
     def xpath
-      path = @element.xpath
-      path += "/@#{self.expanded_name}"
-      return path
+      @element.xpath + "/@#{self.expanded_name}"
     end
 
     def document

lib/rexml/document.rb

@@ -415,7 +415,7 @@ def Document::entity_expansion_limit=( val )
     #
     # Deprecated. Use REXML::Security.entity_expansion_limit= instead.
     def Document::entity_expansion_limit
-      return Security.entity_expansion_limit
+      Security.entity_expansion_limit
     end
 
     # Set the entity expansion limit. By default the limit is set to 10240.
@@ -429,7 +429,7 @@ def Document::entity_expansion_text_limit=( val )
     #
     # Deprecated. Use REXML::Security.entity_expansion_text_limit instead.
     def Document::entity_expansion_text_limit
-      return Security.entity_expansion_text_limit
+      Security.entity_expansion_text_limit
     end
 
     attr_reader :entity_expansion_count

lib/rexml/element.rb

@@ -565,7 +565,7 @@ def prefixes
       prefixes = []
       prefixes = parent.prefixes if parent
       prefixes |= attributes.prefixes
-      return prefixes
+      prefixes
     end
 
     # :call-seq:
@@ -624,7 +624,7 @@ def namespace(prefix=nil)
       ns = namespaces[prefix]
 
       ns = '' if ns.nil? and prefix == 'xmlns'
-      return ns
+      ns
     end
 
     # :call-seq:
@@ -956,7 +956,7 @@ def get_elements( xpath )
     def next_element
       element = next_sibling
       element = element.next_sibling until element.nil? or element.kind_of? Element
-      return element
+      element
     end
 
     # :call-seq:
@@ -972,7 +972,7 @@ def next_element
     def previous_element
       element = previous_sibling
       element = element.previous_sibling until element.nil? or element.kind_of? Element
-      return element
+      element
     end
 
 
@@ -1022,8 +1022,7 @@ def has_text?
     #
     def text( path = nil )
       rv = get_text(path)
-      return rv.value unless rv.nil?
-      nil
+      rv&.value
     end
 
     # :call-seq:
@@ -1051,7 +1050,7 @@ def get_text path = nil
       else
         rv = @children.find { |node| node.kind_of? Text }
       end
-      return rv
+      rv
     end
 
     # :call-seq:
@@ -1095,7 +1094,7 @@ def text=( text )
           old_text.replace_with( text )
         end
       end
-      return self
+      self
     end
 
     # :call-seq:
@@ -1146,7 +1145,7 @@ def add_text( text )
         text = Text.new( text, whitespace(), nil, raw() )
       end
       self << text unless text.nil?
-      return self
+      self
     end
 
     # :call-seq:
@@ -1190,7 +1189,7 @@ def xpath
         cur = cur.parent
         path_elements << __to_xpath_helper( cur )
       end
-      return path_elements.reverse.join( "/" )
+      path_elements.reverse.join( "/" )
     end
 
     #################################################
@@ -1292,7 +1291,6 @@ def attribute( name, namespace=nil )
       return nil unless ( namespaces[ prefix ] == namespaces[ 'xmlns' ] )
 
       attributes.get_attribute( name )
-
     end
 
     # :call-seq:
@@ -1306,7 +1304,7 @@ def attribute( name, namespace=nil )
     #   b.has_attributes? # => false
     #
     def has_attributes?
-      return !@attributes.empty?
+      !@attributes.empty?
     end
 
     # :call-seq:
@@ -1684,11 +1682,7 @@ def []( index, name=nil)
           (num += 1) == index
         }
       else
-        return XPath::first( @element, index )
-        #{ |element|
-        #       return element if element.kind_of? Element
-        #}
-        #return nil
+        XPath::first( @element, index )
       end
     end
 
@@ -1735,7 +1729,7 @@ def []=( index, element )
       else
         previous.replace_with element
       end
-      return previous
+      previous
     end
 
     # :call-seq:
@@ -1774,7 +1768,7 @@ def index element
         child == element
       end
       return rv if found == element
-      return -1
+      -1
     end
 
     # :call-seq:
@@ -1853,7 +1847,7 @@ def delete_all( xpath )
         @element.delete element
         element.remove
       end
-      return rv
+      rv
     end
 
     # :call-seq:
@@ -2180,8 +2174,7 @@ def initialize element
     #
     def [](name)
       attr = get_attribute(name)
-      return attr.value unless attr.nil?
-      return nil
+      attr&.value
     end
 
     # :call-seq:
@@ -2336,7 +2329,7 @@ def get_attribute( name )
       if attr.kind_of? Hash
         attr = attr[ @element.prefix ]
       end
-      return attr
+      attr
     end
 
     # :call-seq:
@@ -2390,7 +2383,7 @@ def []=( name, value )
       else
         store value.name, value
       end
-      return @element
+      @element
     end
 
     # :call-seq:
@@ -2494,9 +2487,7 @@ def delete( attribute )
           old.each_value{|v| repl = v}
           store name, repl
         end
-      elsif old.nil?
-        return @element
-      else # the supplied attribute is a top-level one
+      elsif old # the supplied attribute is a top-level one
         super(name)
       end
       @element
@@ -2550,7 +2541,7 @@ def delete_all( name )
         rv << attribute if attribute.expanded_name == name
       }
       rv.each{ |attr| attr.remove }
-      return rv
+      rv
     end
 
     # :call-seq:

lib/rexml/functions.rb

@@ -39,11 +39,11 @@ def Functions::context=(value); @@context = value; end
 
     def Functions::text( )
       if @@context[:node].node_type == :element
-        return @@context[:node].find_all{|n| n.node_type == :text}.collect{|n| n.value}
+        @@context[:node].find_all{|n| n.node_type == :text}.collect{|n| n.value}
       elsif @@context[:node].node_type == :text
-        return @@context[:node].value
+        @@context[:node].value
       else
-        return false
+        false
       end
     end
 

lib/rexml/namespace.rb

@@ -42,11 +42,11 @@ def name=( name )
     # Compares names optionally WITH namespaces
     def has_name?( other, ns=nil )
       if ns
-        return (namespace() == ns and name() == other)
+        namespace() == ns and name() == other
       elsif other.include? ":"
-        return fully_expanded_name == other
+        fully_expanded_name == other
       else
-        return name == other
+        name == other
       end
     end
 
@@ -57,7 +57,7 @@ def has_name?( other, ns=nil )
     def fully_expanded_name
       ns = prefix
       return "#{ns}:#@name" if ns.size > 0
-      return @name
+      @name
     end
   end
 end

lib/rexml/node.rb

@@ -68,7 +68,7 @@ def find_first_recursive(&block) # :yields: node
       each_recursive {|node|
         return node if block.call(node)
       }
-      return nil
+      nil
     end
 
     # Returns the position that +self+ holds in its parent's array, indexed

lib/rexml/parsers/baseparser.rb

@@ -206,12 +206,12 @@ def position
 
       # Returns true if there are no more events
       def empty?
-        return (@source.empty? and @stack.empty?)
+        (@source.empty? and @stack.empty?)
       end
 
       # Returns true if there are more events.  Synonymous with !empty?
       def has_next?
-        return !(@source.empty? and @stack.empty?)
+        !(@source.empty? and @stack.empty?)
       end
 
       # Push an event back on the head of the stream.  This method
@@ -522,7 +522,8 @@ def pull_event
           raise REXML::ParseException.new( "Exception parsing",
             @source, self, (error ? error : $!) )
         end
-        return [ :dummy ]
+        # NOTE: The end of the method never runs, because it is unreachable.
+        #       All branches of code above have explicit unconditional return or raise statements.
       end
       private :pull_event
 

lib/rexml/parsers/xpathparser.rb

@@ -215,7 +215,7 @@ def predicate_to_path(parsed, &block)
         else
           path << yield( parsed )
         end
-        return path.squeeze(" ")
+        path.squeeze(" ")
       end
       # For backward compatibility
       alias_method :preciate_to_string, :predicate_to_path
@@ -252,7 +252,7 @@ def LocationPath path, parsed
             path = path[1..-1]
           end
         end
-        return RelativeLocationPath( path, parsed ) if path.size > 0
+        RelativeLocationPath( path, parsed ) if path.size > 0
       end
 
       #RelativeLocationPath
@@ -388,7 +388,7 @@ def NodeTest path, parsed
         else
           path = original_path
         end
-        return path
+        path
       end
 
       # Filters the supplied nodeset on the predicate(s)
@@ -600,7 +600,7 @@ def PathExpr path, parsed
         end
         rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w*]/
         parsed.concat(n)
-        return rest
+        rest
       end
 
       #| FilterExpr Predicate