]> pd.if.org Git - pdclib/blobdiff - _PDCLIB_int.h
Test-compile fixes.
[pdclib] / _PDCLIB_int.h
index af65596f89b49876eed8d39c42232eeb8d32d594..24accb0da68e221d6f34821649f9cbb79a658257 100644 (file)
@@ -1,6 +1,8 @@
 /* $Id$ */
 
-/* Internal PDCLib logic <_PDCLIB_internal.h>
+/* Release $Name$ */
+
+/* PDCLib internal integer logic <_PDCLIB_int.h>
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 
 /* -------------------------------------------------------------------------- */
 /* You should not have to edit anything in this file; if you DO have to, it   */
-/* would be considered a bug / missing feature: notify the author.            */
+/* would be considered a bug / missing feature: notify the author(s).         */
 /* -------------------------------------------------------------------------- */
 
+#ifndef _PDCLIB_CONFIG_H
+#define _PDCLIB_CONFIG_H _PDCLIB_CONFIG_H
 #include <_PDCLIB_config.h>
+#endif
+
+#ifndef _PDCLIB_AUX_H
+#define _PDCLIB_AUX_H _PDCLIB_AUX_H
+#include <_PDCLIB_aux.h>
+#endif
 
 /* null pointer constant */
 #define _PDCLIB_NULL 0
 
-/* -------------------------------------------------------------------------- */
-/* Helper macros:                                                             */
-/* _PDCLIB_cc( x, y ) concatenates two preprocessor tokens without extending  */
-/* _PDCLIB_concat( x, y ) concatenates two preprocessor tokens with extending */
-/* -------------------------------------------------------------------------- */
-
-#define _PDCLIB_cc( x, y ) x ## y
-#define _PDCLIB_concat( x, y ) _PDCLIB_cc( x, y )
-
 /* -------------------------------------------------------------------------- */
 /* Limits of native datatypes                                                 */
 /* -------------------------------------------------------------------------- */
 #endif
 
 /* Setting 'short' limits                                                     */
-#if     _PDCLIB_SHRT_BYTES == 1
-#define _PDCLIB_SHRT_MAX   0x7f
-#define _PDCLIB_SHRT_MIN   (-0x7f - 1)
-#define _PDCLIB_USHRT_MAX  0xff
-#elif   _PDCLIB_SHRT_BYTES == 2
-#define _PDCLIB_SHRT_MAX   0x7fff
-#define _PDCLIB_SHRT_MIN   (-0x7fff - 1)
-#define _PDCLIB_USHRT_MAX  0xffff
+#if     _PDCLIB_SHRT_BYTES == 2
+#define _PDCLIB_SHRT_MAX      0x7fff
+#define _PDCLIB_SHRT_MIN      (-0x7fff - 1)
+#define _PDCLIB_USHRT_MAX     0xffff
 #else
-#error Unsupported width of 'short' (neither 8 nor 16 bit).
+#error Unsupported width of 'short' (not 16 bit).
 #endif
 #define _PDCLIB_USHRT_MIN 0
 
+#if _PDCLIB_INT_BYTES < _PDCLIB_SHRT_BYTES
+#error Bogus setting: short > int? Check _PDCLIB_config.h.
+#endif
+
 /* Setting 'int' limits                                                       */
 #if     _PDCLIB_INT_BYTES == 2
 #define _PDCLIB_INT_MAX   0x7fff
@@ -84,7 +85,7 @@
 #if   _PDCLIB_LONG_BYTES   == 4
 #define _PDCLIB_LONG_MAX   0x7fffffffL
 #define _PDCLIB_LONG_MIN   (-0x7fffffffL - 1L)
-#define _PDCLIB_LONG_MAX   0xffffffffUL
+#define _PDCLIB_ULONG_MAX   0xffffffffUL
 #elif   _PDCLIB_LONG_BYTES == 8
 #define _PDCLIB_LONG_MAX   0x7fffffffffffffffL
 #define _PDCLIB_LONG_MIN   (-0x7fffffffffffffffL - 1L)
 #define _PDCLIB_ULLONG_MIN 0
 
 /* -------------------------------------------------------------------------- */
-/* <stdint.h> exact-width types, their limits and literals                    */
+/* <stdint.h> exact-width types and their limits                              */
 /* -------------------------------------------------------------------------- */
 
 /* Setting 'int8_t', its limits, and its literal.                             */
-#if     _PDCLIB_SHRT_BYTES == 1
-typedef signed short       _PDCLIB_int8_t;
-typedef unsigned short     _PDCLIB_int8_t;
-#define _PDCLIB_INT8_MAX   _PDCLIB_SHRT_MAX
-#define _PDCLIB_INT8_MIN   _PDCLIB_SHRT_MIN
-#define _PDCLIB_UINT8_MAX  _PDCLIB_USHRT_MAX
-#else
+#if     _PDCLIB_CHAR_BIT == 8
 typedef signed char        _PDCLIB_int8_t;
 typedef unsigned char      _PDCLIB_uint8_t;
 #define _PDCLIB_INT8_MAX   _PDCLIB_CHAR_MAX
 #define _PDCLIB_INT8_MIN   _PDCLIB_CHAR_MIN
 #define _PDCLIB_UINT8_MAX  _PDCLIB_UCHAR_MAX
+#define _PDCLIB_INT8_LITERAL
+#define _PDCLIB_UINT8_LITERAL
+#else
+#error Unsupported width of char (not 8 bits).
 #endif
 
 /* Setting 'int16_t', its limits, and its literal                             */
@@ -134,12 +133,16 @@ typedef unsigned int       _PDCLIB_uint16_t;
 #define _PDCLIB_INT16_MAX  _PDCLIB_INT_MAX
 #define _PDCLIB_INT16_MIN  _PDCLIB_INT_MIN
 #define _PDCLIB_UINT16_MAX _PDCLIB_UINT_MAX
+#define _PDCLIB_INT16_LITERAL
+#define _PDCLIB_UINT16_LITERAL
 #elif   _PDCLIB_SHRT_BYTES == 2
 typedef signed short       _PDCLIB_int16_t;
-typedef unsigned short     _PDCLIB_int16_t;
+typedef unsigned short     _PDCLIB_uint16_t;
 #define _PDCLIB_INT16_MAX  _PDCLIB_SHRT_MAX
 #define _PDCLIB_INT16_MIN  _PDCLIB_SHRT_MIN
 #define _PDCLIB_UINT16_MAX _PDCLIB_USHRT_MAX
+#define _PDCLIB_INT16_LITERAL  s
+#define _PDCLIB_UINT16_LITERAL us
 #else
 #error Neither 'short' nor 'int' are 16-bit.
 #endif
@@ -147,32 +150,40 @@ typedef unsigned short     _PDCLIB_int16_t;
 /* Setting 'int32_t', its limits, and its literal                             */
 #if     _PDCLIB_INT_BYTES  == 4
 typedef signed int         _PDCLIB_int32_t;
-typedef unsigned int       _PDCLIB_int32_t;
+typedef unsigned int       _PDCLIB_uint32_t;
 #define _PDCLIB_INT32_MAX  _PDCLIB_INT_MAX
 #define _PDCLIB_INT32_MIN  _PDCLIB_INT_MIN
 #define _PDCLIB_UINT32_MAX _PDCLIB_UINT_MAX
+#define _PDCLIB_INT32_LITERAL
+#define _PDCLIB_UINT32_LITERAL
 #elif   _PDCLIB_LONG_BYTES == 4
 typedef signed long        _PDCLIB_int32_t;
-typedef unsigned long      _PDCLIB_int32_t;
+typedef unsigned long      _PDCLIB_uint32_t;
 #define _PDCLIB_INT32_MAX  _PDCLIB_LONG_MAX
 #define _PDCLIB_INT32_MIN  _PDCLIB_LONG_MIN
 #define _PDCLIB_UINT32_MAX _PDCLIB_LONG_MAX
+#define _PDCLIB_INT32_LITERAL  l
+#define _PDCLIB_UINT32_LITERAL ul
 #else
 #error Neither 'int' nor 'long' are 32-bit.
 #endif
 
 #if     _PDCLIB_LONG_BYTES == 8
 typedef signed long        _PDCLIB_int64_t;
-typedef unsigned long      _PDCLIB_int64_t;
+typedef unsigned long      _PDCLIB_uint64_t;
 #define _PDCLIB_INT64_MAX  _PDCLIB_LONG_MAX
 #define _PDCLIB_INT64_MIN  _PDCLIB_LONG_MIN
-#define _PDCLIB_INT64_MAX  _PDCLIB_ULONG_MAX
+#define _PDCLIB_UINT64_MAX  _PDCLIB_ULONG_MAX
+#define _PDCLIB_INT64_LITERAL  l
+#define _PDCLIB_UINT64_LITERAL ul
 #elif _PDCLIB_LLONG_BYTES  == 8
 typedef signed long long   _PDCLIB_int64_t;
-typedef unsigned long long _PDCLIB_int64_t;
+typedef unsigned long long _PDCLIB_uint64_t;
 #define _PDCLIB_INT64_MAX  _PDCLIB_LLONG_MAX
 #define _PDCLIB_INT64_MIN  _PDCLIB_LLONG_MIN
-#define _PDCLIB_INT64_MAX  _PDCLIB_ULLONG_MAX
+#define _PDCLIB_UINT64_MAX  _PDCLIB_ULLONG_MAX
+#define _PDCLIB_INT64_LITERAL  ll
+#define _PDCLIB_UINT64_LITERAL ull
 #else
 #error Neither 'long' nor 'long long' are 64-bit.
 #endif
@@ -210,45 +221,33 @@ typedef unsigned _PDCLIB_fast64 _PDCLIB_uint_fast64_t;
 #define _PDCLIB_UINT_FAST64_MAX concat( concat( _PDCLIB_U, _PDCLIB_FAST64 ), _MAX )
 
 /* -------------------------------------------------------------------------- */
-/* Various <stddef.h> limits                                                  */
+/* Various <stddef.h> typedefs and limits                                     */
 /* -------------------------------------------------------------------------- */
 
+typedef _PDCLIB_ptrdiff     _PDCLIB_ptrdiff_t;
 #define _PDCLIB_PTRDIFF_MIN concat( concat( _PDCLIB_, _PDCLIB_PTRDIFF ), _MIN )
 #define _PDCLIB_PTRDIFF_MAX concat( concat( _PDCLIB_, _PDCLIB_PTRDIFF ), _MAX )
 
 #define _PDCLIB_SIG_ATOMIC_MIN concat( concat( _PDCLIB_, _PDCLIB_SIG_ATOMIC ), _MIN )
 #define _PDCLIB_SIG_ATOMIC_MAX concat( concat( _PDCLIB_, _PDCLIB_SIG_ATOMIC ), _MAX )
 
+typedef _PDCLIB_size     _PDCLIB_size_t;
 #define _PDCLIB_SIZE_MAX concat( concat( _PDCLIB_, _PDCLIB_SIZE ), _MAX )
 
+typedef _PDCLIB_wchar     _PDCLIB_wchar_t;
 #define _PDCLIB_WCHAR_MIN concat( concat( _PDCLIB_, _PDCLIB_WCHAR ), _MIN )
 #define _PDCLIB_WCHAR_MAX concat( concat( _PDCLIB_, _PDCLIB_WCHAR ), _MAX )
 
-/* -------------------------------------------------------------------------- */
-/* <stdint.h> "exact width" literal suffixes                                  */
-/* -------------------------------------------------------------------------- */
-
-#define _PDCLIB_INT8_LITERAL  c
-#define _PDCLIB_INT16_LITERAL s
-#define _PDCLIB_INT32_LITERAL l
-#define _PDCLIB_INT64_LITERAL ll
-#define _PDCLIB_UINT8_LITERAL uc
-#define _PDCLIB_UINT16_LITERAL us
-#define _PDCLIB_UINT32_LITERAL ul
-#define _PDCLIB_UINT64_LITERAL ull
-
-/* -------------------------------------------------------------------------- */
-/* <stdint.h> "fast" typedefs                                                 */
-/* -------------------------------------------------------------------------- */
-
-typedef int                 _PDCLIB_intptr_t;
-#define _PDCLIB_INTPTR_MIN  (-0x7fffff - 1)
-#define _PDCLIB_INTPTR_MAX  0x7fffff
-typedef unsigned int        _PDCLIB_uintptr_t;
-#define _PDCLIB_UINTPTR_MAX 0xffffff
-
-typedef signed long long int   _PDCLIB_intmax_t;
-#define _PDCLIB_INTMAX_MIN     (-0x7fffffffffffffff - 1)
-#define _PDCLIB_INTMAX_MAX     0x7fffffffffffffff
-typedef unsigned long long int _PDCLIB_uintmax_t;
-#define _PDCLIB_UINTMAX_MAX    0xffffffffffffffff
+typedef _PDCLIB_intptr          _PDCLIB_intptr_t;
+typedef unsigned _PDCLIB_intptr _PDCLIB_uintptr_t;
+#define _PDCLIB_INTPTR_MIN  concat( concat( _PDCLIB_, _PDCLIB_INTPTR ), _MIN )
+#define _PDCLIB_INTPTR_MAX  concat( concat( _PDCLIB_, _PDCLIB_INTPTR ), _MAX )
+#define _PDCLIB_UINTPTR_MAX concat( concat( _PDCLIB_U, _PDCLIB_INTPTR ), _MAX )
+
+typedef _PDCLIB_intmax          _PDCLIB_intmax_t;
+typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t;
+#define _PDCLIB_INTMAX_MIN  concat( concat( _PDCLIB_, _PDCLIB_INTMAX ), _MIN )
+#define _PDCLIB_INTMAX_MAX  concat( concat( _PDCLIB_, _PDCLIB_INTMAX ), _MAX )
+#define _PDCLIB_UINTMAX_MAX concat( concat( _PDCLIB_U, _PDCLIB_INTMAX ), _MAX )
+#define _PDCLIB_INTMAX_C( value )  concat( value, _PDCLIB_INTMAX_LITERAL )
+#define _PDCLIB_UINTMAX_C( value ) concat( value, concat( u, _PDCLIB_INTMAX_LITERAL ) )