luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-24 13:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

regex: Add BSR_ANYCRLF compile option

Browse Source 
When this flag is set, \R only matches CR, LF and CRLF.
This commit is contained in:
Christian Persch 2012-06-07 16:44:10 +02:00
parent 86a04a05e6
commit 88ac3839f5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gregex.c
View File

@ -113,7 +113,8 @@
G_REGEX_NEWLINE_CR | \ G_REGEX_NEWLINE_CR | \
G_REGEX_NEWLINE_LF | \ G_REGEX_NEWLINE_LF | \
G_REGEX_NEWLINE_CRLF | \ G_REGEX_NEWLINE_CRLF | \
G_REGEX_NEWLINE_ANYCRLF) G_REGEX_NEWLINE_ANYCRLF | \
G_REGEX_BSR_ANYCRLF)
/* Mask of all the possible values for GRegexMatchFlags. */ /* Mask of all the possible values for GRegexMatchFlags. */
#define G_REGEX_MATCH_MASK (G_REGEX_MATCH_ANCHORED | \ #define G_REGEX_MATCH_MASK (G_REGEX_MATCH_ANCHORED | \
@ -141,6 +142,7 @@ G_STATIC_ASSERT (G_REGEX_NEWLINE_CR == PCRE_NEWLINE_CR);
G_STATIC_ASSERT (G_REGEX_NEWLINE_LF == PCRE_NEWLINE_LF); G_STATIC_ASSERT (G_REGEX_NEWLINE_LF == PCRE_NEWLINE_LF);
G_STATIC_ASSERT (G_REGEX_NEWLINE_CRLF == PCRE_NEWLINE_CRLF); G_STATIC_ASSERT (G_REGEX_NEWLINE_CRLF == PCRE_NEWLINE_CRLF);
G_STATIC_ASSERT (G_REGEX_NEWLINE_ANYCRLF == PCRE_NEWLINE_ANYCRLF); G_STATIC_ASSERT (G_REGEX_NEWLINE_ANYCRLF == PCRE_NEWLINE_ANYCRLF);
G_STATIC_ASSERT (G_REGEX_BSR_ANYCRLF == PCRE_BSR_ANYCRLF);
G_STATIC_ASSERT (G_REGEX_MATCH_ANCHORED == PCRE_ANCHORED); G_STATIC_ASSERT (G_REGEX_MATCH_ANCHORED == PCRE_ANCHORED);
G_STATIC_ASSERT (G_REGEX_MATCH_NOTBOL == PCRE_NOTBOL); G_STATIC_ASSERT (G_REGEX_MATCH_NOTBOL == PCRE_NOTBOL);

7
glib/gregex.h
View File

@ -271,6 +271,10 @@ GQuark g_regex_error_quark (void);
* @G_REGEX_NEWLINE_ANYCRLF: Usually any newline character or character sequence * @G_REGEX_NEWLINE_ANYCRLF: Usually any newline character or character sequence
* is recognized. If this option is set, the only recognized newline character * is recognized. If this option is set, the only recognized newline character
* sequences are '\r', '\n', and '\r\n'. Since: 2.34 * sequences are '\r', '\n', and '\r\n'. Since: 2.34
* G_REGEX_BSR_ANYCRLF: Usually any newline character or character sequence
* is recognised. If this option is set, then "\R" only recognizes the newline
* characters '\r', '\n' and '\r\n'. Since: 2.34
*
* *
* Flags specifying compile-time options. * Flags specifying compile-time options.
* *
@ -294,7 +298,8 @@ typedef enum
G_REGEX_NEWLINE_CR = 1 << 20, G_REGEX_NEWLINE_CR = 1 << 20,
G_REGEX_NEWLINE_LF = 1 << 21, G_REGEX_NEWLINE_LF = 1 << 21,
G_REGEX_NEWLINE_CRLF = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF, G_REGEX_NEWLINE_CRLF = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF,
G_REGEX_NEWLINE_ANYCRLF = G_REGEX_NEWLINE_CR | 1 << 22 G_REGEX_NEWLINE_ANYCRLF = G_REGEX_NEWLINE_CR | 1 << 22,
G_REGEX_BSR_ANYCRLF = 1 << 23
} GRegexCompileFlags; } GRegexCompileFlags;
/** /**