Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/wctype.h
+++ new/usr/src/head/wctype.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
13 13 *
14 14 * When distributing Covered Code, include this CDDL HEADER in each
15 15 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 * If applicable, add the following below this CDDL HEADER, with the
|
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
17 17 * fields enclosed by brackets "[]" replaced with your own identifying
18 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /* wctype.h 1.13 89/11/02 SMI; JLE */
23 23 /* from AT&T JAE 2.1 */
24 24 /* definitions for international functions */
25 25
26 26 /*
27 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
27 28 * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
28 29 * Use is subject to license terms.
29 30 */
30 31
31 32 #ifndef _WCTYPE_H
32 33 #define _WCTYPE_H
33 34
34 -#pragma ident "%Z%%M% %I% %E% SMI"
35 -
35 +#include <sys/feature_tests.h>
36 36 #include <iso/wctype_iso.h>
37 -#if !defined(__XOPEN_OR_POSIX) && !defined(_STRICT_STDC) || \
38 - defined(__EXTENSIONS__)
37 +#ifndef _STRICT_SYMBOLS
39 38 #include <ctype.h>
40 39 #include <wchar.h>
41 40 #endif
42 41
43 42 /*
44 43 * Allow global visibility for symbols defined in
45 44 * C++ "std" namespace in <iso/wctype_iso.h>.
46 45 */
47 46 #if __cplusplus >= 199711L
48 47 using std::wint_t;
49 48 using std::wctrans_t;
50 49 using std::iswalnum;
51 50 using std::iswalpha;
52 51 using std::iswcntrl;
53 52 using std::iswdigit;
54 53 using std::iswgraph;
55 54 using std::iswlower;
56 55 using std::iswprint;
|
↓ open down ↓ |
8 lines elided |
↑ open up ↑ |
57 56 using std::iswpunct;
58 57 using std::iswspace;
59 58 using std::iswupper;
60 59 using std::iswxdigit;
61 60 using std::towlower;
62 61 using std::towupper;
63 62 using std::wctrans;
64 63 using std::towctrans;
65 64 using std::iswctype;
66 65 using std::wctype;
66 +#if __cplusplus >= 201103L
67 +using std::iswblank;
67 68 #endif
69 +#endif
68 70
69 -/*
70 - * This header needs to be included here because it relies on the global
71 - * visibility of wint_t in the C++ environment.
72 - */
73 -
74 -#include <iso/wctype_c99.h>
75 -
76 71 #ifdef __cplusplus
77 72 extern "C" {
78 73 #endif
79 74
80 75 /* do not allow any of the following in a strictly conforming application */
81 -#if !defined(__XOPEN_OR_POSIX) && !defined(_STRICT_STDC) || \
82 - defined(__EXTENSIONS__)
76 +#ifndef _STRICT_SYMBOLS
83 77
84 78 /*
85 79 * data structure for supplementary code set
86 80 * for character class and conversion
87 81 */
88 82 struct _wctype {
89 83 wchar_t tmin; /* minimum code for wctype */
90 84 wchar_t tmax; /* maximum code for wctype */
91 85 unsigned char *index; /* class index */
92 86 unsigned int *type; /* class type */
93 87 wchar_t cmin; /* minimum code for conversion */
94 88 wchar_t cmax; /* maximum code for conversion */
95 89 wchar_t *code; /* conversion code */
96 90 };
97 91
98 92
99 93 #ifdef _ILLUMOS_PRIVATE
100 94 extern int __iswrune(wint_t);
101 95 extern wint_t __nextwctype(wint_t, wctype_t);
102 96 #define iswrune(c) __iswrune(c)
103 97 #define nextwctype(c, t) __nextwctype(c, t)
|
↓ open down ↓ |
11 lines elided |
↑ open up ↑ |
104 98 #endif
105 99
106 100 /* character classification functions */
107 101
108 102 /* iswascii is still a macro */
109 103 #define iswascii(c) isascii(c)
110 104
111 105 /* isw*, except iswascii(), are not macros any more. They become functions */
112 106 #ifdef __STDC__
113 107
114 -extern unsigned _iswctype(wchar_t, int);
115 -extern wchar_t _trwctype(wchar_t, int);
116 108 /* is* also become functions */
117 109 extern int isphonogram(wint_t);
118 110 extern int isideogram(wint_t);
119 111 extern int isenglish(wint_t);
120 112 extern int isnumber(wint_t);
121 113 extern int isspecial(wint_t);
122 -#else
114 +/* From BSD/MacOS */
115 +extern int iswideogram(wint_t);
116 +extern int iswphonogram(wint_t);
117 +extern int iswnumber(wint_t);
118 +extern int iswspecial(wint_t);
123 119
124 -extern unsigned _iswctype();
125 -extern wchar_t _trwctype();
120 +#else /* __STDC__ */
121 +
126 122 /* is* also become functions */
127 123 extern int isphonogram();
128 124 extern int isideogram();
129 125 extern int isenglish();
130 126 extern int isnumber();
131 127 extern int isspecial();
128 +/* From BSD/MacOS */
129 +extern int iswideogram();
130 +extern int iswphonogram();
131 +extern int iswnumber();
132 +extern int iswspecial();
132 133 #endif
133 134
134 135 #define iscodeset0(c) isascii(c)
135 136 #define iscodeset1(c) (((c) & WCHAR_CSMASK) == WCHAR_CS1)
136 137 #define iscodeset2(c) (((c) & WCHAR_CSMASK) == WCHAR_CS2)
137 138 #define iscodeset3(c) (((c) & WCHAR_CSMASK) == WCHAR_CS3)
138 139
139 -#endif /* !defined(__XOPEN_OR_POSIX)... */
140 +#endif /* !defined(_STRICT_SYMBOLS)... */
140 141
142 +
143 +/* XPG7 extended locale support */
144 +#if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
145 +
146 +#ifndef _LOCALE_T
147 +#define _LOCALE_T
148 +typedef struct locale *locale_t;
149 +#endif
150 +
151 +#if defined(__STDC__)
152 +extern wint_t towlower_l(wint_t, locale_t);
153 +extern wint_t towupper_l(wint_t, locale_t);
154 +extern wint_t towctrans_l(wint_t, wctrans_t, locale_t);
155 +extern int iswctype_l(wint_t, wctype_t, locale_t);
156 +extern int iswalnum_l(wint_t, locale_t);
157 +extern int iswalpha_l(wint_t, locale_t);
158 +extern int iswcntrl_l(wint_t, locale_t);
159 +extern int iswdigit_l(wint_t, locale_t);
160 +extern int iswgraph_l(wint_t, locale_t);
161 +extern int iswlower_l(wint_t, locale_t);
162 +extern int iswprint_l(wint_t, locale_t);
163 +extern int iswpunct_l(wint_t, locale_t);
164 +extern int iswspace_l(wint_t, locale_t);
165 +extern int iswupper_l(wint_t, locale_t);
166 +extern int iswxdigit_l(wint_t, locale_t);
167 +extern wctrans_t wctrans_l(const char *, locale_t);
168 +extern wctype_t wctype_l(const char *, locale_t);
169 +#else /* __STDC__ */
170 +extern wint_t towlower_l();
171 +extern wint_t towupper_l();
172 +extern wint_t towctrans_l();
173 +extern int iswctype_l();
174 +extern int iswalnum_l();
175 +extern int iswalpha_l();
176 +extern int iswcntrl_l();
177 +extern int iswdigit_l();
178 +extern int iswgraph_l();
179 +extern int iswlower_l();
180 +extern int iswprint_l();
181 +extern int iswpunct_l();
182 +extern int iswspace_l();
183 +extern int iswupper_l();
184 +extern int iswxdigit_l();
185 +extern wctrans_t wctrans_l();
186 +extern wctype_t wctype_l();
187 +#endif /* __STDC__ */
188 +#endif /* defined(_XPG7) || !defined(_STRICT_SYMBOLS) */
189 +
141 190 #ifdef __cplusplus
142 191 }
143 192 #endif
144 193
145 194 #endif /* _WCTYPE_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX