summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-26 07:51:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-26 07:51:04 +0000
commitf8665e42f01f5caff4cb90e1ba0893a8518d521f (patch)
treee7994866dfc9937de8e77fd306b98f5e44e7b1b0 /template
parent7e88248f7dfc639492df59bb3b251bfb4163c996 (diff)
merge revision(s) 40525,40526,40528,40530: [Backport #8345]
proc.c: remove unnecessary static function * proc.c (proc_lambda): remove and use rb_block_lambda directly instead. * include/ruby/intern.h (rb_block_lambda): add declaration instead of deprecated rb_f_lambda. * proc.c (mproc, mlambda): use frozen core methods instead of plain global methods, so that methods cannot be overridden. [ruby-core:54687] [Bug #8345] * vm.c (Init_VM): define proc and lambda on the frozen core object. * defs/id.def (predefined): add "idProc". * proc.c (mnew, mproc, mlambda): use predefined IDs. * vm.c (Init_VM): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@41649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
-rw-r--r--template/id.h.tmpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 5ad91452ec..ae30cf98a0 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -98,6 +98,7 @@ enum ruby_method_ids {
tGets,
tSucc,
tEach,
+ tProc,
tLambda,
tSend,
t__send__,
@@ -120,6 +121,7 @@ enum ruby_method_ids {
TOKEN2ID(Gets),
TOKEN2ID(Succ),
TOKEN2ID(Each),
+ TOKEN2ID(Proc),
TOKEN2ID(Lambda),
TOKEN2ID(Send),
TOKEN2ID(__send__),