summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parse.y2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e84d6a73d..480a459614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
+Wed Dec 24 09:38:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (arg): should return 0 after error. [ruby-dev:22360]
+
Wed Dec 24 00:56:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (read_all): do not return nil at the end of file.
[ruby-dev:22334]
* io.c (argf_read): do not depend on nil at eof behavior of
- IO#read().
+ IO#read().
* eval.c (rb_thread_join): dup exception before re-raising it.
diff --git a/parse.y b/parse.y
index 783689aa10..75b0cba312 100644
--- a/parse.y
+++ b/parse.y
@@ -1038,10 +1038,12 @@ arg : lhs '=' arg
| primary_value tCOLON2 tCONSTANT tOP_ASGN arg
{
yyerror("constant re-assignment");
+ $$ = 0;
}
| tCOLON3 tCONSTANT tOP_ASGN arg
{
yyerror("constant re-assignment");
+ $$ = 0;
}
| backref tOP_ASGN arg
{