From 87c3618c822e3e49ca794bd2a37804570b5f62b7 Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Fri, 27 Aug 2010 17:45:50 +0200 Subject: [PATCH] Hoist unnecessarily nested requires up to file scope Signed-off-by: Wincent Colaiuta --- lib/walrat/additions/regexp.rb | 2 +- lib/walrat/memoizing_cache.rb | 2 +- lib/walrat/no_parameter_marker.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/walrat/additions/regexp.rb b/lib/walrat/additions/regexp.rb index 6390e8e..8b51974 100755 --- a/lib/walrat/additions/regexp.rb +++ b/lib/walrat/additions/regexp.rb @@ -21,9 +21,9 @@ # POSSIBILITY OF SUCH DAMAGE. require 'walrat' +require 'walrat/parslet_combining' class Regexp - require 'walrat/parslet_combining' 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 3e8cc4e..3f5f6eb 100755 --- a/lib/walrat/memoizing_cache.rb +++ b/lib/walrat/memoizing_cache.rb @@ -21,6 +21,7 @@ # POSSIBILITY OF SUCH DAMAGE. require 'walrat' +require 'singleton' 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 - require 'singleton' include Singleton end diff --git a/lib/walrat/no_parameter_marker.rb b/lib/walrat/no_parameter_marker.rb index d237bed..a8dafcf 100644 --- a/lib/walrat/no_parameter_marker.rb +++ b/lib/walrat/no_parameter_marker.rb @@ -21,10 +21,10 @@ # POSSIBILITY OF SUCH DAMAGE. require 'walrat' +require 'singleton' module Walrat class NoParameterMarker - require 'singleton' include Singleton end # class NoParameterMarker end # module Walrat -- 2.37.1