diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-15 16:18:41 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-15 16:18:41 +0000 |
commit | d2a5354255bab4d74c710ee8ff21f43998f33095 (patch) | |
tree | 1ec7bb66dc38e3d46bc69892fa6d18184386ec72 /regenc.h | |
parent | d198d64e0464c141f70c49880bf511ac3dcd1162 (diff) | |
download | ruby-d2a5354255bab4d74c710ee8ff21f43998f33095.tar.gz |
* reg*.c: Merge Onigmo 5.15.0 38a870960aa7370051a3544
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regenc.h')
-rw-r--r-- | regenc.h | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -29,15 +29,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #ifndef REGINT_H #ifndef RUBY_EXTERN #include "ruby/config.h" #include "ruby/defines.h" #endif +#endif + #ifdef ONIG_ESCAPE_UCHAR_COLLISION #undef ONIG_ESCAPE_UCHAR_COLLISION #endif -#endif + #include "ruby/oniguruma.h" RUBY_SYMBOL_EXPORT_BEGIN @@ -104,7 +107,13 @@ typedef struct { short int len; } PosixBracketEntryType; -#define PosixBracketEntryInit(name, ctype) {(const UChar *)name, ctype, (short int)(sizeof(name) - 1)} +#define POSIX_BRACKET_ENTRY_INIT(name, ctype) \ + {(const UChar* )(name), (ctype), (short int )(sizeof(name) - 1)} + +#ifndef numberof +#define numberof(array) (int )(sizeof(array) / sizeof((array)[0])) +#endif + #define USE_CRNL_AS_LINE_TERMINATOR #define USE_UNICODE_PROPERTIES @@ -159,6 +168,7 @@ ONIG_EXTERN int onigenc_unicode_apply_all_case_fold P_((OnigCaseFoldType flag, O #define UTF16_IS_SURROGATE_FIRST(c) (((c) & 0xfc) == 0xd8) #define UTF16_IS_SURROGATE_SECOND(c) (((c) & 0xfc) == 0xdc) +#define UTF16_IS_SURROGATE(c) (((c) & 0xf8) == 0xd8) #define ONIGENC_ISO_8859_1_TO_LOWER_CASE(c) \ OnigEncISO_8859_1_ToLowerCaseTable[c] |