Changeset 9c47a47 for src/tests/searchsort.c

Timestamp:

Dec 28, 2017, 9:56:28 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

853451b

Parents:

e672372

Message:

extend stdlib bsearch

File:

• src/tests/searchsort.c (modified) (6 diffs)

src/tests/searchsort.c

@@ -10 +10 @@
 // Created On       : Thu Feb  4 18:17:50 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 09:14:06 2017
-// Update Count     : 77
+// Last Modified On : Thu Dec 28 18:48:10 2017
+// Update Count     : 99
 // 
 
@@ -38 +38 @@
         for ( unsigned int i = 0; i < size; i += 1 ) {          // C version
                 int key = size - i;
-                int *v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
-                sout | *v | ", ";
+                int * v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
+                sout | key | ':' | *v | ", ";
         } // for
         sout | endl;
+
         for ( unsigned int i = 0; i < size; i += 1 ) {
-                int *v = bsearch( size - i, iarr, size );
-                sout | *v | ", ";
+                int * v = bsearch( size - i, iarr, size );
+                sout | size - i | ':' | *v | ", ";
         } // for
         sout | endl;
         for ( unsigned int i = 0; i < size; i += 1 ) {
                 unsigned int posn = bsearch( size - i, iarr, size );
-                sout | iarr[posn] | ", ";
+                sout | size - i | ':' | iarr[posn] | ", ";
         } // for
         sout | endl | endl;
@@ -67 +68 @@
                 sout | endl;
                 for ( unsigned int i = 0; i < size; i += 1 ) {
-                        int *v = bsearch( size - i, iarr, size );
-                        sout | *v | ", ";
+                        int * v = bsearch( size - i, iarr, size );
+                        sout | size - i | ':' | *v | ", ";
                 } // for
                 sout | endl;
                 for ( unsigned int i = 0; i < size; i += 1 ) {
                         unsigned int posn = bsearch( size - i, iarr, size );
-                        sout | iarr[posn] | ", ";
+                        sout | size - i | ':' | iarr[posn] | ", ";
                 } // for
         }
@@ -90 +91 @@
         sout | endl;
         for ( unsigned int i = 0; i < size; i += 1 ) {
-                double *v = bsearch( size - i + 0.5, darr, size );
-                sout | *v | ", ";
+                double * v = bsearch( size - i + 0.5, darr, size );
+                sout | size - i + 0.5 | ':' | *v | ", ";
         } // for
         sout | endl;
         for ( unsigned int i = 0; i < size; i += 1 ) {
                 unsigned int posn = bsearch( size - i + 0.5, darr, size );
-                sout | darr[posn] | ", ";
+                sout | size - i + 0.5 | ':' | darr[posn] | ", ";
         } // for
         sout | endl | endl;
@@ -116 +117 @@
         for ( unsigned int i = 0; i < size; i += 1 ) {
                 S temp = { size - i, size - i + 1 };
-                S *v = bsearch( temp, sarr, size );
-                sout | *v | ", ";
+                S * v = bsearch( temp, sarr, size );
+                sout | temp | ':' | *v | ", ";
         } // for
         sout | endl;
@@ -123 +124 @@
                 S temp = { size - i, size - i + 1 };
                 unsigned int posn = bsearch( temp, sarr, size );
-                sout | sarr[posn] | ", ";
+                sout | temp | ':' | sarr[posn] | ", ";
         } // for
         sout | endl | endl;
+        {
+                unsigned int getKey( S & s ) { return s.j; }
+                for ( unsigned int i = 0; i < size; i += 1 ) {
+                        sout | sarr[i] | ", ";
+                } // for
+                sout | endl;
+                for ( unsigned int i = 0; i < size; i += 1 ) {
+                        S * v = bsearch( size - i + 1, sarr, size );
+                        sout | size - i + 1 | ':' | *v | ", ";
+                } // for
+                sout | endl;
+                for ( unsigned int i = 0; i < size; i += 1 ) {
+                        unsigned int posn = bsearch( size - i + 1, sarr, size );
+                        sout | size - i + 1 | ':' | sarr[posn] | ", ";
+                } // for
+                sout | endl | endl;
+        }
 } // main