Hoist unnecessarily nested requires up to file scope

Signed-off-by: Wincent Colaiuta <win@wincent.com>

diff --git a/lib/walrat/additions/regexp.rb b/lib/walrat/additions/regexp.rb
index 6390e8ec615dd3b11b1ac420c3ba42b7065950a0..8b51974b3af7aa0b402e0b835363fb2d7aee212e 100755 (executable)
--- a/lib/walrat/additions/regexp.rb
+++ b/lib/walrat/additions/regexp.rb
@@ -21,9 +21,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'walrat'
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'walrat'

+require 'walrat/parslet_combining'

 
 class Regexp
 
 class Regexp

-  require 'walrat/parslet_combining'

   include Walrat::ParsletCombining
 
   # Returns a RegexpParslet based on the receiver
   include Walrat::ParsletCombining
 
   # Returns a RegexpParslet based on the receiver

diff --git a/lib/walrat/memoizing_cache.rb b/lib/walrat/memoizing_cache.rb
index 3e8cc4eb2b9307893d34e9b028185e0ce660a709..3f5f6ebb5195a982528cce51e4fc61cca771cc4c 100755 (executable)
--- a/lib/walrat/memoizing_cache.rb
+++ b/lib/walrat/memoizing_cache.rb
@@ -21,6 +21,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'walrat'
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'walrat'

+require 'singleton'

 
 module Walrat
   # The MemoizingCache class memoizes the outcomes of parse operations. The
 
 module Walrat
   # The MemoizingCache class memoizes the outcomes of parse operations. The


@@ -38,7 +39,6 @@ module Walrat
   class MemoizingCache
     # Singleton class that serves as a default value for unset keys in a Hash.
     class NoValueForKey
   class MemoizingCache
     # Singleton class that serves as a default value for unset keys in a Hash.
     class NoValueForKey

-      require 'singleton'

       include Singleton
     end
 
       include Singleton
     end
 

diff --git a/lib/walrat/no_parameter_marker.rb b/lib/walrat/no_parameter_marker.rb
index d237bed9ca9a80cfcdfd3f9c4bc2657c39dce8b9..a8dafcf5710d0dc6a8ad5299d5b2619dcc8da2ad 100644 (file)
--- a/lib/walrat/no_parameter_marker.rb
+++ b/lib/walrat/no_parameter_marker.rb
@@ -21,10 +21,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'walrat'
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'walrat'

+require 'singleton'

 
 module Walrat
   class NoParameterMarker
 
 module Walrat
   class NoParameterMarker

-    require 'singleton'

     include Singleton
   end # class NoParameterMarker
 end # module Walrat
     include Singleton
   end # class NoParameterMarker
 end # module Walrat