aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--parse.y18
2 files changed, 23 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 548c6f58c4..8cd19c868c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,19 @@
+Fri Sep 2 23:51:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID.
+ fixed: [ruby-dev:26942]
+
Thu Sep 1 17:11:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): wrong condition for $SAFE restoration.
Thu Sep 1 14:12:45 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
- work (gives wrong order of arguments).
+ * ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
+ work (gives wrong order of arguments).
- * ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
- to support '-namespace' option of 'interp invokehidden' command
+ * ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
+ to support '-namespace' option of 'interp invokehidden' command
on Tcl8.5.
Wed Aug 31 14:41:30 2005 NAKAMURA Usaku <usa@ruby-lang.org>
diff --git a/parse.y b/parse.y
index 33adddadac..b04cd40c20 100644
--- a/parse.y
+++ b/parse.y
@@ -4095,15 +4095,25 @@ f_norm_arg : tCONSTANT
f_arg : f_norm_arg
{
- $$ = rb_ary_new3(1, ID2SYM($1));
+ /*%%%*/
+ VALUE arg = ID2SYM($1);
+ /*%
+ VALUE arg = $1;
+ %*/
+ $$ = rb_ary_new3(1, arg);
}
| f_arg ',' f_norm_arg
{
+ /*%%%*/
+ VALUE arg = ID2SYM($3);
+ /*%
+ VALUE arg = $3;
+ %*/
$$ = $1;
- if (rb_ary_includes($$, ID2SYM($3))) {
- yyerror("duplicated argument name");
+ if (rb_ary_includes($$, arg)) {
+ yyerror("duplicated argument arg");
}
- rb_ary_push($$, ID2SYM($3));
+ rb_ary_push($$, arg);
}
;