#define E_unsigned 1<<16
-/* Helper macro for assigning a readily converted integer value to the correct
- parameter type, used in a switch on status->flags (see E_* flags above).
- case_cond: combination of the E_* flags above, used for the switch-case
- type: integer type, used to get the correct type from the parameter
- stack as well as for cast target.
-*/
-#define ASSIGN_VALUE_TO( case_cond, type ) \
- case case_cond: \
- *( va_arg( status->arg, type * ) ) = (type)( value * sign ); \
- break
-
-
/* Helper function to get a character from the string or stream, whatever is
used for input. When reading from a string, returns EOF on end-of-string
so that handling of the return value can be uniform for both streams and
if ( rc != EOF )
{
++(status->i);
- ++(status->this);
+ ++(status->current);
}
return rc;
}
--(status->s);
}
--(status->i);
- --(status->this);
+ --(status->current);
}
/* Initializing status structure */
status->flags = 0;
status->base = -1;
- status->this = 0;
+ status->current = 0;
status->width = 0;
status->prec = 0;
status->width = 1;
}
/* reading until width reached or input exhausted */
- while ( ( status->this < status->width ) &&
+ while ( ( status->current < status->width ) &&
( ( rc = GET( status ) ) != EOF ) )
{
*(c++) = rc;
case 's':
{
char * c = va_arg( status->arg, char * );
- while ( ( status->this < 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->this < status->width ) &&
+ while ( ( status->current < status->width ) &&
( ( rc = GET( status ) ) != EOF ) )
{
if ( negative_scanlist )
uintmax_t value = 0; /* absolute value read */
bool prefix_parsed = false;
int sign = 0;
- while ( ( status->this < status->width ) &&
+ while ( ( status->current < status->width ) &&
( ( rc = GET( status ) ) != EOF ) )
{
if ( isspace( rc ) )
else
{
/* leading whitespace not counted against width */
- status->this--;
+ status->current--;
}
}
else if ( ! sign )
{
/* starts with zero, so it might be a prefix. */
/* check what follows next (might be 0x...) */
- if ( ( status->this < status->width ) &&
+ if ( ( status->current < status->width ) &&
( ( rc = GET( status ) ) != EOF ) )
{
if ( tolower( rc ) == 'x' )
E_intmax | E_size | E_ptrdiff |
E_unsigned ) )
{
- ASSIGN_VALUE_TO( E_char, char );
- ASSIGN_VALUE_TO( E_char | E_unsigned, unsigned char );
- ASSIGN_VALUE_TO( E_short, short );
- ASSIGN_VALUE_TO( E_short | E_unsigned, unsigned short );
- ASSIGN_VALUE_TO( 0, int );
- ASSIGN_VALUE_TO( E_unsigned, unsigned int );
- ASSIGN_VALUE_TO( E_long, long );
- ASSIGN_VALUE_TO( E_long | E_unsigned, unsigned long );
- ASSIGN_VALUE_TO( E_llong, long long );
- ASSIGN_VALUE_TO( E_llong | E_unsigned, unsigned long long );
- ASSIGN_VALUE_TO( E_intmax, intmax_t );
- ASSIGN_VALUE_TO( E_intmax | E_unsigned, uintmax_t );
- ASSIGN_VALUE_TO( E_size, size_t );
- /* ASSIGN_VALUE_TO( E_size | E_unsigned, unsigned size_t ); */
- ASSIGN_VALUE_TO( E_ptrdiff, ptrdiff_t );
- /* ASSIGN_VALUE_TO( E_ptrdiff | E_unsigned, unsigned ptrdiff_t ); */
+ 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 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_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_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;
+
default:
puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
return NULL; /* behaviour unspecified */
#ifdef TEST
+#define _PDCLIB_FILEID "_PDCLIB/scan.c"
+#define _PDCLIB_STRINGIO
+
#include <_PDCLIB_test.h>
-#include <limits.h>
+static int testscanf( char const * s, char const * format, ... )
+{
+ struct _PDCLIB_status_t status;
+ status.n = 0;
+ status.i = 0;
+ status.s = (char *)s;
+ status.stream = NULL;
+ va_start( status.arg, format );
+ if ( *(_PDCLIB_scan( format, &status )) != '\0' )
+ {
+ printf( "_PDCLIB_scan() did not return end-of-specifier on '%s'.\n", format );
+ ++TEST_RESULTS;
+ }
+ va_end( status.arg );
+ return status.n;
+}
+
+#define TEST_CONVERSION_ONLY
-
int main( void )
{
- /* Testing covered by fscanf.c */
+ char source[100];
+#include "scanf_testcases.h"
return TEST_RESULTS;
}
projects / pdclib / blobdiff