mirror of
https://github.com/ruby/ruby.git
synced 2025-08-16 05:59:00 +02:00
* variable.c (rb_mod_const_at): use hash table as internal
data. [new] * variable.c (rb_mod_const_of): ditto. * variable.c (rb_const_list): new function to convert internal data (hash table) to array of strings. * eval.c (rb_mod_s_constants): data handling scheme has changed. * eval.c (rb_add_method): should not call rb_secure(), for last_func may not be set. * io.c (rb_io_ctl): ioctl should accept any integer within C long range. * marshal.c (r_object): wrong type check for modules. * marshal.c (w_object): should not dump anonymous classes/modules. * io.c (rb_open_file): use rb_file_sysopen_internal() if the 3rd argument (permission flags) is given. [new, should be backported?] * io.c (rb_io_mode_binmode): mode string (e.g. "r+") to flags to open(2). * eval.c (rb_eval): NODE_REXPAND expand an array of 1 element as the element itself. [new, should be backported?] * parse.y (ret_args): should treat "*[a]" in rhs expression as "a", not "[a]". * regex.c (re_compile_pattern): should push option modifier at the right place. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz
parent
21524a3fc0
commit
d6c60dbf6d
10 changed files with 422 additions and 251 deletions
303
regex.c
303
regex.c
|
|
@ -543,7 +543,7 @@ print_mbc(c)
|
|||
reset the pointers that pointed into the old allocation to point to
|
||||
the correct places in the new allocation. If extending the buffer
|
||||
results in it being larger than 1 << 16, then flag memory exhausted. */
|
||||
#define EXTEND_BUFFER \
|
||||
#define EXTEND_BUFFER \
|
||||
do { char *old_buffer = bufp->buffer; \
|
||||
if (bufp->allocated == (1L<<16)) goto too_big; \
|
||||
bufp->allocated *= 2; \
|
||||
|
|
@ -1260,7 +1260,6 @@ re_compile_pattern(pattern, size, bufp)
|
|||
int had_char_class = 0;
|
||||
|
||||
int options = bufp->options;
|
||||
int old_options = 0;
|
||||
|
||||
bufp->fastmap_accurate = 0;
|
||||
bufp->must = 0;
|
||||
|
|
@ -1683,167 +1682,182 @@ re_compile_pattern(pattern, size, bufp)
|
|||
break;
|
||||
|
||||
case '(':
|
||||
old_options = options;
|
||||
PATFETCH(c);
|
||||
if (c == '?') {
|
||||
int negative = 0;
|
||||
{
|
||||
int old_options = options;
|
||||
int push_option = 0;
|
||||
PATFETCH_RAW(c);
|
||||
int casefold = 0;
|
||||
|
||||
PATFETCH(c);
|
||||
if (c == '?') {
|
||||
int negative = 0;
|
||||
|
||||
PATFETCH_RAW(c);
|
||||
switch (c) {
|
||||
case 'x': case 'p': case 'm': case 'i': case '-':
|
||||
for (;;) {
|
||||
switch (c) {
|
||||
case '-':
|
||||
negative = 1;
|
||||
break;
|
||||
|
||||
case ':':
|
||||
case ')':
|
||||
break;
|
||||
|
||||
case 'x':
|
||||
if (negative)
|
||||
options &= ~RE_OPTION_EXTENDED;
|
||||
else
|
||||
options |= RE_OPTION_EXTENDED;
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
if (negative) {
|
||||
if ((options&RE_OPTION_POSIXLINE) == RE_OPTION_POSIXLINE) {
|
||||
options &= ~RE_OPTION_POSIXLINE;
|
||||
}
|
||||
}
|
||||
else if ((options&RE_OPTION_POSIXLINE) != RE_OPTION_POSIXLINE) {
|
||||
options |= RE_OPTION_POSIXLINE;
|
||||
}
|
||||
push_option = 1;
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
if (negative) {
|
||||
if (options&RE_OPTION_MULTILINE) {
|
||||
options &= ~RE_OPTION_MULTILINE;
|
||||
}
|
||||
}
|
||||
else if (!(options&RE_OPTION_MULTILINE)) {
|
||||
options |= RE_OPTION_MULTILINE;
|
||||
}
|
||||
push_option = 1;
|
||||
break;
|
||||
|
||||
case 'i':
|
||||
if (negative) {
|
||||
if (options&RE_OPTION_IGNORECASE) {
|
||||
options &= ~RE_OPTION_IGNORECASE;
|
||||
}
|
||||
}
|
||||
else if (!(options&RE_OPTION_IGNORECASE)) {
|
||||
options |= RE_OPTION_IGNORECASE;
|
||||
}
|
||||
casefold = 1;
|
||||
break;
|
||||
|
||||
default:
|
||||
FREE_AND_RETURN(stackb, "undefined (?...) inline option");
|
||||
}
|
||||
if (c == ')') {
|
||||
c = '#'; /* read whole in-line options */
|
||||
break;
|
||||
}
|
||||
if (c == ':') break;
|
||||
PATFETCH_RAW(c);
|
||||
}
|
||||
break;
|
||||
|
||||
case '#':
|
||||
for (;;) {
|
||||
PATFETCH(c);
|
||||
if (c == ')') break;
|
||||
}
|
||||
c = '#';
|
||||
break;
|
||||
|
||||
case ':':
|
||||
case '=':
|
||||
case '!':
|
||||
case '>':
|
||||
break;
|
||||
|
||||
default:
|
||||
FREE_AND_RETURN(stackb, "undefined (?...) sequence");
|
||||
}
|
||||
}
|
||||
else {
|
||||
PATUNFETCH;
|
||||
c = '(';
|
||||
}
|
||||
if (c == '#') {
|
||||
if (push_option) {
|
||||
BUFPUSH(option_set);
|
||||
BUFPUSH(options);
|
||||
}
|
||||
if (casefold) {
|
||||
if (options & RE_OPTION_IGNORECASE)
|
||||
BUFPUSH(casefold_on);
|
||||
else
|
||||
BUFPUSH(casefold_off);
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (stackp+8 >= stacke) {
|
||||
DOUBLE_STACK(int);
|
||||
}
|
||||
|
||||
/* Laststart should point to the start_memory that we are about
|
||||
to push (unless the pattern has RE_NREGS or more ('s). */
|
||||
/* obsolete: now RE_NREGS is just a default register size. */
|
||||
*stackp++ = b - bufp->buffer;
|
||||
*stackp++ = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
|
||||
*stackp++ = begalt - bufp->buffer;
|
||||
switch (c) {
|
||||
case 'x': case 'p': case 'm': case 'i': case '-':
|
||||
for (;;) {
|
||||
switch (c) {
|
||||
case '-':
|
||||
negative = 1;
|
||||
break;
|
||||
|
||||
case ':':
|
||||
case ')':
|
||||
break;
|
||||
|
||||
case 'x':
|
||||
if (negative)
|
||||
options &= ~RE_OPTION_EXTENDED;
|
||||
else
|
||||
options |= RE_OPTION_EXTENDED;
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
if (negative) {
|
||||
if ((options&RE_OPTION_POSIXLINE) == RE_OPTION_POSIXLINE) {
|
||||
options &= ~RE_OPTION_POSIXLINE;
|
||||
}
|
||||
}
|
||||
else if ((options&RE_OPTION_POSIXLINE) != RE_OPTION_POSIXLINE) {
|
||||
options |= RE_OPTION_POSIXLINE;
|
||||
}
|
||||
push_option = 1;
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
if (negative) {
|
||||
if (options&RE_OPTION_MULTILINE) {
|
||||
options &= ~RE_OPTION_MULTILINE;
|
||||
}
|
||||
}
|
||||
else if (!(options&RE_OPTION_MULTILINE)) {
|
||||
options |= RE_OPTION_MULTILINE;
|
||||
}
|
||||
push_option = 1;
|
||||
break;
|
||||
|
||||
case 'i':
|
||||
if (negative) {
|
||||
if (options&RE_OPTION_IGNORECASE) {
|
||||
options &= ~RE_OPTION_IGNORECASE;
|
||||
BUFPUSH(casefold_off);
|
||||
}
|
||||
}
|
||||
else if (!(options&RE_OPTION_IGNORECASE)) {
|
||||
options |= RE_OPTION_IGNORECASE;
|
||||
BUFPUSH(casefold_on);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
FREE_AND_RETURN(stackb, "undefined (?...) inline option");
|
||||
}
|
||||
if (c == ')') {
|
||||
c = '#'; /* read whole in-line options */
|
||||
break;
|
||||
}
|
||||
if (c == ':') break;
|
||||
PATFETCH_RAW(c);
|
||||
}
|
||||
case '(':
|
||||
BUFPUSH(start_memory);
|
||||
BUFPUSH(regnum);
|
||||
*stackp++ = regnum++;
|
||||
*stackp++ = b - bufp->buffer;
|
||||
BUFPUSH(0);
|
||||
/* too many ()'s to fit in a byte. (max 254) */
|
||||
if (regnum >= RE_REG_MAX) goto too_big;
|
||||
break;
|
||||
|
||||
case '#':
|
||||
for (;;) {
|
||||
PATFETCH(c);
|
||||
if (c == ')') break;
|
||||
}
|
||||
c = '#';
|
||||
break;
|
||||
|
||||
case ':':
|
||||
case '=':
|
||||
case '!':
|
||||
case '>':
|
||||
BUFPUSH(start_nowidth);
|
||||
*stackp++ = b - bufp->buffer;
|
||||
BUFPUSH(0); /* temporary value */
|
||||
BUFPUSH(0);
|
||||
if (c != '!') break;
|
||||
|
||||
BUFPUSH(on_failure_jump);
|
||||
*stackp++ = b - bufp->buffer;
|
||||
BUFPUSH(0); /* temporary value */
|
||||
BUFPUSH(0);
|
||||
break;
|
||||
|
||||
case ':':
|
||||
BUFPUSH(start_paren);
|
||||
pending_exact = 0;
|
||||
default:
|
||||
FREE_AND_RETURN(stackb, "undefined (?...) sequence");
|
||||
break;
|
||||
}
|
||||
if (push_option) {
|
||||
BUFPUSH(option_set);
|
||||
BUFPUSH(options);
|
||||
}
|
||||
if (casefold) {
|
||||
if (options & RE_OPTION_IGNORECASE)
|
||||
BUFPUSH(casefold_on);
|
||||
else
|
||||
BUFPUSH(casefold_off);
|
||||
}
|
||||
*stackp++ = c;
|
||||
*stackp++ = old_options;
|
||||
fixup_alt_jump = 0;
|
||||
laststart = 0;
|
||||
begalt = b;
|
||||
}
|
||||
else {
|
||||
PATUNFETCH;
|
||||
c = '(';
|
||||
}
|
||||
if (c == '#') break;
|
||||
if (stackp+8 >= stacke) {
|
||||
DOUBLE_STACK(int);
|
||||
}
|
||||
|
||||
/* Laststart should point to the start_memory that we are about
|
||||
to push (unless the pattern has RE_NREGS or more ('s). */
|
||||
/* obsolete: now RE_NREGS is just a default register size. */
|
||||
*stackp++ = b - bufp->buffer;
|
||||
*stackp++ = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
|
||||
*stackp++ = begalt - bufp->buffer;
|
||||
switch (c) {
|
||||
case '(':
|
||||
BUFPUSH(start_memory);
|
||||
BUFPUSH(regnum);
|
||||
*stackp++ = regnum++;
|
||||
*stackp++ = b - bufp->buffer;
|
||||
BUFPUSH(0);
|
||||
/* too many ()'s to fit in a byte. (max 254) */
|
||||
if (regnum >= RE_REG_MAX) goto too_big;
|
||||
break;
|
||||
|
||||
case '=':
|
||||
case '!':
|
||||
case '>':
|
||||
BUFPUSH(start_nowidth);
|
||||
*stackp++ = b - bufp->buffer;
|
||||
BUFPUSH(0); /* temporary value */
|
||||
BUFPUSH(0);
|
||||
if (c != '!') break;
|
||||
|
||||
BUFPUSH(on_failure_jump);
|
||||
*stackp++ = b - bufp->buffer;
|
||||
BUFPUSH(0); /* temporary value */
|
||||
BUFPUSH(0);
|
||||
break;
|
||||
|
||||
case ':':
|
||||
BUFPUSH(start_paren);
|
||||
pending_exact = 0;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
*stackp++ = c;
|
||||
*stackp++ = old_options;
|
||||
fixup_alt_jump = 0;
|
||||
laststart = 0;
|
||||
begalt = b;
|
||||
break;
|
||||
|
||||
case ')':
|
||||
if (stackp == stackb)
|
||||
FREE_AND_RETURN(stackb, "unmatched )");
|
||||
|
||||
if (options != stackp[-1]) {
|
||||
if ((options ^ stackp[-1]) & RE_OPTION_IGNORECASE) {
|
||||
BUFPUSH((options&RE_OPTION_IGNORECASE)?casefold_off:casefold_on);
|
||||
}
|
||||
BUFPUSH(option_set);
|
||||
BUFPUSH(stackp[-1]);
|
||||
}
|
||||
pending_exact = 0;
|
||||
if (fixup_alt_jump) {
|
||||
/* Push a dummy failure point at the end of the
|
||||
|
|
@ -1856,6 +1870,13 @@ re_compile_pattern(pattern, size, bufp)
|
|||
to `fixup_alt_jump', in the `handle_alt' case below. */
|
||||
store_jump(fixup_alt_jump, jump, b);
|
||||
}
|
||||
if (options != stackp[-1]) {
|
||||
if ((options ^ stackp[-1]) & RE_OPTION_IGNORECASE) {
|
||||
BUFPUSH((options&RE_OPTION_IGNORECASE)?casefold_off:casefold_on);
|
||||
}
|
||||
BUFPUSH(option_set);
|
||||
BUFPUSH(stackp[-1]);
|
||||
}
|
||||
p0 = b;
|
||||
options = *--stackp;
|
||||
switch (c = *--stackp) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue