#include <assert.h>
#include <string.h>
#include <limits.h>
+#include <stddef.h>
#undef TEST
#include </home/solar/src/pdclib/functions/_PDCLIB/digits.c>
/* Using an integer's bits as flags for both the conversion flags and length
modifiers.
*/
-#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
-#define E_term 1<<15
-
-void parse_out( const char * spec, va_list ap );
+#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
+#define E_unsigned 1<<15
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 */
+ 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 */
+ FILE * stream;/* for to-stream output */
};
-union value_t
+void parse_out( const char * spec, struct status_t * status, va_list ap );
+void parse_out_wrapper( const char * spec, struct status_t * status, ... );
+
+#define TESTCASE( _n, _value, _expect ) \
+ status.n = _n; \
+ status.i = 0; \
+ memset( status.s, '\0', 50 ); \
+ spec = _expect; \
+ ++spec; \
+ parse_out_wrapper( spec, &status, _value ); \
+ 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( void )
{
- int8_t int8;
- uint8_t uint8;
- int16_t int16;
- uint16_t uint16;
- int32_t int32;
- uint32_t uint32;
- int64_t int64;
- uint64_t uint64;
-};
+ struct status_t status;
+ int rc;
+ char * buffer = malloc( 50 );
+ const char * spec;
+ status.s = calloc( 50, 1 );
+ status.i = 0;
+ status.stream = NULL;
+ status.n = SIZE_MAX;
+ puts( "- Signed min / max -\n" );
+ TESTCASE( SIZE_MAX, CHAR_MIN, "%hhd" );
+ TESTCASE( SIZE_MAX, CHAR_MAX, "%hhd" );
+ TESTCASE( SIZE_MAX, 0, "%hhd" );
+ TESTCASE( SIZE_MAX, SHRT_MIN, "%hd" );
+ TESTCASE( SIZE_MAX, SHRT_MAX, "%hd" );
+ TESTCASE( SIZE_MAX, 0, "%hd" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%d" );
+ TESTCASE( SIZE_MAX, 0, "%d" );
+ TESTCASE( SIZE_MAX, LONG_MIN, "%ld" );
+ TESTCASE( SIZE_MAX, LONG_MAX, "%ld" );
+ TESTCASE( SIZE_MAX, 0l, "%ld" );
+ TESTCASE( SIZE_MAX, LLONG_MIN, "%lld" );
+ TESTCASE( SIZE_MAX, LLONG_MAX, "%lld" );
+ TESTCASE( SIZE_MAX, 0ll, "%lld" );
+ puts( "- Unsigned min / max -\n" );
+ TESTCASE( SIZE_MAX, UCHAR_MAX, "%hhu" );
+ TESTCASE( SIZE_MAX, (unsigned char)-1, "%hhu" );
+ TESTCASE( SIZE_MAX, USHRT_MAX, "%hu" );
+ TESTCASE( SIZE_MAX, (unsigned short)-1, "%hu" );
+ TESTCASE( SIZE_MAX, UINT_MAX, "%u" );
+ TESTCASE( SIZE_MAX, -1u, "%u" );
+ TESTCASE( SIZE_MAX, ULONG_MAX, "%lu" );
+ TESTCASE( SIZE_MAX, -1ul, "%lu" );
+ TESTCASE( SIZE_MAX, ULLONG_MAX, "%llu" );
+ TESTCASE( SIZE_MAX, -1ull, "%llu" );
+ puts( "- Hex and Octal, normal and alternative, upper and lowercase -\n" );
+ TESTCASE( SIZE_MAX, UINT_MAX, "%X" );
+ TESTCASE( SIZE_MAX, -1u, "%#X" );
+ TESTCASE( SIZE_MAX, UINT_MAX, "%x" );
+ TESTCASE( SIZE_MAX, -1u, "%#x" );
+ TESTCASE( SIZE_MAX, UINT_MAX, "%o" );
+ TESTCASE( SIZE_MAX, -1u, "%#o" );
+ puts( "- Plus flag -\n" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%+d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%+d" );
+ TESTCASE( SIZE_MAX, 0, "%+d" );
+ TESTCASE( SIZE_MAX, UINT_MAX, "%+u" );
+ TESTCASE( SIZE_MAX, -1u, "%+u" );
+ puts( "- Space flag -\n" );
+ TESTCASE( SIZE_MAX, INT_MIN, "% d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "% d" );
+ TESTCASE( SIZE_MAX, 0, "% d" );
+ TESTCASE( SIZE_MAX, UINT_MAX, "% u" );
+ TESTCASE( SIZE_MAX, -1u, "% u" );
+ puts( "- Field width -\n" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%9d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%9d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%10d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%10d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%11d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%11d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%12d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%12d" );
+ puts( "- Field width (left bound) -\n" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-9d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-9d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-10d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-10d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-11d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-11d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-12d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-12d" );
+ puts( "- Field width, zero padding -\n");
+ TESTCASE( SIZE_MAX, INT_MIN, "%09d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%09d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%010d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%010d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%011d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%011d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%012d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%012d" );
+ puts( "- Field width, zero padding (left bound) -\n" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-09d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-09d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-010d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-010d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-011d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-011d" );
+ TESTCASE( SIZE_MAX, INT_MIN, "%-012d" );
+ TESTCASE( SIZE_MAX, INT_MAX, "%-012d" );
+ return 0;
+}
/* x - the character to be delivered
i - pointer to number of characters already delivered in this call
s - the buffer into which the character shall be delivered
TODO: Overruns.
*/
-#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?
-*/
+#define DELIVER( x ) do { if ( status->i < status->n ) { if ( status->stream != NULL ) putc( x, status->stream ); else status->s[status->i] = x; } ++(status->i); } while ( 0 )
static void int2base( intmax_t value, struct status_t * status )
{
{
preface[ preidx++ ] = '-';
}
- else
+ else if ( ! ( status->flags & E_unsigned ) )
{
if ( status->flags & E_plus )
{
}
}
-static void padwrap( intmax_t value, struct status_t * status )
+void parse_out( const char * spec, struct status_t * status, va_list ap )
{
- int2base( value, status );
- if ( status->flags & E_minus )
- {
- while ( status->this < status->width )
- {
- DELIVER( ' ' );
- ++(status->this);
- }
- }
- if ( status->i >= status->n )
- {
- status->s[status->n - 1] = '\0';
- }
-}
+ /* TODO: "%%" handled correctly? */
+
+ /* Initializing status structure */
+ status->flags = 0;
+ status->base = 0;
+ status->this = 0;
+ status->width = 0;
+ status->prec = 0;
-void parse_out( const char * spec, va_list ap )
-{
- /* TODO: '%' handled correctly? */
- struct status_t status = { 0, 0, 0, 0, 0, NULL, 0, EOF };
/* First come 0..n flags */
- while ( ! ( status.flags & E_done ) )
+ do
{
- switch ( *(++spec) )
+ switch ( *spec )
{
case '-':
- status.flags |= E_minus;
+ status->flags |= E_minus;
+ ++spec;
break;
case '+':
- status.flags |= E_plus;
+ status->flags |= E_plus;
+ ++spec;
break;
case '#':
- status.flags |= E_alt;
+ status->flags |= E_alt;
+ ++spec;
break;
case ' ':
- status.flags |= E_space;
+ status->flags |= E_space;
+ ++spec;
break;
case '0':
- status.flags |= E_zero;
+ status->flags |= E_zero;
+ ++spec;
break;
default:
- status.flags |= E_done;
+ status->flags |= E_done;
break;
}
- }
+ } while ( ! ( status->flags & E_done ) );
+
+ /* Optional field width */
if ( *spec == '*' )
{
/* Retrieve width value from argument stack */
- if ( ( status.width = va_arg( ap, int ) ) < 0 )
+ if ( ( status->width = va_arg( ap, int ) ) < 0 )
{
/* Negative value is '-' flag plus absolute value */
- status.flags |= E_minus;
- status.width *= -1;
+ status->flags |= E_minus;
+ status->width *= -1;
}
++spec;
}
{
/* If a width is given, strtol() will return its value. If not given,
strtol() will return zero. In both cases, endptr will point to the
- rest of the conversion specifier.
+ rest of the conversion specifier - just what we need.
*/
- char * endptr;
- status.width = (int)strtol( spec, &endptr, 10 );
- spec = endptr;
+ status->width = (int)strtol( spec, (char**)&spec, 10 );
}
+
+ /* Optional precision */
if ( *spec == '.' )
{
- if ( *(++spec) == '*' )
+ ++spec;
+ if ( *spec == '*' )
{
/* Retrieve precision value from argument stack. A negative value
is as if no precision is given - as precision is initalized to
EOF (negative), there is no need for testing for negative here.
*/
- status.prec = va_arg( ap, int );
+ status->prec = va_arg( ap, int );
}
else
{
char * endptr;
- status.prec = (int)strtol( spec, &endptr, 10 );
- spec = endptr;
+ status->prec = (int)strtol( spec, &endptr, 10 );
+ if ( spec == endptr )
+ {
+ /* TODO: Decimal point but no number - bad conversion specifier. */
+ }
}
}
- /* We step one character ahead in any case, and step back only if we find
+
+ /* Optional length modifier
+ We step one character ahead in any case, and step back only if we find
there has been no length modifier (or step ahead another character if it
has been "hh" or "ll").
*/
case 'h':
if ( *spec == 'h' )
{
- status.flags |= E_char;
+ status->flags |= E_char;
++spec;
}
else
{
- status.flags |= E_short;
+ status->flags |= E_short;
}
break;
case 'l':
if ( *spec == 'l' )
{
- status.flags |= E_llong;
+ status->flags |= E_llong;
++spec;
}
else
{
- status.flags |= E_long;
+ status->flags |= E_long;
}
break;
case 'j':
- status.flags |= E_intmax;
+ status->flags |= E_intmax;
break;
case 'z':
- status.flags |= E_size;
+ status->flags |= E_size;
break;
case 't':
- status.flags |= E_ptrdiff;
+ status->flags |= E_ptrdiff;
break;
case 'L':
- status.flags |= E_double;
+ status->flags |= E_double;
break;
default:
- ++spec;
+ --spec;
break;
}
+
+ /* Conversion specifier */
switch ( *spec )
{
case 'd':
case 'i':
- /* int2base( 10, value, true ) */
+ status->base = 10;
break;
case 'o':
- /* int2base( 8, value, true ) */
+ status->base = 8;
+ status->flags |= E_unsigned;
break;
case 'u':
- /* uint2base( 10, value, true ) */
+ status->base = 10;
+ status->flags |= E_unsigned;
break;
case 'x':
- /* uint2base( 16, value, true ) */
+ status->base = 16;
+ status->flags |= ( E_lower | E_unsigned );
break;
case 'X':
- /* uint2base( 16, value, false ) */
+ status->base = 16;
+ status->flags |= E_unsigned;
break;
case 'f':
case 'F':
case 'n':
case '%':
// conversion specifier
+ /* TODO: May this be accompaigned by flags, width, precision, length modifier at all? */
break;
default:
- // undefined
+ /* TODO: No conversion specifier. Bad conversion. */
return;
}
+ switch ( status->flags )
+ {
+ /* TODO */
+ }
+ if ( status->base != 0 )
+ {
+ /* Integer conversions */
+ /* TODO: Eliminate the padwrap as far as possible. */
+ if ( status->flags & E_unsigned )
+ {
+ uintmax_t value;
+ switch ( status->flags & ( E_char | E_short | E_long | E_llong ) )
+ {
+ case E_char:
+ value = (uintmax_t)(unsigned char)va_arg( ap, int );
+ break;
+ case E_short:
+ value = (uintmax_t)(unsigned short)va_arg( ap, int );
+ break;
+ case 0:
+ value = (uintmax_t)va_arg( ap, unsigned int );
+ break;
+ case E_long:
+ value = (uintmax_t)(unsigned long)va_arg( ap, unsigned long );
+ break;
+ case E_llong:
+ value = (uintmax_t)(unsigned long long)va_arg( ap, unsigned long long );
+ break;
+ }
+ ++(status->this);
+ if ( ( value / status->base ) != 0 )
+ {
+ int2base( (intmax_t)(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 ] ) );
+ }
+ }
+ else
+ {
+ switch ( status->flags & ( E_char | E_short | E_long | E_llong ) )
+ {
+ case E_char:
+ int2base( (intmax_t)(char)va_arg( ap, int ), status );
+ break;
+ case E_short:
+ int2base( (intmax_t)(short)va_arg( ap, int ), status );
+ break;
+ case 0:
+ int2base( (intmax_t)va_arg( ap, int ), status );
+ break;
+ case E_long:
+ int2base( (intmax_t)va_arg( ap, long ), status );
+ break;
+ case E_llong:
+ int2base( (intmax_t)va_arg( ap, long long ), status );
+ break;
+ }
+ }
+ if ( status->flags & E_minus )
+ {
+ while ( status->this < status->width )
+ {
+ DELIVER( ' ' );
+ ++(status->this);
+ }
+ }
+ if ( status->i >= status->n )
+ {
+ status->s[status->n - 1] = '\0';
+ }
+ }
}
-/*
-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; \
- status.i = 0; \
- status.width = _width; \
- status.prec = _prec; \
- status.base = _base; \
- status.this = 0; \
- memset( status.s, '\0', 50 ); \
- padwrap( _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()
+void parse_out_wrapper( const char * spec, struct status_t * status, ... )
{
- struct status_t status;
- int rc;
- int tmp;
- char * buffer = malloc( 50 );
- status.s = malloc( 50 );
-#if 0
- TESTCASE( E_plus, 5, 0, 0, 1234, 10, "%+d" );
- TESTCASE( E_space, 3, 0, 0, 1234, 10, "% d" );
- TESTCASE( E_space, 3, 0, 0, -1234, 10, "% d" );
- TESTCASE( E_plus, 3, 0, 0, -1234, 10, "%+d" );
- TESTCASE( E_done, 4, 0, 0, 65535, 16, "%X" );
- TESTCASE( E_lower | E_alt, 4, 0, 0, 65534, 16, "%#x" );
- TESTCASE( E_done, 4, 0, 0, 62, 8, "%o" );
- TESTCASE( E_alt, 4, 0, 0, 62, 8, "%#o" );
- TESTCASE( E_done, 6, 6, 0, 1234, 10, "%6d" );
- TESTCASE( E_minus, 6, 6, 0, 1234, 10, "%-6d" );
- TESTCASE( E_minus, 6, 2, 0, 1234, 10, "%-2d" );
- TESTCASE( E_done, 6, 2, 0, 1234, 10, "%2d" );
- TESTCASE( E_zero, 6, 6, 0, -1234, 10, "%06d" );
- /* TODO: These two are *unsigned* conversions! */
- TESTCASE( E_zero, 7, 7, 0, -65535, 16, "%07X" );
- TESTCASE( E_zero, 7, 7, 0, -65535, 10, "%07u" );
-
- TESTCASE( E_zero | E_minus, 6, 6, 0, 1234, 10, "%-06d" );
- TESTCASE( E_plus, 6, 6, 0, 1234, 10, "%+6d" );
- TESTCASE( E_space, 6, 6, 0, 1234, 10, "% 6d" );
- TESTCASE( E_space, 6, 6, 0, -1234, 10, "% 6d" );
- TESTCASE( E_space | E_minus, 6, 6, 0, -1234, 10, "%- 6d" );
-#endif
- puts( "--- Serious Tests ---\n" );
- puts( "- Signed min / max -\n" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, CHAR_MIN, 10, "%hhd" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, CHAR_MAX, 10, "%hhd" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, 0, 10, "%hhd" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, SHRT_MIN, 10, "%hd" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, SHRT_MAX, 10, "%hd" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, 0, 10, "%hd" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, INT_MIN, 10, "%d" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, INT_MAX, 10, "%d" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, 0, 10, "%d" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, LONG_MIN, 10, "%ld" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, LONG_MAX, 10, "%ld" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, 0l, 10, "%ld" );
- TESTCASE( E_done, SIZE_MAX, 0, 0, LLONG_MIN, 10, "%lld" );
- 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" );
- return 0;
+ va_list ap;
+ va_start( ap, status );
+ parse_out( spec, status, ap );
+ va_end( ap );
}
projects / pdclib.old / blobdiff