aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-11-06 06:37:40 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-11-06 06:37:40 +0000
commit6d32246b31a698dfe22ed64ed478ea40683bb330 (patch)
tree3f3572f7a122cecb83116bbd3d15746d3148ce37
parentd304aa6382747bc2c5094c9d3081f6e8260e5d96 (diff)
downloadruby-6d32246b31a698dfe22ed64ed478ea40683bb330.tar.gz
* parse.y (arg_dup_check): vid may be nameless internal id.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y1
-rw-r--r--string.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d558f76066..0b79717988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 6 00:42:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (arg_dup_check): vid may be nameless internal id.
+
Sun Nov 5 19:52:19 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb: updated based on date2 3.9.7.
diff --git a/parse.y b/parse.y
index 5b963aaef1..7e26b36f08 100644
--- a/parse.y
+++ b/parse.y
@@ -7886,6 +7886,7 @@ arg_dup_check(ID vid, VALUE m, VALUE list, NODE *node)
VALUE sym;
if (!vid) return 0;
+ if (is_junk_id(vid)) return 0;
sym = ID2SYM(vid);
if ((m && rb_ary_includes(m, sym)) || rb_ary_includes(list, sym)) {
ruby_sourceline = nd_line(node);
diff --git a/string.c b/string.c
index 18405af965..56b03baa74 100644
--- a/string.c
+++ b/string.c
@@ -3592,7 +3592,7 @@ rb_str_split(VALUE str, const char *sep0)
* str.lines(separator=$/) {|substr| block } => str
*
* Returns an enumerator that gives each line in the string. If a block is
- * given, it iterates over eac line in the string.
+ * given, it iterates over each line in the string.
*
* "foo\nbar\n".lines.to_a #=> ["foo\n", "bar\n"]
* "foo\nb ar".lines.sort #=> ["b ar", "foo\n"]