kc3-lang/gnulib/lib/gl_avltree_omap.c

• Show log

  Commit

• Hash : 91af6d73
  Author :
  Date : 2020-07-20T20:06:29
  

  oset: Add an 'update' operation.
  
  * lib/gl_array_oset.c (gl_array_update): New function.
  (gl_array_oset_implementation): Use it.
  * lib/gl_avltree_omap.c (NODE_PAYLOAD_DISPOSE): Add parameters.
  * lib/gl_rbtree_omap.c (NODE_PAYLOAD_DISPOSE): Add parameters.
  * lib/gl_avltree_ordered.h (gl_tree_add_node_before): New function,
  extracted from gl_tree_nx_add_before.
  (gl_tree_nx_add_before): Invoke it.
  (gl_tree_add_node_after): New function, extracted from
  gl_tree_nx_add_after.
  (gl_tree_nx_add_after): Invoke it.
  (gl_tree_remove_node_no_free): New function, extracted from
  gl_tree_remove_node.
  (gl_tree_remove_node): Invoke it.
  * lib/gl_rbtree_ordered.h (gl_tree_add_node_before): New function,
  extracted from gl_tree_nx_add_before.
  (gl_tree_nx_add_before): Invoke it.
  (gl_tree_add_node_after): New function, extracted from
  gl_tree_nx_add_after.
  (gl_tree_nx_add_after): Invoke it.
  (gl_tree_remove_node_no_free): New function, extracted from
  gl_tree_remove_node.
  (gl_tree_remove_node): Invoke it.
  * lib/gl_anytree_oset.h (gl_tree_next_node): New function, extracted
  from gl_tree_iterator_next.
  (gl_tree_iterator_next): Invoke it.
  (gl_tree_prev_node, gl_tree_update): New functions.
  * lib/gl_avltree_oset.c (NODE_PAYLOAD_DISPOSE): Add parameters.
  (gl_avltree_oset_implementation): Use gl_tree_update.
  * lib/gl_rbtree_oset.c (NODE_PAYLOAD_DISPOSE): Add parameters.
  (gl_rbtree_oset_implementation): Use gl_tree_update.
  * lib/gl_oset.h (struct gl_oset_implementation): Add 'update' member.
  (gl_oset_update): New function.
  * lib/gl_oset.hh (gl_OSet): Add 'update' member.
  * modules/avltree-oset (configure.ac): Require AC_C_INLINE.
  * modules/rbtree-oset (configure.ac): Likewise.
  * tests/test-oset-update.h: New file.
  * tests/test-array_oset.c: Include test-oset-update.h.
  (main): Invoke test_update.
  * tests/test-avltree_oset.c: Likewise.
  * tests/test-rbtree_oset.c: Likewise.
  * modules/array-oset-tests (Files): Add tests/test-oset-update.h.
  * modules/avltree-oset-tests (Files): Likewise.
  * modules/rbtree-oset-tests (Files): Likewise.
  * tests/test-oset-c++.cc (action): New function.
  (main): Test the 'update' member function.
  

Download

• lib/gl_avltree_omap.c

• /* Ordered map data type implemented by a binary tree.
     Copyright (C) 2006-2007, 2009-2020 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 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 <https://www.gnu.org/licenses/>.  */
  
  #include <config.h>
  
  /* Specification.  */
  #include "gl_avltree_omap.h"
  
  #include <stdlib.h>
  
  /* -------------------------- gl_omap_t Data Type -------------------------- */
  
  /* Parameterization of gl_avltree_ordered.h.  */
  #define CONTAINER_T gl_omap_t
  #define CONTAINER_IMPL gl_omap_impl
  #define CONTAINER_IMPL_BASE gl_omap_impl_base
  #define NODE_IMPL gl_omap_node_impl
  #define NODE_T gl_omap_node_t
  #define NODE_PAYLOAD_FIELDS \
    const void *key; \
    const void *value;
  #define NODE_PAYLOAD_PARAMS \
    const void *key, const void *value
  #define NODE_PAYLOAD_ASSIGN(node) \
    node->key = key; \
    node->value = value;
  #define NODE_PAYLOAD_DISPOSE(container, node) \
    if (container->base.kdispose_fn != NULL) \
      container->base.kdispose_fn (node->key);
  
  #include "gl_avltree_ordered.h"
  
  /* Generic binary tree code.  */
  #include "gl_anytree_omap.h"
  
  /* For debugging.  */
  void
  gl_avltree_omap_check_invariants (gl_omap_t map)
  {
    size_t counter = 0;
    if (map->root != NULL)
      check_invariants (map->root, NULL, &counter);
    if (!(map->count == counter))
      abort ();
  }
  
  const struct gl_omap_implementation gl_avltree_omap_implementation =
    {
      gl_tree_nx_create_empty,
      gl_tree_size,
      gl_tree_search,
      gl_tree_search_atleast,
      gl_tree_nx_getput,
      gl_tree_getremove,
      gl_tree_omap_free,
      gl_tree_iterator,
      gl_tree_iterator_next,
      gl_tree_iterator_free
    };
  

Download