X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fscan.c;h=8d4d7e0b98b3de5db39ff07fd71c83cadefb68cd;hb=5596d52a975696c29adc741ac1cdb49fb7315d73;hp=8aaabfb54696aaf4b6f28786ccd45c1ada2764af;hpb=c07ec996170cb522e4ac8179c332dfbca2d8de5b;p=pdclib diff --git a/functions/_PDCLIB/scan.c b/functions/_PDCLIB/scan.c index 8aaabfb..8d4d7e0 100644 --- a/functions/_PDCLIB/scan.c +++ b/functions/_PDCLIB/scan.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /* _PDCLIB_scan( const char *, struct _PDCLIB_status_t * ) This file is part of the Public Domain C Library (PDCLib). @@ -27,23 +25,11 @@ #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 -/* 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 @@ -51,7 +37,7 @@ */ static int GET( struct _PDCLIB_status_t * status ) { - int rc; + int rc = EOF; if ( status->stream != NULL ) { rc = getc( status->stream ); @@ -63,7 +49,7 @@ static int GET( struct _PDCLIB_status_t * status ) if ( rc != EOF ) { ++(status->i); - ++(status->this); + ++(status->current); } return rc; } @@ -83,7 +69,7 @@ static void UNGET( int c, struct _PDCLIB_status_t * status ) --(status->s); } --(status->i); - --(status->this); + --(status->current); } @@ -153,7 +139,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) /* Initializing status structure */ status->flags = 0; status->base = -1; - status->this = 0; + status->current = 0; status->width = 0; status->prec = 0; @@ -272,7 +258,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) 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; @@ -297,7 +283,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) 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 ) ) @@ -357,7 +343,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) } 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 ) @@ -396,7 +382,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) } case 'p': status->base = 16; - status->flags |= E_unsigned; + status->flags |= E_pointer; break; case 'n': { @@ -415,7 +401,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) 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 ) ) @@ -429,7 +415,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) else { /* leading whitespace not counted against width */ - status->this--; + status->current--; } } else if ( ! sign ) @@ -467,7 +453,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) { /* 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' ) @@ -531,31 +517,75 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) 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 ) ) { - 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 ); */ - default: - puts( "UNSUPPORTED SCANF FLAG COMBINATION" ); - return NULL; /* behaviour unspecified */ + 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 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; + + 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. */ @@ -564,14 +594,34 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) #ifdef TEST +#define _PDCLIB_FILEID "_PDCLIB/scan.c" +#define _PDCLIB_STRINGIO + #include <_PDCLIB_test.h> -#include +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; }