From: Bruno Haible Date: Tue, 11 Dec 2018 19:56:30 +0000 (+0100) Subject: xomap: New module. X-Git-Tag: v1.0~5255 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2f4becc3bf329ab03b8a9128b53526f1ada082b0;p=gnulib.git xomap: New module. * lib/gl_xomap.h: New file. * lib/gl_xomap.c: New file. * modules/xomap: New file. --- diff --git a/ChangeLog b/ChangeLog index 3fe2652429..dec644be5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-12-11 Bruno Haible + xomap: New module. + * lib/gl_xomap.h: New file. + * lib/gl_xomap.c: New file. + * modules/xomap: New file. + rbtree-omap: New module. * lib/gl_rbtree_omap.h: New file. * lib/gl_rbtree_omap.c: New file. diff --git a/lib/gl_xomap.c b/lib/gl_xomap.c new file mode 100644 index 0000000000..756123d5a6 --- /dev/null +++ b/lib/gl_xomap.c @@ -0,0 +1,3 @@ +#include +#define GL_XOMAP_INLINE _GL_EXTERN_INLINE +#include "gl_xomap.h" diff --git a/lib/gl_xomap.h b/lib/gl_xomap.h new file mode 100644 index 0000000000..13ee21d494 --- /dev/null +++ b/lib/gl_xomap.h @@ -0,0 +1,88 @@ +/* Abstract ordered map data type, with out-of-memory checking. + Copyright (C) 2009-2018 Free Software Foundation, Inc. + Written by Bruno Haible , 2018. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _GL_XOMAP_H +#define _GL_XOMAP_H + +#include "gl_omap.h" +#include "xalloc.h" + +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef GL_XOMAP_INLINE +# define GL_XOMAP_INLINE _GL_INLINE +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +/* These functions are thin wrappers around the corresponding functions with + _nx_ infix from gl_omap.h. Upon out-of-memory, they invoke xalloc_die (), + instead of returning an error indicator. */ +#if 0 /* These are defined inline below. */ +extern gl_omap_t gl_omap_create_empty (gl_omap_implementation_t implementation, + gl_mapkey_compar_fn compar_fn, + gl_mapkey_dispose_fn kdispose_fn, + gl_mapvalue_dispose_fn vdispose_fn); +extern bool gl_omap_put (gl_omap_t map, const void *key, const void *value); +extern bool gl_omap_getput (gl_omap_t map, const void *key, const void *value, + const void **oldvaluep); +#endif + +GL_XOMAP_INLINE gl_omap_t +gl_omap_create_empty (gl_omap_implementation_t implementation, + gl_mapkey_compar_fn compar_fn, + gl_mapkey_dispose_fn kdispose_fn, + gl_mapvalue_dispose_fn vdispose_fn) +{ + gl_omap_t result = + gl_omap_nx_create_empty (implementation, compar_fn, kdispose_fn, vdispose_fn); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XOMAP_INLINE bool +gl_omap_put (gl_omap_t map, const void *key, const void *value) +{ + int result = gl_omap_nx_put (map, key, value); + if (result < 0) + xalloc_die (); + return result; +} + +GL_XOMAP_INLINE bool +gl_omap_getput (gl_omap_t map, const void *key, const void *value, + const void **oldvaluep) +{ + int result = gl_omap_nx_getput (map, key, value, oldvaluep); + if (result < 0) + xalloc_die (); + return result; +} + +#ifdef __cplusplus +} +#endif + +_GL_INLINE_HEADER_END + +#endif /* _GL_XOMAP_H */ diff --git a/modules/xomap b/modules/xomap new file mode 100644 index 0000000000..196717de1b --- /dev/null +++ b/modules/xomap @@ -0,0 +1,26 @@ +Description: +Abstract ordered map data type, with out-of-memory checking. + +Files: +lib/gl_xomap.h +lib/gl_xomap.c + +Depends-on: +omap +extern-inline +stdbool +xalloc-die + +configure.ac: + +Makefile.am: +lib_SOURCES += gl_xomap.h gl_xomap.c + +Include: +"gl_xomap.h" + +License: +GPL + +Maintainer: +all