diff options
| author | Christian Persch <chpe@gnome.org> | 2012-06-07 15:23:37 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2012-07-02 14:17:34 +0200 |
| commit | c8c049b177dc40c0242409389ddccfa59ba88953 (patch) | |
| tree | 177bf8478774fc026b79dda11cb0ebb18e4d83a4 /glib/gregex.h | |
| parent | 7e8b5ea442f235f5e272b0fe7a4768bf897b6aad (diff) | |
| download | glib-c8c049b177dc40c0242409389ddccfa59ba88953.tar.gz | |
regex: Add NEWLINE_ANYCRLF compile option
The PCRE_NEWLINE_ANYCRLF option is new in PCRE 7.1. With it set, the only
only newline sequences recognised are CR, LF and CRLF.
Diffstat (limited to 'glib/gregex.h')
| -rw-r--r-- | glib/gregex.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/glib/gregex.h b/glib/gregex.h index 4964c662e..6e510c33f 100644 --- a/glib/gregex.h +++ b/glib/gregex.h @@ -259,12 +259,18 @@ GQuark g_regex_error_quark (void); * be unique. This can be helpful for certain types of pattern when it * is known that only one instance of the named subpattern can ever be * matched. - * @G_REGEX_NEWLINE_CR: Usually any newline character is recognized, if this - * option is set, the only recognized newline character is '\r'. - * @G_REGEX_NEWLINE_LF: Usually any newline character is recognized, if this - * option is set, the only recognized newline character is '\n'. - * @G_REGEX_NEWLINE_CRLF: Usually any newline character is recognized, if this - * option is set, the only recognized newline character sequence is '\r\n'. + * @G_REGEX_NEWLINE_CR: Usually any newline character or character sequence is + * recognized. If this option is set, the only recognized newline character + * is '\r'. + * @G_REGEX_NEWLINE_LF: Usually any newline character or character sequence is + * recognized. If this option is set, the only recognized newline character + * is '\n'. + * @G_REGEX_NEWLINE_CRLF: Usually any newline character or character sequence is + * recognized. If this option is set, the only recognized newline character + * sequence is '\r\n'. + * @G_REGEX_NEWLINE_ANYCRLF: Usually any newline character or character sequence + * is recognized. If this option is set, the only recognized newline character + * sequences are '\r', '\n', and '\r\n'. Since: 2.34 * * Flags specifying compile-time options. * @@ -287,7 +293,8 @@ typedef enum G_REGEX_DUPNAMES = 1 << 19, G_REGEX_NEWLINE_CR = 1 << 20, 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 } GRegexCompileFlags; /** |