summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-09 15:07:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-09 15:07:14 +0000
commita51ba48abcc65bb1fcb6d92d5da3f8b74237c7d9 (patch)
tree874a7e4c21ad02d70f1fa6e78ca7de2a9a8c1c5c
parent152380a87c7f26445141e845eaab95fe20c42918 (diff)
* parse.y (primary): primary_value may be 0 when syntax error.
[ruby-talk:84893] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--parse.y2
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 709966346e3..77e4197f695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 10 00:07:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (primary): primary_value may be 0 when syntax error.
+ [ruby-talk:84893]
+
Sat Nov 9 02:05:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
* lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
@@ -35,9 +40,9 @@ Sat Nov 8 13:28:46 2003 Takaaki Tateishi <ttate@ttsky.net>
Sat Nov 8 06:19:38 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
- TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
- (queueing a handler to the EventQueue).
+ * ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
+ TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
+ (queueing a handler to the EventQueue).
* ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
diff --git a/parse.y b/parse.y
index 6098e96cada..c37a5bea7a4 100644
--- a/parse.y
+++ b/parse.y
@@ -1445,7 +1445,7 @@ primary : literal
}
| primary_value '[' aref_args ']'
{
- if (nd_type($1) == NODE_SELF)
+ if ($1 && nd_type($1) == NODE_SELF)
$$ = NEW_FCALL(tAREF, $3);
else
$$ = NEW_CALL($1, tAREF, $3);