-/* $Id$ */
-
/* _PDCLIB_print( const char *, struct _PDCLIB_status_t * )
This file is part of the Public Domain C Library (PDCLib).
#include <stdlib.h>
#include <stddef.h>
+#ifndef REGTEST
+
/* Using an integer's bits as flags for both the conversion flags and length
modifiers.
*/
/* FIXME: one too many flags to work on a 16-bit machine, join some (e.g. the
- width flags) into a combined field.
-*/
+ width flags) into a combined field. */
#define E_minus 1<<0
#define E_plus 1<<1
#define E_alt 1<<2
#define E_intmax 1<<10
#define E_size 1<<11
#define E_ptrdiff 1<<12
-#define E_intptr 1<<13
+#define E_pointer 1<<13
#define E_ldouble 1<<14
#define E_lower 1<<15
#define E_unsigned 1<<16
case 'p':
/* TODO: E_long -> E_intptr */
status->base = 16;
- status->flags |= ( E_lower | E_unsigned | E_alt | E_long );
+ status->flags |= ( E_lower | E_unsigned | E_alt | E_pointer );
break;
case 'n':
{
if ( status->flags & E_unsigned )
{
uintmax_t value;
- switch ( status->flags & ( E_char | E_short | E_long | E_llong | E_size ) )
+ switch ( status->flags & ( E_char | E_short | E_long | E_llong | E_size | E_pointer ) )
{
case E_char:
value = (uintmax_t)(unsigned char)va_arg( status->arg, int );
case E_size:
value = (uintmax_t)va_arg( status->arg, size_t );
break;
+ case E_pointer:
+ value = (uintmax_t)(uintptr_t)va_arg( status->arg, void * );
+ break;
+ default:
+ puts( "UNSUPPORTED PRINTF FLAG COMBINATION" );
+ return NULL;
}
++(status->current);
/* FIXME: The if clause means one-digit values do not get formatted */
case E_intmax:
int2base( va_arg( status->arg, intmax_t ), status );
break;
+ default:
+ puts( "UNSUPPORTED PRINTF FLAG COMBINATION" );
+ return NULL;
}
}
if ( status->flags & E_minus )
return ++spec;
}
+#endif
+
#ifdef TEST
#define _PDCLIB_FILEID "_PDCLIB/print.c"
#define _PDCLIB_STRINGIO
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
+
+#ifndef REGTEST
static int testprintf( char * buffer, const char * format, ... )
{
return status.i;
}
+#endif
+
#define TEST_CONVERSION_ONLY
int main( void )
{
+#ifndef REGTEST
char target[100];
#include "printf_testcases.h"
+#endif
return TEST_RESULTS;
}