X-Git-Url: https://pd.if.org/git/?p=pdclib.old;a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=c200419e6133a0235fd92448066744cdf83db6d6;hp=e9de2e4695fc0ab588c629ebce02e12ff94a15de;hb=3309ec3ad8a5db735eaa2de7f5dc6a331d8e7319;hpb=814c9f639d79b682af88d4e4f4ce62ebfc9a653b diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index e9de2e4..c200419 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -1,5 +1,5 @@ -#ifndef _PDCLIB_INT_H -#define _PDCLIB_INT_H +#ifndef __PDCLIB_INT_H +#define __PDCLIB_INT_H __PDCLIB_INT_H /* PDCLib internal integer logic <_PDCLIB_int.h> @@ -294,36 +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 */ - unsigned n; /* print: maximum characters to be written */ - /* scan: number matched conversion specifiers */ - unsigned i; /* number of characters read/written */ - unsigned current;/* chars read/written in the CURRENT conversion */ - char * s; /* *sprintf(): target buffer */ - /* *sscanf(): source string */ - unsigned width; /* specified field width */ - int prec; /* specified field precision */ - struct _PDCLIB_file_t * stream; /* *fprintf() / *fscanf() stream */ - _PDCLIB_va_list arg; /* argument stack */ -}; - /* -------------------------------------------------------------------------- */ /* Declaration of helper functions (implemented in functions/_PDCLIB). */ /* -------------------------------------------------------------------------- */ @@ -339,91 +309,93 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCL 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 ); - -/* The worker for all scanf() 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 scanf() function, of which the member stream will be - preserved; n, i, and s will be updated; and all others will be trashed by - the function. - Returns a pointer to the first character not parsed as conversion specifier, - or NULL in case of error. - FIXME: Should distinguish between matching and input error -*/ -const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ); +/* -------------------------------------------------------------------------- */ +/* locale / wchar / uchar */ +/* -------------------------------------------------------------------------- */ -/* Parsing any fopen() style filemode string into a number of flags. */ -unsigned int _PDCLIB_filemode( const char * mode ); +#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 -/* Sanity checking and preparing of read buffer, should be called first thing - by any stdio read-data function. - Returns 0 on success, EOF on error. - On error, EOF / error flags and errno are set appropriately. -*/ -int _PDCLIB_prepread( struct _PDCLIB_file_t * stream ); +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]; + }; -/* Sanity checking, should be called first thing by any stdio write-data - function. - Returns 0 on success, EOF on error. - On error, error flags and errno are set appropriately. -*/ -int _PDCLIB_prepwrite( struct _PDCLIB_file_t * stream ); + /* 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; -/* Closing all streams on program exit */ -void _PDCLIB_closeall( void ); +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 ); /* -------------------------------------------------------------------------- */ -/* errno */ +/* stdio */ /* -------------------------------------------------------------------------- */ -/* If PDCLib would call its error number "errno" directly, there would be no way - to catch its value from underlying system calls that also use it (i.e., POSIX - operating systems). That is why we use an internal name, providing a means to - access it through . -*/ -extern int _PDCLIB_errno; - -/* A mechanism for delayed evaluation. (Not sure if this is really necessary, so - no detailed documentation on the "why".) -*/ -int * _PDCLIB_errno_func( void ) _PDCLIB_nothrow; +/* 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; -/* -------------------------------------------------------------------------- */ -/* lookup tables */ -/* -------------------------------------------------------------------------- */ +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? -#define _PDCLIB_CTYPE_ALPHA 1 -#define _PDCLIB_CTYPE_BLANK 2 -#define _PDCLIB_CTYPE_CNTRL 4 -#define _PDCLIB_CTYPE_GRAPH 8 -#define _PDCLIB_CTYPE_PUNCT 16 -#define _PDCLIB_CTYPE_SPACE 32 -#define _PDCLIB_CTYPE_LOWER 64 -#define _PDCLIB_CTYPE_UPPER 128 -#define _PDCLIB_CTYPE_DIGIT 256 -#define _PDCLIB_CTYPE_XDIGT 512 - -struct _PDCLIB_ctype_t +/* Status structure required by _PDCLIB_print(). */ +struct _PDCLIB_status_t { - _PDCLIB_uint16_t flags; - unsigned char upper; - unsigned char lower; - unsigned char collation; -}; + /* XXX This structure is horrible now. scanf needs its own */ -/* -------------------------------------------------------------------------- */ -/* mbstate_t */ -/* -------------------------------------------------------------------------- */ + 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 */ -typedef struct _PDCLIB_mbstate_t { - _PDCLIB_uint32_t st[4]; -} _PDCLIB_mbstate_t; + 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