summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-21 00:56:05 +0000
committerkosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-21 00:56:05 +0000
commit24faafb25308b140b40eb876b8f5078544565cb6 (patch)
treee32e24be443999425587fa9f85fc33b3f8454834
parent3c9db8d6ac19de67cb2d34f3392e4844a1dd1c3b (diff)
downloadruby-24faafb25308b140b40eb876b8f5078544565cb6.tar.gz
ruby-24faafb25308b140b40eb876b8f5078544565cb6.tar.xz
ruby-24faafb25308b140b40eb876b8f5078544565cb6.zip
fix bug [ruby-list:42234]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--regexec.c3
-rw-r--r--version.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 34c7f15f0..b22cde12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sunn May 21 09:50:31 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
+
+ * regexec.c: add STK_NULL_CHECK_END to IS_TO_VOID_TARGET().
+ [ruby-list:42234]
+
Thu May 18 22:37:20 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/config.rb (WEBrick::Config::HTTP): add new parameters,
diff --git a/regexec.c b/regexec.c
index de14d6d81..90514d403 100644
--- a/regexec.c
+++ b/regexec.c
@@ -360,7 +360,8 @@ typedef struct _StackType {
/* stack type check mask */
#define STK_MASK_POP_USED 0x00ff
#define IS_TO_VOID_TARGET(stk) \
- (((stk)->type & STK_MASK_POP_USED) || (stk)->type == STK_NULL_CHECK_START)
+ (((stk)->type & STK_MASK_POP_USED) || \
+ (stk)->type == STK_NULL_CHECK_START || (stk)->type == STK_NULL_CHECK_END)
typedef struct {
void* stack_p;
diff --git a/version.h b/version.h
index d66a76309..2dd0dea7b 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,14 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2006-05-18"
+#define RUBY_RELEASE_DATE "2006-05-21"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20060518
+#define RUBY_RELEASE_CODE 20060521
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2006
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 21
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];