irb 1.7.0 → 1.7.2

data/lib/irb/version.rb

@@ -5,7 +5,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.7.0"
+  VERSION = "1.7.2"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2023-06-03"
+  @LAST_UPDATE_DATE = "2023-07-12"
 end

data/lib/irb.rb

@@ -154,7 +154,7 @@ require_relative "irb/easter-egg"
 #
 #     IRB.conf[:EVAL_HISTORY] = <number>
 #
-# See IRB::Context#eval_history= and History class. The history of command
+# See IRB::Context#eval_history= and EvalHistory class. The history of command
 # results is not permanently saved in any file.
 #
 # == Customizing the IRB Prompt
@@ -506,8 +506,6 @@ module IRB
 
     # Evaluates input for this session.
     def eval_input
-      exc = nil
-
       @scanner.set_prompt do
         |ltype, indent, continue, line_no|
         if ltype
@@ -560,26 +558,10 @@ module IRB
       @scanner.each_top_level_statement do |line, line_no|
         signal_status(:IN_EVAL) do
           begin
-            if IRB.conf[:MEASURE] && IRB.conf[:MEASURE_CALLBACKS].empty?
-              IRB.set_measure_callback
-            end
-            # Assignment expression check should be done before @context.evaluate to handle code like `a /2#/ if false; a = 1`
+            # Assignment expression check should be done before evaluate_line to handle code like `a /2#/ if false; a = 1`
             is_assignment = assignment_expression?(line)
-            if IRB.conf[:MEASURE] && !IRB.conf[:MEASURE_CALLBACKS].empty?
-              result = nil
-              last_proc = proc{ result = @context.evaluate(line, line_no, exception: exc) }
-              IRB.conf[:MEASURE_CALLBACKS].inject(last_proc) { |chain, item|
-                _name, callback, arg = item
-                proc {
-                  callback.(@context, line, line_no, arg, exception: exc) do
-                    chain.call
-                  end
-                }
-              }.call
-              @context.set_last_value(result)
-            else
-              @context.evaluate(line, line_no, exception: exc)
-            end
+            evaluate_line(line, line_no)
+
             if @context.echo?
               if is_assignment
                 if @context.echo_on_assignment?
@@ -589,21 +571,33 @@ module IRB
                 output_value
               end
             end
-          rescue Interrupt => exc
           rescue SystemExit, SignalException
             raise
-          rescue Exception => exc
-          else
-            exc = nil
-            next
+          rescue Interrupt, Exception => exc
+            handle_exception(exc)
+            @context.workspace.local_variable_set(:_, exc)
           end
-          handle_exception(exc)
-          @context.workspace.local_variable_set(:_, exc)
-          exc = nil
         end
       end
     end
 
+    def evaluate_line(line, line_no)
+      # Transform a non-identifier alias (@, $) or keywords (next, break)
+      command, args = line.split(/\s/, 2)
+      if original = @context.command_aliases[command.to_sym]
+        line = line.gsub(/\A#{Regexp.escape(command)}/, original.to_s)
+        command = original
+      end
+
+      # Hook command-specific transformation
+      command_class = ExtendCommandBundle.load_command(command)
+      if command_class&.respond_to?(:transform_args)
+        line = "#{command} #{command_class.transform_args(args)}"
+      end
+
+      @context.evaluate(line, line_no)
+    end
+
     def convert_invalid_byte_sequence(str, enc)
       str.force_encoding(enc)
       str.scrub { |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - aycabta
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-04 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.6
 description: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).
 email:
 - aycabta@gmail.com
@@ -55,7 +55,6 @@ files:
 - lib/irb/cmd/delete.rb
 - lib/irb/cmd/edit.rb
 - lib/irb/cmd/finish.rb
-- lib/irb/cmd/fork.rb
 - lib/irb/cmd/help.rb
 - lib/irb/cmd/info.rb
 - lib/irb/cmd/irb_info.rb
@@ -77,16 +76,16 @@ files:
 - lib/irb/context.rb
 - lib/irb/easter-egg.rb
 - lib/irb/ext/change-ws.rb
-- lib/irb/ext/history.rb
+- lib/irb/ext/eval_history.rb
 - lib/irb/ext/loader.rb
 - lib/irb/ext/multi-irb.rb
-- lib/irb/ext/save-history.rb
 - lib/irb/ext/tracer.rb
 - lib/irb/ext/use-loader.rb
 - lib/irb/ext/workspaces.rb
 - lib/irb/extend-command.rb
 - lib/irb/frame.rb
 - lib/irb/help.rb
+- lib/irb/history.rb
 - lib/irb/init.rb
 - lib/irb/input-method.rb
 - lib/irb/inspector.rb
@@ -95,11 +94,11 @@ files:
 - lib/irb/lc/ja/error.rb
 - lib/irb/lc/ja/help-message
 - lib/irb/locale.rb
+- lib/irb/nesting_parser.rb
 - lib/irb/notifier.rb
 - lib/irb/output-method.rb
 - lib/irb/ruby-lex.rb
 - lib/irb/ruby_logo.aa
-- lib/irb/src_encoding.rb
 - lib/irb/version.rb
 - lib/irb/workspace.rb
 - lib/irb/ws-for-case-2.rb

data/lib/irb/cmd/fork.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#   fork.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "nop"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Fork < Nop
-      def execute
-        pid = __send__ ExtendCommand.irb_original_method_name("fork")
-        unless pid
-          class << self
-            alias_method :exit, ExtendCommand.irb_original_method_name('exit')
-          end
-          if block_given?
-            begin
-              yield
-            ensure
-              exit
-            end
-          end
-        end
-        pid
-      end
-    end
-  end
-
-  # :startdoc:
-end

data/lib/irb/src_encoding.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: false
-# DO NOT WRITE ANY MAGIC COMMENT HERE.
-module IRB
-  def self.default_src_encoding
-    return __ENCODING__
-  end
-end