summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-25 10:06:12 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-25 10:06:12 +0000
commitcc3cbd2965ce1c75bd0eace89eeb3c3fe8c90735 (patch)
tree1e49a2a524425c2624959021120494171724c0c7
parent6194a7eef1338df836b27608ee2eb989887cea39 (diff)
* compile.c (defined_expr): should handle NODE_{AND,OR} as
"expression". [ruby-dev:35951] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--compile.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fc9d7c6f74..f3ac80307a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 25 19:05:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * compile.c (defined_expr): should handle NODE_{AND,OR} as
+ "expression". [ruby-dev:35951]
+
Mon Aug 25 17:36:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/intern.h (rb_io_ungetbyte): added prototype.
diff --git a/compile.c b/compile.c
index 85f85ca300..b778bbd98f 100644
--- a/compile.c
+++ b/compile.c
@@ -2334,6 +2334,8 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
case NODE_STR:
case NODE_LIT:
case NODE_ZARRAY:
+ case NODE_AND:
+ case NODE_OR:
estr = "expression";
break;