X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fprint.c;h=27b4bc26bab9b587ec755b6962d3be03eaa95e75;hb=07810dbd8f3e21618208b923e293715774c80ade;hp=95e71c6c5a8ab979c25dc1fac5606576cecbc9a1;hpb=d79c5a289feef16ce8fd04dc8db1efb934e1aa18;p=pdclib

diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c
index 95e71c6..27b4bc2 100644
--- a/functions/_PDCLIB/print.c
+++ b/functions/_PDCLIB/print.c
@@ -15,6 +15,9 @@
 /* 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.
+*/
 #define E_minus    1<<0
 #define E_plus     1<<1
 #define E_alt      1<<2
@@ -39,22 +42,100 @@
    i - pointer to number of characters already delivered in this call
    n - pointer to maximum number of characters to be delivered in this call
    s - the buffer into which the character shall be delivered
+   TODO: ref. fputs() for a better way to buffer handling
 */
 #define DELIVER( x ) \
 do { \
     if ( status->i < status->n ) { \
-        if ( status->stream != NULL ) { \
-            status->stream->buffer[status->stream->bufidx++] = x; \
-            if ( ( status->stream->bufidx == status->stream->bufsize ) \
-              || ( ( status->stream->status & _IOLBF ) && ( x == '\n' ) ) \
-              || ( status->stream->status & _IONBF ) ) \
-                fflush( status->stream ); \
-        } else \
+        if ( status->stream != NULL ) \
+            putc( x, status->stream ); \
+        else \
             status->s[status->i] = x; \
     } \
     ++(status->i); \
 } while ( 0 )
 
+
+static void intformat( intmax_t value, struct _PDCLIB_status_t * status )
+{
+    /* At worst, we need two prefix characters (hex prefix). */
+    char preface[3] = "\0";
+    size_t preidx = 0;
+    if ( ( status->flags & E_alt ) && ( status->base == 16 || status->base == 8 ) )
+    {
+        /* Octal / hexadecimal prefix for "%#" conversions */
+        preface[ preidx++ ] = '0';
+        if ( status->base == 16 )
+        {
+            preface[ preidx++ ] = ( status->flags & E_lower ) ? 'x' : 'X';
+        }
+    }
+    if ( value < 0 )
+    {
+        /* Negative sign for negative values - at all times. */
+        preface[ preidx++ ] = '-';
+    }
+    else if ( ! ( status->flags & E_unsigned ) )
+    {
+        /* plus sign / extra space are only for unsigned conversions */
+        if ( status->flags & E_plus )
+        {
+            preface[ preidx++ ] = '+';
+        }
+        else if ( status->flags & E_space )
+        {
+            preface[ preidx++ ] = ' ';
+        }
+    }
+    {
+    size_t prec_pads = ( status->prec > status->current ) ? ( status->prec - status->current ) : 0;
+    if ( ! ( status->flags & ( E_minus | E_zero ) ) )
+    {
+        /* Space padding is only done if no zero padding or left alignment
+           is requested. Leave space for any prefixes determined above.
+        */
+        /* The number of characters to be printed, plus prefixes if any. */
+        /* This line contained probably the most stupid, time-wasting bug
+           I've ever perpetrated. Greetings to Samface, DevL, and all
+           sceners at Breakpoint 2006.
+        */
+        size_t characters = preidx + ( ( status->current > status->prec ) ? status->current : status->prec );
+        if ( status->width > characters )
+        {
+            for ( size_t i = 0; i < status->width - characters; ++i )
+            {
+                DELIVER( ' ' );
+                ++(status->current);
+            }
+        }
+    }
+    /* Now we did the padding, do the prefixes (if any). */
+    preidx = 0;
+    while ( preface[ preidx ] != '\0' )
+    {
+        DELIVER( preface[ preidx++ ] );
+        ++(status->current);
+    }
+    if ( ( ! ( status->flags & E_minus ) ) && ( status->flags & E_zero ) )
+    {
+        /* If field is not left aligned, and zero padding is requested, do
+           so.
+        */
+        while ( status->current < status->width )
+        {
+            DELIVER( '0' );
+            ++(status->current);
+        }
+    }
+    /* Do the precision padding if necessary. */
+    for ( size_t i = 0; i < prec_pads; ++i )
+    {
+        DELIVER( '0' );
+    }
+    }
+}
+
+
 /* This function recursively converts a given integer value to a character
    stream. The conversion is done under the control of a given status struct
    and written either to a character string or a stream, depending on that
@@ -69,7 +150,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status )
        already so it will be taken into account when the deepestmost recursion
        does the prefix / padding stuff.
     */
-    ++(status->this);
+    ++(status->current);
     if ( ( value / status->base ) != 0 )
     {
         /* More digits to be done - recurse deeper */
@@ -82,101 +163,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status )
            have to do the sign, prefix, width, and precision padding stuff
            before printing the numbers while we resurface from the recursion.
         */
-        /* At worst, we need two prefix characters (hex prefix). */
-        char preface[3] = "\0";
-        size_t preidx = 0;
-        if ( ( status->flags & E_alt ) && ( status->base == 16 || status->base == 8 ) )
-        {
-            /* Octal / hexadecimal prefix for "%#" conversions */
-            preface[ preidx++ ] = '0';
-            if ( status->base == 16 )
-            {
-                preface[ preidx++ ] = ( status->flags & E_lower ) ? 'x' : 'X';
-            }
-        }
-        if ( value < 0 )
-        {
-            /* Negative sign for negative values - at all times. */
-            preface[ preidx++ ] = '-';
-        }
-        else if ( ! ( status->flags & E_unsigned ) )
-        {
-            /* plus sign / extra space are only for unsigned conversions */
-            if ( status->flags & E_plus )
-            {
-                preface[ preidx++ ] = '+';
-            }
-            else if ( status->flags & E_space )
-            {
-                preface[ preidx++ ] = ' ';
-            }
-        }
-        {
-        size_t prec_pads = ( status->prec > status->this ) ? ( status->prec - status->this ) : 0;
-        if ( ! ( status->flags & ( E_minus | E_zero ) ) )
-        {
-            /* Space padding is only done if no zero padding or left alignment
-               is requested. Leave space for any prefixes determined above.
-            */
-            /* The number of characters to be printed, plus prefixes if any. */
-            /* This line contained probably the most stupid, time-wasting bug
-               I've ever perpetrated. Greetings to Samface, DevL, and all
-               sceners at Breakpoint 2006.
-            */
-            size_t characters = preidx + ( ( status->this > status->prec ) ? status->this : status->prec );
-            if ( status->width > characters )
-            {
-                for ( size_t i = 0; i < status->width - characters; ++i )
-                {
-                    DELIVER( ' ' );
-                    /*
-                    do
-                    {
-                        if ( status->i < status->n )
-                        {
-                            if ( status->stream != 0 )
-                                do
-                                {
-                                    status->stream->buffer[status->stream->bufidx++] = (char)' ',
-                                    if ( ( status->stream->bufidx == status->stream->bufsize )
-                                      || ( ( status->stream->status & 2 ) && (char)' ' == '\n' )
-                                      || ( status->stream->status & 4 ) )
-                                        fflush( status->stream )
-                                } while (0),
-                                ' ';
-                            else status->s[status->i] = ' ';
-                        }
-                        ++(status->i);
-                    } while ( 0 );
-                    */
-                    ++(status->this);
-                }
-            }
-        }
-        /* Now we did the padding, do the prefixes (if any). */
-        preidx = 0;
-        while ( preface[ preidx ] != '\0' )
-        {
-            DELIVER( preface[ preidx++ ] );
-            ++(status->this);
-        }
-        if ( ( ! ( status->flags & E_minus ) ) && ( status->flags & E_zero ) )
-        {
-            /* If field is not left aligned, and zero padding is requested, do
-               so.
-            */
-            while ( status->this < status->width )
-            {
-                DELIVER( '0' );
-                ++(status->this);
-            }
-        }
-        /* Do the precision padding if necessary. */
-        for ( size_t i = 0; i < prec_pads; ++i )
-        {
-            DELIVER( '0' );
-        }
-        }
+        intformat( value, status );
     }
     /* Recursion tail - print the current digit. */
     {
@@ -198,6 +185,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status )
     }
 }
 
+
 const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status )
 {
     const char * orig_spec = spec;
@@ -210,7 +198,7 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
     /* Initializing status structure */
     status->flags = 0;
     status->base  = 0;
-    status->this  = 0;
+    status->current  = 0;
     status->width = 0;
     status->prec  = 0;
 
@@ -255,26 +243,16 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
     if ( *spec == '*' )
     {
         /* Retrieve width value from argument stack */
-#if 1
         int width = va_arg( status->arg, int );
         if ( width < 0 )
         {
             status->flags |= E_minus;
-            status->width = width * -1; /* FIXME: Should be abs( width ) */
+            status->width = abs( width );
         }
         else
         {
             status->width = width;
         }
-#else
-        /* FIXME: Old version - with unsigned status->width, condition <0 is never true */
-        if ( ( status->width = va_arg( status->arg, int ) ) < 0 )
-        {
-            /* Negative value is '-' flag plus absolute value */
-            status->flags |= E_minus;
-            status->width *= -1;
-        }
-#endif
         ++spec;
     }
     else
@@ -460,11 +438,17 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
                     value = (uintmax_t)va_arg( status->arg, size_t );
                     break;
             }
-            ++(status->this);
+            ++(status->current);
+            /* FIXME: The if clause means one-digit values do not get formatted */
+            /* Was introduced originally to get value to "safe" levels re. uintmax_t. */
             if ( ( value / status->base ) != 0 )
             {
                 int2base( (intmax_t)(value / status->base), status );
             }
+            else
+            {
+                intformat( (intmax_t)value, status );
+            }
             int digit = value % status->base;
             if ( digit < 0 )
             {
@@ -508,10 +492,10 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
         }
         if ( status->flags & E_minus )
         {
-            while ( status->this < status->width )
+            while ( status->current < status->width )
             {
                 DELIVER( ' ' );
-                ++(status->this);
+                ++(status->current);
             }
         }
         if ( status->i >= status->n )
@@ -530,22 +514,40 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
 
 static int testprintf( char * buffer, size_t n, const char * format, ... )
 {
-    /* Members: base, flags, n, i, this, s, width, prec, stream, arg         */
-    struct _PDCLIB_status_t status = { 0, 0, n, 0, 0, buffer, 0, 0, NULL, NULL };
-    memset( buffer, '\0', 100 );
+    /* Members: base, flags, n, i, current, s, width, prec, stream, arg      */
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = n;
+    status.i = 0;
+    status.current = 0;
+    status.s = buffer;
+    status.width = 0;
+    status.prec = 0;
+    status.stream = NULL;
     va_start( status.arg, format );
+    memset( buffer, '\0', 100 );
     if ( *(_PDCLIB_print( format, &status )) != '\0' )
     {
         printf( "_PDCLIB_print() did not return end-of-specifier on '%s'.\n", format );
-        ++rc;
+        ++TEST_RESULTS;
     }
     va_end( status.arg );
     return status.i;
 }
 
+#define TEST_CONVERSION_ONLY
+
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
+
 int main( void )
 {
     char buffer[100];
+#include "printf_testcases.incl"
+
+#if 0
+    char buffer[100];
     TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
     TESTCASE( strcmp( buffer, "-128" ) == 0 );
     TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
@@ -784,6 +786,7 @@ int main( void )
     TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
     TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
     TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
+#endif
     return TEST_RESULTS;
 }