mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161.
https://bugs.ruby-lang.org/issues/8583 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f23fe3192c
commit
d39f196401
3 changed files with 15 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Jul 4 10:04:11 2013 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161.
|
||||
https://bugs.ruby-lang.org/issues/8583
|
||||
|
||||
Thu Jul 4 00:36:03 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* internal.h (SIGNED_INTEGER_MAX): suppress warning C4146 on VC6.
|
||||
|
|
|
@ -40,7 +40,7 @@ extern "C" {
|
|||
#define ONIGURUMA
|
||||
#define ONIGURUMA_VERSION_MAJOR 5
|
||||
#define ONIGURUMA_VERSION_MINOR 13
|
||||
#define ONIGURUMA_VERSION_TEENY 4
|
||||
#define ONIGURUMA_VERSION_TEENY 5
|
||||
|
||||
#ifdef __cplusplus
|
||||
# ifndef HAVE_PROTOTYPES
|
||||
|
|
13
regcomp.c
13
regcomp.c
|
@ -1943,7 +1943,12 @@ renumber_by_map(Node* node, GroupNumRemap* map)
|
|||
r = renumber_by_map(NQTFR(node)->target, map);
|
||||
break;
|
||||
case NT_ENCLOSE:
|
||||
r = renumber_by_map(NENCLOSE(node)->target, map);
|
||||
{
|
||||
EncloseNode* en = NENCLOSE(node);
|
||||
if (en->type == ENCLOSE_CONDITION)
|
||||
en->regnum = map[en->regnum].new_val;
|
||||
r = renumber_by_map(en->target, map);
|
||||
}
|
||||
break;
|
||||
|
||||
case NT_BREF:
|
||||
|
@ -4090,8 +4095,8 @@ restart:
|
|||
( BIT_NT_LIST | BIT_NT_ALT | BIT_NT_STR | BIT_NT_CCLASS | BIT_NT_CTYPE | \
|
||||
BIT_NT_CANY | BIT_NT_ANCHOR | BIT_NT_ENCLOSE | BIT_NT_QTFR | BIT_NT_CALL )
|
||||
|
||||
#define ALLOWED_ENCLOSE_IN_LB ( ENCLOSE_MEMORY )
|
||||
#define ALLOWED_ENCLOSE_IN_LB_NOT 0
|
||||
#define ALLOWED_ENCLOSE_IN_LB ( ENCLOSE_MEMORY | ENCLOSE_OPTION )
|
||||
#define ALLOWED_ENCLOSE_IN_LB_NOT ENCLOSE_OPTION
|
||||
|
||||
#define ALLOWED_ANCHOR_IN_LB \
|
||||
( ANCHOR_LOOK_BEHIND | ANCHOR_LOOK_BEHIND_NOT | ANCHOR_BEGIN_LINE | \
|
||||
|
@ -6646,7 +6651,7 @@ print_indent_tree(FILE* f, Node* node, int indent)
|
|||
fprintf(f, "<enclose:%"PRIxPTR"> ", (intptr_t)node);
|
||||
switch (NENCLOSE(node)->type) {
|
||||
case ENCLOSE_OPTION:
|
||||
fprintf(f, "option:%d\n", NENCLOSE(node)->option);
|
||||
fprintf(f, "option:%d", NENCLOSE(node)->option);
|
||||
break;
|
||||
case ENCLOSE_MEMORY:
|
||||
fprintf(f, "memory:%d", NENCLOSE(node)->regnum);
|
||||
|
|
Loading…
Reference in a new issue