summaryrefslogtreecommitdiff
path: root/pcre_xclass.c
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2013-11-19 15:36:57 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2013-11-19 15:36:57 +0000
commit3d0a81dbf14c870df3ab19470bee0c29e1999521 (patch)
tree511475cb8f16f29d723c3fed946eb744895e2fed /pcre_xclass.c
parent840d6a79dec6e3b5c1324207043fb93dea810223 (diff)
downloadpcre-3d0a81dbf14c870df3ab19470bee0c29e1999521.tar.gz
Source tidies for 8.34-RC1.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1404 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_xclass.c')
-rw-r--r--pcre_xclass.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/pcre_xclass.c b/pcre_xclass.c
index 180eb64..ad153be 100644
--- a/pcre_xclass.c
+++ b/pcre_xclass.c
@@ -128,7 +128,7 @@ while ((t = *data++) != XCL_END)
else /* XCL_PROP & XCL_NOTPROP */
{
const ucd_record *prop = GET_UCD(c);
- BOOL isprop = t == XCL_PROP;
+ BOOL isprop = t == XCL_PROP;
switch(*data)
{
@@ -163,16 +163,16 @@ while ((t = *data++) != XCL_END)
/* Perl space used to exclude VT, but from Perl 5.18 it is included,
which means that Perl space and POSIX space are now identical. PCRE
was changed at release 8.34. */
-
+
case PT_SPACE: /* Perl space */
case PT_PXSPACE: /* POSIX space */
switch(c)
{
HSPACE_CASES:
VSPACE_CASES:
- if (isprop) return !negated;
+ if (isprop) return !negated;
break;
-
+
default:
if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == isprop)
return !negated;
@@ -200,42 +200,42 @@ while ((t = *data++) != XCL_END)
return !negated;
}
break;
-
+
/* The following three properties can occur only in an XCLASS, as there
is no \p or \P coding for them. */
- /* Graphic character. Implement this as not Z (space or separator) and
- not C (other), except for Cf (format) with a few exceptions. This seems
+ /* Graphic character. Implement this as not Z (space or separator) and
+ not C (other), except for Cf (format) with a few exceptions. This seems
to be what Perl does. The exceptional characters are:
-
+
U+061C Arabic Letter Mark
- U+180E Mongolian Vowel Separator
+ U+180E Mongolian Vowel Separator
U+2066 - U+2069 Various "isolate"s
- */
-
+ */
+
case PT_PXGRAPH:
if ((PRIV(ucp_gentype)[prop->chartype] != ucp_Z &&
(PRIV(ucp_gentype)[prop->chartype] != ucp_C ||
- (prop->chartype == ucp_Cf &&
+ (prop->chartype == ucp_Cf &&
c != 0x061c && c != 0x180e && (c < 0x2066 || c > 0x2069))
)) == isprop)
- return !negated;
+ return !negated;
break;
-
- /* Printable character: same as graphic, with the addition of Zs, i.e.
+
+ /* Printable character: same as graphic, with the addition of Zs, i.e.
not Zl and not Zp, and U+180E. */
case PT_PXPRINT:
if ((prop->chartype != ucp_Zl &&
- prop->chartype != ucp_Zp &&
+ prop->chartype != ucp_Zp &&
(PRIV(ucp_gentype)[prop->chartype] != ucp_C ||
- (prop->chartype == ucp_Cf &&
+ (prop->chartype == ucp_Cf &&
c != 0x061c && (c < 0x2066 || c > 0x2069))
)) == isprop)
- return !negated;
+ return !negated;
break;
-
- /* Punctuation: all Unicode punctuation, plus ASCII characters that
+
+ /* Punctuation: all Unicode punctuation, plus ASCII characters that
Unicode treats as symbols rather than punctuation, for Perl
compatibility (these are $+<=>^`|~). */
@@ -243,7 +243,7 @@ while ((t = *data++) != XCL_END)
if ((PRIV(ucp_gentype)[prop->chartype] == ucp_P ||
(c < 256 && PRIV(ucp_gentype)[prop->chartype] == ucp_S)) == isprop)
return !negated;
- break;
+ break;
/* This should never occur, but compilers may mutter if there is no
default. */