X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fscan.c;h=15b1d503c32a5fa9481c48f65d625a08922508bb;hb=31fdebd6d624ffce068548cb4d63f4ec583cec04;hp=ce1dac7b307a0d66b86974b8d54ff6b7f4536543;hpb=6089d8ab77f6f7bacbfa6354e8cfecab1b00c8bc;p=pdclib

diff --git a/functions/_PDCLIB/scan.c b/functions/_PDCLIB/scan.c
index ce1dac7..15b1d50 100644
--- a/functions/_PDCLIB/scan.c
+++ b/functions/_PDCLIB/scan.c
@@ -32,18 +32,6 @@
 #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
@@ -531,31 +519,70 @@ 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_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;
+
+                default:
+                    puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
+                    return NULL; /* behaviour unspecified */
+            }
+            ++(status->n);
         }
-        ++(status->n);
         return ++spec;
     }
     /* TODO: Floats. */
@@ -564,14 +591,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 <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;
 }