2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
eval.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Thu Jun 10 14:22:17 JST 1993
|
|
|
|
|
2003-01-16 02:34:03 -05:00
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
2000-05-01 05:42:38 -04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 00:53:16 -04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-01 05:42:38 -04:00
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#include "eval_intern.h"
|
2003-12-12 19:01:28 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE proc_invoke(VALUE, VALUE, VALUE, VALUE);
|
2007-01-17 03:48:52 -05:00
|
|
|
VALUE rb_binding_new();
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE rb_f_block_given_p(void);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ID rb_frame_callee(void);
|
|
|
|
static VALUE rb_frame_self(void);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE *ruby_current_node;
|
2005-05-25 19:35:25 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static ID removed, singleton_removed, undefined, singleton_undefined;
|
|
|
|
static ID init, eqq, each, aref, aset, match, missing;
|
|
|
|
static ID added, singleton_added;
|
|
|
|
static ID object_id, __send, __send_bang, respond_to;
|
2003-12-12 19:01:28 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE rb_eLocalJumpError;
|
|
|
|
VALUE rb_eSysStackError;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
extern int ruby_nerrs;
|
|
|
|
extern VALUE ruby_top_self;
|
1999-12-07 04:25:55 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE ruby_wrapper; /* security wrapper */
|
2002-03-22 02:26:42 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE eval _((VALUE, VALUE, VALUE, char *, int));
|
1999-12-07 04:25:55 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
|
|
|
|
static VALUE rb_call(VALUE, VALUE, ID, int, const VALUE *, int);
|
2005-07-02 02:22:14 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void rb_clear_trace_func(void);
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
typedef struct event_hook {
|
|
|
|
rb_event_hook_func_t func;
|
|
|
|
rb_event_t events;
|
|
|
|
struct event_hook *next;
|
|
|
|
} rb_event_hook_t;
|
2000-05-18 00:32:13 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static rb_event_hook_t *event_hooks;
|
1999-12-14 01:50:43 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
|
|
|
|
do { \
|
|
|
|
rb_event_hook_t *hook; \
|
|
|
|
\
|
|
|
|
for (hook = event_hooks; hook; hook = hook->next) { \
|
|
|
|
if (hook->events & event) \
|
|
|
|
(*hook->func)(event, node, self, id, klass); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
2000-05-24 00:34:26 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void call_trace_func _((rb_event_t, NODE *, VALUE, ID, VALUE));
|
2003-03-24 22:11:27 -05:00
|
|
|
|
2003-03-24 04:38:37 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#include "eval_error.h"
|
|
|
|
#include "eval_method.h"
|
|
|
|
#include "eval_safe.h"
|
|
|
|
#include "eval_jump.h"
|
1999-12-14 01:50:43 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* initialize ruby */
|
2001-05-11 01:24:59 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#if defined(__APPLE__)
|
|
|
|
#define environ (*_NSGetEnviron())
|
|
|
|
#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
|
|
|
|
extern char **environ;
|
|
|
|
#endif
|
|
|
|
char **rb_origenviron;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
jmp_buf function_call_may_return_twice_jmp_buf;
|
|
|
|
int function_call_may_return_twice_false = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void rb_call_inits _((void));
|
|
|
|
void Init_stack _((VALUE *));
|
|
|
|
void Init_heap _((void));
|
|
|
|
void Init_ext _((void));
|
|
|
|
void Init_yarv(void);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
void
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_init(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
static int initialized = 0;
|
|
|
|
int state;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (initialized)
|
|
|
|
return;
|
|
|
|
initialized = 1;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#ifdef __MACOS__
|
|
|
|
rb_origenviron = 0;
|
|
|
|
#else
|
|
|
|
rb_origenviron = environ;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
Init_stack((void *)&state);
|
|
|
|
Init_yarv();
|
|
|
|
Init_heap();
|
|
|
|
|
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
rb_call_inits();
|
|
|
|
|
|
|
|
#ifdef __MACOS__
|
|
|
|
_macruby_init();
|
|
|
|
#elif defined(__VMS)
|
|
|
|
_vmsruby_init();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ruby_prog_init();
|
|
|
|
ALLOW_INTS;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
POP_TAG_INIT();
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (state) {
|
|
|
|
error_print();
|
|
|
|
exit(EXIT_FAILURE);
|
2003-07-15 06:50:54 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_running = 1;
|
2003-07-15 06:50:54 -04:00
|
|
|
}
|
|
|
|
|
2003-07-07 04:28:19 -04:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_options(int argc, char **argv)
|
2002-05-14 02:22:31 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
|
|
|
|
Init_stack((void *)&state);
|
|
|
|
PUSH_THREAD_TAG();
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
ruby_process_options(argc, argv);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_clear_trace_func();
|
|
|
|
exit(error_handle(state));
|
2002-05-14 02:22:31 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
POP_THREAD_TAG();
|
2002-05-14 02:22:31 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_finalize_0(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if (EXEC_TAG() == 0) {
|
|
|
|
rb_trap_exit();
|
2003-05-02 02:41:33 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
POP_TAG();
|
|
|
|
rb_exec_end_proc();
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_finalize_1(void)
|
2002-12-20 03:33:17 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
signal(SIGINT, SIG_DFL);
|
|
|
|
GET_THREAD()->errinfo = 0;
|
|
|
|
rb_gc_call_finalizer_at_exit();
|
|
|
|
rb_clear_trace_func();
|
2002-12-20 03:33:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_finalize(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_finalize_0();
|
|
|
|
ruby_finalize_1();
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
ruby_cleanup(int ex)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
volatile VALUE err = GET_THREAD()->errinfo;
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_vm_t *vm = GET_THREAD()->vm;
|
2003-10-09 18:50:57 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* th->errinfo contains a NODE while break'ing */
|
|
|
|
if (RTEST(err) && (TYPE(err) != T_NODE) &&
|
|
|
|
rb_obj_is_kind_of(err, rb_eSystemExit)) {
|
|
|
|
vm->exit_code = NUM2INT(rb_iv_get(err, "status"));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vm->exit_code = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
GET_THREAD()->safe_level = 0;
|
|
|
|
Init_stack((void *)&state);
|
|
|
|
PUSH_THREAD_TAG();
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
if (GET_THREAD()->errinfo) {
|
|
|
|
err = GET_THREAD()->errinfo;
|
2003-01-14 02:45:19 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_finalize_0();
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else if (ex == 0) {
|
|
|
|
ex = state;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_thread_terminate_all();
|
|
|
|
GET_THREAD()->errinfo = err;
|
|
|
|
ex = error_handle(ex);
|
|
|
|
ruby_finalize_1();
|
|
|
|
POP_THREAD_TAG();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (vm->exit_code) {
|
|
|
|
return vm->exit_code;
|
|
|
|
}
|
|
|
|
return ex;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
extern NODE *ruby_eval_tree;
|
2004-10-18 19:47:32 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static int
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_exec_internal(void)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
int state;
|
|
|
|
VALUE val;
|
|
|
|
PUSH_TAG(0);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
GET_THREAD()->base_block = 0;
|
|
|
|
val = yarvcore_eval_parsed(ruby_eval_tree,
|
|
|
|
rb_str_new2(ruby_sourcefile));
|
2004-05-17 20:32:30 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
POP_TAG();
|
|
|
|
return state;
|
2003-11-14 18:54:06 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_exec(void)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
volatile NODE *tmp;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
Init_stack((void *)&tmp);
|
|
|
|
return ruby_exec_internal();
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_stop(int ex)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
exit(ruby_cleanup(ex));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
2007-02-07 08:34:18 -05:00
|
|
|
ruby_run(void)
|
1999-12-14 01:50:43 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
static int ex;
|
2003-07-07 04:28:19 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (ruby_nerrs > 0) {
|
|
|
|
exit(EXIT_FAILURE);
|
2003-07-07 04:28:19 -04:00
|
|
|
}
|
1999-12-14 01:50:43 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
state = ruby_exec();
|
2003-09-11 23:30:45 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (state && !ex) {
|
|
|
|
ex = state;
|
|
|
|
}
|
|
|
|
ruby_stop(ex);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
2007-02-07 08:34:18 -05:00
|
|
|
rb_eval_string(const char *str)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE v;
|
|
|
|
NODE *oldsrc = ruby_current_node;
|
|
|
|
|
|
|
|
ruby_current_node = 0;
|
|
|
|
ruby_sourcefile = rb_source_filename("(eval)");
|
|
|
|
v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
|
|
|
|
ruby_current_node = oldsrc;
|
|
|
|
|
|
|
|
return v;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
2007-02-07 08:34:18 -05:00
|
|
|
rb_eval_string_protect(const char *str, int *state)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
2007-02-07 08:34:18 -05:00
|
|
|
rb_eval_string_wrap(const char *str, int *state)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
int status;
|
|
|
|
VALUE self = ruby_top_self;
|
|
|
|
VALUE wrapper = ruby_wrapper;
|
|
|
|
VALUE val;
|
|
|
|
|
|
|
|
ruby_top_self = rb_obj_clone(ruby_top_self);
|
|
|
|
rb_extend_object(ruby_top_self, ruby_wrapper);
|
|
|
|
|
|
|
|
val = rb_eval_string_protect(str, &status);
|
|
|
|
ruby_top_self = self;
|
|
|
|
|
|
|
|
ruby_wrapper = wrapper;
|
|
|
|
if (state) {
|
|
|
|
*state = status;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else if (status) {
|
|
|
|
JUMP_TAG(status);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return val;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_eval_cmd(VALUE cmd, VALUE arg, int level)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
VALUE val = Qnil; /* OK */
|
|
|
|
volatile int safe = rb_safe_level();
|
|
|
|
|
|
|
|
if (OBJ_TAINTED(cmd)) {
|
|
|
|
level = 4;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (TYPE(cmd) != T_STRING) {
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
rb_set_safe_level_force(level);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
val =
|
|
|
|
rb_funcall2(cmd, rb_intern("call"), RARRAY_LEN(arg),
|
|
|
|
RARRAY_PTR(arg));
|
|
|
|
}
|
|
|
|
POP_TAG();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_set_safe_level_force(safe);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (state)
|
|
|
|
JUMP_TAG(state);
|
|
|
|
return val;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
val = eval(ruby_top_self, cmd, Qnil, 0, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
POP_TAG();
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_set_safe_level_force(safe);
|
|
|
|
th_jump_tag_but_local_jump(state, val);
|
|
|
|
return val;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Module.nesting => array
|
|
|
|
*
|
|
|
|
* Returns the list of +Modules+ nested at the point of call.
|
|
|
|
*
|
|
|
|
* module M1
|
|
|
|
* module M2
|
|
|
|
* $a = Module.nesting
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* $a #=> [M1::M2, M1]
|
|
|
|
* $a[0].name #=> "M1::M2"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_mod_nesting(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE ary = rb_ary_new();
|
|
|
|
NODE *cref = ruby_cref();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
while (cref && cref->nd_next) {
|
|
|
|
VALUE klass = cref->nd_clss;
|
|
|
|
if (!NIL_P(klass)) {
|
|
|
|
rb_ary_push(ary, klass);
|
|
|
|
}
|
|
|
|
cref = cref->nd_next;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return ary;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Module.constants => array
|
|
|
|
*
|
|
|
|
* Returns an array of the names of all constants defined in the
|
|
|
|
* system. This list includes the names of all modules and classes.
|
|
|
|
*
|
|
|
|
* p Module.constants.sort[1..5]
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
|
2000-01-31 22:12:21 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE *cref = ruby_cref();
|
|
|
|
VALUE klass;
|
|
|
|
VALUE cbase = 0;
|
|
|
|
void *data = 0;
|
2000-01-31 22:12:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (argc > 0) {
|
|
|
|
return rb_mod_constants(argc, argv, rb_cModule);
|
2000-01-31 22:12:21 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
while (cref) {
|
|
|
|
klass = cref->nd_clss;
|
|
|
|
if (!NIL_P(klass)) {
|
|
|
|
data = rb_mod_const_at(cref->nd_clss, data);
|
|
|
|
if (!cbase) {
|
|
|
|
cbase = klass;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
cref = cref->nd_next;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
if (cbase) {
|
|
|
|
data = rb_mod_const_of(cbase, data);
|
|
|
|
}
|
|
|
|
return rb_const_list(data);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_frozen_class_p(VALUE klass)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
char *desc = "something(?!)";
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (OBJ_FROZEN(klass)) {
|
|
|
|
if (FL_TEST(klass, FL_SINGLETON))
|
|
|
|
desc = "object";
|
|
|
|
else {
|
|
|
|
switch (TYPE(klass)) {
|
|
|
|
case T_MODULE:
|
|
|
|
case T_ICLASS:
|
|
|
|
desc = "module";
|
|
|
|
break;
|
|
|
|
case T_CLASS:
|
|
|
|
desc = "class";
|
|
|
|
break;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_error_frozen(desc);
|
2000-01-31 22:12:21 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#ifdef C_ALLOCA
|
|
|
|
# define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
|
|
|
|
# define TMP_ALLOC(n) \
|
|
|
|
(tmp__protect_tmp = NEW_NODE(NODE_ALLOCA, \
|
|
|
|
ALLOC_N(VALUE,n),tmp__protect_tmp,n), \
|
|
|
|
(void*)tmp__protect_tmp->nd_head)
|
|
|
|
#else
|
|
|
|
# define TMP_PROTECT typedef int foobazzz
|
|
|
|
# define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
|
|
|
|
#endif
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define MATCH_DATA *rb_svar(node->nd_cnt)
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_add_event_hook(func, events)
|
2005-03-16 08:05:46 -05:00
|
|
|
rb_event_hook_func_t func;
|
|
|
|
rb_event_t events;
|
2003-05-13 01:53:08 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_event_hook_t *hook;
|
2003-05-13 01:53:08 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
hook = ALLOC(rb_event_hook_t);
|
|
|
|
hook->func = func;
|
|
|
|
hook->events = events;
|
|
|
|
hook->next = event_hooks;
|
|
|
|
event_hooks = hook;
|
2003-05-13 01:53:08 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_remove_event_hook(rb_event_hook_func_t func)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_event_hook_t *prev, *hook;
|
2006-02-12 23:53:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
prev = NULL;
|
|
|
|
hook = event_hooks;
|
|
|
|
while (hook) {
|
|
|
|
if (hook->func == func) {
|
|
|
|
if (prev) {
|
|
|
|
prev->next = hook->next;
|
2006-02-12 23:53:22 -05:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 10:02:22 -05:00
|
|
|
event_hooks = hook->next;
|
2006-02-12 23:53:22 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
xfree(hook);
|
|
|
|
return 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
prev = hook;
|
|
|
|
hook = hook->next;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return -1;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_clear_trace_func(void)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* TODO: fix me */
|
2004-12-16 10:01:49 -05:00
|
|
|
}
|
|
|
|
|
2003-12-28 12:24:32 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* set_trace_func(proc) => proc
|
|
|
|
* set_trace_func(nil) => nil
|
2003-12-28 12:24:32 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Establishes _proc_ as the handler for tracing, or disables
|
|
|
|
* tracing if the parameter is +nil+. _proc_ takes up
|
|
|
|
* to six parameters: an event name, a filename, a line number, an
|
|
|
|
* object id, a binding, and the name of a class. _proc_ is
|
|
|
|
* invoked whenever an event occurs. Events are: <code>c-call</code>
|
|
|
|
* (call a C-language routine), <code>c-return</code> (return from a
|
|
|
|
* C-language routine), <code>call</code> (call a Ruby method),
|
|
|
|
* <code>class</code> (start a class or module definition),
|
|
|
|
* <code>end</code> (finish a class or module definition),
|
|
|
|
* <code>line</code> (execute code on a new line), <code>raise</code>
|
|
|
|
* (raise an exception), and <code>return</code> (return from a Ruby
|
|
|
|
* method). Tracing is disabled within the context of _proc_.
|
2003-12-28 12:24:32 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* class Test
|
|
|
|
* def test
|
|
|
|
* a = 1
|
|
|
|
* b = 2
|
|
|
|
* end
|
|
|
|
* end
|
2003-12-28 12:24:32 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* set_trace_func proc { |event, file, line, id, binding, classname|
|
|
|
|
* printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
|
|
|
|
* }
|
|
|
|
* t = Test.new
|
|
|
|
* t.test
|
|
|
|
*
|
|
|
|
* line prog.rb:11 false
|
|
|
|
* c-call prog.rb:11 new Class
|
|
|
|
* c-call prog.rb:11 initialize Object
|
|
|
|
* c-return prog.rb:11 initialize Object
|
|
|
|
* c-return prog.rb:11 new Class
|
|
|
|
* line prog.rb:12 false
|
|
|
|
* call prog.rb:2 test Test
|
|
|
|
* line prog.rb:3 test Test
|
|
|
|
* line prog.rb:4 test Test
|
|
|
|
* return prog.rb:4 test Test
|
2003-12-28 12:24:32 -05:00
|
|
|
*/
|
|
|
|
|
2003-12-28 22:56:22 -05:00
|
|
|
|
2000-12-05 04:36:54 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
set_trace_func(VALUE obj, VALUE trace)
|
2000-12-05 04:36:54 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_event_hook_t *hook;
|
2000-12-05 04:36:54 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (NIL_P(trace)) {
|
|
|
|
rb_clear_trace_func();
|
|
|
|
rb_remove_event_hook(call_trace_func);
|
|
|
|
return Qnil;
|
2001-12-19 02:48:32 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!rb_obj_is_proc(trace)) {
|
|
|
|
rb_raise(rb_eTypeError, "trace_func needs to be Proc");
|
2005-06-03 10:23:17 -04:00
|
|
|
}
|
|
|
|
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* register trace func */
|
|
|
|
/* trace_func = trace; */
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
for (hook = event_hooks; hook; hook = hook->next) {
|
|
|
|
if (hook->func == call_trace_func)
|
|
|
|
return trace;
|
2005-06-03 10:23:17 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
|
|
|
|
return trace;
|
2005-07-22 22:46:41 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static char *
|
|
|
|
get_event_name(rb_event_t event)
|
2005-07-22 22:46:41 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
switch (event) {
|
|
|
|
case RUBY_EVENT_LINE:
|
|
|
|
return "line";
|
|
|
|
case RUBY_EVENT_CLASS:
|
|
|
|
return "class";
|
|
|
|
case RUBY_EVENT_END:
|
|
|
|
return "end";
|
|
|
|
case RUBY_EVENT_CALL:
|
|
|
|
return "call";
|
|
|
|
case RUBY_EVENT_RETURN:
|
|
|
|
return "return";
|
|
|
|
case RUBY_EVENT_C_CALL:
|
|
|
|
return "c-call";
|
|
|
|
case RUBY_EVENT_C_RETURN:
|
|
|
|
return "c-return";
|
|
|
|
case RUBY_EVENT_RAISE:
|
|
|
|
return "raise";
|
|
|
|
default:
|
|
|
|
return "unknown";
|
|
|
|
}
|
2005-06-03 10:23:17 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
|
|
|
call_trace_func(rb_event_t event, NODE *node, VALUE self, ID id, VALUE klass)
|
2005-06-03 10:23:17 -04:00
|
|
|
{
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* TODO: fix me */
|
2006-12-31 10:02:22 -05:00
|
|
|
#if 0
|
|
|
|
int state, raised;
|
|
|
|
NODE *node_save;
|
|
|
|
VALUE srcfile;
|
|
|
|
char *event_name;
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!trace_func)
|
|
|
|
return;
|
|
|
|
if (tracing)
|
|
|
|
return;
|
|
|
|
if (id == ID_ALLOCATOR)
|
|
|
|
return;
|
|
|
|
if (!node && ruby_sourceline == 0)
|
|
|
|
return;
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!(node_save = ruby_current_node)) {
|
|
|
|
node_save = NEW_BEGIN(0);
|
|
|
|
}
|
|
|
|
tracing = 1;
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (node) {
|
|
|
|
ruby_current_node = node;
|
|
|
|
ruby_sourcefile = node->nd_file;
|
|
|
|
ruby_sourceline = nd_line(node);
|
|
|
|
}
|
|
|
|
if (klass) {
|
|
|
|
if (TYPE(klass) == T_ICLASS) {
|
|
|
|
klass = RBASIC(klass)->klass;
|
|
|
|
}
|
|
|
|
else if (FL_TEST(klass, FL_SINGLETON)) {
|
|
|
|
klass = self;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
raised = thread_reset_raised(th);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
srcfile = rb_str_new2(ruby_sourcefile ? ruby_sourcefile : "(ruby)");
|
|
|
|
event_name = get_event_name(event);
|
|
|
|
proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
|
|
|
|
srcfile,
|
|
|
|
INT2FIX(ruby_sourceline),
|
|
|
|
id ? ID2SYM(id) : Qnil,
|
2007-01-17 03:48:52 -05:00
|
|
|
self ? rb_binding_new() : Qnil,
|
2006-12-31 10:02:22 -05:00
|
|
|
klass ? klass : Qnil), Qundef, 0);
|
|
|
|
}
|
|
|
|
if (raised)
|
|
|
|
thread_set_raised(th);
|
|
|
|
POP_TAG();
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
tracing = 0;
|
|
|
|
ruby_current_node = node_save;
|
|
|
|
SET_CURRENT_SOURCE();
|
|
|
|
if (state)
|
|
|
|
JUMP_TAG(state);
|
|
|
|
#endif
|
2005-07-22 22:46:41 -04:00
|
|
|
}
|
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* obj.respond_to?(symbol, include_private=false) => true or false
|
|
|
|
*
|
|
|
|
* Returns +true+> if _obj_ responds to the given
|
|
|
|
* method. Private methods are included in the search only if the
|
|
|
|
* optional second parameter evaluates to +true+.
|
|
|
|
*/
|
2002-09-11 11:13:10 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static NODE *basic_respond_to = 0;
|
2002-09-11 11:13:10 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_obj_respond_to(VALUE obj, ID id, int priv)
|
2003-05-23 05:34:09 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE klass = CLASS_OF(obj);
|
2003-05-23 05:34:09 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (rb_method_node(klass, respond_to) == basic_respond_to) {
|
|
|
|
return rb_method_boundp(klass, id, !priv);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE args[2];
|
|
|
|
int n = 0;
|
|
|
|
args[n++] = ID2SYM(id);
|
|
|
|
if (priv)
|
|
|
|
args[n++] = Qtrue;
|
|
|
|
return rb_funcall2(obj, respond_to, n, args);
|
|
|
|
}
|
2003-05-23 05:34:09 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_respond_to(VALUE obj, ID id)
|
2006-09-23 17:29:47 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_obj_respond_to(obj, id, Qfalse);
|
2006-09-23 17:29:47 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* obj.respond_to?(symbol, include_private=false) => true or false
|
|
|
|
*
|
|
|
|
* Returns +true+> if _obj_ responds to the given
|
|
|
|
* method. Private methods are included in the search only if the
|
|
|
|
* optional second parameter evaluates to +true+.
|
|
|
|
*/
|
2004-12-02 02:41:50 -05:00
|
|
|
|
2002-09-11 11:13:10 -04:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
obj_respond_to(int argc, VALUE *argv, VALUE obj)
|
2002-09-11 11:13:10 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE mid, priv;
|
|
|
|
ID id;
|
2002-09-11 11:13:10 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_scan_args(argc, argv, "11", &mid, &priv);
|
|
|
|
id = rb_to_id(mid);
|
|
|
|
if (rb_method_boundp(CLASS_OF(obj), id, !RTEST(priv))) {
|
|
|
|
return Qtrue;
|
2001-10-09 04:19:46 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return Qfalse;
|
2001-10-09 04:19:46 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.method_defined?(symbol) => true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if the named method is defined by
|
|
|
|
* _mod_ (or its included modules and, if _mod_ is a class,
|
|
|
|
* its ancestors). Public and protected methods are matched.
|
|
|
|
*
|
|
|
|
* module A
|
|
|
|
* def method1() end
|
|
|
|
* end
|
|
|
|
* class B
|
|
|
|
* def method2() end
|
|
|
|
* end
|
|
|
|
* class C < B
|
|
|
|
* include A
|
|
|
|
* def method3() end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* A.method_defined? :method1 #=> true
|
|
|
|
* C.method_defined? "method1" #=> true
|
|
|
|
* C.method_defined? "method2" #=> true
|
|
|
|
* C.method_defined? "method3" #=> true
|
|
|
|
* C.method_defined? "method4" #=> false
|
|
|
|
*/
|
2001-05-02 00:22:21 -04:00
|
|
|
|
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_method_defined(mod, mid)
|
|
|
|
VALUE mod, mid;
|
2001-05-02 00:22:21 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_method_boundp(mod, rb_to_id(mid), 1);
|
2001-05-02 00:22:21 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
|
2001-05-02 00:22:21 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.public_method_defined?(symbol) => true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if the named public method is defined by
|
|
|
|
* _mod_ (or its included modules and, if _mod_ is a class,
|
|
|
|
* its ancestors).
|
|
|
|
*
|
|
|
|
* module A
|
|
|
|
* def method1() end
|
|
|
|
* end
|
|
|
|
* class B
|
|
|
|
* protected
|
|
|
|
* def method2() end
|
|
|
|
* end
|
|
|
|
* class C < B
|
|
|
|
* include A
|
|
|
|
* def method3() end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* A.method_defined? :method1 #=> true
|
|
|
|
* C.public_method_defined? "method1" #=> true
|
|
|
|
* C.public_method_defined? "method2" #=> false
|
|
|
|
* C.method_defined? "method2" #=> true
|
|
|
|
*/
|
2001-05-02 00:22:21 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_mod_public_method_defined(VALUE mod, VALUE mid)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
ID id = rb_to_id(mid);
|
|
|
|
NODE *method;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
method = rb_method_node(mod, id);
|
|
|
|
if (method) {
|
|
|
|
if (VISI_CHECK(method->nd_noex, NOEX_PUBLIC))
|
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.private_method_defined?(symbol) => true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if the named private method is defined by
|
|
|
|
* _ mod_ (or its included modules and, if _mod_ is a class,
|
|
|
|
* its ancestors).
|
|
|
|
*
|
|
|
|
* module A
|
|
|
|
* def method1() end
|
|
|
|
* end
|
|
|
|
* class B
|
|
|
|
* private
|
|
|
|
* def method2() end
|
|
|
|
* end
|
|
|
|
* class C < B
|
|
|
|
* include A
|
|
|
|
* def method3() end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* A.method_defined? :method1 #=> true
|
|
|
|
* C.private_method_defined? "method1" #=> false
|
|
|
|
* C.private_method_defined? "method2" #=> true
|
|
|
|
* C.method_defined? "method2" #=> false
|
|
|
|
*/
|
2005-02-22 09:57:43 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_mod_private_method_defined(VALUE mod, VALUE mid)
|
2005-12-29 09:59:55 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
ID id = rb_to_id(mid);
|
|
|
|
NODE *method;
|
2005-12-29 09:59:55 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
method = rb_method_node(mod, id);
|
|
|
|
if (method) {
|
|
|
|
if (VISI_CHECK(method->nd_noex, NOEX_PRIVATE))
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
return Qfalse;
|
2005-12-29 09:59:55 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.protected_method_defined?(symbol) => true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if the named protected method is defined
|
|
|
|
* by _mod_ (or its included modules and, if _mod_ is a
|
|
|
|
* class, its ancestors).
|
|
|
|
*
|
|
|
|
* module A
|
|
|
|
* def method1() end
|
|
|
|
* end
|
|
|
|
* class B
|
|
|
|
* protected
|
|
|
|
* def method2() end
|
|
|
|
* end
|
|
|
|
* class C < B
|
|
|
|
* include A
|
|
|
|
* def method3() end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* A.method_defined? :method1 #=> true
|
|
|
|
* C.protected_method_defined? "method1" #=> false
|
|
|
|
* C.protected_method_defined? "method2" #=> true
|
|
|
|
* C.method_defined? "method2" #=> true
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_mod_protected_method_defined(VALUE mod, VALUE mid)
|
2005-12-29 09:59:55 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
ID id = rb_to_id(mid);
|
|
|
|
NODE *method;
|
2005-12-29 11:19:44 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
method = rb_method_node(mod, id);
|
|
|
|
if (method) {
|
|
|
|
if (VISI_CHECK(method->nd_noex, NOEX_PROTECTED))
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
NORETURN(void th_iter_break _((rb_thread_t *)));
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_iter_break()
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
th_iter_break(GET_THREAD());
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
NORETURN(static void rb_longjmp _((int, VALUE)));
|
|
|
|
static VALUE make_backtrace _((void));
|
2001-11-19 00:03:03 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_longjmp(tag, mesg)
|
|
|
|
int tag;
|
|
|
|
VALUE mesg;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE at;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/*
|
2006-12-31 10:02:22 -05:00
|
|
|
//while (th->cfp->pc == 0 || th->cfp->iseq == 0) {
|
|
|
|
//th->cfp++;
|
|
|
|
//}
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (thread_set_raised(th)) {
|
|
|
|
th->errinfo = exception_error;
|
2000-02-17 02:11:22 -05:00
|
|
|
JUMP_TAG(TAG_FATAL);
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (NIL_P(mesg))
|
|
|
|
mesg = GET_THREAD()->errinfo;
|
|
|
|
if (NIL_P(mesg)) {
|
|
|
|
mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
|
|
|
|
}
|
2005-12-27 00:40:04 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_set_current_source();
|
|
|
|
if (ruby_sourcefile && !NIL_P(mesg)) {
|
|
|
|
at = get_backtrace(mesg);
|
|
|
|
if (NIL_P(at)) {
|
|
|
|
at = make_backtrace();
|
|
|
|
set_backtrace(mesg, at);
|
|
|
|
}
|
2005-12-27 00:40:04 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!NIL_P(mesg)) {
|
|
|
|
GET_THREAD()->errinfo = mesg;
|
2005-12-27 00:40:04 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (RTEST(ruby_debug) && !NIL_P(GET_THREAD()->errinfo)
|
|
|
|
&& !rb_obj_is_kind_of(GET_THREAD()->errinfo, rb_eSystemExit)) {
|
|
|
|
VALUE e = GET_THREAD()->errinfo;
|
|
|
|
int status;
|
2005-12-27 00:40:04 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((status = EXEC_TAG()) == 0) {
|
|
|
|
e = rb_obj_as_string(e);
|
|
|
|
warn_printf("Exception `%s' at %s:%d - %s\n",
|
|
|
|
rb_obj_classname(GET_THREAD()->errinfo),
|
|
|
|
ruby_sourcefile, ruby_sourceline, RSTRING_PTR(e));
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
if (status == TAG_FATAL && GET_THREAD()->errinfo == exception_error) {
|
|
|
|
GET_THREAD()->errinfo = mesg;
|
|
|
|
}
|
|
|
|
else if (status) {
|
|
|
|
thread_reset_raised(th);
|
|
|
|
JUMP_TAG(status);
|
|
|
|
}
|
2002-03-25 01:18:07 -05:00
|
|
|
}
|
2000-11-27 04:23:38 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_trap_restore_mask();
|
|
|
|
if (tag != TAG_FATAL) {
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* EXEC_EVENT_HOOK(RUBY_EVENT_RAISE ...) */
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
thread_reset_raised(th);
|
|
|
|
JUMP_TAG(tag);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_exc_raise(mesg)
|
|
|
|
VALUE mesg;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_longjmp(TAG_RAISE, mesg);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_exc_fatal(mesg)
|
|
|
|
VALUE mesg;
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_longjmp(TAG_FATAL, mesg);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_interrupt()
|
2003-09-01 03:59:18 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_raise(rb_eInterrupt, "");
|
2003-09-01 03:59:18 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* raise
|
|
|
|
* raise(string)
|
|
|
|
* raise(exception [, string [, array]])
|
|
|
|
* fail
|
|
|
|
* fail(string)
|
|
|
|
* fail(exception [, string [, array]])
|
|
|
|
*
|
|
|
|
* With no arguments, raises the exception in <code>$!</code> or raises
|
|
|
|
* a <code>RuntimeError</code> if <code>$!</code> is +nil+.
|
|
|
|
* With a single +String+ argument, raises a
|
|
|
|
* +RuntimeError+ with the string as a message. Otherwise,
|
|
|
|
* the first parameter should be the name of an +Exception+
|
|
|
|
* class (or an object that returns an +Exception+ object when sent
|
|
|
|
* an +exception+ message). The optional second parameter sets the
|
|
|
|
* message associated with the exception, and the third parameter is an
|
|
|
|
* array of callback information. Exceptions are caught by the
|
|
|
|
* +rescue+ clause of <code>begin...end</code> blocks.
|
|
|
|
*
|
|
|
|
* raise "Failed to create socket"
|
|
|
|
* raise ArgumentError, "No parameters", caller
|
|
|
|
*/
|
2002-09-27 05:42:24 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE get_errinfo(void);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_f_raise(int argc, VALUE *argv)
|
2000-05-15 22:46:57 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE err;
|
|
|
|
if (argc == 0) {
|
|
|
|
err = get_errinfo();
|
|
|
|
if (!NIL_P(err)) {
|
|
|
|
argc = 1;
|
|
|
|
argv = &err;
|
2000-05-15 22:46:57 -04:00
|
|
|
}
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_raise_jump(rb_make_exception(argc, argv));
|
|
|
|
return Qnil; /* not reached */
|
2000-05-15 22:46:57 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_make_exception(int argc, VALUE *argv)
|
2000-05-15 22:46:57 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE mesg;
|
|
|
|
ID exception;
|
|
|
|
int n;
|
2000-05-15 22:46:57 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
mesg = Qnil;
|
|
|
|
switch (argc) {
|
|
|
|
case 0:
|
|
|
|
mesg = Qnil;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
if (NIL_P(argv[0]))
|
|
|
|
break;
|
|
|
|
if (TYPE(argv[0]) == T_STRING) {
|
|
|
|
mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
|
|
|
|
break;
|
2000-05-15 22:46:57 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
n = 0;
|
|
|
|
goto exception_call;
|
2000-05-15 22:46:57 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
n = 1;
|
|
|
|
exception_call:
|
|
|
|
exception = rb_intern("exception");
|
|
|
|
if (!rb_respond_to(argv[0], exception)) {
|
|
|
|
rb_raise(rb_eTypeError, "exception class/object expected");
|
2000-05-15 22:46:57 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
mesg = rb_funcall(argv[0], exception, n, argv[1]);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (argc > 0) {
|
|
|
|
if (!rb_obj_is_kind_of(mesg, rb_eException))
|
|
|
|
rb_raise(rb_eTypeError, "exception object expected");
|
|
|
|
if (argc > 2)
|
|
|
|
set_backtrace(mesg, argv[2]);
|
2000-05-15 22:46:57 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
return mesg;
|
2000-05-15 22:46:57 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_raise_jump(mesg)
|
|
|
|
VALUE mesg;
|
2000-05-18 00:32:13 -04:00
|
|
|
{
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* TODO: fix me */
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_longjmp(TAG_RAISE, mesg);
|
2000-05-18 00:32:13 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_jump_tag(tag)
|
|
|
|
int tag;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
JUMP_TAG(tag);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_block_given_p()
|
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
if (GC_GUARDED_PTR_REF(th->cfp->lfp[0])) {
|
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
2003-10-09 18:50:57 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_iterator_p()
|
|
|
|
{
|
|
|
|
return rb_block_given_p();
|
|
|
|
}
|
2000-05-25 01:55:12 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* block_given? => true or false
|
|
|
|
* iterator? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <code>yield</code> would execute a
|
|
|
|
* block in the current context. The <code>iterator?</code> form
|
|
|
|
* is mildly deprecated.
|
|
|
|
*
|
|
|
|
* def try
|
|
|
|
* if block_given?
|
|
|
|
* yield
|
|
|
|
* else
|
|
|
|
* "no block"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* try #=> "no block"
|
|
|
|
* try { "hello" } #=> "hello"
|
|
|
|
* try do "hello" end #=> "hello"
|
|
|
|
*/
|
2000-05-09 00:53:16 -04:00
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_f_block_given_p()
|
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
cfp = th_get_ruby_level_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
|
2006-12-31 10:02:22 -05:00
|
|
|
if (GC_GUARDED_PTR_REF(cfp->lfp[0])) {
|
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE rb_eThreadError;
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_need_block()
|
|
|
|
{
|
|
|
|
if (!rb_block_given_p()) {
|
|
|
|
th_localjump_error("no block given", Qnil, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */ , int flags,
|
|
|
|
int avalue)
|
|
|
|
{
|
|
|
|
if (avalue) {
|
|
|
|
return th_invoke_yield(GET_THREAD(),
|
|
|
|
RARRAY_LEN(val), RARRAY_PTR(val));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
int argc = (val == Qundef) ? 0 : 1;
|
|
|
|
VALUE *argv = &val;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* TODO:
|
|
|
|
if (argc == 1 && CLASS_OF(argv[0]) == rb_cValues) {
|
|
|
|
argc = RARRAY_LEN(argv[0]);
|
|
|
|
argv = RARRAY_PTR(argv[0]);
|
2001-03-14 03:39:13 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
*/
|
|
|
|
return th_invoke_yield(GET_THREAD(), argc, argv);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_yield(VALUE val)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_yield_0(val, 0, 0, 0, Qfalse);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_yield_values(int n, ...)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int i;
|
|
|
|
va_list args;
|
|
|
|
VALUE val;
|
|
|
|
|
|
|
|
if (n == 0) {
|
|
|
|
return rb_yield_0(Qundef, 0, 0, 0, Qfalse);
|
|
|
|
}
|
|
|
|
val = rb_ary_new2(n);
|
|
|
|
va_start(args, n);
|
|
|
|
for (i=0; i<n; i++) {
|
|
|
|
rb_ary_push(val, va_arg(args, VALUE));
|
|
|
|
}
|
|
|
|
va_end(args);
|
|
|
|
return rb_yield_0(val, 0, 0, 0, Qtrue);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_yield_splat(VALUE values)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int avalue = Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (TYPE(values) == T_ARRAY) {
|
|
|
|
if (RARRAY_LEN(values) == 0) {
|
|
|
|
values = Qundef;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
avalue = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_yield_0(values, 0, 0, 0, avalue);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* loop {|| block }
|
|
|
|
*
|
|
|
|
* Repeatedly executes the block.
|
|
|
|
*
|
|
|
|
* loop do
|
|
|
|
* print "Input: "
|
|
|
|
* line = gets
|
|
|
|
* break if !line or line =~ /^qQ/
|
|
|
|
* # ...
|
|
|
|
* end
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_f_loop(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
for (;;) {
|
|
|
|
rb_yield_0(Qundef, 0, 0, 0, Qfalse);
|
|
|
|
}
|
|
|
|
return Qnil; /* dummy */
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value)
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_iterate(VALUE (*it_proc) (VALUE), VALUE data1,
|
|
|
|
VALUE (*bl_proc) (ANYARGS), VALUE data2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
volatile VALUE retval = Qnil;
|
|
|
|
NODE *node = NEW_IFUNC(bl_proc, data2);
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
TH_PUSH_TAG(th);
|
|
|
|
state = TH_EXEC_TAG();
|
|
|
|
if (state == 0) {
|
|
|
|
iter_retry:
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_block_t *blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(th->cfp);
|
2006-12-31 10:02:22 -05:00
|
|
|
blockptr->iseq = (void *)node;
|
|
|
|
blockptr->proc = 0;
|
|
|
|
th->passed_block = blockptr;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
retval = (*it_proc) (data1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
VALUE err = th->errinfo;
|
|
|
|
if (state == TAG_BREAK) {
|
|
|
|
VALUE *escape_dfp = GET_THROWOBJ_CATCH_POINT(err);
|
|
|
|
VALUE *cdfp = cfp->dfp;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (cdfp == escape_dfp) {
|
|
|
|
state = 0;
|
|
|
|
th->state = 0;
|
|
|
|
th->errinfo = Qnil;
|
|
|
|
th->cfp = cfp;
|
|
|
|
}
|
|
|
|
else{
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* SDR(); printf("%p, %p\n", cdfp, escape_dfp); */
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else if (state == TAG_RETRY) {
|
|
|
|
VALUE *escape_dfp = GET_THROWOBJ_CATCH_POINT(err);
|
|
|
|
VALUE *cdfp = cfp->dfp;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (cdfp == escape_dfp) {
|
|
|
|
state = 0;
|
|
|
|
th->state = 0;
|
|
|
|
th->errinfo = Qnil;
|
|
|
|
th->cfp = cfp;
|
|
|
|
goto iter_retry;
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
TH_POP_TAG();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
switch (state) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
TH_JUMP_TAG(th, state);
|
|
|
|
}
|
|
|
|
return retval;
|
2002-05-09 13:01:38 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
struct iter_method_arg {
|
|
|
|
VALUE obj;
|
|
|
|
ID mid;
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
};
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2002-05-09 13:01:38 -04:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
iterate_method(VALUE obj)
|
2002-05-09 13:01:38 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
struct iter_method_arg *arg;
|
2002-05-09 13:01:38 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
arg = (struct iter_method_arg *)obj;
|
|
|
|
return rb_call(CLASS_OF(arg->obj), arg->obj, arg->mid,
|
|
|
|
arg->argc, arg->argv, NOEX_PRIVATE);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_block_call(VALUE obj, ID mid, int argc, VALUE *argv,
|
|
|
|
VALUE (*bl_proc) (ANYARGS), VALUE data2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
struct iter_method_arg arg;
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
arg.obj = obj;
|
|
|
|
arg.mid = mid;
|
|
|
|
arg.argc = argc;
|
|
|
|
arg.argv = argv;
|
|
|
|
return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2);
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_each(VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_call(CLASS_OF(obj), obj, rb_intern("each"), 0, 0,
|
|
|
|
NOEX_PRIVATE);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_rescue2(VALUE (*b_proc) (ANYARGS), VALUE data1, VALUE (*r_proc) (ANYARGS),
|
|
|
|
VALUE data2, ...)
|
2000-01-04 23:41:21 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
volatile VALUE result;
|
|
|
|
volatile VALUE e_info = GET_THREAD()->errinfo;
|
|
|
|
va_list args;
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
retry_entry:
|
|
|
|
result = (*b_proc) (data1);
|
2000-01-04 23:41:21 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else if (state == TAG_RAISE) {
|
|
|
|
int handle = Qfalse;
|
|
|
|
VALUE eclass;
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
va_init_list(args, data2);
|
|
|
|
while (eclass = va_arg(args, VALUE)) {
|
|
|
|
if (rb_obj_is_kind_of(GET_THREAD()->errinfo, eclass)) {
|
|
|
|
handle = Qtrue;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
va_end(args);
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (handle) {
|
|
|
|
if (r_proc) {
|
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
result = (*r_proc) (data2, GET_THREAD()->errinfo);
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
if (state == TAG_RETRY) {
|
|
|
|
state = 0;
|
|
|
|
GET_THREAD()->errinfo = Qnil;
|
|
|
|
goto retry_entry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
result = Qnil;
|
|
|
|
state = 0;
|
|
|
|
}
|
|
|
|
if (state == 0) {
|
|
|
|
GET_THREAD()->errinfo = e_info;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
if (state)
|
|
|
|
JUMP_TAG(state);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return result;
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
VALUE
|
2007-02-07 08:34:18 -05:00
|
|
|
rb_rescue(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError,
|
|
|
|
(VALUE)0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE result = Qnil; /* OK */
|
|
|
|
int status;
|
|
|
|
|
|
|
|
PUSH_THREAD_TAG();
|
|
|
|
if ((status = EXEC_TAG()) == 0) {
|
|
|
|
result = (*proc) (data);
|
|
|
|
}
|
|
|
|
POP_THREAD_TAG();
|
|
|
|
if (state) {
|
|
|
|
*state = status;
|
|
|
|
}
|
|
|
|
if (status != 0) {
|
|
|
|
return Qnil;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return result;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE data2)
|
2006-09-23 17:29:47 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
volatile VALUE result = Qnil;
|
2006-09-23 17:29:47 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
result = (*b_proc) (data1);
|
|
|
|
}
|
|
|
|
POP_TAG();
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* TODO: fix me */
|
|
|
|
/* retval = prot_tag ? prot_tag->retval : Qnil; */ /* save retval */
|
2006-12-31 10:02:22 -05:00
|
|
|
(*e_proc) (data2);
|
|
|
|
if (state)
|
|
|
|
JUMP_TAG(state);
|
|
|
|
return result;
|
2006-09-23 17:29:47 -04:00
|
|
|
}
|
|
|
|
|
2003-03-07 00:59:42 -05:00
|
|
|
VALUE
|
2007-02-07 08:34:18 -05:00
|
|
|
rb_with_disable_interrupt(VALUE (*proc)(ANYARGS), VALUE data)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE result = Qnil; /* OK */
|
|
|
|
int status;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
DEFER_INTS;
|
|
|
|
{
|
|
|
|
int thr_critical = rb_thread_critical;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_thread_critical = Qtrue;
|
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((status = EXEC_TAG()) == 0) {
|
|
|
|
result = (*proc) (data);
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
rb_thread_critical = thr_critical;
|
|
|
|
}
|
|
|
|
ENABLE_INTS;
|
|
|
|
if (status)
|
|
|
|
JUMP_TAG(status);
|
2006-09-23 17:29:47 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return result;
|
|
|
|
}
|
2006-09-23 17:29:47 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static inline void
|
2007-02-07 08:34:18 -05:00
|
|
|
stack_check(void)
|
2006-09-23 17:29:47 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
static int overflowing = 0;
|
|
|
|
|
|
|
|
if (!overflowing && ruby_stack_check()) {
|
|
|
|
int state;
|
|
|
|
overflowing = 1;
|
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
rb_exc_raise(sysstack_error);
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
overflowing = 0;
|
|
|
|
JUMP_TAG(state);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* obj.method_missing(symbol [, *args] ) => result
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
|
|
|
|
* <i>symbol</i> is the symbol for the method called, and <i>args</i>
|
|
|
|
* are any arguments that were passed to it. By default, the interpreter
|
|
|
|
* raises an error when this method is called. However, it is possible
|
|
|
|
* to override the method to provide more dynamic behavior.
|
|
|
|
* The example below creates
|
|
|
|
* a class <code>Roman</code>, which responds to methods with names
|
|
|
|
* consisting of roman numerals, returning the corresponding integer
|
|
|
|
* values.
|
|
|
|
*
|
|
|
|
* class Roman
|
|
|
|
* def romanToInt(str)
|
|
|
|
* # ...
|
|
|
|
* end
|
|
|
|
* def method_missing(methId)
|
|
|
|
* str = methId.id2name
|
|
|
|
* romanToInt(str)
|
|
|
|
* end
|
|
|
|
* end
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* r = Roman.new
|
|
|
|
* r.iv #=> 4
|
|
|
|
* r.xxiii #=> 23
|
|
|
|
* r.mm #=> 2000
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_method_missing(int argc, const VALUE *argv, VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
ID id;
|
|
|
|
VALUE exc = rb_eNoMethodError;
|
|
|
|
char *format = 0;
|
|
|
|
NODE *cnode = ruby_current_node;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
int last_call_status = th->method_missing_reason;
|
|
|
|
if (argc == 0 || !SYMBOL_P(argv[0])) {
|
|
|
|
rb_raise(rb_eArgError, "no id given");
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
stack_check();
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
id = SYM2ID(argv[0]);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (last_call_status & NOEX_PRIVATE) {
|
|
|
|
format = "private method `%s' called for %s";
|
|
|
|
}
|
|
|
|
else if (last_call_status & NOEX_PROTECTED) {
|
|
|
|
format = "protected method `%s' called for %s";
|
|
|
|
}
|
|
|
|
else if (last_call_status & NOEX_VCALL) {
|
|
|
|
format = "undefined local variable or method `%s' for %s";
|
|
|
|
exc = rb_eNameError;
|
|
|
|
}
|
|
|
|
else if (last_call_status & NOEX_SUPER) {
|
|
|
|
format = "super: no superclass method `%s'";
|
|
|
|
}
|
|
|
|
if (!format) {
|
|
|
|
format = "undefined method `%s' for %s";
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_current_node = cnode;
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
VALUE args[3];
|
|
|
|
args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!',
|
|
|
|
3, rb_str_new2(format), obj, argv[0]);
|
|
|
|
args[n++] = argv[0];
|
|
|
|
if (exc == rb_eNoMethodError) {
|
|
|
|
args[n++] = rb_ary_new4(argc - 1, argv + 1);
|
|
|
|
}
|
|
|
|
exc = rb_class_new_instance(n, args, exc);
|
|
|
|
rb_exc_raise(exc);
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return Qnil; /* not reached */
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
method_missing(VALUE obj, ID id, int argc, const VALUE *argv, int call_status)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE *nargv;
|
|
|
|
GET_THREAD()->method_missing_reason = call_status;
|
|
|
|
|
|
|
|
if (id == missing) {
|
|
|
|
rb_method_missing(argc, argv, obj);
|
|
|
|
}
|
|
|
|
else if (id == ID_ALLOCATOR) {
|
|
|
|
rb_raise(rb_eTypeError, "allocator undefined for %s",
|
|
|
|
rb_class2name(obj));
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
nargv = ALLOCA_N(VALUE, argc + 1);
|
|
|
|
nargv[0] = ID2SYM(id);
|
|
|
|
MEMCPY(nargv + 1, argv, VALUE, argc);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_funcall2(obj, missing, argc + 1, nargv);
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_call(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE *body, *method;
|
|
|
|
int noex;
|
|
|
|
ID id = mid;
|
|
|
|
struct cache_entry *ent;
|
2000-11-16 23:41:19 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!klass) {
|
|
|
|
rb_raise(rb_eNotImpError,
|
|
|
|
"method `%s' called on terminated object (%p)",
|
|
|
|
rb_id2name(mid), (void *)recv);
|
|
|
|
}
|
|
|
|
/* is it in the method cache? */
|
|
|
|
ent = cache + EXPR1(klass, mid);
|
|
|
|
if (ent->mid == mid && ent->klass == klass) {
|
|
|
|
if (!ent->method)
|
|
|
|
return method_missing(recv, mid, argc, argv,
|
|
|
|
scope == 2 ? NOEX_VCALL : 0);
|
|
|
|
id = ent->mid0;
|
|
|
|
noex = ent->method->nd_noex;
|
|
|
|
klass = ent->method->nd_clss;
|
|
|
|
body = ent->method->nd_body;
|
|
|
|
}
|
|
|
|
else if ((method = rb_get_method_body(klass, id, &id)) != 0) {
|
|
|
|
noex = method->nd_noex;
|
|
|
|
klass = method->nd_clss;
|
|
|
|
body = method->nd_body;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (scope == 3) {
|
|
|
|
return method_missing(recv, mid, argc, argv, NOEX_SUPER);
|
|
|
|
}
|
|
|
|
return method_missing(recv, mid, argc, argv,
|
|
|
|
scope == 2 ? NOEX_VCALL : 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (mid != missing) {
|
|
|
|
/* receiver specified form for private method */
|
|
|
|
if (((noex & NOEX_MASK) & NOEX_PRIVATE) && scope == 0) {
|
|
|
|
return method_missing(recv, mid, argc, argv, NOEX_PRIVATE);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* self must be kind of a specified form for protected method */
|
|
|
|
if (((noex & NOEX_MASK) & NOEX_PROTECTED) && scope == 0) {
|
|
|
|
VALUE defined_class = klass;
|
|
|
|
|
|
|
|
if (TYPE(defined_class) == T_ICLASS) {
|
|
|
|
defined_class = RBASIC(defined_class)->klass;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!rb_obj_is_kind_of(rb_frame_self(),
|
|
|
|
rb_class_real(defined_class))) {
|
|
|
|
return method_missing(recv, mid, argc, argv, NOEX_PROTECTED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
VALUE val;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/*
|
2006-12-31 10:02:22 -05:00
|
|
|
//static int level;
|
|
|
|
//int i;
|
|
|
|
//for(i=0; i<level; i++){printf(" ");}
|
* this commit is a result of refactoring. only renaming functions,
moving definitions place, add/remove prototypes, deleting
unused variables and removing yarv.h.
This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
* debug.[ch]: debug_*() -> ruby_debug_*()
* iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
* iseq.c: node_name() -> ruby_node_name()
* vm.c: yarv_check_redefinition_opt_method() ->
rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 20:25:05 -05:00
|
|
|
//printf("invoke %s (%s)\n", rb_id2name(mid), ruby_node_name(nd_type(body)));
|
2006-12-31 10:02:22 -05:00
|
|
|
//level++;
|
|
|
|
//printf("%s with %d args\n", rb_id2name(mid), argc);
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
*/
|
2006-12-31 10:02:22 -05:00
|
|
|
val =
|
|
|
|
th_call0(GET_THREAD(), klass, recv, mid, id, argc, argv, body,
|
|
|
|
noex & NOEX_NOSUPER);
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/*
|
2006-12-31 10:02:22 -05:00
|
|
|
//level--;
|
|
|
|
//for(i=0; i<level; i++){printf(" ");}
|
* this commit is a result of refactoring. only renaming functions,
moving definitions place, add/remove prototypes, deleting
unused variables and removing yarv.h.
This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
* debug.[ch]: debug_*() -> ruby_debug_*()
* iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
* iseq.c: node_name() -> ruby_node_name()
* vm.c: yarv_check_redefinition_opt_method() ->
rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 20:25:05 -05:00
|
|
|
//printf("done %s (%s)\n", rb_id2name(mid), ruby_node_name(nd_type(body)));
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
*/
|
2006-12-31 10:02:22 -05:00
|
|
|
return val;
|
2000-05-17 00:38:19 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_apply(VALUE recv, ID mid, VALUE args)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
|
|
|
|
argc = RARRAY_LEN(args); /* Assigns LONG, but argc is INT */
|
|
|
|
argv = ALLOCA_N(VALUE, argc);
|
|
|
|
MEMCPY(argv, RARRAY_PTR(args), VALUE, argc);
|
|
|
|
return rb_call(CLASS_OF(recv), recv, mid, argc, argv, NOEX_NOSUPER);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
send_funcall(int argc, VALUE *argv, VALUE recv, int scope)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE vid;
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
rb_raise(rb_eArgError, "no method name given");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
vid = *argv++; argc--;
|
|
|
|
PASS_PASSED_BLOCK();
|
|
|
|
return rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, scope);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* obj.send(symbol [, args...]) => obj
|
|
|
|
* obj.__send__(symbol [, args...]) => obj
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Invokes the method identified by _symbol_, passing it any
|
|
|
|
* arguments specified. You can use <code>__send__</code> if the name
|
|
|
|
* +send+ clashes with an existing method in _obj_.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* class Klass
|
|
|
|
* def hello(*args)
|
|
|
|
* "Hello " + args.join(' ')
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* k = Klass.new
|
|
|
|
* k.send :hello, "gentle", "readers" #=> "Hello gentle readers"
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
2007-01-05 19:24:59 -05:00
|
|
|
VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_f_send(int argc, VALUE *argv, VALUE recv)
|
1999-12-14 01:50:43 -05:00
|
|
|
{
|
2007-01-05 07:00:08 -05:00
|
|
|
int scope = NOEX_PUBLIC;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
|
2007-01-05 07:00:08 -05:00
|
|
|
|
|
|
|
if (SPECIAL_CONST_P(cfp->sp[0])) {
|
|
|
|
scope = NOEX_NOSUPER | NOEX_PRIVATE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return send_funcall(argc, argv, recv, scope);
|
1999-12-14 01:50:43 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* obj.funcall(symbol [, args...]) => obj
|
|
|
|
* obj.__send!(symbol [, args...]) => obj
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Invokes the method identified by _symbol_, passing it any
|
|
|
|
* arguments specified. Unlike send, which calls private methods only
|
|
|
|
* when it is invoked in function call style, funcall always aware of
|
|
|
|
* private methods.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* 1.funcall(:puts, "hello") # prints "foo"
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
2007-01-05 19:24:59 -05:00
|
|
|
VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_f_funcall(int argc, VALUE *argv, VALUE recv)
|
1999-12-14 01:50:43 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return send_funcall(argc, argv, recv, NOEX_NOSUPER | NOEX_PRIVATE);
|
1999-12-14 01:50:43 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_funcall(VALUE recv, ID mid, int n, ...)
|
|
|
|
{
|
|
|
|
VALUE *argv;
|
|
|
|
va_list ar;
|
|
|
|
va_init_list(ar, n);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (n > 0) {
|
|
|
|
long i;
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
argv = ALLOCA_N(VALUE, n);
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
argv[i] = va_arg(ar, VALUE);
|
|
|
|
}
|
|
|
|
va_end(ar);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
argv = 0;
|
2000-06-09 03:55:12 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_call(CLASS_OF(recv), recv, mid, n, argv,
|
|
|
|
NOEX_NOSUPER | NOEX_PRIVATE);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_funcall2(VALUE recv, ID mid, int argc, const VALUE *argv)
|
|
|
|
{
|
|
|
|
return rb_call(CLASS_OF(recv), recv, mid, argc, argv,
|
|
|
|
NOEX_NOSUPER | NOEX_PRIVATE);
|
2000-01-04 23:41:21 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_funcall3(VALUE recv, ID mid, int argc, const VALUE *argv)
|
|
|
|
{
|
|
|
|
return rb_call(CLASS_OF(recv), recv, mid, argc, argv, NOEX_PUBLIC);
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
backtrace(int lev)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return th_backtrace(GET_THREAD(), lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* caller(start=1) => array
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Returns the current execution stack---an array containing strings in
|
|
|
|
* the form ``<em>file:line</em>'' or ``<em>file:line: in
|
|
|
|
* `method'</em>''. The optional _start_ parameter
|
|
|
|
* determines the number of initial stack entries to omit from the
|
|
|
|
* result.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* def a(skip)
|
|
|
|
* caller(skip)
|
2003-12-27 19:02:59 -05:00
|
|
|
* end
|
2006-12-31 10:02:22 -05:00
|
|
|
* def b(skip)
|
|
|
|
* a(skip)
|
|
|
|
* end
|
|
|
|
* def c(skip)
|
|
|
|
* b(skip)
|
|
|
|
* end
|
|
|
|
* c(0) #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
|
|
|
|
* c(1) #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
|
|
|
|
* c(2) #=> ["prog:8:in `c'", "prog:12"]
|
|
|
|
* c(3) #=> ["prog:13"]
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_f_caller(int argc, VALUE *argv)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE level;
|
|
|
|
int lev;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_scan_args(argc, argv, "01", &level);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (NIL_P(level))
|
|
|
|
lev = 1;
|
|
|
|
else
|
|
|
|
lev = NUM2INT(level);
|
|
|
|
if (lev < 0)
|
|
|
|
rb_raise(rb_eArgError, "negative level (%d)", lev);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return backtrace(lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_backtrace(void)
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
VALUE ary;
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ary = backtrace(-1);
|
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
printf("\tfrom %s\n", RSTRING_PTR(RARRAY_PTR(ary)[i]));
|
|
|
|
}
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
make_backtrace(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return backtrace(-1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static ID
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
frame_func_id(rb_control_frame_t *cfp)
|
2003-07-24 03:05:28 -04:00
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_iseq_t *iseq = cfp->iseq;
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!iseq) {
|
|
|
|
return cfp->method_id;
|
2003-07-24 03:05:28 -04:00
|
|
|
}
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
else if (RUBY_VM_IFUNC_P(iseq)) {
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_intern("<ifunc>");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return rb_intern(RSTRING_PTR(iseq->name));
|
2000-09-20 05:16:32 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ID
|
|
|
|
rb_frame_this_func(void)
|
2003-12-13 04:13:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return frame_func_id(GET_THREAD()->cfp);
|
2003-12-13 04:13:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ID
|
|
|
|
rb_frame_callee(void)
|
2003-12-13 04:13:39 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
|
2007-02-04 14:12:52 -05:00
|
|
|
/* check if prev_cfp can be accessible */
|
|
|
|
if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return frame_func_id(prev_cfp);
|
2003-12-13 04:13:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_frame_pop(void)
|
2003-12-13 04:13:39 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
|
2003-12-13 04:13:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_frame_self(void)
|
2003-12-13 04:13:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return GET_THREAD()->cfp->self;
|
2003-12-13 04:13:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
const char *
|
|
|
|
rb_sourcefile(void)
|
2003-12-24 03:47:36 -05:00
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_iseq_t *iseq = GET_THREAD()->cfp->iseq;
|
|
|
|
if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
|
2006-12-31 10:02:22 -05:00
|
|
|
return RSTRING_PTR(iseq->file_name);
|
2003-12-24 03:47:36 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return 0;
|
2003-12-24 03:47:36 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_sourceline(void)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
return th_get_sourceline(th->cfp);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
eval(VALUE self, VALUE src, VALUE scope, char *file, int line)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int state;
|
|
|
|
VALUE result = Qundef;
|
|
|
|
VALUE envval;
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_binding_t *bind = 0;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_env_t *env = NULL;
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE *stored_cref_stack = 0;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (file == 0) {
|
|
|
|
ruby_set_current_source();
|
|
|
|
file = ruby_sourcefile;
|
|
|
|
line = ruby_sourceline;
|
|
|
|
}
|
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_iseq_t *iseq;
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE iseqval;
|
|
|
|
|
|
|
|
if (scope != Qnil) {
|
2007-01-17 03:48:52 -05:00
|
|
|
|
|
|
|
if (CLASS_OF(scope) == rb_cBinding) {
|
2006-12-31 10:02:22 -05:00
|
|
|
GetBindingPtr(scope, bind);
|
|
|
|
envval = bind->env;
|
|
|
|
stored_cref_stack = bind->cref_stack;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"wrong argument type %s (expected Binding)",
|
|
|
|
rb_obj_classname(scope));
|
|
|
|
}
|
|
|
|
GetEnvPtr(envval, env);
|
|
|
|
th->base_block = &env->block;
|
|
|
|
}
|
|
|
|
else {
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp);
|
|
|
|
th->base_block = RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp);
|
2006-12-31 10:02:22 -05:00
|
|
|
th->base_block->iseq = cfp->iseq; /* TODO */
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2005-02-12 08:17:18 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* make eval iseq */
|
|
|
|
th->parse_in_eval++;
|
|
|
|
iseqval = th_compile(th, src, rb_str_new2(file), INT2FIX(line));
|
|
|
|
th->parse_in_eval--;
|
|
|
|
th_set_eval_stack(th, iseqval);
|
|
|
|
th->base_block = 0;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
if (0) { /* for debug */
|
* this commit is a result of refactoring. only renaming functions,
moving definitions place, add/remove prototypes, deleting
unused variables and removing yarv.h.
This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
* debug.[ch]: debug_*() -> ruby_debug_*()
* iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
* iseq.c: node_name() -> ruby_node_name()
* vm.c: yarv_check_redefinition_opt_method() ->
rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 20:25:05 -05:00
|
|
|
extern VALUE ruby_iseq_disasm(VALUE);
|
|
|
|
printf("%s\n", RSTRING_PTR(ruby_iseq_disasm(iseqval)));
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
2005-02-12 08:17:18 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* save new env */
|
|
|
|
GetISeqPtr(iseqval, iseq);
|
|
|
|
if (bind && iseq->local_size > 0) {
|
|
|
|
bind->env = th_make_env_object(th, th->cfp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* push tag */
|
|
|
|
if (stored_cref_stack) {
|
|
|
|
stored_cref_stack =
|
|
|
|
th_set_special_cref(th, env->block.lfp, stored_cref_stack);
|
|
|
|
}
|
|
|
|
/* kick */
|
|
|
|
result = th_eval_body(th);
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
|
|
|
|
if (stored_cref_stack) {
|
|
|
|
th_set_special_cref(th, env->block.lfp, stored_cref_stack);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (state) {
|
|
|
|
if (state == TAG_RAISE) {
|
|
|
|
if (strcmp(file, "(eval)") == 0) {
|
|
|
|
VALUE mesg, errat;
|
|
|
|
|
|
|
|
errat = get_backtrace(GET_THREAD()->errinfo);
|
|
|
|
mesg = rb_attr_get(GET_THREAD()->errinfo, rb_intern("mesg"));
|
|
|
|
if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) {
|
|
|
|
if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
|
|
|
|
rb_str_update(mesg, 0, 0, rb_str_new2(": "));
|
|
|
|
rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]);
|
|
|
|
}
|
|
|
|
RARRAY_PTR(errat)[0] = RARRAY_PTR(backtrace(-2))[0];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rb_exc_raise(GET_THREAD()->errinfo);
|
|
|
|
}
|
|
|
|
JUMP_TAG(state);
|
|
|
|
}
|
|
|
|
return result;
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* eval(string [, binding [, filename [,lineno]]]) => obj
|
|
|
|
*
|
|
|
|
* Evaluates the Ruby expression(s) in <em>string</em>. If
|
|
|
|
* <em>binding</em> is given, the evaluation is performed in its
|
|
|
|
* context. The binding may be a <code>Binding</code> object or a
|
|
|
|
* <code>Proc</code> object. If the optional <em>filename</em> and
|
|
|
|
* <em>lineno</em> parameters are present, they will be used when
|
|
|
|
* reporting syntax errors.
|
|
|
|
*
|
|
|
|
* def getBinding(str)
|
|
|
|
* return binding
|
|
|
|
* end
|
|
|
|
* str = "hello"
|
|
|
|
* eval "str + ' Fred'" #=> "hello Fred"
|
|
|
|
* eval "str + ' Fred'", getBinding("bye") #=> "bye Fred"
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_f_eval(int argc, VALUE *argv, VALUE self)
|
2005-02-12 08:17:18 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE src, scope, vfile, vline;
|
|
|
|
char *file = "(eval)";
|
|
|
|
int line = 1;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
|
|
|
|
if (rb_safe_level() >= 4) {
|
|
|
|
StringValue(src);
|
|
|
|
if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
|
|
|
|
rb_raise(rb_eSecurityError,
|
|
|
|
"Insecure: can't modify trusted binding");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
SafeStringValue(src);
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (argc >= 3) {
|
|
|
|
StringValue(vfile);
|
|
|
|
}
|
|
|
|
if (argc >= 4) {
|
|
|
|
line = NUM2INT(vline);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!NIL_P(vfile))
|
|
|
|
file = RSTRING_PTR(vfile);
|
|
|
|
return eval(self, src, scope, file, line);
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
|
|
|
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
VALUE *th_cfp_svar(rb_control_frame_t *cfp, int idx);
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
/* function to call func under the specified class/module context */
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
exec_under(VALUE (*func) (VALUE), VALUE under, VALUE self, VALUE args)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE val = Qnil; /* OK */
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
rb_control_frame_t *pcfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE stored_self = pcfp->self;
|
|
|
|
NODE *stored_cref = 0;
|
|
|
|
NODE **pcref = 0;
|
|
|
|
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_block_t block;
|
|
|
|
rb_block_t *blockptr;
|
1998-01-16 07:19:22 -05:00
|
|
|
int state;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* replace environment */
|
|
|
|
pcfp->self = self;
|
|
|
|
if ((blockptr = GC_GUARDED_PTR_REF(*th->cfp->lfp)) != 0) {
|
|
|
|
/* copy block info */
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* TODO: why? */
|
2006-12-31 10:02:22 -05:00
|
|
|
block = *blockptr;
|
|
|
|
block.self = self;
|
|
|
|
*th->cfp->lfp = GC_GUARDED_PTR(&block);
|
2003-07-16 05:23:33 -04:00
|
|
|
}
|
|
|
|
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
while (!RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
|
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
2003-12-13 04:13:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
pcref = (NODE **) th_cfp_svar(cfp, -1);
|
|
|
|
stored_cref = *pcref;
|
|
|
|
*pcref = th_cref_push(th, under, NOEX_PUBLIC);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
PUSH_TAG(PROT_NONE);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
val = (*func) (args);
|
2001-06-19 00:35:17 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
POP_TAG();
|
|
|
|
|
|
|
|
/* restore environment */
|
|
|
|
*pcref = stored_cref;
|
|
|
|
pcfp->self = stored_self;
|
2001-06-19 00:35:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (state) {
|
|
|
|
JUMP_TAG(state);
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return val;
|
|
|
|
}
|
2005-02-12 08:17:18 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
yield_under_i(VALUE arg)
|
|
|
|
{
|
|
|
|
int avalue = Qtrue;
|
|
|
|
|
|
|
|
if (arg == Qundef) {
|
|
|
|
avalue = Qfalse;
|
2000-07-10 00:49:24 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_yield_0(arg, 0, 0, 0, avalue);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* block eval under the class/module context */
|
|
|
|
static VALUE
|
|
|
|
yield_under(VALUE under, VALUE self, VALUE values)
|
|
|
|
{
|
|
|
|
return exec_under(yield_under_i, under, self, values);
|
|
|
|
}
|
2000-10-16 05:13:20 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
eval_under_i(VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
return eval(args[0], args[1], Qnil, (char *)args[2], (int)args[3]);
|
|
|
|
}
|
2001-05-02 00:22:21 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* string eval under the class/module context */
|
|
|
|
static VALUE
|
|
|
|
eval_under(VALUE under, VALUE self, VALUE src, const char *file, int line)
|
|
|
|
{
|
|
|
|
VALUE args[4];
|
2001-06-19 00:35:17 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (rb_safe_level() >= 4) {
|
|
|
|
StringValue(src);
|
2004-10-29 04:08:16 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
SafeStringValue(src);
|
|
|
|
}
|
|
|
|
args[0] = self;
|
|
|
|
args[1] = src;
|
|
|
|
args[2] = (VALUE)file;
|
|
|
|
args[3] = (VALUE)line;
|
|
|
|
return exec_under(eval_under_i, under, self, (VALUE)args);
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self)
|
2005-02-12 08:17:18 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
if (argc > 0) {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)",
|
|
|
|
argc);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return yield_under(klass, self, Qundef);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char *file = "(eval)";
|
|
|
|
int line = 1;
|
2001-05-02 00:22:21 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (argc == 0) {
|
|
|
|
rb_raise(rb_eArgError, "block not supplied");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (rb_safe_level() >= 4) {
|
|
|
|
StringValue(argv[0]);
|
2001-05-02 00:22:21 -04:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 10:02:22 -05:00
|
|
|
SafeStringValue(argv[0]);
|
|
|
|
}
|
|
|
|
if (argc > 3) {
|
2007-02-07 09:25:47 -05:00
|
|
|
const char *name = rb_id2name(rb_frame_callee());
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_raise(rb_eArgError,
|
|
|
|
"wrong number of arguments: %s(src) or %s{..}",
|
* this commit is a result of refactoring. only renaming functions,
moving definitions place, add/remove prototypes, deleting
unused variables and removing yarv.h.
This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
* debug.[ch]: debug_*() -> ruby_debug_*()
* iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
* iseq.c: node_name() -> ruby_node_name()
* vm.c: yarv_check_redefinition_opt_method() ->
rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 20:25:05 -05:00
|
|
|
name, name);
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
if (argc > 2)
|
|
|
|
line = NUM2INT(argv[2]);
|
|
|
|
if (argc > 1) {
|
|
|
|
file = StringValuePtr(argv[1]);
|
2000-10-13 05:01:58 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return eval_under(klass, self, argv[0], file, line);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* obj.instance_eval(string [, filename [, lineno]] ) => obj
|
|
|
|
* obj.instance_eval {| | block } => obj
|
|
|
|
*
|
|
|
|
* Evaluates a string containing Ruby source code, or the given block,
|
|
|
|
* within the context of the receiver (_obj_). In order to set the
|
|
|
|
* context, the variable +self+ is set to _obj_ while
|
|
|
|
* the code is executing, giving the code access to _obj_'s
|
|
|
|
* instance variables. In the version of <code>instance_eval</code>
|
|
|
|
* that takes a +String+, the optional second and third
|
|
|
|
* parameters supply a filename and starting line number that are used
|
|
|
|
* when reporting compilation errors.
|
|
|
|
*
|
|
|
|
* class Klass
|
|
|
|
* def initialize
|
|
|
|
* @secret = 99
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* k = Klass.new
|
|
|
|
* k.instance_eval { @secret } #=> 99
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_obj_instance_eval(int argc, VALUE *argv, VALUE self)
|
2005-02-12 08:17:18 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE klass;
|
2005-02-12 08:17:18 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (SPECIAL_CONST_P(self)) {
|
|
|
|
klass = Qnil;
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
klass = rb_singleton_class(self);
|
2005-02-12 08:17:18 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return specific_eval(argc, argv, klass, self);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* obj.instance_exec(arg...) {|var...| block } => obj
|
|
|
|
*
|
|
|
|
* Executes the given block within the context of the receiver
|
|
|
|
* (_obj_). In order to set the context, the variable +self+ is set
|
|
|
|
* to _obj_ while the code is executing, giving the code access to
|
|
|
|
* _obj_'s instance variables. Arguments are passed as block parameters.
|
|
|
|
*
|
|
|
|
* class Klass
|
|
|
|
* def initialize
|
|
|
|
* @secret = 99
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* k = Klass.new
|
|
|
|
* k.instance_exec(5) {|x| @secret+x } #=> 104
|
|
|
|
*/
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_obj_instance_exec(int argc, VALUE *argv, VALUE self)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE klass;
|
2001-09-20 02:23:50 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (SPECIAL_CONST_P(self)) {
|
|
|
|
klass = Qnil;
|
2001-09-20 02:23:50 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
klass = rb_singleton_class(self);
|
|
|
|
}
|
|
|
|
return yield_under(klass, self, rb_ary_new4(argc, argv));
|
2000-04-10 01:48:43 -04:00
|
|
|
}
|
|
|
|
|
2003-12-30 11:38:32 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* mod.class_eval(string [, filename [, lineno]]) => obj
|
|
|
|
* mod.module_eval {|| block } => obj
|
2003-12-30 11:38:32 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Evaluates the string or block in the context of _mod_. This can
|
|
|
|
* be used to add methods to a class. <code>module_eval</code> returns
|
|
|
|
* the result of evaluating its argument. The optional _filename_
|
|
|
|
* and _lineno_ parameters set the text for error messages.
|
2003-12-30 11:38:32 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* class Thing
|
|
|
|
* end
|
|
|
|
* a = %q{def hello() "Hello there!" end}
|
|
|
|
* Thing.module_eval(a)
|
|
|
|
* puts Thing.new.hello()
|
|
|
|
* Thing.module_eval("invalid code", "dummy", 123)
|
2003-12-30 11:38:32 -05:00
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Hello there!
|
|
|
|
* dummy:123:in `module_eval': undefined local variable
|
|
|
|
* or method `code' for Thing:Class
|
2003-12-30 11:38:32 -05:00
|
|
|
*/
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_mod_module_eval(int argc, VALUE *argv, VALUE mod)
|
2000-04-10 01:48:43 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return specific_eval(argc, argv, mod, mod);
|
2000-04-10 01:48:43 -04:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* mod.module_exec(arg...) {|var...| block } => obj
|
|
|
|
* mod.class_exec(arg...) {|var...| block } => obj
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Evaluates the given block in the context of the class/module.
|
|
|
|
* The method defined in the block will belong to the receiver.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* class Thing
|
|
|
|
* end
|
|
|
|
* Thing.class_exec{
|
|
|
|
* def hello() "Hello there!" end
|
|
|
|
* }
|
|
|
|
* puts Thing.new.hello()
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Hello there!
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_mod_module_exec(int argc, VALUE *argv, VALUE mod)
|
2000-04-10 01:48:43 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return yield_under(mod, mod, rb_ary_new4(argc, argv));
|
|
|
|
}
|
2005-01-04 22:50:04 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
|
|
|
secure_visibility(VALUE self)
|
|
|
|
{
|
|
|
|
if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
|
|
|
|
rb_raise(rb_eSecurityError,
|
|
|
|
"Insecure: can't change method visibility");
|
2005-01-04 22:50:04 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
|
|
|
set_method_visibility(VALUE self, int argc, VALUE *argv, ID ex)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
secure_visibility(self);
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
rb_export_method(self, rb_to_id(argv[i]), ex);
|
|
|
|
}
|
|
|
|
rb_clear_cache_by_class(self);
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* public => self
|
|
|
|
* public(symbol, ...) => self
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* With no arguments, sets the default visibility for subsequently
|
|
|
|
* defined methods to public. With arguments, sets the named methods to
|
|
|
|
* have public visibility.
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_public(int argc, VALUE *argv, VALUE module)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
secure_visibility(module);
|
|
|
|
if (argc == 0) {
|
|
|
|
SCOPE_SET(NOEX_PUBLIC);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
set_method_visibility(module, argc, argv, NOEX_PUBLIC);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return module;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* protected => self
|
|
|
|
* protected(symbol, ...) => self
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* With no arguments, sets the default visibility for subsequently
|
|
|
|
* defined methods to protected. With arguments, sets the named methods
|
|
|
|
* to have protected visibility.
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_protected(int argc, VALUE *argv, VALUE module)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
secure_visibility(module);
|
|
|
|
if (argc == 0) {
|
|
|
|
SCOPE_SET(NOEX_PROTECTED);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
set_method_visibility(module, argc, argv, NOEX_PROTECTED);
|
|
|
|
}
|
|
|
|
return module;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* private => self
|
|
|
|
* private(symbol, ...) => self
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* With no arguments, sets the default visibility for subsequently
|
|
|
|
* defined methods to private. With arguments, sets the named methods
|
|
|
|
* to have private visibility.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* module Mod
|
|
|
|
* def a() end
|
|
|
|
* def b() end
|
|
|
|
* private
|
|
|
|
* def c() end
|
|
|
|
* private :a
|
|
|
|
* end
|
|
|
|
* Mod.private_instance_methods #=> ["a", "c"]
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_private(int argc, VALUE *argv, VALUE module)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
secure_visibility(module);
|
|
|
|
if (argc == 0) {
|
|
|
|
SCOPE_SET(NOEX_PRIVATE);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
set_method_visibility(module, argc, argv, NOEX_PRIVATE);
|
|
|
|
}
|
|
|
|
return module;
|
2000-01-04 23:41:21 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.public_class_method(symbol, ...) => mod
|
|
|
|
*
|
|
|
|
* Makes a list of existing class methods public.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_mod_public_method(int argc, VALUE *argv, VALUE obj)
|
|
|
|
{
|
|
|
|
set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PUBLIC);
|
|
|
|
return obj;
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* mod.private_class_method(symbol, ...) => mod
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Makes existing class methods private. Often used to hide the default
|
|
|
|
* constructor <code>new</code>.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* class SimpleSingleton # Not thread safe
|
|
|
|
* private_class_method :new
|
|
|
|
* def SimpleSingleton.create(*args, &block)
|
|
|
|
* @me = new(*args, &block) if ! @me
|
|
|
|
* @me
|
|
|
|
* end
|
|
|
|
* end
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_private_method(int argc, VALUE *argv, VALUE obj)
|
2000-01-04 23:41:21 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PRIVATE);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* public
|
|
|
|
* public(symbol, ...)
|
|
|
|
*
|
|
|
|
* With no arguments, sets the default visibility for subsequently
|
|
|
|
* defined methods to public. With arguments, sets the named methods to
|
|
|
|
* have public visibility.
|
|
|
|
*/
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
top_public(int argc, VALUE *argv)
|
|
|
|
{
|
|
|
|
return rb_mod_public(argc, argv, rb_cObject);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
top_private(int argc, VALUE *argv)
|
|
|
|
{
|
|
|
|
return rb_mod_private(argc, argv, rb_cObject);
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* module_function(symbol, ...) => self
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Creates module functions for the named methods. These functions may
|
|
|
|
* be called with the module as a receiver, and also become available
|
|
|
|
* as instance methods to classes that mix in the module. Module
|
|
|
|
* functions are copies of the original, and so may be changed
|
|
|
|
* independently. The instance-method versions are made private. If
|
|
|
|
* used with no arguments, subsequently defined methods become module
|
|
|
|
* functions.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* module Mod
|
|
|
|
* def one
|
|
|
|
* "This is one"
|
|
|
|
* end
|
|
|
|
* module_function :one
|
|
|
|
* end
|
|
|
|
* class Cls
|
|
|
|
* include Mod
|
|
|
|
* def callOne
|
|
|
|
* one
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* Mod.one #=> "This is one"
|
|
|
|
* c = Cls.new
|
|
|
|
* c.callOne #=> "This is one"
|
|
|
|
* module Mod
|
|
|
|
* def one
|
|
|
|
* "This is the new one"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* Mod.one #=> "This is one"
|
|
|
|
* c.callOne #=> "This is the new one"
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_modfunc(int argc, VALUE *argv, VALUE module)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int i;
|
|
|
|
ID id;
|
|
|
|
NODE *fbody;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (TYPE(module) != T_MODULE) {
|
|
|
|
rb_raise(rb_eTypeError, "module_function must be called for modules");
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
secure_visibility(module);
|
|
|
|
if (argc == 0) {
|
|
|
|
SCOPE_SET(NOEX_MODFUNC);
|
|
|
|
return module;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
set_method_visibility(module, argc, argv, NOEX_PRIVATE);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
VALUE m = module;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
id = rb_to_id(argv[i]);
|
|
|
|
for (;;) {
|
|
|
|
fbody = search_method(m, id, &m);
|
|
|
|
if (fbody == 0) {
|
|
|
|
fbody = search_method(rb_cObject, id, &m);
|
|
|
|
}
|
|
|
|
if (fbody == 0 || fbody->nd_body == 0) {
|
|
|
|
rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
|
2002-04-24 00:54:16 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (nd_type(fbody->nd_body->nd_body) != NODE_ZSUPER) {
|
|
|
|
break; /* normal case: need not to follow 'super' link */
|
|
|
|
}
|
|
|
|
m = RCLASS(m)->super;
|
|
|
|
if (!m)
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_add_method(rb_singleton_class(module), id, fbody->nd_body->nd_body,
|
|
|
|
NOEX_PUBLIC);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return module;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* append_features(mod) => mod
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* When this module is included in another, Ruby calls
|
|
|
|
* <code>append_features</code> in this module, passing it the
|
|
|
|
* receiving module in _mod_. Ruby's default implementation is
|
|
|
|
* to add the constants, methods, and module variables of this module
|
|
|
|
* to _mod_ if this module has not already been added to
|
|
|
|
* _mod_ or one of its ancestors. See also <code>Module#include</code>.
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_append_features(VALUE module, VALUE include)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
switch (TYPE(include)) {
|
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
Check_Type(include, T_CLASS);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rb_include_module(include, module);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
return module;
|
|
|
|
}
|
2003-12-27 19:02:59 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* include(module, ...) => self
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Invokes <code>Module.append_features</code> on each parameter in turn.
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_include(int argc, VALUE *argv, VALUE module)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int i;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
Check_Type(argv[i], T_MODULE);
|
|
|
|
while (argc--) {
|
|
|
|
rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
|
|
|
|
rb_funcall(argv[argc], rb_intern("included"), 1, module);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return module;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_obj_call_init(VALUE obj, int argc, VALUE *argv)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
PASS_PASSED_BLOCK();
|
|
|
|
rb_funcall2(obj, init, argc, argv);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2005-06-12 12:56:06 -04:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_extend_object(VALUE obj, VALUE module)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_include_module(rb_singleton_class(obj), module);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* extend_object(obj) => obj
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Extends the specified object by adding this module's constants and
|
|
|
|
* methods (which are added as singleton methods). This is the callback
|
|
|
|
* method used by <code>Object#extend</code>.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* module Picky
|
|
|
|
* def Picky.extend_object(o)
|
|
|
|
* if String === o
|
|
|
|
* puts "Can't add Picky to a String"
|
|
|
|
* else
|
|
|
|
* puts "Picky added to #{o.class}"
|
|
|
|
* super
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* (s = Array.new).extend Picky # Call Object.extend
|
|
|
|
* (s = "quick brown fox").extend Picky
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Picky added to Array
|
|
|
|
* Can't add Picky to a String
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
2000-10-11 02:29:16 -04:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_mod_extend_object(VALUE mod, VALUE obj)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_extend_object(obj, mod);
|
|
|
|
return obj;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* obj.extend(module, ...) => obj
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Adds to _obj_ the instance methods from each module given as a
|
|
|
|
* parameter.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* module Mod
|
|
|
|
* def hello
|
|
|
|
* "Hello from Mod.\n"
|
|
|
|
* end
|
|
|
|
* end
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* class Klass
|
|
|
|
* def hello
|
|
|
|
* "Hello from Klass.\n"
|
|
|
|
* end
|
|
|
|
* end
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* k = Klass.new
|
|
|
|
* k.hello #=> "Hello from Klass.\n"
|
|
|
|
* k.extend(Mod) #=> #<Klass:0x401b3bc8>
|
|
|
|
* k.hello #=> "Hello from Mod.\n"
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_obj_extend(int argc, VALUE *argv, VALUE obj)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int i;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (argc == 0) {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
Check_Type(argv[i], T_MODULE);
|
|
|
|
while (argc--) {
|
|
|
|
rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
|
|
|
|
rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return obj;
|
2001-06-05 03:19:39 -04:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* include(module, ...) => self
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Invokes <code>Module.append_features</code>
|
|
|
|
* on each parameter in turn. Effectively adds the methods and constants
|
|
|
|
* in each module to the receiver.
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
2001-06-05 03:19:39 -04:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
top_include(int argc, VALUE *argv, VALUE self)
|
2001-06-05 03:19:39 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_secure(4);
|
|
|
|
if (ruby_wrapper) {
|
|
|
|
rb_warning
|
|
|
|
("main#include in the wrapped load is effective only in wrapper module");
|
|
|
|
return rb_mod_include(argc, argv, ruby_wrapper);
|
2001-06-05 03:19:39 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return rb_mod_include(argc, argv, rb_cObject);
|
2001-06-05 03:19:39 -04:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE rb_f_trace_var();
|
|
|
|
VALUE rb_f_untrace_var();
|
2003-12-30 11:38:32 -05:00
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
get_errinfo(void)
|
2000-11-27 04:23:38 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
|
2000-11-27 04:23:38 -05:00
|
|
|
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
|
|
|
|
if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
|
2006-12-31 10:02:22 -05:00
|
|
|
if (cfp->iseq->type == ISEQ_TYPE_RESCUE) {
|
|
|
|
return cfp->dfp[-1];
|
|
|
|
}
|
|
|
|
else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
|
|
|
|
TYPE(cfp->dfp[-1]) != T_NODE) {
|
|
|
|
return cfp->dfp[-1];
|
|
|
|
}
|
2000-11-27 04:23:38 -05:00
|
|
|
}
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
2000-11-27 04:23:38 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return Qnil;
|
2000-11-27 04:23:38 -05:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
errinfo_getter(ID id)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
return get_errinfo();
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_errinfo(void)
|
|
|
|
{
|
|
|
|
return get_errinfo();
|
|
|
|
}
|
2000-09-20 05:16:32 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
|
|
|
errinfo_setter(VALUE val, ID id, VALUE *var)
|
|
|
|
{
|
|
|
|
if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
|
|
|
|
rb_raise(rb_eTypeError, "assigning non-exception to $!");
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 10:02:22 -05:00
|
|
|
GET_THREAD()->errinfo = val;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_set_errinfo(VALUE err)
|
|
|
|
{
|
|
|
|
errinfo_setter(err, 0, 0);
|
|
|
|
}
|
2003-12-21 02:28:54 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
errat_getter(ID id)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE err = get_errinfo();
|
|
|
|
if (!NIL_P(err)) {
|
|
|
|
return get_backtrace(err);
|
2000-08-02 05:22:27 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
else {
|
|
|
|
return Qnil;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static void
|
|
|
|
errat_setter(VALUE val, ID id, VALUE *var)
|
2000-01-31 22:12:21 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE err = get_errinfo();
|
|
|
|
if (NIL_P(err)) {
|
|
|
|
rb_raise(rb_eArgError, "$! not set");
|
|
|
|
}
|
|
|
|
set_backtrace(err, val);
|
2000-01-31 22:12:21 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 10:02:22 -05:00
|
|
|
* local_variables => array
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* Returns the names of the current local variables.
|
2003-12-27 19:02:59 -05:00
|
|
|
*
|
2006-12-31 10:02:22 -05:00
|
|
|
* fred = 1
|
|
|
|
* for i in 1..10
|
|
|
|
* # ...
|
|
|
|
* end
|
|
|
|
* local_variables #=> ["fred", "i"]
|
2003-12-27 19:02:59 -05:00
|
|
|
*/
|
|
|
|
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
int th_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary);
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2000-01-31 22:12:21 -05:00
|
|
|
static VALUE
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_f_local_variables(void)
|
2000-01-31 22:12:21 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE ary = rb_ary_new();
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_control_frame_t *cfp =
|
|
|
|
th_get_ruby_level_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp));
|
2006-12-31 10:02:22 -05:00
|
|
|
int i;
|
2000-01-31 22:12:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
while (1) {
|
|
|
|
if (cfp->iseq) {
|
|
|
|
int start = 0;
|
|
|
|
if (cfp->lfp == cfp->dfp) {
|
|
|
|
start = 1;
|
|
|
|
}
|
|
|
|
for (i = start; i < cfp->iseq->local_size; i++) {
|
|
|
|
ID lid = cfp->iseq->local_tbl[i];
|
|
|
|
if (lid) {
|
|
|
|
rb_ary_push(ary, rb_str_new2(rb_id2name(lid)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (cfp->lfp != cfp->dfp) {
|
|
|
|
/* block */
|
|
|
|
VALUE *dfp = GC_GUARDED_PTR_REF(cfp->dfp[0]);
|
2000-01-31 22:12:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (th_collect_local_variables_in_heap(th, dfp, ary)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
while (cfp->dfp != dfp) {
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
2000-01-31 22:12:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
2007-02-07 08:34:18 -05:00
|
|
|
Init_eval(void)
|
2003-07-16 03:11:30 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
/* TODO: fix position */
|
|
|
|
GET_THREAD()->vm->mark_object_ary = rb_ary_new();
|
|
|
|
|
|
|
|
init = rb_intern("initialize");
|
|
|
|
eqq = rb_intern("===");
|
|
|
|
each = rb_intern("each");
|
2003-07-16 03:11:30 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
aref = rb_intern("[]");
|
|
|
|
aset = rb_intern("[]=");
|
|
|
|
match = rb_intern("=~");
|
|
|
|
missing = rb_intern("method_missing");
|
|
|
|
added = rb_intern("method_added");
|
|
|
|
singleton_added = rb_intern("singleton_method_added");
|
|
|
|
removed = rb_intern("method_removed");
|
|
|
|
singleton_removed = rb_intern("singleton_method_removed");
|
|
|
|
undefined = rb_intern("method_undefined");
|
|
|
|
singleton_undefined = rb_intern("singleton_method_undefined");
|
2003-07-16 03:11:30 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
object_id = rb_intern("object_id");
|
|
|
|
__send = rb_intern("__send");
|
|
|
|
__send_bang = rb_intern("__send!");
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_global_variable((VALUE *)&ruby_eval_tree);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_virtual_variable("$@", errat_getter, errat_setter);
|
|
|
|
rb_define_virtual_variable("$!", errinfo_getter, errinfo_setter);
|
2003-07-16 03:11:30 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_global_function("eval", rb_f_eval, -1);
|
|
|
|
rb_define_global_function("iterator?", rb_f_block_given_p, 0);
|
|
|
|
rb_define_global_function("block_given?", rb_f_block_given_p, 0);
|
|
|
|
rb_define_global_function("method_missing", rb_method_missing, -1);
|
|
|
|
rb_define_global_function("loop", rb_f_loop, 0);
|
2003-07-16 03:11:30 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
|
|
|
|
respond_to = rb_intern("respond_to?");
|
|
|
|
basic_respond_to = rb_method_node(rb_cObject, respond_to);
|
|
|
|
rb_register_mark_object((VALUE)basic_respond_to);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_global_function("raise", rb_f_raise, -1);
|
|
|
|
rb_define_global_function("fail", rb_f_raise, -1);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_global_function("caller", rb_f_caller, -1);
|
2000-01-31 22:12:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
|
|
|
|
rb_define_global_function("local_variables", rb_f_local_variables, 0);
|
2003-07-16 03:11:30 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_method(rb_cBasicObject, "send", rb_f_send, -1);
|
|
|
|
rb_define_method(rb_cBasicObject, "__send__", rb_f_send, -1);
|
|
|
|
rb_define_method(rb_cBasicObject, "__send", rb_f_send, -1);
|
|
|
|
rb_define_method(rb_cBasicObject, "funcall", rb_f_funcall, -1);
|
|
|
|
rb_define_method(rb_cBasicObject, "__send!", rb_f_funcall, -1);
|
2007-01-05 19:24:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_method(rb_mKernel, "instance_eval", rb_obj_instance_eval, -1);
|
|
|
|
rb_define_method(rb_mKernel, "instance_exec", rb_obj_instance_exec, -1);
|
2003-07-18 23:23:05 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
|
|
|
|
rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
|
|
|
|
rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
|
|
|
|
rb_define_private_method(rb_cModule, "public", rb_mod_public, -1);
|
|
|
|
rb_define_private_method(rb_cModule, "protected", rb_mod_protected, -1);
|
|
|
|
rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
|
|
|
|
rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
|
|
|
|
rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
|
|
|
|
rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
|
|
|
|
rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
|
|
|
|
rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
|
|
|
|
rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
|
|
|
|
rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
|
|
|
|
rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
|
|
|
|
rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
|
|
|
|
rb_define_method(rb_cModule, "module_exec", rb_mod_module_exec, -1);
|
|
|
|
rb_define_method(rb_cModule, "class_exec", rb_mod_module_exec, -1);
|
2000-01-31 22:12:21 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_undef_method(rb_cClass, "module_function");
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
|
|
|
|
rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
|
|
|
|
rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
|
|
|
|
rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
|
2003-12-27 19:02:59 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_singleton_method(ruby_top_self, "include", top_include, -1);
|
|
|
|
rb_define_singleton_method(ruby_top_self, "public", top_public, -1);
|
|
|
|
rb_define_singleton_method(ruby_top_self, "private", top_private, -1);
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
|
2003-12-28 22:56:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
|
|
|
|
rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_global_function("set_trace_func", set_trace_func, 1);
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
/* for parser */
|
2003-12-28 22:56:22 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_dvar_defined(ID id)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
rb_iseq_t *iseq;
|
2006-12-31 10:02:22 -05:00
|
|
|
if (th->base_block && (iseq = th->base_block->iseq)) {
|
|
|
|
while (iseq->type == ISEQ_TYPE_BLOCK ||
|
|
|
|
iseq->type == ISEQ_TYPE_RESCUE ||
|
|
|
|
iseq->type == ISEQ_TYPE_ENSURE ||
|
|
|
|
iseq->type == ISEQ_TYPE_EVAL) {
|
|
|
|
int i;
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* printf("local size: %d\n", iseq->local_size); */
|
2006-12-31 10:02:22 -05:00
|
|
|
for (i = 0; i < iseq->local_size; i++) {
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* printf("id (%4d): %s\n", i, rb_id2name(iseq->local_tbl[i])); */
|
2006-12-31 10:02:22 -05:00
|
|
|
if (iseq->local_tbl[i] == id) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
iseq = iseq->parent_iseq;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_scope_setup_top_local_tbl(ID *tbl)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
if (tbl) {
|
|
|
|
if (th->top_local_tbl) {
|
|
|
|
xfree(th->top_local_tbl);
|
|
|
|
th->top_local_tbl = 0;
|
|
|
|
}
|
|
|
|
th->top_local_tbl = tbl;
|
2005-03-06 21:05:08 -05:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 10:02:22 -05:00
|
|
|
th->top_local_tbl = 0;
|
2005-03-06 21:05:08 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_scope_base_local_tbl_size(void)
|
2005-03-06 21:05:08 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
if (th->base_block) {
|
|
|
|
return th->base_block->iseq->local_iseq->local_size +
|
|
|
|
2 /* $_, $~ */ - 1 /* svar */ ;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 10:02:22 -05:00
|
|
|
return 0;
|
2005-03-06 21:05:08 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
ID
|
|
|
|
rb_scope_base_local_tbl_id(int i)
|
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
switch (i) {
|
|
|
|
case 0:
|
|
|
|
return rb_intern("$_");
|
|
|
|
case 1:
|
|
|
|
return rb_intern("$~");
|
|
|
|
default:
|
|
|
|
return th->base_block->iseq->local_iseq->
|
|
|
|
local_tbl[i - 1 /* tbl[0] is reserved by svar */ ];
|
|
|
|
}
|
2005-03-06 21:05:08 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
int
|
|
|
|
rb_dvar_current(void)
|
2005-03-06 21:05:08 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
if (th->base_block) {
|
|
|
|
return 1;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 10:02:22 -05:00
|
|
|
return 0;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
}
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
int
|
|
|
|
rb_parse_in_eval(void)
|
|
|
|
{
|
|
|
|
return GET_THREAD()->parse_in_eval != 0;
|
|
|
|
}
|