mirror of
https://github.com/ruby/ruby.git
synced 2025-09-17 01:23:57 +02:00
ca75332f46
Fix parsing of regexps that toggle extended mode on/off inside regexp
This was broken in ec3542229b. That commit
didn't handle cases where extended mode was turned on/off inside the
regexp. There are two ways to turn extended mode on/off:
```
/(?-x:#y)#z
/x =~ '#y'
/(?-x)#y(?x)#z
/x =~ '#y'
```
These can be nested inside the same regexp:
```
/(?-x:(?x)#x
(?-x)#y)#z
/x =~ '#y'
```
As you can probably imagine, this makes handling these regexps
somewhat complex. Due to the nesting inside portions of regexps,
the unassign_nonascii function needs to be recursive. In
recursive mode, it needs to track both opening and closing
parentheses, similar to how it already tracked opening and
closing brackets for character classes.
When scanning the regexp and coming to `(?` not followed by `#`,
scan for options, and use `x` and `i` to determine whether to
turn on or off extended mode. For `:`, indicting only the
current regexp section should have the extended mode
switched, recurse with the extended mode set or unset. For `)`,
indicating the remainder of the regexp (or current regexp portion
if already recursing) should turn extended mode on or off, just
change the extended mode flag and keep scanning.
While testing this, I noticed that `a`, `d`, and `u` are accepted
as options, in addition to `i`, `m`, and `x`, but I can't see
where those options are documented. I'm not sure whether or not
handling `a`, `d`, and `u` as options is a bug.
Fixes [Bug #19379]
---
re.c | 153 +++++++++++++++++++++++++++++++++++++----------
test/ruby/test_regexp.rb | 56 +++++++++++++++++
2 files changed, 176 insertions(+), 33 deletions(-)
65 lines
2.3 KiB
C
65 lines
2.3 KiB
C
#ifndef RUBY_TOPLEVEL_VERSION_H /*-*-C-*-vi:se ft=c:*/
|
|
#define RUBY_TOPLEVEL_VERSION_H
|
|
/**
|
|
* @author Ruby developers <ruby-core@ruby-lang.org>
|
|
* @copyright This file is a part of the programming language Ruby.
|
|
* Permission is hereby granted, to either redistribute and/or
|
|
* modify this file, provided that the conditions mentioned in the
|
|
* file COPYING are met. Consult the file for details.
|
|
*/
|
|
# define RUBY_VERSION_MAJOR RUBY_API_VERSION_MAJOR
|
|
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
|
|
#define RUBY_VERSION_TEENY 0
|
|
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
|
|
#define RUBY_PATCHLEVEL 24
|
|
|
|
#include "ruby/version.h"
|
|
#include "ruby/internal/abi.h"
|
|
|
|
#ifndef RUBY_REVISION
|
|
#include "revision.h"
|
|
|
|
#ifndef TOKEN_PASTE
|
|
#define TOKEN_PASTE(x,y) x##y
|
|
#endif
|
|
#define ONLY_ONE_DIGIT(x) TOKEN_PASTE(10,x) < 1000
|
|
#define WITH_ZERO_PADDING(x) TOKEN_PASTE(0,x)
|
|
#define RUBY_BIRTH_YEAR_STR STRINGIZE(RUBY_BIRTH_YEAR)
|
|
#define RUBY_RELEASE_YEAR_STR STRINGIZE(RUBY_RELEASE_YEAR)
|
|
#if ONLY_ONE_DIGIT(RUBY_RELEASE_MONTH)
|
|
#define RUBY_RELEASE_MONTH_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_MONTH))
|
|
#else
|
|
#define RUBY_RELEASE_MONTH_STR STRINGIZE(RUBY_RELEASE_MONTH)
|
|
#endif
|
|
#if ONLY_ONE_DIGIT(RUBY_RELEASE_DAY)
|
|
#define RUBY_RELEASE_DAY_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_DAY))
|
|
#else
|
|
#define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY)
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifdef RUBY_ABI_VERSION
|
|
# define RUBY_ABI_VERSION_SUFFIX "+"STRINGIZE(RUBY_ABI_VERSION)
|
|
#else
|
|
# define RUBY_ABI_VERSION_SUFFIX ""
|
|
#endif
|
|
#if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE
|
|
# if RUBY_LIB_VERSION_STYLE == 3
|
|
# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR) \
|
|
"."STRINGIZE(RUBY_API_VERSION_TEENY) RUBY_ABI_VERSION_SUFFIX
|
|
# elif RUBY_LIB_VERSION_STYLE == 2
|
|
# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR) \
|
|
RUBY_ABI_VERSION_SUFFIX
|
|
# endif
|
|
#endif
|
|
|
|
#if RUBY_PATCHLEVEL == -1
|
|
#define RUBY_PATCHLEVEL_STR "dev"
|
|
#elif defined RUBY_ABI_VERSION
|
|
#error RUBY_ABI_VERSION is defined in non-development branch
|
|
#else
|
|
#define RUBY_PATCHLEVEL_STR ""
|
|
#endif
|
|
|
|
#endif /* RUBY_TOPLEVEL_VERSION_H */
|