mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* lib/cmath.rb: fixed indent.
* lib/drb/ssl.rb: ditto. * lib/irb/**/*.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									45592f4b4c
								
							
						
					
					
						commit
						8e5af8b628
					
				
					 32 changed files with 1363 additions and 1357 deletions
				
			
		| 
						 | 
				
			
			@ -19,8 +19,8 @@ module IRB
 | 
			
		|||
      include IrbLoader
 | 
			
		||||
 | 
			
		||||
      def execute(file_name, priv = nil)
 | 
			
		||||
#	return ruby_load(file_name) unless IRB.conf[:USE_LOADER]
 | 
			
		||||
	return irb_load(file_name, priv)
 | 
			
		||||
        #	return ruby_load(file_name) unless IRB.conf[:USE_LOADER]
 | 
			
		||||
        return irb_load(file_name, priv)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -28,38 +28,38 @@ module IRB
 | 
			
		|||
      include IrbLoader
 | 
			
		||||
 | 
			
		||||
      def execute(file_name)
 | 
			
		||||
#	return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
 | 
			
		||||
        #	return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
 | 
			
		||||
 | 
			
		||||
	rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?")
 | 
			
		||||
	return false if $".find{|f| f =~ rex}
 | 
			
		||||
        rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?")
 | 
			
		||||
        return false if $".find{|f| f =~ rex}
 | 
			
		||||
 | 
			
		||||
	case file_name
 | 
			
		||||
	when /\.rb$/
 | 
			
		||||
	  begin
 | 
			
		||||
	    if irb_load(file_name)
 | 
			
		||||
	      $".push file_name
 | 
			
		||||
	      return true
 | 
			
		||||
	    end
 | 
			
		||||
	  rescue LoadError
 | 
			
		||||
	  end
 | 
			
		||||
	when /\.(so|o|sl)$/
 | 
			
		||||
	  return ruby_require(file_name)
 | 
			
		||||
	end
 | 
			
		||||
        case file_name
 | 
			
		||||
        when /\.rb$/
 | 
			
		||||
          begin
 | 
			
		||||
            if irb_load(file_name)
 | 
			
		||||
              $".push file_name
 | 
			
		||||
              return true
 | 
			
		||||
            end
 | 
			
		||||
          rescue LoadError
 | 
			
		||||
          end
 | 
			
		||||
        when /\.(so|o|sl)$/
 | 
			
		||||
          return ruby_require(file_name)
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
	begin
 | 
			
		||||
	  irb_load(f = file_name + ".rb")
 | 
			
		||||
	  $".push f
 | 
			
		||||
	  return true
 | 
			
		||||
	rescue LoadError
 | 
			
		||||
	  return ruby_require(file_name)
 | 
			
		||||
	end
 | 
			
		||||
        begin
 | 
			
		||||
          irb_load(f = file_name + ".rb")
 | 
			
		||||
          $".push f
 | 
			
		||||
          return true
 | 
			
		||||
        rescue LoadError
 | 
			
		||||
          return ruby_require(file_name)
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    class Source<Nop
 | 
			
		||||
      include IrbLoader
 | 
			
		||||
      def execute(file_name)
 | 
			
		||||
	source_file(file_name)
 | 
			
		||||
        source_file(file_name)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue