kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Only define history_root member of the Oniguruma re_registers struct if USE_CAPTURE_HISTORY is enabled

Browse source
This commit is contained in:
Lourens Naudé 2019-03-16 12:48:34 +00:00 • committed by NARUSE, Yui
parent 14dd8d6b37
commit 31cf13060c
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/ruby/onigmo.h
View file

@ -701,6 +701,7 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#define ONIG_IS_CAPTURE_HISTORY_GROUP(r, i) \ #define ONIG_IS_CAPTURE_HISTORY_GROUP(r, i) \
((i) <= ONIG_MAX_CAPTURE_HISTORY_GROUP && (r)->list && (r)->list[i]) ((i) <= ONIG_MAX_CAPTURE_HISTORY_GROUP && (r)->list && (r)->list[i])
#ifdef USE_CAPTURE_HISTORY
typedef struct OnigCaptureTreeNodeStruct { typedef struct OnigCaptureTreeNodeStruct {
int group; /* group number */ int group; /* group number */
OnigPosition beg; OnigPosition beg;
@ -709,6 +710,7 @@ typedef struct OnigCaptureTreeNodeStruct {
int num_childs; int num_childs;
struct OnigCaptureTreeNodeStruct** childs; struct OnigCaptureTreeNodeStruct** childs;
} OnigCaptureTreeNode; } OnigCaptureTreeNode;
#endif
/* match result region type */ /* match result region type */
struct re_registers { struct re_registers {
@ -716,8 +718,10 @@ struct re_registers {
int num_regs; int num_regs;
OnigPosition* beg; OnigPosition* beg;
OnigPosition* end; OnigPosition* end;
#ifdef USE_CAPTURE_HISTORY
/* extended */ /* extended */
OnigCaptureTreeNode* history_root; /* capture history tree root */ OnigCaptureTreeNode* history_root; /* capture history tree root */
#endif
}; };
/* capture tree traverse */ /* capture tree traverse */
@ -866,8 +870,10 @@ ONIG_EXTERN
int onig_number_of_captures(const OnigRegexType *reg); int onig_number_of_captures(const OnigRegexType *reg);
ONIG_EXTERN ONIG_EXTERN
int onig_number_of_capture_histories(const OnigRegexType *reg); int onig_number_of_capture_histories(const OnigRegexType *reg);
#ifdef USE_CAPTURE_HISTORY
ONIG_EXTERN ONIG_EXTERN
OnigCaptureTreeNode* onig_get_capture_tree(OnigRegion* region); OnigCaptureTreeNode* onig_get_capture_tree(OnigRegion* region);
#endif
ONIG_EXTERN ONIG_EXTERN
int onig_capture_tree_traverse(OnigRegion* region, int at, int(*callback_func)(int,OnigPosition,OnigPosition,int,int,void*), void* arg); int onig_capture_tree_traverse(OnigRegion* region, int at, int(*callback_func)(int,OnigPosition,OnigPosition,int,int,void*), void* arg);
ONIG_EXTERN ONIG_EXTERN

2
regexec.c
View file

@ -323,7 +323,9 @@ onig_region_init(OnigRegion* region)
region->allocated = 0; region->allocated = 0;
region->beg = (OnigPosition* )0; region->beg = (OnigPosition* )0;
region->end = (OnigPosition* )0; region->end = (OnigPosition* )0;
#ifdef USE_CAPTURE_HISTORY
region->history_root = (OnigCaptureTreeNode* )0; region->history_root = (OnigCaptureTreeNode* )0;
#endif
} }
extern OnigRegion* extern OnigRegion*