-/* $Id$ */
-
/* _PDCLIB_scan( const char *, struct _PDCLIB_status_t * )
This file is part of the Public Domain C Library (PDCLib).
#include <stddef.h>
#include <limits.h>
+#ifndef REGTEST
+
/* Using an integer's bits as flags for both the conversion flags and length
modifiers.
*/
#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_unsigned 1<<16
*/
static int GET( struct _PDCLIB_status_t * status )
{
- int rc;
+ int rc = EOF;
if ( status->stream != NULL )
{
rc = getc( status->stream );
case 's':
{
char * c = va_arg( status->arg, char * );
- while ( ( status->current < status->width ) &&
+ while ( ( status->current < status->width ) &&
( ( rc = GET( status ) ) != EOF ) )
{
if ( isspace( rc ) )
} while ( *endspec != ']' );
// read according to scanlist, equiv. to %s above
char * c = va_arg( status->arg, char * );
- while ( ( status->current < status->width ) &&
+ while ( ( status->current < status->width ) &&
( ( rc = GET( status ) ) != EOF ) )
{
if ( negative_scanlist )
}
case 'p':
status->base = 16;
- status->flags |= E_unsigned;
+ status->flags |= E_pointer;
break;
case 'n':
{
return NULL;
}
/* convert value to target type and assign to parameter */
- switch ( status->flags & ( E_char | E_short | E_long | E_llong |
- E_intmax | E_size | E_ptrdiff |
- E_unsigned ) )
+ if ( ! ( status->flags & E_suppressed ) )
{
- case E_char:
- *( va_arg( status->arg, char * ) ) = (char)( value * sign );
- break;
- case E_char | E_unsigned:
- *( va_arg( status->arg, unsigned char * ) ) = (unsigned char)( value * sign );
- break;
+ switch ( status->flags & ( E_char | E_short | E_long | E_llong |
+ E_intmax | E_size | E_ptrdiff | E_pointer |
+ E_unsigned ) )
+ {
+ case E_char:
+ *( va_arg( status->arg, char * ) ) = (char)( value * sign );
+ break;
+ case E_char | E_unsigned:
+ *( va_arg( status->arg, unsigned char * ) ) = (unsigned char)( value * sign );
+ break;
- case E_short:
- *( va_arg( status->arg, short * ) ) = (short)( value * sign );
- break;
- case E_short | E_unsigned:
- *( va_arg( status->arg, unsigned short * ) ) = (unsigned short)( value * sign );
- break;
+ case E_short:
+ *( va_arg( status->arg, short * ) ) = (short)( value * sign );
+ break;
+ case E_short | E_unsigned:
+ *( va_arg( status->arg, unsigned short * ) ) = (unsigned short)( value * sign );
+ break;
- case 0:
- *( va_arg( status->arg, int * ) ) = (int)( value * sign );
- break;
- case E_unsigned:
- *( va_arg( status->arg, unsigned int * ) ) = (unsigned int)( value * sign );
- break;
+ case 0:
+ *( va_arg( status->arg, int * ) ) = (int)( value * sign );
+ break;
+ case E_unsigned:
+ *( va_arg( status->arg, unsigned int * ) ) = (unsigned int)( value * sign );
+ break;
- case E_long:
- *( va_arg( status->arg, long * ) ) = (long)( value * sign );
- break;
- case E_long | E_unsigned:
- *( va_arg( status->arg, unsigned long * ) ) = (unsigned long)( value * sign );
- break;
+ case E_long:
+ *( va_arg( status->arg, long * ) ) = (long)( value * sign );
+ break;
+ case E_long | E_unsigned:
+ *( va_arg( status->arg, unsigned long * ) ) = (unsigned long)( value * sign );
+ break;
- case E_llong:
- *( va_arg( status->arg, long long * ) ) = (long long)( value * sign );
- break;
- case E_llong | E_unsigned:
- *( va_arg( status->arg, unsigned long long * ) ) = (unsigned long long)( value * sign );
- break;
+ case E_llong:
+ *( va_arg( status->arg, long long * ) ) = (long long)( value * sign );
+ break;
+ case E_llong | E_unsigned:
+ *( va_arg( status->arg, unsigned long long * ) ) = (unsigned long long)( value * sign );
+ break;
- case E_intmax:
- *( va_arg( status->arg, intmax_t * ) ) = (intmax_t)( value * sign );
- break;
- case E_intmax | E_unsigned:
- *( va_arg( status->arg, uintmax_t * ) ) = (uintmax_t)( value * sign );
- break;
+ case E_intmax:
+ *( va_arg( status->arg, intmax_t * ) ) = (intmax_t)( value * sign );
+ break;
+ case E_intmax | E_unsigned:
+ *( va_arg( status->arg, uintmax_t * ) ) = (uintmax_t)( value * sign );
+ break;
- case E_size:
- /* E_size always implies unsigned */
- *( va_arg( status->arg, size_t * ) ) = (size_t)( value * sign );
- break;
+ case E_size:
+ /* E_size always implies unsigned */
+ *( va_arg( status->arg, size_t * ) ) = (size_t)( value * sign );
+ break;
- case E_ptrdiff:
- /* E_ptrdiff always implies signed */
- *( va_arg( status->arg, ptrdiff_t * ) ) = (ptrdiff_t)( value * sign );
- break;
+ case E_ptrdiff:
+ /* E_ptrdiff always implies signed */
+ *( va_arg( status->arg, ptrdiff_t * ) ) = (ptrdiff_t)( value * sign );
+ break;
- default:
- puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
- return NULL; /* behaviour unspecified */
+ case E_pointer:
+ /* E_pointer always implies unsigned */
+ *( uintptr_t* )( va_arg( status->arg, void * ) ) = (uintptr_t)( value * sign );
+ break;
+
+ default:
+ puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
+ return NULL; /* behaviour unspecified */
+ }
+ ++(status->n);
}
- ++(status->n);
return ++spec;
}
/* TODO: Floats. */
return NULL;
}
+#endif
#ifdef TEST
#define _PDCLIB_FILEID "_PDCLIB/scan.c"
#define _PDCLIB_STRINGIO
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
+
+#ifndef REGTEST
static int testscanf( char const * s, char const * format, ... )
{
return status.n;
}
+#endif
+
#define TEST_CONVERSION_ONLY
int main( void )
{
+#ifndef REGTEST
char source[100];
#include "scanf_testcases.h"
+#endif
return TEST_RESULTS;
}