diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-01 21:54:59 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-01 21:54:59 +0000 |
commit | db37773e13fba8ccb28612361220638e702d4deb (patch) | |
tree | 72ffe3fbbb7762810ec3780c3004408ee5d0d693 /enc | |
parent | e1c33162cf821b5251559564242e0d91ad29a79c (diff) | |
download | ruby-db37773e13fba8ccb28612361220638e702d4deb.tar.gz |
* include/ruby/oniguruma.h: updated to follow Oniguruma 5.9.2.
* re.c (make_regexp): use onig_new() instead of onig_alloc_init().
* re.c (rb_reg_to_s): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r-- | enc/euc_tw.c | 11 | ||||
-rw-r--r-- | enc/iso_8859_5.c | 2 | ||||
-rw-r--r-- | enc/koi8_r.c | 2 | ||||
-rw-r--r-- | enc/koi8_u.c | 2 | ||||
-rw-r--r-- | enc/shift_jis.c | 6 | ||||
-rw-r--r-- | enc/unicode.c | 2 | ||||
-rw-r--r-- | enc/utf_16be.c | 2 | ||||
-rw-r--r-- | enc/utf_16le.c | 2 |
8 files changed, 10 insertions, 19 deletions
diff --git a/enc/euc_tw.c b/enc/euc_tw.c index d025a0dd45..cf95954bc5 100644 --- a/enc/euc_tw.c +++ b/enc/euc_tw.c @@ -2,7 +2,7 @@ euc_tw.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -169,15 +169,6 @@ euctw_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, pp, end, lower); } -#if 0 -static int -euctw_is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end, OnigEncoding enc) -{ - return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end); -} -#endif - static int euctw_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c index 1550763323..81cc8e5b32 100644 --- a/enc/iso_8859_5.c +++ b/enc/iso_8859_5.c @@ -2,7 +2,7 @@ iso8859_5.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/enc/koi8_r.c b/enc/koi8_r.c index fb6e10eadc..f5b7d22349 100644 --- a/enc/koi8_r.c +++ b/enc/koi8_r.c @@ -2,7 +2,7 @@ koi8_r.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/enc/koi8_u.c b/enc/koi8_u.c index 9bd363df12..dfbaa9ac36 100644 --- a/enc/koi8_u.c +++ b/enc/koi8_u.c @@ -2,7 +2,7 @@ koi8_u.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/enc/shift_jis.c b/enc/shift_jis.c index b4d8592a27..f7614205af 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -2,7 +2,7 @@ sjis.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -294,7 +294,7 @@ init_property_list(void) static int property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { - st_data_t ctype; + hash_data_type ctype; PROPERTY_LIST_INIT_CHECK; @@ -302,7 +302,7 @@ property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) return onigenc_minimum_property_name_to_ctype(enc, p, end); } - return ctype; + return (int)ctype; } static int diff --git a/enc/unicode.c b/enc/unicode.c index 82fc877fe6..e3a314b6f3 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -2,7 +2,7 @@ unicode.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/enc/utf_16be.c b/enc/utf_16be.c index 8d7c8e9b11..d6e2c953b7 100644 --- a/enc/utf_16be.c +++ b/enc/utf_16be.c @@ -2,7 +2,7 @@ utf_16be.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/enc/utf_16le.c b/enc/utf_16le.c index c8a1e7a10a..9547714e52 100644 --- a/enc/utf_16le.c +++ b/enc/utf_16le.c @@ -2,7 +2,7 @@ utf_16le.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without |