X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=draft.c;h=5925e7069cbdab6383114bb935ae678446ea19eb;hb=ddf68b918e23f3ddfaa62c3a0d0076457811db96;hp=c5f7ad78b5c6eec47108cc2753fa4d65335ee456;hpb=4216d0f529d932fc91ec2a095d82584a5de0e799;p=pdclib.old diff --git a/draft.c b/draft.c index c5f7ad7..5925e70 100644 --- a/draft.c +++ b/draft.c @@ -35,26 +35,14 @@ void parse_out( const char * spec, va_list ap ); struct status_t { - int base; /* base to which the value shall be converted */ - int flags; /* flags and length modifiers */ - size_t n; /* maximum number of characters to be written */ - size_t i; /* number of characters already written */ - size_t this; /* number of output chars in the current conversion */ - char * s; /* target buffer */ - size_t width; /* width of current field */ - int prec; /* precision of current field */ -}; - -union value_t -{ - int8_t int8; - uint8_t uint8; - int16_t int16; - uint16_t uint16; - int32_t int32; - uint32_t uint32; - int64_t int64; - uint64_t uint64; + int base; /* base to which the value shall be converted */ + int_fast16_t flags; /* flags and length modifiers */ + size_t n; /* maximum number of characters to be written */ + size_t i; /* number of characters already written */ + size_t this; /* number of output chars in the current conversion */ + char * s; /* target buffer */ + size_t width; /* width of current field */ + size_t prec; /* precision of current field */ }; /* x - the character to be delivered @@ -65,11 +53,6 @@ union value_t */ #define DELIVER( x ) do { if ( status->i < status->n ) status->s[status->i] = x; ++(status->i); } while ( 0 ) -/* TODO: Left / right alignment - requires track-keeping of width and printed chars. - "Father function", die für right alignment "tail recursive" gerufen wird, und - "after" für left alignment? Parameter als struct? -*/ - static void int2base( intmax_t value, struct status_t * status ) { ++(status->this); @@ -161,6 +144,40 @@ static void padwrap( intmax_t value, struct status_t * status ) } } +static void upadwrap( uintmax_t value, struct status_t * status ) +{ + ++(status->this); + if ( ( value / status->base ) != 0 ) + { + int2base( value / status->base, status ); + } + int digit = value % status->base; + if ( digit < 0 ) + { + digit *= -1; + } + if ( status->flags & E_lower ) + { + DELIVER( _PDCLIB_digits[ digit ] ); + } + else + { + DELIVER( toupper( _PDCLIB_digits[ digit ] ) ); + } + if ( status->flags & E_minus ) + { + while ( status->this < status->width ) + { + DELIVER( ' ' ); + ++(status->this); + } + } + if ( status->i >= status->n ) + { + status->s[status->n - 1] = '\0'; + } +} + void parse_out( const char * spec, va_list ap ) { /* TODO: '%' handled correctly? */ @@ -316,36 +333,6 @@ void parse_out( const char * spec, va_list ap ) } } -/* -static void int2base( int value, int base, struct status_t * status ) - -#define E_minus 1<<0 -#define E_plus 1<<1 -#define E_alt 1<<2 -#define E_space 1<<3 -#define E_zero 1<<4 -#define E_done 1<<5 -#define E_char 1<<6 -#define E_short 1<<7 -#define E_long 1<<8 -#define E_llong 1<<9 -#define E_intmax 1<<10 -#define E_size 1<<11 -#define E_ptrdiff 1<<12 -#define E_double 1<<13 -#define E_lower 1<<14 - - struct status_t -{ - int flags; - size_t n; - size_t i; - char * s; - size_t width; - size_t prec; -}; -*/ - #define TESTCASE( _flags, _n, _width, _prec, _value, _base, _expect ) \ status.flags = _flags | E_term; \ status.n = _n; \ @@ -362,6 +349,22 @@ static void int2base( int value, int base, struct status_t * status ) printf( "Output '%s', RC %d\nExpect '%s', RC %d\n\n", status.s, status.i, buffer, rc ); \ } \ +#define UTESTCASE( _flags, _n, _width, _prec, _value, _base, _expect ) \ + status.flags = _flags | E_term; \ + status.n = _n; \ + status.i = 0; \ + status.width = _width; \ + status.prec = _prec; \ + status.base = _base; \ + status.this = 0; \ + memset( status.s, '\0', 50 ); \ + upadwrap( _value, &status ); \ + rc = snprintf( buffer, _n, _expect, _value ); \ + if ( ( strcmp( status.s, buffer ) != 0 ) || ( status.i != rc ) ) \ +{ \ + printf( "Output '%s', RC %d\nExpect '%s', RC %d\n\n", status.s, status.i, buffer, rc ); \ +} \ + int main() { struct status_t status; @@ -411,15 +414,15 @@ int main() TESTCASE( E_done, SIZE_MAX, 0, 0, LLONG_MAX, 10, "%lld" ); TESTCASE( E_done, SIZE_MAX, 0, 0, 0ll, 10, "%lld" ); puts( "- Unsigned min / max -\n" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, UCHAR_MAX, 10, "%hhu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%hhu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, USHRT_MAX, 10, "%hu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%hu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, UINT_MAX, 10, "%u" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%u" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, ULONG_MAX, 10, "%lu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, -1l, 10, "%lu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, ULLONG_MAX, 10, "%llu" ); - TESTCASE( E_done, SIZE_MAX, 0, 0, -1ll, 10, "%llu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, UCHAR_MAX, 10, "%hhu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%hhu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, USHRT_MAX, 10, "%hu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%hu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, UINT_MAX, 10, "%u" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%u" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, ULONG_MAX, 10, "%lu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, -1l, 10, "%lu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, ULLONG_MAX, 10, "%llu" ); + UTESTCASE( E_done, SIZE_MAX, 0, 0, -1ll, 10, "%llu" ); return 0; }