irb 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ffc4aa655192040fa6afa339ebd3a440a0edab364b8adb43879b46b4437bb7d
-  data.tar.gz: b8abfe5e41f5685a487458d6c8dde123151b4e49814850d39bb54ac159614850
+  metadata.gz: cb526faa67bbfaad97480a6e642dc161725c6c444dcb6e6080498fae665173a6
+  data.tar.gz: 58c89d71946d694826f2409eaf4a49ed88644bf640564e2f3a6c9ab3d8e9c0e1
 SHA512:
-  metadata.gz: fb7613e840270144cf31aeeffa2ae70367492c79a47dcae24da0ff90c69ca8c089efb031f52972b50be02db816ad4e35a493b654f2a43e7639f1fdf9c55060e7
-  data.tar.gz: d587ad70d0d944a7c9f0ca58adff4adf0055d3d1f6aa3052f4d2783cf04f4184689d6e16dff173bddf1755543eedecd4308da6db113aca644502ce4aa46274d3
+  metadata.gz: 9e101c1374b8ea161ec76217739ce5dbcd93c9e85e3cc147852717634085b97e5bd1aa71a9a6c316a660e9c60f0d16a03d08c26e7b7e65bdbb44886295bfa8dd
+  data.tar.gz: 6243fb79d8747f0c507ebbd7e3f4efd486b3848ea7b2bf4db5ee4bb48591ee20857bcf5d86f61520c7d17b1d9307dc28a2ac785a64dda83ba1c78ebff90d53b6

data/lib/irb.rb

@@ -544,9 +544,10 @@ module IRB
             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].map{ |s| s.last }.inject(last_proc) { |chain, item|
+              IRB.conf[:MEASURE_CALLBACKS].inject(last_proc) { |chain, item|
+                _name, callback, arg = item
                 proc {
-                  item.(@context, line, line_no, exception: exc) do
+                  callback.(@context, line, line_no, arg, exception: exc) do
                     chain.call
                   end
                 }

data/lib/irb/init.rb

@@ -120,7 +120,7 @@ module IRB # :nodoc:
       puts 'processing time: %fs' % (now - time) if IRB.conf[:MEASURE]
       result
     }
-    @CONF[:MEASURE_PROC][:STACKPROF] = proc { |context, code, line_no, &block|
+    @CONF[:MEASURE_PROC][:STACKPROF] = proc { |context, code, line_no, arg, &block|
       success = false
       begin
         require 'stackprof'
@@ -130,7 +130,7 @@ module IRB # :nodoc:
       end
       if success
         result = nil
-        stackprof_result = StackProf.run(mode: :cpu) do
+        stackprof_result = StackProf.run(mode: arg ? arg : :cpu) do
           result = block.()
         end
         StackProf::Report.new(stackprof_result).print_text if IRB.conf[:MEASURE]
@@ -146,17 +146,17 @@ module IRB # :nodoc:
     @CONF[:AT_EXIT] = []
   end
 
-  def IRB.set_measure_callback(type = nil)
+  def IRB.set_measure_callback(type = nil, arg = nil)
     added = nil
     if type
       type_sym = type.upcase.to_sym
       if IRB.conf[:MEASURE_PROC][type_sym]
-        added = [type_sym, IRB.conf[:MEASURE_PROC][type_sym]]
+        added = [type_sym, IRB.conf[:MEASURE_PROC][type_sym], arg]
       end
     elsif IRB.conf[:MEASURE_PROC][:CUSTOM]
-      added = [:CUSTOM, IRB.conf[:MEASURE_PROC][:CUSTOM]]
+      added = [:CUSTOM, IRB.conf[:MEASURE_PROC][:CUSTOM], arg]
     else
-      added = [:TIME, IRB.conf[:MEASURE_PROC][:TIME]]
+      added = [:TIME, IRB.conf[:MEASURE_PROC][:TIME], arg]
     end
     IRB.conf[:MEASURE_CALLBACKS] << added if added
     added
@@ -167,7 +167,7 @@ module IRB # :nodoc:
       IRB.conf[:MEASURE_CALLBACKS].clear
     else
       type_sym = type.upcase.to_sym
-      IRB.conf[:MEASURE_CALLBACKS].reject!{ |t, c| t == type_sym }
+      IRB.conf[:MEASURE_CALLBACKS].reject!{ |t, | t == type_sym }
     end
   end
 

data/lib/irb/ruby-lex.rb

@@ -201,14 +201,14 @@ class RubyLex
     code = @line + (line.nil? ? '' : line)
     code.gsub!(/\s*\z/, '').concat("\n")
     @tokens = ripper_lex_without_warning(code)
-    @continue = process_continue(@tokens)
-    @code_block_open = check_code_block(code, @tokens)
-    @indent = process_nesting_level(@tokens)
-    @ltype = process_literal_type(@tokens)
+    @continue = process_continue
+    @code_block_open = check_code_block(code)
+    @indent = process_nesting_level
+    @ltype = process_literal_type
     line
   end
 
-  def process_continue(tokens)
+  def process_continue(tokens = @tokens)
     # last token is always newline
     if tokens.size >= 2 and tokens[-2][1] == :on_regexp_end
       # end of regexp literal
@@ -228,7 +228,7 @@ class RubyLex
     false
   end
 
-  def check_code_block(code, tokens)
+  def check_code_block(code, tokens = @tokens)
     return true if tokens.empty?
     if tokens.last[1] == :on_heredoc_beg
       return true
@@ -321,7 +321,7 @@ class RubyLex
     false
   end
 
-  def process_nesting_level(tokens)
+  def process_nesting_level(tokens = @tokens)
     indent = 0
     in_oneliner_def = nil
     tokens.each_with_index { |t, index|
@@ -574,7 +574,7 @@ class RubyLex
     start_token.last.nil? ? '' : start_token.last
   end
 
-  def process_literal_type(tokens)
+  def process_literal_type(tokens = @tokens)
     start_token = check_string_literal(tokens)
     case start_token[1]
     when :on_tstring_beg

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2020-12-20"
+  @LAST_UPDATE_DATE = "2020-12-22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Keiju ISHITSUKA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline