dav: comparison ucx/cx/map.h

-:22257f6d06a3
+:bc782cca0759
 /**
 * \file map.h
 * \brief Interface for map implementations.
 * \author Mike Becker
 * \author Olaf Wintermann
-* \version 3.0
 * \copyright 2-Clause BSD License
 */
 #ifndef UCX_MAP_H
 #define UCX_MAP_H
 /** Type for map class definitions. */
 typedef struct cx_map_class_s cx_map_class;
 /** Structure for the UCX map. */
 struct cx_map_s {
-CX_COLLECTION_MEMBERS
+/**
+* Base attributes.
+*/
+CX_COLLECTION_BASE;
 /** The map class definition. */
 cx_map_class *cl;
 };
 /**
 * @param map the map
 * @see cxMapStorePointers()
 */
 __attribute__((__nonnull__))
 static inline void cxMapStoreObjects(CxMap *map) {
-map->store_pointer = false;
+map->collection.store_pointer = false;
 }
 /**
 * Advises the map to only store pointers to the objects.
 *
 * @param map the map
 * @see cxMapStoreObjects()
 */
 __attribute__((__nonnull__))
 static inline void cxMapStorePointers(CxMap *map) {
-map->store_pointer = true;
+map->collection.store_pointer = true;
-map->item_size = sizeof(void *);
+map->collection.elem_size = sizeof(void *);
 }
+/**
+* Returns true, if this map is storing pointers instead of the actual data.
+*
+* @param map
+* @return true, if this map is storing pointers
+* @see cxMapStorePointers()
+*/
+__attribute__((__nonnull__))
+static inline bool cxMapIsStoringPointers(CxMap const *map) {
+return map->collection.store_pointer;
+}
 /**
 * Deallocates the memory of the specified map.
 *
 * @param map the map to be destroyed
 * @param map the map to be cleared
 */
 __attribute__((__nonnull__))
 static inline void cxMapClear(CxMap *map) {
 map->cl->clear(map);
+}
+/**
+* Returns the number of elements in this map.
+*
+* @param map the map
+* @return the number of stored elements
+*/
+__attribute__((__nonnull__))
+static inline size_t cxMapSize(CxMap const *map) {
+return map->collection.size;
 }
 // TODO: set-like map operations (union, intersect, difference)
 *
 * @param map the map to create the iterator for
 * @return an iterator for the currently stored values
 */
 __attribute__((__nonnull__, __warn_unused_result__))
-CxMutIterator cxMapMutIteratorValues(CxMap *map);
+CxIterator cxMapMutIteratorValues(CxMap *map);
 /**
 * Creates a mutating iterator over the keys of a map.
 *
 * The elements of the iterator are keys of type CxHashKey.
 *
 * @param map the map to create the iterator for
 * @return an iterator for the currently stored keys
 */
 __attribute__((__nonnull__, __warn_unused_result__))
-CxMutIterator cxMapMutIteratorKeys(CxMap *map);
+CxIterator cxMapMutIteratorKeys(CxMap *map);
 /**
 * Creates a mutating iterator for a map.
 *
 * The elements of the iterator are key/value pairs of type CxMapEntry.
 * @return an iterator for the currently stored entries
 * @see cxMapMutIteratorKeys()
 * @see cxMapMutIteratorValues()
 */
 __attribute__((__nonnull__, __warn_unused_result__))
-CxMutIterator cxMapMutIterator(CxMap *map);
+CxIterator cxMapMutIterator(CxMap *map);
 #ifdef __cplusplus
 } // end the extern "C" block here, because we want to start overloading
 /**
 __attribute__((__nonnull__, __warn_unused_result__))
 static inline void *cx_map_remove_and_get(
 CxMap *map,
 CxHashKey key
 ) {
-return map->cl->remove(map, key, !map->store_pointer);
+return map->cl->remove(map, key, !map->collection.store_pointer);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
 __attribute__((__nonnull__, __warn_unused_result__))
 static inline void *cx_map_remove_and_get_cxstr(
 CxMap *map,
 cxstring key
 ) {
-return map->cl->remove(map, cx_hash_key_cxstr(key), !map->store_pointer);
+return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
 __attribute__((__nonnull__, __warn_unused_result__))
 static inline void *cx_map_remove_and_get_mustr(
 CxMap *map,
 cxmutstr key
 ) {
-return map->cl->remove(map, cx_hash_key_cxstr(key), !map->store_pointer);
+return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
 __attribute__((__nonnull__, __warn_unused_result__))
 static inline void *cx_map_remove_and_get_str(
 CxMap *map,
 char const *key
 ) {
-return map->cl->remove(map, cx_hash_key_str(key), !map->store_pointer);
+return map->cl->remove(map, cx_hash_key_str(key), !map->collection.store_pointer);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *

Mercurial > hg > dav / file comparison

comparison: ucx/cx/map.h

ucx/cx/map.h