1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proc.c: void env

Browse Source 
* proc.c (rb_sym_to_proc): make void env.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-15 14:56:05 +00:00
parent 4951f3b5e3
commit 14b8530454
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Oct 15 23:56:03 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (rb_sym_to_proc): make void env.
Thu Oct 15 13:37:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Oct 15 13:37:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (rb_sym_to_proc): move from string.c and create a Proc * proc.c (rb_sym_to_proc): move from string.c and create a Proc

15
proc.c
View File

@ -57,9 +57,17 @@ proc_mark(void *ptr)
RUBY_MARK_LEAVE("proc"); RUBY_MARK_LEAVE("proc");
} }
typedef struct {
rb_proc_t basic;
VALUE env[2]; /* specval, envval */
} sym_proc_t;
static size_t static size_t
proc_memsize(const void *ptr) proc_memsize(const void *ptr)
{ {
const rb_proc_t *proc = ptr;
if (proc->block.ep == ((const sym_proc_t *)ptr)->env)
return sizeof(sym_proc_t);
return sizeof(rb_proc_t); return sizeof(rb_proc_t);
} }
@ -1060,9 +1068,12 @@ rb_sym_to_proc(VALUE sym)
} }
else { else {
rb_proc_t *ptr; rb_proc_t *ptr;
sym_proc_t *symproc;
VALUE ifunc = (VALUE)IFUNC_NEW(rb_sym_proc_call, (VALUE)id, 0); VALUE ifunc = (VALUE)IFUNC_NEW(rb_sym_proc_call, (VALUE)id, 0);
proc = rb_proc_alloc(rb_cProc); proc = TypedData_Make_Struct(rb_cProc, sym_proc_t, &proc_data_type, symproc);
ptr = RTYPEDDATA_DATA(proc); symproc->env[0] = VM_ENVVAL_BLOCK_PTR(0);
ptr = &symproc->basic;
ptr->block.ep = symproc->env;
ptr->block.iseq = (rb_iseq_t *)ifunc; ptr->block.iseq = (rb_iseq_t *)ifunc;
ptr->block.proc = ifunc; ptr->block.proc = ifunc;
aryp[index] = sym; aryp[index] = sym;

1
test/ruby/test_symbol.rb
View File

@ -137,6 +137,7 @@ class TestSymbol < Test::Unit::TestCase
assert_separately([], <<-"end;", timeout: 5.0) assert_separately([], <<-"end;", timeout: 5.0)
bug11566 = '[ruby-core:70980] [Bug #11566]' bug11566 = '[ruby-core:70980] [Bug #11566]'
assert_raise(NoMethodError, bug11566) {Proc.new(&:foo).(1)} assert_raise(NoMethodError, bug11566) {Proc.new(&:foo).(1)}
assert_raise(NoMethodError, bug11566) {:foo.to_proc.(1)}
end; end;
end end