mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
Merge Onigmo 6.0.0
* https://github.com/k-takata/Onigmo/blob/Onigmo-6.0.0/HISTORY * fix for ruby 2.4: https://github.com/k-takata/Onigmo/pull/78 * suppress warning: https://github.com/k-takata/Onigmo/pull/79 * include/ruby/oniguruma.h: include onigmo.h. * template/encdb.h.tmpl: ignore duplicated definition of EUC-CN in enc/euc_kr.c. It is defined in enc/gb2313.c with CRuby macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse
parent
42a677c895
commit
2873edeafb
57 changed files with 3098 additions and 3173 deletions
410
regint.h
410
regint.h
|
|
@ -1,11 +1,11 @@
|
|||
#ifndef ONIGURUMA_REGINT_H
|
||||
#define ONIGURUMA_REGINT_H
|
||||
#ifndef ONIGMO_REGINT_H
|
||||
#define ONIGMO_REGINT_H
|
||||
/**********************************************************************
|
||||
regint.h - Onigmo (Oniguruma-mod) (regular expression library)
|
||||
**********************************************************************/
|
||||
/*-
|
||||
* Copyright (c) 2002-2013 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
|
||||
* Copyright (c) 2011-2014 K.Takata <kentkt AT csc DOT jp>
|
||||
* Copyright (c) 2011-2016 K.Takata <kentkt AT csc DOT jp>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -35,6 +35,7 @@
|
|||
/* #define ONIG_DEBUG_COMPILE */
|
||||
/* #define ONIG_DEBUG_SEARCH */
|
||||
/* #define ONIG_DEBUG_MATCH */
|
||||
/* #define ONIG_DEBUG_MEMLEAK */
|
||||
/* #define ONIG_DONT_OPTIMIZE */
|
||||
|
||||
/* for byte-code statistical data. */
|
||||
|
|
@ -42,25 +43,25 @@
|
|||
|
||||
#if defined(ONIG_DEBUG_PARSE_TREE) || defined(ONIG_DEBUG_MATCH) || \
|
||||
defined(ONIG_DEBUG_SEARCH) || defined(ONIG_DEBUG_COMPILE) || \
|
||||
defined(ONIG_DEBUG_STATISTICS)
|
||||
#ifndef ONIG_DEBUG
|
||||
#define ONIG_DEBUG
|
||||
#endif
|
||||
defined(ONIG_DEBUG_STATISTICS) || defined(ONIG_DEBUG_MEMLEAK)
|
||||
# ifndef ONIG_DEBUG
|
||||
# define ONIG_DEBUG
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef UNALIGNED_WORD_ACCESS
|
||||
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
|
||||
defined(__powerpc64__) || \
|
||||
defined(__mc68020__)
|
||||
#define UNALIGNED_WORD_ACCESS 1
|
||||
#else
|
||||
#define UNALIGNED_WORD_ACCESS 0
|
||||
#endif
|
||||
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
|
||||
defined(__powerpc64__) || \
|
||||
defined(__mc68020__)
|
||||
# define UNALIGNED_WORD_ACCESS 1
|
||||
# else
|
||||
# define UNALIGNED_WORD_ACCESS 0
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if UNALIGNED_WORD_ACCESS
|
||||
#define PLATFORM_UNALIGNED_WORD_ACCESS
|
||||
# define PLATFORM_UNALIGNED_WORD_ACCESS
|
||||
#endif
|
||||
|
||||
/* config */
|
||||
|
|
@ -73,213 +74,163 @@
|
|||
#define USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT /* /(?:()|())*\2/ */
|
||||
#define USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE /* /\n$/ =~ "\n" */
|
||||
#define USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
|
||||
/* #define USE_RECOMPILE_API */
|
||||
/* !!! moved to regenc.h. */ /* #define USE_CRNL_AS_LINE_TERMINATOR */
|
||||
#define USE_NO_INVALID_QUANTIFIER
|
||||
|
||||
/* internal config */
|
||||
#define USE_PARSE_TREE_NODE_RECYCLE
|
||||
#define USE_OP_PUSH_OR_JUMP_EXACT
|
||||
/* #define USE_OP_PUSH_OR_JUMP_EXACT */
|
||||
#define USE_QTFR_PEEK_NEXT
|
||||
#define USE_ST_LIBRARY
|
||||
#define USE_SHARED_CCLASS_TABLE
|
||||
#define USE_SUNDAY_QUICK_SEARCH
|
||||
|
||||
#define INIT_MATCH_STACK_SIZE 160
|
||||
#define DEFAULT_MATCH_STACK_LIMIT_SIZE 0 /* unlimited */
|
||||
#define DEFAULT_PARSE_DEPTH_LIMIT 4096
|
||||
|
||||
#define OPT_EXACT_MAXLEN 24
|
||||
|
||||
/* check config */
|
||||
#if defined(USE_PERL_SUBEXP_CALL) || defined(USE_CAPITAL_P_NAMED_GROUP)
|
||||
#if !defined(USE_NAMED_GROUP) || !defined(USE_SUBEXP_CALL)
|
||||
#error USE_NAMED_GROUP and USE_SUBEXP_CALL must be defined.
|
||||
#endif
|
||||
# if !defined(USE_NAMED_GROUP) || !defined(USE_SUBEXP_CALL)
|
||||
# error USE_NAMED_GROUP and USE_SUBEXP_CALL must be defined.
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
# define ARG_UNUSED __attribute__ ((unused))
|
||||
# define ARG_UNUSED __attribute__ ((unused))
|
||||
#else
|
||||
# define ARG_UNUSED
|
||||
# define ARG_UNUSED
|
||||
#endif
|
||||
|
||||
#ifndef RUBY_DEFINES_H
|
||||
#include "ruby/ruby.h"
|
||||
#undef xmalloc
|
||||
#undef xrealloc
|
||||
#undef xcalloc
|
||||
#undef xfree
|
||||
#if !defined(RUBY) && defined(RUBY_EXPORT)
|
||||
# define RUBY
|
||||
#endif
|
||||
#ifdef RUBY
|
||||
# ifndef RUBY_DEFINES_H
|
||||
# include "ruby/ruby.h"
|
||||
# undef xmalloc
|
||||
# undef xrealloc
|
||||
# undef xcalloc
|
||||
# undef xfree
|
||||
# endif
|
||||
#else /* RUBY */
|
||||
# include "config.h"
|
||||
# if SIZEOF_LONG_LONG > 0
|
||||
# define LONG_LONG long long
|
||||
# endif
|
||||
#endif /* RUBY */
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
/* */
|
||||
/* escape other system UChar definition */
|
||||
#ifdef ONIG_ESCAPE_UCHAR_COLLISION
|
||||
#undef ONIG_ESCAPE_UCHAR_COLLISION
|
||||
# undef ONIG_ESCAPE_UCHAR_COLLISION
|
||||
#endif
|
||||
|
||||
#define USE_WORD_BEGIN_END /* "\<": word-begin, "\>": word-end */
|
||||
#undef USE_CAPTURE_HISTORY
|
||||
#ifdef RUBY
|
||||
# undef USE_CAPTURE_HISTORY
|
||||
#else
|
||||
# define USE_CAPTURE_HISTORY
|
||||
#endif
|
||||
#define USE_VARIABLE_META_CHARS
|
||||
#define USE_POSIX_API_REGION_OPTION /* needed for POSIX API support */
|
||||
#define USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
|
||||
/* #define USE_COMBINATION_EXPLOSION_CHECK */ /* (X*)* */
|
||||
|
||||
/* multithread config */
|
||||
/* #define USE_MULTI_THREAD_SYSTEM */
|
||||
/* #define USE_DEFAULT_MULTI_THREAD_SYSTEM */
|
||||
|
||||
#if defined(USE_MULTI_THREAD_SYSTEM) \
|
||||
&& defined(USE_DEFAULT_MULTI_THREAD_SYSTEM)
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
extern CRITICAL_SECTION gOnigMutex;
|
||||
#define THREAD_SYSTEM_INIT InitializeCriticalSection(&gOnigMutex)
|
||||
#define THREAD_SYSTEM_END DeleteCriticalSection(&gOnigMutex)
|
||||
#define THREAD_ATOMIC_START EnterCriticalSection(&gOnigMutex)
|
||||
#define THREAD_ATOMIC_END LeaveCriticalSection(&gOnigMutex)
|
||||
#define THREAD_PASS Sleep(0)
|
||||
#else /* _WIN32 */
|
||||
#include <pthread.h>
|
||||
#include <sched.h>
|
||||
extern pthread_mutex_t gOnigMutex;
|
||||
#define THREAD_SYSTEM_INIT pthread_mutex_init(&gOnigMutex, NULL)
|
||||
#define THREAD_SYSTEM_END pthread_mutex_destroy(&gOnigMutex)
|
||||
#define THREAD_ATOMIC_START pthread_mutex_lock(&gOnigMutex)
|
||||
#define THREAD_ATOMIC_END pthread_mutex_unlock(&gOnigMutex)
|
||||
#define THREAD_PASS sched_yield()
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#else /* USE_DEFAULT_MULTI_THREAD_SYSTEM */
|
||||
|
||||
#ifndef THREAD_SYSTEM_INIT
|
||||
#define THREAD_SYSTEM_INIT /* depend on thread system */
|
||||
#endif
|
||||
#ifndef THREAD_SYSTEM_END
|
||||
#define THREAD_SYSTEM_END /* depend on thread system */
|
||||
#endif
|
||||
#ifndef THREAD_ATOMIC_START
|
||||
#define THREAD_ATOMIC_START /* depend on thread system */
|
||||
#endif
|
||||
#ifndef THREAD_ATOMIC_END
|
||||
#define THREAD_ATOMIC_END /* depend on thread system */
|
||||
#endif
|
||||
#ifndef THREAD_PASS
|
||||
#define THREAD_PASS /* depend on thread system */
|
||||
#endif
|
||||
|
||||
#endif /* USE_DEFAULT_MULTI_THREAD_SYSTEM */
|
||||
|
||||
#ifndef xmalloc
|
||||
#define xmalloc malloc
|
||||
#define xrealloc realloc
|
||||
#define xcalloc calloc
|
||||
#define xfree free
|
||||
# define xmalloc malloc
|
||||
# define xrealloc realloc
|
||||
# define xcalloc calloc
|
||||
# define xfree free
|
||||
#endif
|
||||
|
||||
#ifdef RUBY
|
||||
|
||||
#define CHECK_INTERRUPT_IN_MATCH_AT rb_thread_check_ints()
|
||||
#define onig_st_init_table st_init_table
|
||||
#define onig_st_init_table_with_size st_init_table_with_size
|
||||
#define onig_st_init_numtable st_init_numtable
|
||||
#define onig_st_init_numtable_with_size st_init_numtable_with_size
|
||||
#define onig_st_init_strtable st_init_strtable
|
||||
#define onig_st_init_strtable_with_size st_init_strtable_with_size
|
||||
#define onig_st_delete st_delete
|
||||
#define onig_st_delete_safe st_delete_safe
|
||||
#define onig_st_insert st_insert
|
||||
#define onig_st_lookup st_lookup
|
||||
#define onig_st_foreach st_foreach
|
||||
#define onig_st_add_direct st_add_direct
|
||||
#define onig_st_free_table st_free_table
|
||||
#define onig_st_cleanup_safe st_cleanup_safe
|
||||
#define onig_st_copy st_copy
|
||||
#define onig_st_nothing_key_clone st_nothing_key_clone
|
||||
#define onig_st_nothing_key_free st_nothing_key_free
|
||||
#define onig_st_is_member st_is_member
|
||||
# define CHECK_INTERRUPT_IN_MATCH_AT rb_thread_check_ints()
|
||||
# define onig_st_init_table st_init_table
|
||||
# define onig_st_init_table_with_size st_init_table_with_size
|
||||
# define onig_st_init_numtable st_init_numtable
|
||||
# define onig_st_init_numtable_with_size st_init_numtable_with_size
|
||||
# define onig_st_init_strtable st_init_strtable
|
||||
# define onig_st_init_strtable_with_size st_init_strtable_with_size
|
||||
# define onig_st_delete st_delete
|
||||
# define onig_st_delete_safe st_delete_safe
|
||||
# define onig_st_insert st_insert
|
||||
# define onig_st_lookup st_lookup
|
||||
# define onig_st_foreach st_foreach
|
||||
# define onig_st_add_direct st_add_direct
|
||||
# define onig_st_free_table st_free_table
|
||||
# define onig_st_cleanup_safe st_cleanup_safe
|
||||
# define onig_st_copy st_copy
|
||||
# define onig_st_nothing_key_clone st_nothing_key_clone
|
||||
# define onig_st_nothing_key_free st_nothing_key_free
|
||||
# define onig_st_is_member st_is_member
|
||||
|
||||
#define USE_UPPER_CASE_TABLE
|
||||
#else
|
||||
# define USE_UPPER_CASE_TABLE
|
||||
#else /* RUBY */
|
||||
|
||||
#define CHECK_INTERRUPT_IN_MATCH_AT
|
||||
# define CHECK_INTERRUPT_IN_MATCH_AT
|
||||
|
||||
#define st_init_table onig_st_init_table
|
||||
#define st_init_table_with_size onig_st_init_table_with_size
|
||||
#define st_init_numtable onig_st_init_numtable
|
||||
#define st_init_numtable_with_size onig_st_init_numtable_with_size
|
||||
#define st_init_strtable onig_st_init_strtable
|
||||
#define st_init_strtable_with_size onig_st_init_strtable_with_size
|
||||
#define st_delete onig_st_delete
|
||||
#define st_delete_safe onig_st_delete_safe
|
||||
#define st_insert onig_st_insert
|
||||
#define st_lookup onig_st_lookup
|
||||
#define st_foreach onig_st_foreach
|
||||
#define st_add_direct onig_st_add_direct
|
||||
#define st_free_table onig_st_free_table
|
||||
#define st_cleanup_safe onig_st_cleanup_safe
|
||||
#define st_copy onig_st_copy
|
||||
#define st_nothing_key_clone onig_st_nothing_key_clone
|
||||
#define st_nothing_key_free onig_st_nothing_key_free
|
||||
# define st_init_table onig_st_init_table
|
||||
# define st_init_table_with_size onig_st_init_table_with_size
|
||||
# define st_init_numtable onig_st_init_numtable
|
||||
# define st_init_numtable_with_size onig_st_init_numtable_with_size
|
||||
# define st_init_strtable onig_st_init_strtable
|
||||
# define st_init_strtable_with_size onig_st_init_strtable_with_size
|
||||
# define st_delete onig_st_delete
|
||||
# define st_delete_safe onig_st_delete_safe
|
||||
# define st_insert onig_st_insert
|
||||
# define st_lookup onig_st_lookup
|
||||
# define st_foreach onig_st_foreach
|
||||
# define st_add_direct onig_st_add_direct
|
||||
# define st_free_table onig_st_free_table
|
||||
# define st_cleanup_safe onig_st_cleanup_safe
|
||||
# define st_copy onig_st_copy
|
||||
# define st_nothing_key_clone onig_st_nothing_key_clone
|
||||
# define st_nothing_key_free onig_st_nothing_key_free
|
||||
/* */
|
||||
#define onig_st_is_member st_is_member
|
||||
# define onig_st_is_member st_is_member
|
||||
|
||||
#endif
|
||||
#endif /* RUBY */
|
||||
|
||||
#define STATE_CHECK_STRING_THRESHOLD_LEN 7
|
||||
#define STATE_CHECK_BUFF_MAX_SIZE 0x4000
|
||||
|
||||
#define THREAD_PASS_LIMIT_COUNT 8
|
||||
#define xmemset memset
|
||||
#define xmemcpy memcpy
|
||||
#define xmemmove memmove
|
||||
|
||||
#if defined(_WIN32) && !defined(__GNUC__)
|
||||
#define xalloca _alloca
|
||||
#define xvsnprintf _vsnprintf
|
||||
# define xalloca _alloca
|
||||
# define xvsnprintf(buf,size,fmt,args) _vsnprintf_s(buf,size,_TRUNCATE,fmt,args)
|
||||
# define xsnprintf sprintf_s
|
||||
# define xstrcat(dest,src,size) strcat_s(dest,size,src)
|
||||
#else
|
||||
#define xalloca alloca
|
||||
#define xvsnprintf vsnprintf
|
||||
# define xalloca alloca
|
||||
# define xvsnprintf vsnprintf
|
||||
# define xsnprintf snprintf
|
||||
# define xstrcat(dest,src,size) strcat(dest,src)
|
||||
#endif
|
||||
|
||||
#if defined(ONIG_DEBUG_MEMLEAK) && defined(_MSC_VER)
|
||||
# define _CRTDBG_MAP_ALLOC
|
||||
# include <malloc.h>
|
||||
# include <crtdbg.h>
|
||||
#endif
|
||||
|
||||
#if defined(USE_RECOMPILE_API) && defined(USE_MULTI_THREAD_SYSTEM)
|
||||
#define ONIG_STATE_INC(reg) (reg)->state++
|
||||
#define ONIG_STATE_DEC(reg) (reg)->state--
|
||||
|
||||
#define ONIG_STATE_INC_THREAD(reg) do {\
|
||||
THREAD_ATOMIC_START;\
|
||||
(reg)->state++;\
|
||||
THREAD_ATOMIC_END;\
|
||||
} while(0)
|
||||
#define ONIG_STATE_DEC_THREAD(reg) do {\
|
||||
THREAD_ATOMIC_START;\
|
||||
(reg)->state--;\
|
||||
THREAD_ATOMIC_END;\
|
||||
} while(0)
|
||||
#else
|
||||
#define ONIG_STATE_INC(reg) /* Nothing */
|
||||
#define ONIG_STATE_DEC(reg) /* Nothing */
|
||||
#define ONIG_STATE_INC_THREAD(reg) /* Nothing */
|
||||
#define ONIG_STATE_DEC_THREAD(reg) /* Nothing */
|
||||
#endif /* USE_RECOMPILE_API && USE_MULTI_THREAD_SYSTEM */
|
||||
|
||||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_ALLOCA_H) && (defined(_AIX) || !defined(__GNUC__))
|
||||
#include <alloca.h>
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
# include <string.h>
|
||||
#else
|
||||
# include <strings.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
|
|
@ -290,12 +241,10 @@ extern pthread_mutex_t gOnigMutex;
|
|||
# include <inttypes.h>
|
||||
#endif
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stddef.h>
|
||||
#endif
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <malloc.h> /* for alloca() */
|
||||
# include <malloc.h> /* for alloca() */
|
||||
#endif
|
||||
|
||||
#ifdef ONIG_DEBUG
|
||||
|
|
@ -303,28 +252,32 @@ extern pthread_mutex_t gOnigMutex;
|
|||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined(_MSC_VER) && (_MSC_VER < 1300)
|
||||
#ifndef _INTPTR_T_DEFINED
|
||||
#define _INTPTR_T_DEFINED
|
||||
# if defined(_MSC_VER) && (_MSC_VER < 1300)
|
||||
# ifndef _INTPTR_T_DEFINED
|
||||
# define _INTPTR_T_DEFINED
|
||||
typedef int intptr_t;
|
||||
#endif
|
||||
#ifndef _UINTPTR_T_DEFINED
|
||||
#define _UINTPTR_T_DEFINED
|
||||
# endif
|
||||
# ifndef _UINTPTR_T_DEFINED
|
||||
# define _UINTPTR_T_DEFINED
|
||||
typedef unsigned int uintptr_t;
|
||||
#endif
|
||||
#endif
|
||||
# endif
|
||||
# endif
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#ifndef PRIdPTR
|
||||
#ifdef _WIN64
|
||||
#define PRIdPTR "I64d"
|
||||
#define PRIuPTR "I64u"
|
||||
#define PRIxPTR "I64x"
|
||||
#else
|
||||
#define PRIdPTR "ld"
|
||||
#define PRIuPTR "lu"
|
||||
#define PRIxPTR "lx"
|
||||
# ifdef _WIN64
|
||||
# define PRIdPTR "I64d"
|
||||
# define PRIuPTR "I64u"
|
||||
# define PRIxPTR "I64x"
|
||||
# else
|
||||
# define PRIdPTR "ld"
|
||||
# define PRIuPTR "lu"
|
||||
# define PRIxPTR "lx"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef PRIdPTRDIFF
|
||||
# define PRIdPTRDIFF PRIdPTR
|
||||
#endif
|
||||
|
||||
#include "regenc.h"
|
||||
|
|
@ -332,10 +285,10 @@ typedef unsigned int uintptr_t;
|
|||
RUBY_SYMBOL_EXPORT_BEGIN
|
||||
|
||||
#ifdef MIN
|
||||
#undef MIN
|
||||
# undef MIN
|
||||
#endif
|
||||
#ifdef MAX
|
||||
#undef MAX
|
||||
# undef MAX
|
||||
#endif
|
||||
#define MIN(a,b) (((a)>(b))?(b):(a))
|
||||
#define MAX(a,b) (((a)<(b))?(b):(a))
|
||||
|
|
@ -350,28 +303,28 @@ RUBY_SYMBOL_EXPORT_BEGIN
|
|||
|
||||
#ifdef PLATFORM_UNALIGNED_WORD_ACCESS
|
||||
|
||||
#define PLATFORM_GET_INC(val,p,type) do{\
|
||||
# define PLATFORM_GET_INC(val,p,type) do{\
|
||||
val = *(type* )p;\
|
||||
(p) += sizeof(type);\
|
||||
} while(0)
|
||||
|
||||
#else
|
||||
|
||||
#define PLATFORM_GET_INC(val,p,type) do{\
|
||||
# define PLATFORM_GET_INC(val,p,type) do{\
|
||||
xmemcpy(&val, (p), sizeof(type));\
|
||||
(p) += sizeof(type);\
|
||||
} while(0)
|
||||
|
||||
/* sizeof(OnigCodePoint) */
|
||||
#define WORD_ALIGNMENT_SIZE SIZEOF_LONG
|
||||
# define WORD_ALIGNMENT_SIZE SIZEOF_LONG
|
||||
|
||||
#define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
|
||||
# define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
|
||||
(pad_size) = WORD_ALIGNMENT_SIZE \
|
||||
- ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\
|
||||
if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\
|
||||
} while (0)
|
||||
|
||||
#define ALIGNMENT_RIGHT(addr) do {\
|
||||
# define ALIGNMENT_RIGHT(addr) do {\
|
||||
(addr) += (WORD_ALIGNMENT_SIZE - 1);\
|
||||
(addr) -= ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\
|
||||
} while (0)
|
||||
|
|
@ -435,7 +388,6 @@ typedef unsigned int BitStatusType;
|
|||
#define IS_NOTEOL(option) ((option) & ONIG_OPTION_NOTEOL)
|
||||
#define IS_NOTBOS(option) ((option) & ONIG_OPTION_NOTBOS)
|
||||
#define IS_NOTEOS(option) ((option) & ONIG_OPTION_NOTEOS)
|
||||
#define IS_POSIX_REGION(option) ((option) & ONIG_OPTION_POSIX_REGION)
|
||||
#define IS_ASCII_RANGE(option) ((option) & ONIG_OPTION_ASCII_RANGE)
|
||||
#define IS_POSIX_BRACKET_ALL_RANGE(option) ((option) & ONIG_OPTION_POSIX_BRACKET_ALL_RANGE)
|
||||
#define IS_WORD_BOUND_ALL_RANGE(option) ((option) & ONIG_OPTION_WORD_BOUND_ALL_RANGE)
|
||||
|
|
@ -618,7 +570,6 @@ enum OpCode {
|
|||
OP_CCLASS_NOT,
|
||||
OP_CCLASS_MB_NOT,
|
||||
OP_CCLASS_MIX_NOT,
|
||||
OP_CCLASS_NODE, /* pointer to CClassNode node */
|
||||
|
||||
OP_ANYCHAR, /* "." */
|
||||
OP_ANYCHAR_ML, /* "." multi-line */
|
||||
|
|
@ -781,10 +732,10 @@ typedef void* PointerType;
|
|||
#define SIZE_OP_CONDITION (SIZE_OPCODE + SIZE_MEMNUM + SIZE_RELADDR)
|
||||
|
||||
#ifdef USE_COMBINATION_EXPLOSION_CHECK
|
||||
#define SIZE_OP_STATE_CHECK (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
|
||||
#define SIZE_OP_STATE_CHECK_PUSH (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
|
||||
#define SIZE_OP_STATE_CHECK_PUSH_OR_JUMP (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
|
||||
#define SIZE_OP_STATE_CHECK_ANYCHAR_STAR (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
|
||||
# define SIZE_OP_STATE_CHECK (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
|
||||
# define SIZE_OP_STATE_CHECK_PUSH (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
|
||||
# define SIZE_OP_STATE_CHECK_PUSH_OR_JUMP (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
|
||||
# define SIZE_OP_STATE_CHECK_ANYCHAR_STAR (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
|
||||
#endif
|
||||
|
||||
#define MC_ESC(syn) (syn)->meta_char_table.esc
|
||||
|
|
@ -832,13 +783,10 @@ typedef void* PointerType;
|
|||
|
||||
/* cclass node */
|
||||
#define FLAG_NCCLASS_NOT (1<<0)
|
||||
#define FLAG_NCCLASS_SHARE (1<<1)
|
||||
|
||||
#define NCCLASS_SET_NOT(nd) NCCLASS_FLAG_SET(nd, FLAG_NCCLASS_NOT)
|
||||
#define NCCLASS_SET_SHARE(nd) NCCLASS_FLAG_SET(nd, FLAG_NCCLASS_SHARE)
|
||||
#define NCCLASS_CLEAR_NOT(nd) NCCLASS_FLAG_CLEAR(nd, FLAG_NCCLASS_NOT)
|
||||
#define IS_NCCLASS_NOT(nd) IS_NCCLASS_FLAG_ON(nd, FLAG_NCCLASS_NOT)
|
||||
#define IS_NCCLASS_SHARE(nd) IS_NCCLASS_FLAG_ON(nd, FLAG_NCCLASS_SHARE)
|
||||
|
||||
typedef struct {
|
||||
int type;
|
||||
|
|
@ -936,60 +884,44 @@ typedef struct {
|
|||
extern OnigOpInfoType OnigOpInfo[];
|
||||
|
||||
|
||||
extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc));
|
||||
extern void onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc);
|
||||
|
||||
#ifdef ONIG_DEBUG_STATISTICS
|
||||
extern void onig_statistics_init P_((void));
|
||||
extern void onig_print_statistics P_((FILE* f));
|
||||
#endif
|
||||
# ifdef ONIG_DEBUG_STATISTICS
|
||||
extern void onig_statistics_init(void);
|
||||
extern void onig_print_statistics(FILE* f);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
extern UChar* onig_error_code_to_format P_((OnigPosition code));
|
||||
extern void onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));
|
||||
extern int onig_bbuf_init P_((BBuf* buf, OnigDistance size));
|
||||
extern int onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo, const char *sourcefile, int sourceline));
|
||||
extern void onig_chain_reduce P_((regex_t* reg));
|
||||
extern void onig_chain_link_add P_((regex_t* to, regex_t* add));
|
||||
extern void onig_transfer P_((regex_t* to, regex_t* from));
|
||||
extern int onig_is_code_in_cc P_((OnigEncoding enc, OnigCodePoint code, CClassNode* cc));
|
||||
extern int onig_is_code_in_cc_len P_((int enclen, OnigCodePoint code, CClassNode* cc));
|
||||
extern UChar* onig_error_code_to_format(OnigPosition code);
|
||||
extern void onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, va_list args);
|
||||
extern void onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...);
|
||||
extern int onig_bbuf_init(BBuf* buf, OnigDistance size);
|
||||
extern int onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo);
|
||||
#ifdef RUBY
|
||||
extern int onig_compile_ruby(regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo, const char *sourcefile, int sourceline);
|
||||
#endif
|
||||
extern void onig_transfer(regex_t* to, regex_t* from);
|
||||
extern int onig_is_code_in_cc(OnigEncoding enc, OnigCodePoint code, CClassNode* cc);
|
||||
extern int onig_is_code_in_cc_len(int enclen, OnigCodePoint code, CClassNode* cc);
|
||||
|
||||
/* strend hash */
|
||||
typedef void hash_table_type;
|
||||
#ifdef RUBY
|
||||
#include "ruby/st.h"
|
||||
typedef st_data_t hash_data_type;
|
||||
# include "ruby/st.h"
|
||||
#else
|
||||
#include "st.h"
|
||||
typedef uintptr_t hash_data_type;
|
||||
# include "st.h"
|
||||
#endif
|
||||
typedef st_data_t hash_data_type;
|
||||
|
||||
extern hash_table_type* onig_st_init_strend_table_with_size P_((st_index_t size));
|
||||
extern int onig_st_lookup_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type *value));
|
||||
extern int onig_st_insert_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type value));
|
||||
extern hash_table_type* onig_st_init_strend_table_with_size(st_index_t size);
|
||||
extern int onig_st_lookup_strend(hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type *value);
|
||||
extern int onig_st_insert_strend(hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type value);
|
||||
|
||||
/* encoding property management */
|
||||
#define PROPERTY_LIST_ADD_PROP(Name, CR) \
|
||||
r = onigenc_property_list_add_property((UChar* )Name, CR,\
|
||||
&PropertyNameTable, &PropertyList, &PropertyListNum,\
|
||||
&PropertyListSize);\
|
||||
if (r != 0) goto end
|
||||
|
||||
#define PROPERTY_LIST_INIT_CHECK \
|
||||
if (PropertyInited == 0) {\
|
||||
int r = onigenc_property_list_init(init_property_list);\
|
||||
if (r != 0) return r;\
|
||||
}
|
||||
|
||||
extern int onigenc_property_list_add_property P_((UChar* name, const OnigCodePoint* prop, hash_table_type **table, const OnigCodePoint*** plist, int *pnum, int *psize));
|
||||
|
||||
typedef int (*ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE)(void);
|
||||
|
||||
extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));
|
||||
|
||||
extern size_t onig_memsize P_((const regex_t *reg));
|
||||
extern size_t onig_region_memsize P_((const struct re_registers *regs));
|
||||
#ifdef RUBY
|
||||
extern size_t onig_memsize(const regex_t *reg);
|
||||
extern size_t onig_region_memsize(const struct re_registers *regs);
|
||||
#endif
|
||||
|
||||
RUBY_SYMBOL_EXPORT_END
|
||||
|
||||
#endif /* ONIGURUMA_REGINT_H */
|
||||
#endif /* ONIGMO_REGINT_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue