diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-18 19:18:15 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-18 19:18:15 +0000 |
commit | 12f4488c582a4f80bfe971754dbf7da7df2cea95 (patch) | |
tree | 003e186a6ef5e9e209b4528adc59262f20fb4324 /defs/id.def | |
parent | fff67882f9ed1436a32fd9120158d274c4515234 (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_2_0_0@41394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs/id.def')
-rw-r--r-- | defs/id.def | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/defs/id.def b/defs/id.def index ea0746e4d6..91c4110d24 100644 --- a/defs/id.def +++ b/defs/id.def @@ -7,6 +7,7 @@ firstline, predefined = __LINE__+1, %[\ gets succ each + proc lambda send __send__ @@ -48,7 +49,10 @@ const_ids = [] class_ids = [] names = {} predefined.split(/^/).each_with_index do |line, num| - next if /^#/ =~ line or (name, token = line.split; !name) + next if /^#/ =~ line + line.sub!(/\s+#.*/, '') + name, token = line.split + next unless name token ||= name if /#/ =~ token token = "_#{token.gsub(/\W+/, '_')}" |