diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regparse.c | 20 |
2 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sun Nov 28 12:14:47 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp> + + * regparse.c (fetch_token): fixed test failure on HP-UX ia64 + ([ruby-dev:24859]). + Sun Nov 28 12:08:15 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp> * regparse.c, test/ruby/test_regexp.rb: fixed problem with UTF-8 diff --git a/regparse.c b/regparse.c index 16792ee9eb..f4b72c3e84 100644 --- a/regparse.c +++ b/regparse.c @@ -2561,9 +2561,9 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env) if (p == prev) { /* can't read nothing. */ num = 0; /* but, it's not error */ } - tok->type = TK_CODE_POINT; - tok->base = 16; - tok->u.c = num; + tok->type = TK_CODE_POINT; + tok->base = 16; + tok->u.code = (OnigCodePoint )num; } break; @@ -2588,8 +2588,8 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env) num = fetch_escaped_value(&p, end, env); if (num < 0) return num; if (tok->u.c != num) { - tok->u.c = num; - tok->type = TK_CODE_POINT; + tok->u.code = (OnigCodePoint )num; + tok->type = TK_CODE_POINT; } break; } @@ -2892,9 +2892,9 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env) if (p == prev) { /* can't read nothing. */ num = 0; /* but, it's not error */ } - tok->type = TK_CODE_POINT; - tok->base = 16; - tok->u.c = num; + tok->type = TK_CODE_POINT; + tok->base = 16; + tok->u.code = (OnigCodePoint )num; } break; @@ -3042,8 +3042,8 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env) if (num < 0) return num; /* set_raw: */ if (tok->u.c != num) { - tok->type = TK_CODE_POINT; - tok->u.c = num; + tok->type = TK_CODE_POINT; + tok->u.code = (OnigCodePoint )num; } else { /* string */ p = tok->backp + enc_len(enc, tok->backp); |