kotovalexarian-likes-github/pry--pry
1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00
Code Releases Activity

got rid of Pry.cmd_ret_value (not threadsafe)

Browse source
This commit is contained in:
John Mair 2011-09-04 01:28:47 +12:00
parent a381a9f11e
commit fc15407150
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pry/pry_class.rb
View file

@ -25,10 +25,6 @@ class Pry
# Pry.custom_completions = proc { Dir.entries('.') }
attr_accessor :custom_completions
# Value returned by last executed Pry command.
# @return [Object] The command value
attr_accessor :cmd_ret_value
# @return [Fixnum] The current input line.
attr_accessor :current_line

8
lib/pry/pry_instance.rb
View file

@ -278,7 +278,7 @@ class Pry
# @param [String] val The input string.
# @return [Boolean] Whether the input is null.
def null_input?(val)
val.empty? && !Pry.cmd_ret_value
val.empty? && !Thread.current[:__pry_cmd_ret_value__]
end
# Read a line of input and check for ^d, also determine prompt to use.
@ -306,10 +306,10 @@ class Pry
# @param [String] eval_string The cumulative lines of input.
# @param [Binding] target The target of the Pry session.
def process_line(val, eval_string, target)
Pry.cmd_ret_value = @command_processor.process_commands(val, eval_string, target)
Thread.current[:__pry_cmd_ret_value__] = @command_processor.process_commands(val, eval_string, target)
if Pry.cmd_ret_value
eval_string << "Pry.cmd_ret_value\n"
if Thread.current[:__pry_cmd_ret_value__]
eval_string << "Thread.current[:__pry_cmd_ret_value__]\n"
else
# only commands (with no ret_value) should have an empty `val` so this ignores their result
eval_string << "#{val.rstrip}\n" if !val.empty?