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

* eval_proc.c (rb_proc_new): added.

Browse source 
* string.c (sym_to_proc): supported.
* vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
  rb_proc_new.
* yarvcore.c: add a test code.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-01-16 03:06:01 +00:00
parent d2907d42be
commit 7eb928624f
6 changed files with 72 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Tue Jan 16 12:00:06 2007 Koichi Sasada <ko1@atdot.net>
* eval_proc.c (rb_proc_new): added.
* string.c (sym_to_proc): supported.
* vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
rb_proc_new.
* yarvcore.c: add a test code.
Sat Jan 13 23:24:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_free, ole_type_free,

12
eval_proc.c
View file

@ -1023,6 +1023,18 @@ bmcall(VALUE args, VALUE method)
return rb_method_call(RARRAY_LEN(a), RARRAY_PTR(a), method);
}
VALUE
rb_proc_new(
VALUE (*func)(ANYARGS), /* VALUE yieldarg[, VALUE procarg] */
VALUE val)
{
yarv_proc_t *proc;
VALUE procval = rb_iterate((VALUE(*)(VALUE))mproc, 0, func, val);
GetProcPtr(procval, proc);
((NODE*)proc->block.iseq)->u3.state = 1;
return procval;
}
/*
* call-seq:
* meth.to_proc => prc

5
string.c
View file

@ -4802,10 +4802,7 @@ sym_call(VALUE args, VALUE sym)
static VALUE
sym_to_proc(VALUE sym)
{
rb_notimplement();
return Qnil;
// TODO
// return rb_proc_new(sym_call, (VALUE)SYM2ID(sym));
return rb_proc_new(sym_call, (VALUE)SYM2ID(sym));
}

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-01-13"
#define RUBY_RELEASE_DATE "2007-01-16"
#define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070113
#define RUBY_RELEASE_CODE 20070116
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 13
#define RUBY_RELEASE_DAY 16
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];

91
vm.c
View file

@ -662,40 +662,49 @@ th_yield_setup_args(yarv_iseq_t *iseq, int argc, VALUE *argv)
return argc;
}
static VALUE
invoke_block(yarv_thread_t *th, yarv_block_t *block, int argc, VALUE *argv, int magic)
{
VALUE val;
if (BUILTIN_TYPE(block->iseq) != T_NODE) {
yarv_iseq_t *iseq = block->iseq;
int i;
th_set_finish_env(th);
/* TODO: check overflow */
for (i=0; i<argc; i++) {
th->cfp->sp[i] = argv[i];
}
argc = th_yield_setup_args(iseq, argc, th->cfp->sp);
th->cfp->sp += argc;
push_frame(th, iseq, magic,
block->self, GC_GUARDED_PTR(block->dfp),
iseq->iseq_encoded, th->cfp->sp, block->lfp,
iseq->local_size - argc);
val = th_eval_body(th);
}
else {
if (((NODE*)block->iseq)->u3.state == 1) {
VALUE args = rb_ary_new4(argc, argv);
argc = 1;
argv = &args;
}
val = th_invoke_yield_cfunc(th, block, block->self, argc, argv);
}
return val;
}
VALUE
th_invoke_yield(yarv_thread_t *th, int argc, VALUE *argv)
{
yarv_control_frame_t *cfp = th->cfp;
yarv_block_t *block = GC_GUARDED_PTR_REF(cfp->lfp[0]);
VALUE val;
yarv_block_t *block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
if (block == 0) {
th_localjump_error("no block given", Qnil, 0);
}
else {
if (BUILTIN_TYPE(block->iseq) != T_NODE) {
yarv_iseq_t *iseq = block->iseq;
int i;
th_set_finish_env(th);
/* TODO: check overflow */
for (i=0; i<argc; i++) {
th->cfp->sp[i] = argv[i];
}
argc = th_yield_setup_args(iseq, argc, th->cfp->sp);
th->cfp->sp += argc;
push_frame(th, iseq, FRAME_MAGIC_BLOCK,
block->self, GC_GUARDED_PTR(block->dfp),
iseq->iseq_encoded, th->cfp->sp, block->lfp,
iseq->local_size - argc);
val = th_eval_body(th);
}
else {
val = th_invoke_yield_cfunc(th, block, block->self, argc, argv);
}
}
return val;
return invoke_block(th, block, argc, argv, FRAME_MAGIC_BLOCK);
}
VALUE
@ -705,7 +714,7 @@ th_invoke_proc(yarv_thread_t *th, yarv_proc_t *proc,
VALUE val = Qundef;
int state;
volatile int stored_safe = th->safe_level;
volatile NODE *stored_special_cref_stack = 0;
volatile NODE *stored_special_cref_stack;
yarv_control_frame_t * volatile cfp = th->cfp;
TH_PUSH_TAG(th);
@ -714,32 +723,8 @@ th_invoke_proc(yarv_thread_t *th, yarv_proc_t *proc,
lfp_set_special_cref(proc->block.lfp, proc->special_cref_stack);
th->safe_level = proc->safe_level;
if (BUILTIN_TYPE(proc->block.iseq) == T_NODE) {
val = th_invoke_yield_cfunc(th, &proc->block,
proc->block.self, argc, argv);
}
else {
yarv_iseq_t *iseq = proc->block.iseq;
yarv_control_frame_t *cfp;
int i;
th_set_finish_env(th);
cfp = th->cfp;
/* TODO: check overflow */
for (i=0; i<argc; i++) {
cfp->sp[i] = argv[i];
}
argc = th_yield_setup_args(iseq, argc, cfp->sp);
cfp->sp += argc;
push_frame(th, iseq,
proc->is_lambda ? FRAME_MAGIC_LAMBDA : FRAME_MAGIC_PROC,
self, (VALUE)proc->block.dfp, iseq->iseq_encoded,
cfp->sp, proc->block.lfp,
iseq->local_size - argc);
val = th_eval_body(th);
}
val = invoke_block(th, &proc->block, argc, argv,
proc->is_lambda ? FRAME_MAGIC_LAMBDA : FRAME_MAGIC_PROC);
}
else {
if (state == TAG_BREAK ||

10
yarvcore.c
View file

@ -814,12 +814,16 @@ yarv_segv()
return Qnil;
}
static VALUE
proc_func(VALUE v)
{
dp(v);
}
static VALUE
cfunc(void)
{
rb_funcall(Qnil, rb_intern("rfunc"), 0, 0);
rb_funcall(Qnil, rb_intern("rfunc"), 0, 0);
return Qnil;
return rb_proc_new(proc_func, INT2FIX(12345));
}
// VALUE yarv_Hash_each();