irb 1.6.2 → 1.6.4

data/lib/irb/ext/save-history.rb

@@ -1,13 +1,8 @@
 # frozen_string_literal: false
+#
 #   save-history.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB
   module HistorySavingAbility # :nodoc:

data/lib/irb/ext/tracer.rb

@@ -1,20 +1,14 @@
 # frozen_string_literal: false
 #
 #   irb/lib/tracer.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
+
 begin
   require "tracer"
 rescue LoadError
   $stderr.puts "Tracer extension of IRB is enabled but tracer gem doesn't found."
   module IRB
-    TracerLoadError = true
     class Context
       def use_tracer=(opt)
         # do nothing
@@ -70,12 +64,12 @@ module IRB
       if context.use_tracer? && file != nil && line != nil
         Tracer.on
         begin
-          __evaluate__(context, statements, file, line)
+          __evaluate__(statements, file, line)
         ensure
           Tracer.off
         end
       else
-        __evaluate__(context, statements, file || __FILE__, line || __LINE__)
+        __evaluate__(statements, file || __FILE__, line || __LINE__)
       end
     end
   end

data/lib/irb/ext/use-loader.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   use-loader.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 require_relative "../cmd/load"
 require_relative "loader"

data/lib/irb/ext/workspaces.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   push-ws.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB # :nodoc:
   class Context

data/lib/irb/extend-command.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: false
 #
 #   irb/extend-command.rb - irb extend command
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
+
 module IRB # :nodoc:
   # Installs the default irb extensions command bundle.
   module ExtendCommandBundle
@@ -251,7 +246,7 @@ module IRB # :nodoc:
     #
     # The optional +load_file+ parameter will be required within the method
     # definition.
-    def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
+    def self.def_extend_command(cmd_name, cmd_class, load_file, *aliases)
       case cmd_class
       when Symbol
         cmd_class = cmd_class.id2name
@@ -260,34 +255,12 @@ module IRB # :nodoc:
         cmd_class = cmd_class.name
       end
 
-      if load_file
-        kwargs = ", **kwargs" if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.7.0"
-        line = __LINE__; eval %[
-          def #{cmd_name}(*opts#{kwargs}, &b)
-            require_relative "#{load_file}"
-            arity = ExtendCommand::#{cmd_class}.instance_method(:execute).arity
-            args = (1..(arity < 0 ? ~arity : arity)).map {|i| "arg" + i.to_s }
-            args << "*opts#{kwargs}" if arity < 0
-            args << "&block"
-            args = args.join(", ")
-            line = __LINE__; eval %[
-              unless singleton_class.class_variable_defined?(:@@#{cmd_name}_)
-                singleton_class.class_variable_set(:@@#{cmd_name}_, true)
-                def self.#{cmd_name}_(\#{args})
-                  ExtendCommand::#{cmd_class}.execute(irb_context, \#{args})
-                end
-              end
-            ], nil, __FILE__, line
-            __send__ :#{cmd_name}_, *opts#{kwargs}, &b
-          end
-        ], nil, __FILE__, line
-      else
-        line = __LINE__; eval %[
-          def #{cmd_name}(*opts, &b)
-            ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
-          end
-        ], nil, __FILE__, line
-      end
+      line = __LINE__; eval %[
+        def #{cmd_name}(*opts, **kwargs, &b)
+          Kernel.require_relative "#{load_file}"
+          ::IRB::ExtendCommand::#{cmd_class}.execute(irb_context, *opts, **kwargs, &b)
+        end
+      ], nil, __FILE__, line
 
       for ali, flag in aliases
         @ALIASES.push [ali, cmd_name, flag]
@@ -376,58 +349,4 @@ module IRB # :nodoc:
 
     CE.install_extend_commands
   end
-
-  # A convenience module for extending Ruby methods.
-  module MethodExtender
-    # Extends the given +base_method+ with a prefix call to the given
-    # +extend_method+.
-    def def_pre_proc(base_method, extend_method)
-      base_method = base_method.to_s
-      extend_method = extend_method.to_s
-
-      alias_name = new_alias_name(base_method)
-      module_eval %[
-        alias_method alias_name, base_method
-        def #{base_method}(*opts)
-          __send__ :#{extend_method}, *opts
-          __send__ :#{alias_name}, *opts
-        end
-      ]
-    end
-
-    # Extends the given +base_method+ with a postfix call to the given
-    # +extend_method+.
-    def def_post_proc(base_method, extend_method)
-      base_method = base_method.to_s
-      extend_method = extend_method.to_s
-
-      alias_name = new_alias_name(base_method)
-      module_eval %[
-        alias_method alias_name, base_method
-        def #{base_method}(*opts)
-          __send__ :#{alias_name}, *opts
-          __send__ :#{extend_method}, *opts
-        end
-      ]
-    end
-
-    # Returns a unique method name to use as an alias for the given +name+.
-    #
-    # Usually returns <code>#{prefix}#{name}#{postfix}<num></code>, example:
-    #
-    #     new_alias_name('foo') #=> __alias_of__foo__
-    #     def bar; end
-    #     new_alias_name('bar') #=> __alias_of__bar__2
-    def new_alias_name(name, prefix = "__alias_of__", postfix = "__")
-      base_name = "#{prefix}#{name}#{postfix}"
-      all_methods = instance_methods(true) + private_instance_methods(true)
-      same_methods = all_methods.grep(/^#{Regexp.quote(base_name)}[0-9]*$/)
-      return base_name if same_methods.empty?
-      no = same_methods.size
-      while !same_methods.include?(alias_name = base_name + no)
-        no += 1
-      end
-      alias_name
-    end
-  end
 end

data/lib/irb/frame.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   frame.rb -
-#   	$Release Version: 0.9$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
-# --
-#
-#
-#
 
 module IRB
   class Frame

data/lib/irb/help.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   irb/help.rb - print usage module
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
-# --
-#
-#
-#
 
 require_relative 'magic-file'
 

data/lib/irb/init.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   irb/init.rb - irb initialize module
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB # :nodoc:
 
@@ -407,9 +401,9 @@ module IRB # :nodoc:
     end
     if home = ENV["HOME"]
       yield proc{|rc| home+"/.irb#{rc}"}
+      yield proc{|rc| home+"/.config/irb/irb#{rc}"}
     end
     current_dir = Dir.pwd
-    yield proc{|rc| current_dir+"/.config/irb/irb#{rc}"}
     yield proc{|rc| current_dir+"/.irb#{rc}"}
     yield proc{|rc| current_dir+"/irb#{rc.sub(/\A_?/, '.')}"}
     yield proc{|rc| current_dir+"/_irb#{rc}"}
@@ -427,8 +421,6 @@ module IRB # :nodoc:
     end
   end
 
-
-  DefaultEncodings = Struct.new(:external, :internal)
   class << IRB
     private
     def set_encoding(extern, intern = nil, override: true)

data/lib/irb/input-method.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: false
 #
 #   irb/input-method.rb - input methods used irb
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
+
 require_relative 'src_encoding'
 require_relative 'magic-file'
 require_relative 'completion'

data/lib/irb/inspector.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: false
 #
 #   irb/inspector.rb - inspect methods
-#   	$Release Version: 0.9.6$
-#   	$Revision: 1.19 $
-#   	$Date: 2002/06/11 07:51:31 $
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB # :nodoc:
 
@@ -42,6 +35,7 @@ module IRB # :nodoc:
   #     irb(main):001:0> "what?" #=> omg! what?
   #
   class Inspector
+    KERNEL_INSPECT = Object.instance_method(:inspect)
     # Default inspectors available to irb, this includes:
     #
     # +:pp+::       Using Kernel#pretty_inspect
@@ -100,9 +94,17 @@ module IRB # :nodoc:
     # Proc to call when the input is evaluated and output in irb.
     def inspect_value(v)
       @inspect.call(v)
-    rescue
-      puts "(Object doesn't support #inspect)"
-      ''
+    rescue => e
+      puts "An error occurred when inspecting the object: #{e.inspect}"
+
+      begin
+        puts "Result of Kernel#inspect: #{KERNEL_INSPECT.bind_call(v)}"
+        ''
+      rescue => e
+        puts "An error occurred when running Kernel#inspect: #{e.inspect}"
+        puts e.backtrace.join("\n")
+        ''
+      end
     end
   end
 

data/lib/irb/lc/error.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   irb/lc/error.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB
   # :stopdoc:

data/lib/irb/lc/help-message

@@ -22,8 +22,8 @@ Usage:  irb.rb [options] [programfile] [arguments]
                     Show truncated result on assignment (default).
   --inspect         Use 'inspect' for output.
   --noinspect       Don't use 'inspect' for output.
-  --multiline       Use multiline editor module.
-  --nomultiline     Don't use multiline editor module (default).
+  --multiline       Use multiline editor module (default).
+  --nomultiline     Don't use multiline editor module.
   --singleline      Use single line editor module.
   --nosingleline    Don't use single line editor module (default).
   --colorize        Use color-highlighting (default).

data/lib/irb/lc/ja/error.rb

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
 # frozen_string_literal: false
+#
 #   irb/lc/ja/error.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB
   # :stopdoc:

data/lib/irb/locale.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: false
 #
 #   irb/locale.rb - internationalization module
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
+
 module IRB # :nodoc:
   class Locale
 

data/lib/irb/notifier.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   notifier.rb - output methods used by irb
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 require_relative "output-method"
 

data/lib/irb/output-method.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: false
 #
 #   output-method.rb - output methods used by irb
-#   	$Release Version: 0.9.6$
-#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# --
-#
-#
-#
 
 module IRB
   # An abstract output class for IO in irb. This is mainly used internally by