summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-27 22:08:41 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-27 22:08:41 +0000
commit8654730aa8449ccd5b470c88cb5c0a22e36eabbd (patch)
tree575bce44ea42828bd69a4547886e43078fee5261
parent109d71ac71cab09d415a489deb39191735d9d00c (diff)
* def/id.def: use split(/^/) instead of String#lines to support
Ruby 1.8.5 as BASERUBY. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--defs/id.def2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 034c0c0..a73f3c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 28 07:07:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * def/id.def: use split(/^/) instead of String#lines to support
+ Ruby 1.8.5 as BASERUBY.
+
Thu Dec 27 21:56:56 2012 NARUSE, Yui <naruse@ruby-lang.org>
* variable.c (rb_mod_remove_const): fix segv caused by r38558.
diff --git a/defs/id.def b/defs/id.def
index 1196e8f..ea0746e 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -47,7 +47,7 @@ global_ids = []
const_ids = []
class_ids = []
names = {}
-predefined.lines.each_with_index do |line, num|
+predefined.split(/^/).each_with_index do |line, num|
next if /^#/ =~ line or (name, token = line.split; !name)
token ||= name
if /#/ =~ token