mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
![matz](/assets/img/avatar_default.png)
rb_exec_recursive() in eval.c. * eval.c (rb_exec_recursive): new function. * array.c (rb_ary_join): use rb_exec_recursive(). * array.c (rb_ary_inspect, rb_ary_hash): ditto. * file.c (rb_file_join): ditto. * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto. * io.c (rb_io_puts): ditto. * object.c (rb_obj_inspect): ditto * struct.c (rb_struct_inspect): ditto. * lib/set.rb (SortedSet::setup): a hack to shut up warning. [ruby-talk:132866] * lib/time.rb (Time::strptime): add new function. inspired by [ruby-talk:132815]. * lib/parsedate.rb (ParseDate::strptime): ditto. * regparse.c: move st_*_strend() functions from st.c. fixed some potential memory leaks. * exception error messages updated. [ruby-core:04497] * ext/socket/socket.c (Init_socket): add bunch of Socket constants. Patch from Sam Roberts <sroberts@uniserve.com>. [ruby-core:04409] * array.c (rb_ary_s_create): no need for negative argc check. [ruby-core:04463] * array.c (rb_ary_unshift_m): ditto. * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass of StandardError class, not Exception class. [ruby-core:04429] * parse.y (fcall_gen): lvar(arg) will be evaluated as lvar.call(arg) when lvar is a defined local variable. [new] * object.c (rb_class_initialize): call inherited method before calling initializing block. * eval.c (rb_thread_start_1): initialize newly pushed frame. * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE. fixed: [ruby-core:04444] * eval.c (is_defined): NODE_IASGN is an assignment. * ext/readline/readline.c (Readline.readline): use rl_outstream and rl_instream. [ruby-dev:25699] * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check [ruby-dev:25675] * misc/ruby-mode.el: [ruby-core:04415] * lib/rdoc/generators/html_generator.rb: [ruby-core:04412] * lib/rdoc/generators/ri_generator.rb: ditto. * struct.c (make_struct): fixed: [ruby-core:04402] * ext/curses/curses.c (window_color_set): [ruby-core:04393] * ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] * object.c: [ruby-doc:818] * parse.y (open_args): fix too verbose warnings for the space before argument parentheses. [ruby-dev:25492] * parse.y (parser_yylex): ditto. * parse.y (parser_yylex): the first expression in the parentheses should not be a command. [ruby-dev:25492] * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330] * object.c (Init_Object): remove Object#type. [ruby-core:04335] * st.c (st_foreach): report success/failure by return value. [ruby-Bugs-1396] * parse.y: forgot to initialize parser struct. [ruby-dev:25492] * parse.y (parser_yylex): no tLABEL on EXPR_BEG. [ruby-talk:127711] * document updates - [ruby-core:04296], [ruby-core:04301], [ruby-core:04302], [ruby-core:04307] * dir.c (rb_push_glob): should work for NUL delimited patterns. * dir.c (rb_glob2): should aware of offset in the pattern. * string.c (rb_str_new4): should propagate taintedness. * env.h: rename member names in struct FRAME; last_func -> callee, orig_func -> this_func, last_class -> this_class. * struct.c (rb_struct_set): use original method name, not callee name, to retrieve member slot. [ruby-core:04268] * time.c (time_strftime): protect from format modification from GC finalizers. * object.c (Init_Object): remove rb_obj_id_obsolete() * eval.c (rb_mod_define_method): incomplete subclass check. [ruby-dev:25464] * gc.c (rb_data_object_alloc): klass may be NULL. [ruby-list:40498] * bignum.c (rb_big_rand): should return positive random number. [ruby-dev:25401] * bignum.c (rb_big_rand): do not use rb_big_modulo to generate random bignums. [ruby-dev:25396] * variable.c (rb_autoload): [ruby-dev:25373] * eval.c (svalue_to_avalue): [ruby-dev:25366] * string.c (rb_str_justify): [ruby-dev:25367] * io.c (rb_f_select): [ruby-dev:25312] * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072] * struct.c (make_struct): [ruby-dev:25249] * dir.c (dir_open_dir): new function. [ruby-dev:25242] * io.c (rb_f_open): add type check for return value from to_open. * lib/pstore.rb (PStore#transaction): Use the empty content when a file is not found. [ruby-dev:24561] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
234 lines
5.5 KiB
Ruby
234 lines
5.5 KiB
Ruby
#
|
|
# irb/context.rb - irb context
|
|
# $Release Version: 0.9$
|
|
# $Revision$
|
|
# $Date$
|
|
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
|
|
#
|
|
# --
|
|
#
|
|
#
|
|
#
|
|
require "irb/workspace"
|
|
|
|
module IRB
|
|
class Context
|
|
#
|
|
# Arguments:
|
|
# input_method: nil -- stdin or readline
|
|
# String -- File
|
|
# other -- using this as InputMethod
|
|
#
|
|
def initialize(irb, workspace = nil, input_method = nil)
|
|
@irb = irb
|
|
if workspace
|
|
@workspace = workspace
|
|
else
|
|
@workspace = WorkSpace.new
|
|
end
|
|
@thread = Thread.current if defined? Thread
|
|
# @irb_level = 0
|
|
|
|
# copy of default configuration
|
|
@ap_name = IRB.conf[:AP_NAME]
|
|
@rc = IRB.conf[:RC]
|
|
@load_modules = IRB.conf[:LOAD_MODULES]
|
|
|
|
@use_readline = IRB.conf[:USE_READLINE]
|
|
@inspect_mode = IRB.conf[:INSPECT_MODE]
|
|
|
|
self.math_mode = IRB.conf[:MATH_MODE] if IRB.conf[:MATH_MODE]
|
|
self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRACER]
|
|
self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
|
|
self.eval_history = IRB.conf[:EVAL_HISTORY] if IRB.conf[:EVAL_HISTORY]
|
|
|
|
@ignore_sigint = IRB.conf[:IGNORE_SIGINT]
|
|
@ignore_eof = IRB.conf[:IGNORE_EOF]
|
|
|
|
@back_trace_limit = IRB.conf[:BACK_TRACE_LIMIT]
|
|
|
|
self.prompt_mode = IRB.conf[:PROMPT_MODE]
|
|
|
|
if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
|
|
@irb_name = IRB.conf[:IRB_NAME]
|
|
else
|
|
@irb_name = "irb#"+IRB.JobManager.n_jobs.to_s
|
|
end
|
|
@irb_path = "(" + @irb_name + ")"
|
|
|
|
case input_method
|
|
when nil
|
|
if (defined?(ReadlineInputMethod) &&
|
|
(use_readline? || IRB.conf[:PROMPT_MODE] != :INF_RUBY && STDIN.tty?))
|
|
@io = ReadlineInputMethod.new
|
|
else
|
|
@io = StdioInputMethod.new
|
|
end
|
|
when String
|
|
@io = FileInputMethod.new(input_method)
|
|
@irb_name = File.basename(input_method)
|
|
@irb_path = input_method
|
|
else
|
|
@io = input_method
|
|
end
|
|
|
|
@verbose = IRB.conf[:VERBOSE]
|
|
@echo = IRB.conf[:ECHO]
|
|
if @echo.nil?
|
|
@echo = true
|
|
end
|
|
@debug_level = IRB.conf[:DEBUG_LEVEL]
|
|
end
|
|
|
|
def main
|
|
@workspace.main
|
|
end
|
|
|
|
attr_reader :workspace_home
|
|
attr_accessor :workspace
|
|
attr_reader :thread
|
|
attr_accessor :io
|
|
|
|
attr_accessor :irb
|
|
attr_accessor :ap_name
|
|
attr_accessor :rc
|
|
attr_accessor :load_modules
|
|
attr_accessor :irb_name
|
|
attr_accessor :irb_path
|
|
|
|
attr_accessor :use_readline
|
|
attr_reader :inspect_mode
|
|
|
|
attr_reader :prompt_mode
|
|
attr_accessor :prompt_i
|
|
attr_accessor :prompt_s
|
|
attr_accessor :prompt_c
|
|
attr_accessor :auto_indent_mode
|
|
attr_accessor :return_format
|
|
|
|
attr_accessor :ignore_sigint
|
|
attr_accessor :ignore_eof
|
|
attr_accessor :echo
|
|
attr_accessor :verbose
|
|
attr_reader :debug_level
|
|
|
|
attr_accessor :back_trace_limit
|
|
|
|
alias use_readline? use_readline
|
|
alias rc? rc
|
|
alias ignore_sigint? ignore_sigint
|
|
alias ignore_eof? ignore_eof
|
|
alias echo? echo
|
|
|
|
def verbose?
|
|
if @verbose.nil?
|
|
if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
|
|
false
|
|
elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
|
|
true
|
|
else
|
|
false
|
|
end
|
|
end
|
|
end
|
|
|
|
def prompting?
|
|
verbose? || (STDIN.tty? && @io.kind_of?(StdioInputMethod) ||
|
|
(defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)))
|
|
end
|
|
|
|
attr_reader :last_value
|
|
|
|
def set_last_value(value)
|
|
@last_value = value
|
|
end
|
|
|
|
attr_reader :irb_name
|
|
|
|
def prompt_mode=(mode)
|
|
@prompt_mode = mode
|
|
pconf = IRB.conf[:PROMPT][mode]
|
|
@prompt_i = pconf[:PROMPT_I]
|
|
@prompt_s = pconf[:PROMPT_S]
|
|
@prompt_c = pconf[:PROMPT_C]
|
|
@return_format = pconf[:RETURN]
|
|
if ai = pconf.include?(:AUTO_INDENT)
|
|
@auto_indent_mode = ai
|
|
else
|
|
@auto_indent_mode = IRB.conf[:AUTO_INDENT]
|
|
end
|
|
end
|
|
|
|
def inspect?
|
|
@inspect_mode.nil? or @inspect_mode
|
|
end
|
|
|
|
def file_input?
|
|
@io.class == FileInputMethod
|
|
end
|
|
|
|
def inspect_mode=(opt)
|
|
if opt
|
|
@inspect_mode = opt
|
|
else
|
|
@inspect_mode = !@inspect_mode
|
|
end
|
|
print "Switch to#{unless @inspect_mode; ' non';end} inspect mode.\n" if verbose?
|
|
@inspect_mode
|
|
end
|
|
|
|
undef use_readline=
|
|
def use_readline=(opt)
|
|
@use_readline = opt
|
|
print "use readline module\n" if @use_readline
|
|
end
|
|
|
|
def debug_level=(value)
|
|
@debug_level = value
|
|
RubyLex.debug_level = value
|
|
SLex.debug_level = value
|
|
end
|
|
|
|
def debug?
|
|
@debug_level > 0
|
|
end
|
|
|
|
def evaluate(line, line_no)
|
|
@line_no = line_no
|
|
set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
|
|
# @workspace.evaluate("_ = IRB.conf[:MAIN_CONTEXT]._")
|
|
# @_ = @workspace.evaluate(line, irb_path, line_no)
|
|
end
|
|
|
|
alias __exit__ exit
|
|
def exit(ret = 0)
|
|
IRB.irb_exit(@irb, ret)
|
|
end
|
|
|
|
NOPRINTING_IVARS = ["@last_value"]
|
|
NO_INSPECTING_IVARS = ["@irb", "@io"]
|
|
IDNAME_IVARS = ["@prompt_mode"]
|
|
|
|
alias __inspect__ inspect
|
|
def inspect
|
|
array = []
|
|
for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
|
|
name = ivar.sub(/^@(.*)$/){$1}
|
|
val = instance_eval(ivar)
|
|
case ivar
|
|
when *NOPRINTING_IVARS
|
|
array.push format("conf.%s=%s", name, "...")
|
|
when *NO_INSPECTING_IVARS
|
|
array.push format("conf.%s=%s", name, val.to_s)
|
|
when *IDNAME_IVARS
|
|
array.push format("conf.%s=:%s", name, val.id2name)
|
|
else
|
|
array.push format("conf.%s=%s", name, val.inspect)
|
|
end
|
|
end
|
|
array.join("\n")
|
|
end
|
|
alias __to_s__ to_s
|
|
alias to_s inspect
|
|
end
|
|
end
|