X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=draft.c;h=c5f7ad78b5c6eec47108cc2753fa4d65335ee456;hb=4216d0f529d932fc91ec2a095d82584a5de0e799;hp=fdda32d1fe8703840350c3b9ec593b53796cc529;hpb=7bcac73ac7bf61de3dd1bbeaf6071894c7805e7f;p=pdclib.old

diff --git a/draft.c b/draft.c
index fdda32d..c5f7ad7 100644
--- a/draft.c
+++ b/draft.c
@@ -6,6 +6,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include <string.h>
+#include <limits.h>
 
 #undef TEST
 #include </home/solar/src/pdclib/functions/_PDCLIB/digits.c>
@@ -44,20 +45,32 @@ struct status_t
     int    prec;  /* precision of current field                              */
 };
 
+union value_t
+{
+      int8_t  int8;
+     uint8_t uint8;
+     int16_t  int16;
+    uint16_t uint16;
+     int32_t  int32;
+    uint32_t uint32;
+     int64_t  int64;
+    uint64_t uint64; 
+};
+
 /* x - the character to be delivered
    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: Overruns.
 */
-#define DELIVER( x ) if ( status->i < status->n ) status->s[status->i] = x; ++(status->i)
+#define DELIVER( x ) do { if ( status->i < status->n ) status->s[status->i] = x; ++(status->i); } while ( 0 )
 
 /* TODO: Left / right alignment - requires track-keeping of width and printed chars.
    "Father function", die für right alignment "tail recursive" gerufen wird, und
    "after" für left alignment? Parameter als struct?
 */
 
-static void int2base( int value, struct status_t * status )
+static void int2base( intmax_t value, struct status_t * status )
 {
     ++(status->this);
     if ( ( value / status->base ) != 0 )
@@ -114,21 +127,24 @@ static void int2base( int value, struct status_t * status )
             }
         }
     }
-    if ( value < 0 )
     {
-        value *= -1;
+    int digit = value % status->base;
+    if ( digit < 0 )
+    {
+        digit *= -1;
     }
     if ( status->flags & E_lower )
     {
-        DELIVER( _PDCLIB_digits[ value % status->base ] );
+        DELIVER( _PDCLIB_digits[ digit ] );
     }
     else
     {
-        DELIVER( toupper( _PDCLIB_digits[ value % status->base ] ) );
+        DELIVER( toupper( _PDCLIB_digits[ digit ] ) );
+    }
     }
 }
 
-static void padwrap( int value, struct status_t * status )
+static void padwrap( intmax_t value, struct status_t * status )
 {
     int2base( value, status );
     if ( status->flags & E_minus )
@@ -139,9 +155,9 @@ static void padwrap( int value, struct status_t * status )
             ++(status->this);
         }
     }
-    if ( status->i == status->n )
+    if ( status->i >= status->n )
     {
-        status->s[status->i] = '\0';
+        status->s[status->n - 1] = '\0';
     }
 }
 
@@ -338,18 +354,22 @@ static void int2base( int value, int base, struct status_t * status )
     status.prec = _prec; \
     status.base = _base; \
     status.this = 0; \
-    memset( status.s, '\0', 20 ); \
+    memset( status.s, '\0', 50 ); \
     padwrap( _value, &status ); \
-    printf( "Output '%s', RC %d \t- ", status.s, status.i ); \
     rc = snprintf( buffer, _n, _expect, _value ); \
-    printf( "Expect '%s', RC %d\n", buffer, rc );
+    if ( ( strcmp( status.s, buffer ) != 0 ) || ( status.i != rc ) ) \
+    { \
+        printf( "Output '%s', RC %d\nExpect '%s', RC %d\n\n", status.s, status.i, buffer, rc ); \
+    } \
 
 int main()
 {
     struct status_t status;
     int rc;
-    char * buffer = malloc( 20 );
-    status.s = malloc( 20 );
+    int tmp;
+    char * buffer = malloc( 50 );
+    status.s = malloc( 50 );
+#if 0
     TESTCASE( E_plus, 5, 0, 0, 1234, 10, "%+d" );
     TESTCASE( E_space, 3, 0, 0, 1234, 10, "% d" );
     TESTCASE( E_space, 3, 0, 0, -1234, 10, "% d" );
@@ -363,11 +383,43 @@ int main()
     TESTCASE( E_minus, 6, 2, 0, 1234, 10, "%-2d" );
     TESTCASE( E_done, 6, 2, 0, 1234, 10, "%2d" );
     TESTCASE( E_zero, 6, 6, 0, -1234, 10, "%06d" );
+    /* TODO: These two are *unsigned* conversions! */
     TESTCASE( E_zero, 7, 7, 0, -65535, 16, "%07X" );
+    TESTCASE( E_zero, 7, 7, 0, -65535, 10, "%07u" );
+
     TESTCASE( E_zero | E_minus, 6, 6, 0, 1234, 10, "%-06d" );
     TESTCASE( E_plus, 6, 6, 0, 1234, 10, "%+6d" );
     TESTCASE( E_space, 6, 6, 0, 1234, 10, "% 6d" );
     TESTCASE( E_space, 6, 6, 0, -1234, 10, "% 6d" );
     TESTCASE( E_space | E_minus, 6, 6, 0, -1234, 10, "%- 6d" );
+#endif
+    puts( "--- Serious Tests ---\n" );
+    puts( "- Signed min / max -\n" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, CHAR_MIN, 10, "%hhd" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, CHAR_MAX, 10, "%hhd" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, 0, 10, "%hhd" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, SHRT_MIN, 10, "%hd" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, SHRT_MAX, 10, "%hd" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, 0, 10, "%hd" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, INT_MIN, 10, "%d" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, INT_MAX, 10, "%d" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, 0, 10, "%d" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, LONG_MIN, 10, "%ld" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, LONG_MAX, 10, "%ld" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, 0l, 10, "%ld" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, LLONG_MIN, 10, "%lld" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, LLONG_MAX, 10, "%lld" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, 0ll, 10, "%lld" ); 
+    puts( "- Unsigned min / max -\n" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, UCHAR_MAX, 10, "%hhu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%hhu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, USHRT_MAX, 10, "%hu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%hu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, UINT_MAX, 10, "%u" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, -1, 10, "%u" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, ULONG_MAX, 10, "%lu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, -1l, 10, "%lu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, ULLONG_MAX, 10, "%llu" );
+    TESTCASE( E_done, SIZE_MAX, 0, 0, -1ll, 10, "%llu" );
     return 0;
 }