X-Git-Url: https://pd.if.org/git/?p=pdclib.old;a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=c200419e6133a0235fd92448066744cdf83db6d6;hp=0ce2c99fc383ab9c700ceb42482203a3cc0da7fe;hb=3309ec3ad8a5db735eaa2de7f5dc6a331d8e7319;hpb=76aab9d24d750a2e639eb878d5907a8bcfab08cf diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index 0ce2c99..c200419 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -1,4 +1,5 @@ -/* $Id$ */ +#ifndef __PDCLIB_INT_H +#define __PDCLIB_INT_H __PDCLIB_INT_H /* PDCLib internal integer logic <_PDCLIB_int.h> @@ -11,15 +12,8 @@ /* 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 @@ -101,7 +95,7 @@ #elif _PDCLIB_LLONG_BYTES == 16 #define _PDCLIB_LLONG_MAX 0x7fffffffffffffffffffffffffffffffLL #define _PDCLIB_LLONG_MIN (-0x7fffffffffffffffffffffffffffffffLL - 1LL) -#define _PDCLIB_ULLONG_MAX 0xffffffffffffffffffffffffffffffffLL +#define _PDCLIB_ULLONG_MAX 0xffffffffffffffffffffffffffffffffULL #else #error Unsupported width of 'long long' (neither 64 nor 128 bit). #endif @@ -110,42 +104,41 @@ /* -------------------------------------------------------------------------- */ /* exact-width types and their limits */ /* -------------------------------------------------------------------------- */ +/* Note that, for the "standard" widths of 8, 16, 32 and 64 bit, the "LEAST" */ +/* types are identical to the "exact-width" types, by definition. */ -/* Setting 'int8_t', its limits, and its literal. */ +/* Setting 'int8_t', its limits, its literal, and conversion macros. */ #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 +#define _PDCLIB_8_CONV hh #else #error Unsupported width of char (not 8 bits). #endif -/* Setting 'int16_t', its limits, and its literal */ +/* Setting 'int16_t', its limits, its literal, and conversion macros. */ #if _PDCLIB_INT_BYTES == 2 typedef signed int _PDCLIB_int16_t; 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 +#define _PDCLIB_16_CONV #elif _PDCLIB_SHRT_BYTES == 2 typedef signed 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 +#define _PDCLIB_16_CONV h #else #error Neither 'short' nor 'int' are 16-bit. #endif -/* Setting 'int32_t', its limits, and its literal */ +/* Setting 'int32_t', its limits, its literal, and conversion macros. */ #if _PDCLIB_INT_BYTES == 4 typedef signed int _PDCLIB_int32_t; typedef unsigned int _PDCLIB_uint32_t; @@ -154,6 +147,7 @@ typedef unsigned int _PDCLIB_uint32_t; #define _PDCLIB_UINT32_MAX _PDCLIB_UINT_MAX #define _PDCLIB_INT32_LITERAL #define _PDCLIB_UINT32_LITERAL +#define _PDCLIB_32_CONV #elif _PDCLIB_LONG_BYTES == 4 typedef signed long _PDCLIB_int32_t; typedef unsigned long _PDCLIB_uint32_t; @@ -162,11 +156,13 @@ typedef unsigned long _PDCLIB_uint32_t; #define _PDCLIB_UINT32_MAX _PDCLIB_LONG_MAX #define _PDCLIB_INT32_LITERAL l #define _PDCLIB_UINT32_LITERAL ul +#define _PDCLIB_32_CONV l #else #error Neither 'int' nor 'long' are 32-bit. #endif -#if _PDCLIB_LONG_BYTES == 8 +/* Setting 'int64_t', its limits, its literal, and conversion macros. */ +#if _PDCLIB_LONG_BYTES == 8 && !defined(_PDCLIB_INT64_IS_LLONG) typedef signed long _PDCLIB_int64_t; typedef unsigned long _PDCLIB_uint64_t; #define _PDCLIB_INT64_MAX _PDCLIB_LONG_MAX @@ -174,6 +170,7 @@ typedef unsigned long _PDCLIB_uint64_t; #define _PDCLIB_UINT64_MAX _PDCLIB_ULONG_MAX #define _PDCLIB_INT64_LITERAL l #define _PDCLIB_UINT64_LITERAL ul +#define _PDCLIB_64_CONV l #elif _PDCLIB_LLONG_BYTES == 8 typedef signed long long _PDCLIB_int64_t; typedef unsigned long long _PDCLIB_uint64_t; @@ -182,6 +179,7 @@ typedef unsigned long long _PDCLIB_uint64_t; #define _PDCLIB_UINT64_MAX _PDCLIB_ULLONG_MAX #define _PDCLIB_INT64_LITERAL ll #define _PDCLIB_UINT64_LITERAL ull +#define _PDCLIB_64_CONV ll #else #error Neither 'long' nor 'long long' are 64-bit. #endif @@ -232,7 +230,12 @@ typedef _PDCLIB_ptrdiff _PDCLIB_ptrdiff_t; typedef _PDCLIB_size _PDCLIB_size_t; #define _PDCLIB_SIZE_MAX _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_SIZE ), _MAX ) -typedef _PDCLIB_wchar _PDCLIB_wchar_t; +typedef _PDCLIB_wint _PDCLIB_wint_t; +#ifndef __cplusplus + typedef _PDCLIB_wchar _PDCLIB_wchar_t; +#else + typedef wchar_t _PDCLIB_wchar_t; +#endif #define _PDCLIB_WCHAR_MIN _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_WCHAR ), _MIN ) #define _PDCLIB_WCHAR_MAX _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_WCHAR ), _MAX ) @@ -251,36 +254,34 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t; #define _PDCLIB_UINTMAX_C( value ) _PDCLIB_concat( value, _PDCLIB_concat( u, _PDCLIB_INTMAX_LITERAL ) ) /* -------------------------------------------------------------------------- */ -/* Various internals */ +/* Various internals */ /* -------------------------------------------------------------------------- */ -/* Flags for representing mode (see fopen()). Note these must fit the same - status field as the _IO?BF flags in and the internal flags below. -*/ -#define _PDCLIB_FREAD 8u -#define _PDCLIB_FWRITE 16u -#define _PDCLIB_FAPPEND 32u -#define _PDCLIB_FRW 64u -#define _PDCLIB_FBIN 128u - -/* Internal flags, made to fit the same status field as the flags above. */ -#define _PDCLIB_WROTELAST 256u -#define _PDCLIB_LIBBUFFER 512u -#define _PDCLIB_VIRGINSTR 1024u -#define _PDCLIB_ERRORFLAG 2048u -#define _PDCLIB_EOFFLAG 4096u - -struct _PDCLIB_file_t -{ - _PDCLIB_fd_t handle; /* OS-specific file descriptor */ - _PDCLIB_fpos_t position; /* file position indicator */ - char * buffer; /* file buffer */ - _PDCLIB_size_t bufsize; /* size of buffer */ - _PDCLIB_size_t bufidx; /* pointer into buffer */ - unsigned int status; /* misc. status bits */ - /*mbstate_t mbstate; multibyte parse state - TODO: Unmask. */ - struct _PDCLIB_file_t * next; /* provisions for linked list handling */ -}; +typedef _PDCLIB_time _PDCLIB_time_t; +typedef _PDCLIB_clock _PDCLIB_clock_t; + +#if !defined(_PDCLIB_DEFINE_STRUCT_TIMESPEC) +#define _PDCLIB_DEFINE_STRUCT_TIMESPEC() \ + struct timespec { \ + time_t tv_sec; \ + long tv_nsec; \ + }; +#endif + +#if !defined(_PDCLIB_DEFINE_STRUCT_TM) +#define _PDCLIB_DEFINE_STRUCT_TM() \ + struct tm { \ + int tm_sec; \ + int tm_min; \ + int tm_hour; \ + int tm_mday; \ + int tm_mon; \ + int tm_year; \ + int tm_wday; \ + int tm_yday; \ + int tm_isdst; \ + }; +#endif /* -------------------------------------------------------------------------- */ /* Internal data types */ @@ -293,34 +294,6 @@ struct _PDCLIB_exitfunc_t void (*func)( void ); }; -/* Structures required by malloc(), realloc(), and free(). */ -struct _PDCLIB_headnode_t -{ - struct _PDCLIB_memnode_t * first; - struct _PDCLIB_memnode_t * last; -}; - -struct _PDCLIB_memnode_t -{ - _PDCLIB_size_t size; - struct _PDCLIB_memnode_t * next; -}; - -/* Status structure required by _PDCLIB_print(). */ -struct _PDCLIB_status_t -{ - int base; /* base to which the value shall be converted */ - _PDCLIB_int_fast32_t flags; /* flags and length modifiers */ - _PDCLIB_size_t n; /* maximum number of characters to be written */ - _PDCLIB_size_t i; /* number of characters already written */ - _PDCLIB_size_t this; /* output chars in the current conversion */ - char * s; /* target buffer */ - _PDCLIB_size_t width; /* width of current field */ - _PDCLIB_size_t prec; /* precision of current field */ - struct _PDCLIB_file_t * stream;/* for to-stream output */ - _PDCLIB_va_list arg; /* argument stack passed to the printf function */ -}; - /* -------------------------------------------------------------------------- */ /* Declaration of helper functions (implemented in functions/_PDCLIB). */ /* -------------------------------------------------------------------------- */ @@ -330,20 +303,99 @@ _PDCLIB_intmax_t _PDCLIB_atomax( const char * s ); /* Two helper functions used by strtol(), strtoul() and long long variants. */ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base ); -_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, _PDCLIB_uintmax_t limdigit, char * sign ); +_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, int limdigit, char * sign ); /* Digits arrays used by various integer conversion functions */ extern char _PDCLIB_digits[]; extern char _PDCLIB_Xdigits[]; -/* The worker for all printf() type of functions. The pointer spec should point - to the introducing '%' of a conversion specifier. The status structure is to - be that of the current printf() function, of which the members n, s, stream - and arg will be preserved, i will be updated, and all others will be trashed - by the function. - Returns a pointer to the first character not parsed as conversion specifier. -*/ -const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status ); +/* -------------------------------------------------------------------------- */ +/* locale / wchar / uchar */ +/* -------------------------------------------------------------------------- */ + +#ifndef __cplusplus +typedef _PDCLIB_uint16_t _PDCLIB_char16_t; +typedef _PDCLIB_uint32_t _PDCLIB_char32_t; +#else +typedef char16_t _PDCLIB_char16_t; +typedef char32_t _PDCLIB_char32_t; +#endif + +typedef struct _PDCLIB_mbstate { + union { + /* Is this the best way to represent this? Is this big enough? */ + _PDCLIB_uint64_t _St64[15]; + _PDCLIB_uint32_t _St32[31]; + _PDCLIB_uint16_t _St16[62]; + unsigned char _StUC[124]; + signed char _StSC[124]; + char _StC [124]; + }; + + /* c16/related functions: Surrogate storage + * + * If zero, no surrogate pending. If nonzero, surrogate. + */ + _PDCLIB_uint16_t _Surrogate; + + /* In cases where the underlying codec is capable of regurgitating a + * character without consuming any extra input (e.g. a surrogate pair in a + * UCS-4 to UTF-16 conversion) then these fields are used to track that + * state. In particular, they are used to buffer/fake the input for mbrtowc + * and similar functions. + * + * See _PDCLIB_encoding.h for values of _PendState and the resultant value + * in _PendChar. + */ + unsigned char _PendState; + char _PendChar; +} _PDCLIB_mbstate_t; + +typedef struct _PDCLIB_charcodec *_PDCLIB_charcodec_t; +typedef struct _PDCLIB_locale *_PDCLIB_locale_t; +typedef struct lconv _PDCLIB_lconv_t; + +_PDCLIB_size_t _PDCLIB_mb_cur_max( void ); + +/* -------------------------------------------------------------------------- */ +/* stdio */ +/* -------------------------------------------------------------------------- */ -/* Parsing any fopen() style filemode string into a number of flags. */ -unsigned int _PDCLIB_filemode( const char * mode ); +/* Position / status structure for getpos() / fsetpos(). */ +typedef struct _PDCLIB_fpos +{ + _PDCLIB_int_fast64_t offset; /* File position offset */ + _PDCLIB_mbstate_t mbs; /* Multibyte parsing state */ +} _PDCLIB_fpos_t; + +typedef struct _PDCLIB_fileops _PDCLIB_fileops_t; +typedef union _PDCLIB_fd _PDCLIB_fd_t; +typedef struct _PDCLIB_file _PDCLIB_file_t; // Rename to _PDCLIB_FILE? + +/* Status structure required by _PDCLIB_print(). */ +struct _PDCLIB_status_t +{ + /* XXX This structure is horrible now. scanf needs its own */ + + int base; /* base to which the value shall be converted */ + _PDCLIB_int_fast32_t flags; /* flags and length modifiers */ + unsigned n; /* print: maximum characters to be written (snprintf) */ + /* scan: number matched conversion specifiers */ + unsigned i; /* number of characters read/written */ + unsigned current;/* chars read/written in the CURRENT conversion */ + unsigned width; /* specified field width */ + int prec; /* specified field precision */ + + union { + void * ctx; /* context for callback */ + const char * s; /* input string for scanf */ + }; + + union { + _PDCLIB_size_t ( *write ) ( void *p, const char *buf, _PDCLIB_size_t size ); + _PDCLIB_file_t *stream; /* for scanf */ + }; + _PDCLIB_va_list arg; /* argument stack */ +}; + +#endif