Changeset 9c47a47 for src/libcfa/stdlib.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/libcfa/stdlib.c (modified) (2 diffs)

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 24 13:00:15 2017
-// Update Count     : 344
+// Last Modified On : Thu Dec 28 18:43:16 2017
+// Update Count     : 378
 //
 
@@ -128 +128 @@
 //---------------------------------------
 
-forall( otype T | { int ?<?( T, T ); } )
-T * bsearch( T key, const T * arr, size_t dim ) {
-        int comp( const void * t1, const void * t2 ) { return *(T *)t1 < *(T *)t2 ? -1 : *(T *)t2 < *(T *)t1 ? 1 : 0; }
-        return (T *)bsearch( &key, arr, dim, sizeof(T), comp );
+forall( otype E | { int ?<?( E, E ); } )
+E * bsearch( E key, const E * arr, size_t dim ) {
+        int comp( const void * t1, const void * t2 ) { return *(E *)t1 < *(E *)t2 ? -1 : *(E *)t2 < *(E *)t1 ? 1 : 0; }
+        return (E *)bsearch( &key, arr, dim, sizeof(E), comp );
 } // bsearch
 
-forall( otype T | { int ?<?( T, T ); } )
-unsigned int bsearch( T key, const T * arr, size_t dim ) {
-        T * result = bsearch( key, arr, dim );
-        return result ? result - arr : dim;                                     // pointer subtraction includes sizeof(T)
+forall( otype E | { int ?<?( E, E ); } )
+unsigned int bsearch( E key, const E * arr, size_t dim ) {
+        E * result = bsearch( key, arr, dim );
+        return result ? result - arr : dim;                                     // pointer subtraction includes sizeof(E)
 } // bsearch
 
-forall( otype T | { int ?<?( T, T ); } )
-void qsort( const T * arr, size_t dim ) {
-        int comp( const void * t1, const void * t2 ) { return *(T *)t1 < *(T *)t2 ? -1 : *(T *)t2 < *(T *)t1 ? 1 : 0; }
-        qsort( arr, dim, sizeof(T), comp );
+forall( otype K, otype E | { int ?<?( K, K ); K getKey( E & ); } )
+E * bsearch( K key, const E * arr, size_t dim ) {
+        int comp( const void * t1, const void * t2 ) { return *(K *)t1 < getKey( *(E *)t2 ) ? -1 : getKey( *(E *)t2 ) < *(K *)t1 ? 1 : 0; }
+        return (E *)bsearch( &key, arr, dim, sizeof(E), comp );
+} // bsearch
+
+forall( otype K, otype E | { int ?<?( K, K ); K getKey( E & ); } )
+unsigned int bsearch( K key, const E * arr, size_t dim ) {
+        E * result = bsearch( key, arr, dim );
+        return result ? result - arr : dim;                                     // pointer subtraction includes sizeof(E)
+} // bsearch
+
+forall( otype E | { int ?<?( E, E ); } )
+void qsort( E * arr, size_t dim ) {
+        int comp( const void * t1, const void * t2 ) { return *(E *)t1 < *(E *)t2 ? -1 : *(E *)t2 < *(E *)t1 ? 1 : 0; }
+        qsort( arr, dim, sizeof(E), comp );
 } // qsort