diff --git a/include/wctype.h b/include/wctype.h new file mode 100644 index 00000000000..780fb67c7c6 --- /dev/null +++ b/include/wctype.h @@ -0,0 +1,115 @@ +/**************************************************************************** + * include/wctype.h + * + * Copyright (C) 2016 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __INCLUDE_WTYPE_H +#define __INCLUDE_WTYPE_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#ifndef WEOF +# define WEOF ((wint_t)-1) +#endif + +/* valid values for wctype_t */ + +#define WC_ALNUM 1 +#define WC_ALPHA 2 +#define WC_BLANK 3 +#define WC_CNTRL 4 +#define WC_DIGIT 5 +#define WC_GRAPH 6 +#define WC_LOWER 7 +#define WC_PRINT 8 +#define WC_PUNCT 9 +#define WC_SPACE 10 +#define WC_UPPER 11 +#define WC_XDIGIT 12 + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +#ifndef _WCTYPE_T +# define _WCTYPE_T +typedef int wctype_t; +#endif + +#ifndef _WCTRANS_T +# define _WCTRANS_T +typedef int wctrans_t; +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/* "The header declares the following as functions and may also + * define them as macros. Function prototypes must be provided for use with + * an ISO C compiler." + * + * Reference: Opengroup.org + */ + +int iswalnum(wint_t); +int iswalpha(wint_t); +int iswblank(wint_t); +int iswcntrl(wint_t); +int iswctype(wint_t, wctype_t); +int iswdigit(wint_t); +int iswgraph(wint_t); +int iswlower(wint_t); +int iswprint(wint_t); +int iswpunct(wint_t); +int iswspace(wint_t); +int iswupper(wint_t); +int iswxdigit(wint_t); +int towctrans(wint_t, wctrans_t); +wint_t towlower(wint_t); +wint_t towupper(wint_t); +wctrans_t wctrans(FAR const char *); +int iswctype(wint_t, wctype_t); +wctype_t wctype(FAR const char *); + +#endif /* INCLUDE_WTYPE_H */ diff --git a/libc/Makefile b/libc/Makefile index 4df221514c0..81a1994007b 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -88,6 +88,7 @@ include time/Make.defs include tls/Make.defs include unistd/Make.defs include wchar/Make.defs +include wctype/Make.defs include wqueue/Make.defs # REVISIT: Backslash causes problems in $(COBJS) target diff --git a/libc/README.txt b/libc/README.txt index 2e4f902212a..dd8a94020d4 100644 --- a/libc/README.txt +++ b/libc/README.txt @@ -45,6 +45,7 @@ we have: time - time.h unistd - unistd.h wchar - wchar.h + wctype - wctype.h Most of these are "standard" header files; some are not: hex2bin.h and fixemath.h are non-standard. diff --git a/libc/wctype/Make.defs b/libc/wctype/Make.defs new file mode 100644 index 00000000000..c48e619b649 --- /dev/null +++ b/libc/wctype/Make.defs @@ -0,0 +1,48 @@ +############################################################################ +# libc/wctype/Make.defs +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_LIBC_WCHAR),y) + +# Add the internal C files to the build + +CSRCS += lib_wctype.c + +# Add the wctype directory to the build + +DEPPATH += --dep-path wctype +VPATH += :wctype + +endif + diff --git a/libc/wchar/lib_wctype.c b/libc/wctype/lib_wctype.c similarity index 99% rename from libc/wchar/lib_wctype.c rename to libc/wctype/lib_wctype.c index 5b701c7cf6f..8ba10f06f79 100644 --- a/libc/wchar/lib_wctype.c +++ b/libc/wctype/lib_wctype.c @@ -1,5 +1,5 @@ /**************************************************************************** - * libc/wchar/wctype.c + * libc/wctype/wctype.c * * Copyright (c) 2002 Red Hat Incorporated. * All rights reserved.