summaryrefslogtreecommitdiff
path: root/src/pcre2_internal.h
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2015-06-19 16:41:22 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2015-06-19 16:41:22 +0000
commit01e4ac7b3d04f803cdfec28355d197898fbdcf9c (patch)
treef86e7160269a6952a0fb5e5f97bdf43f32c15e5b /src/pcre2_internal.h
parent4222a94390663018d5396ebd4f909a172aba8da2 (diff)
downloadpcre2-01e4ac7b3d04f803cdfec28355d197898fbdcf9c.tar.gz
Fix EBCDIC 0x41 omission and give error for \p and \P in a class when not
supported. git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@292 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/pcre2_internal.h')
-rw-r--r--src/pcre2_internal.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/pcre2_internal.h b/src/pcre2_internal.h
index 62d2667..8986bfd 100644
--- a/src/pcre2_internal.h
+++ b/src/pcre2_internal.h
@@ -382,7 +382,7 @@ space. However, in many other sources it is listed as a space and has been in
PCRE for a long time. */
#define HSPACE_LIST \
- CHAR_HT, CHAR_SPACE, 0xa0, \
+ CHAR_HT, CHAR_SPACE, CHAR_NBSP, \
0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
NOTACHAR
@@ -408,7 +408,7 @@ PCRE for a long time. */
#define HSPACE_BYTE_CASES \
case CHAR_HT: \
case CHAR_SPACE: \
- case 0xa0 /* NBSP */
+ case CHAR_NBSP
#define HSPACE_CASES \
HSPACE_BYTE_CASES: \
@@ -435,11 +435,12 @@ PCRE for a long time. */
/* -------------- EBCDIC environments -------------- */
#else
-#define HSPACE_LIST CHAR_HT, CHAR_SPACE
+#define HSPACE_LIST CHAR_HT, CHAR_SPACE, CHAR_NBSP
#define HSPACE_BYTE_CASES \
case CHAR_HT: \
- case CHAR_SPACE
+ case CHAR_SPACE: \
+ case CHAR_NBSP
#define HSPACE_CASES HSPACE_BYTE_CASES
@@ -633,6 +634,7 @@ same code point. */
#define CHAR_ESC '\047'
#define CHAR_DEL '\007'
+#define CHAR_NBSP ((unsigned char)'\x41')
#define STR_ESC "\047"
#define STR_DEL "\007"
@@ -647,6 +649,7 @@ a positive value. */
#define CHAR_NEL ((unsigned char)'\x85')
#define CHAR_ESC '\033'
#define CHAR_DEL '\177'
+#define CHAR_NBSP ((unsigned char)'\xa0')
#define STR_LF "\n"
#define STR_NL STR_LF
@@ -1029,6 +1032,7 @@ only. */
#define CHAR_VERTICAL_LINE '\174'
#define CHAR_RIGHT_CURLY_BRACKET '\175'
#define CHAR_TILDE '\176'
+#define CHAR_NBSP ((unsigned char)'\xa0')
#define STR_HT "\011"
#define STR_VT "\013"