[ruby/irb] Drop unused arguments in RubyLex
(https://github.com/ruby/irb/pull/504) * Simplify `RubyLex#set_prompt` It's optional argument is never used by any caller. * Remove the optional `p` argument from `RubyLex#set_input` The argument is only used in a test case, which can be easily replaced by a block argument.
This commit is contained in:
parent
3642006872
commit
c693dfd7ef
@ -48,7 +48,7 @@ class RubyLex
|
||||
end
|
||||
|
||||
# io functions
|
||||
def set_input(io, p = nil, context:, &block)
|
||||
def set_input(io, context:, &block)
|
||||
@io = io
|
||||
if @io.respond_to?(:check_termination)
|
||||
@io.check_termination do |code|
|
||||
@ -116,22 +116,15 @@ class RubyLex
|
||||
end
|
||||
end
|
||||
|
||||
if p.respond_to?(:call)
|
||||
@input = p
|
||||
elsif block_given?
|
||||
if block_given?
|
||||
@input = block
|
||||
else
|
||||
@input = Proc.new{@io.gets}
|
||||
end
|
||||
end
|
||||
|
||||
def set_prompt(p = nil, &block)
|
||||
p = block if block_given?
|
||||
if p.respond_to?(:call)
|
||||
@prompt = p
|
||||
else
|
||||
@prompt = Proc.new{print p}
|
||||
end
|
||||
def set_prompt(&block)
|
||||
@prompt = block
|
||||
end
|
||||
|
||||
ERROR_TOKENS = [
|
||||
|
@ -62,7 +62,9 @@ module TestIRB
|
||||
|
||||
context = build_context(local_variables)
|
||||
io = proc{ lines.join("\n") }
|
||||
ruby_lex.set_input(io, io, context: context)
|
||||
ruby_lex.set_input(io, context: context) do
|
||||
lines.join("\n")
|
||||
end
|
||||
ruby_lex.lex(context)
|
||||
ruby_lex
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user