X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fhash.h;h=57fc2678d09548ad50922b9130298afb6cf80cac;hb=ebbfbe937906e4b4ca577478965cf06d1a812715;hp=1610a47d79ab5cad7738468aabf878bd4fa518a0;hpb=c708736bdd0fea4b79f3ee4a10e00c3abb95d9e3;p=pspp-builds.git diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h index 1610a47d..57fc2678 100644 --- a/src/libpspp/hash.h +++ b/src/libpspp/hash.h @@ -1,31 +1,29 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 2 of the - License, or (at your option) any later version. + 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. + 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, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #if !hash_h #define hash_h 1 #include #include +#include -typedef int hsh_compare_func (const void *, const void *, void *aux); -typedef unsigned hsh_hash_func (const void *, void *aux); -typedef void hsh_free_func (void *, void *aux); +typedef int hsh_compare_func (const void *, const void *, const void *aux); +typedef unsigned hsh_hash_func (const void *, const void *aux); +typedef void hsh_free_func (void *, const void *aux); /* Hash table iterator (opaque). */ struct hsh_iterator @@ -33,17 +31,17 @@ struct hsh_iterator size_t next; /* Index of next entry. */ }; -/* Hash functions. */ -unsigned hsh_hash_bytes (const void *, size_t); -unsigned hsh_hash_string (const char *); -unsigned hsh_hash_case_string (const char *); -unsigned hsh_hash_int (int); -unsigned hsh_hash_double (double); - /* Hash tables. */ struct hsh_table *hsh_create (int m, hsh_compare_func *, hsh_hash_func *, hsh_free_func *, - void *aux); + const void *aux); + +struct pool; +struct hsh_table *hsh_create_pool (struct pool *pool, int m, + hsh_compare_func *, + hsh_hash_func *, hsh_free_func *, + const void *aux); + void hsh_clear (struct hsh_table *); void hsh_destroy (struct hsh_table *); void *const *hsh_sort (struct hsh_table *); @@ -81,4 +79,109 @@ size_t hsh_count (struct hsh_table *); void hsh_dump (struct hsh_table *); #endif + +/* Const Wrappers for the above */ + +static inline struct const_hsh_table * +const_hsh_create (int m, + hsh_compare_func *hcf, + hsh_hash_func *hhf, hsh_free_func *hff, + const void *aux) +{ + return (struct const_hsh_table *) hsh_create (m, hcf, hhf, hff, aux); +} + + + +static inline struct const_hsh_table * +const_hsh_create_pool (struct pool *pool, int m, + hsh_compare_func *cf, + hsh_hash_func *hf, hsh_free_func *ff, + const void *aux) +{ + return (struct const_hsh_table *) hsh_create_pool (pool, m, cf, hf, ff, aux); +} + + +static inline void +const_hsh_clear (struct const_hsh_table *h) +{ + hsh_clear ( (struct hsh_table *) h); +} + +static inline void +const_hsh_destroy (struct const_hsh_table *h) +{ + hsh_destroy ( (struct hsh_table *) h); +} + +static inline void *const * +const_hsh_sort (struct const_hsh_table *h) +{ + return hsh_sort ( (struct hsh_table *) h); +} + +static inline void *const * +const_hsh_data (struct const_hsh_table *h) +{ + return hsh_data ( (struct hsh_table *) h); +} + +static inline void ** +const_hsh_sort_copy (struct const_hsh_table *h) +{ + return hsh_sort_copy ( (struct hsh_table *) h); +} + +static inline void ** +const_hsh_data_copy (struct const_hsh_table *h) +{ + return hsh_data_copy ( (struct hsh_table *) h); +} + + +static inline size_t +const_hsh_count (struct const_hsh_table *h) +{ + return hsh_count ( (struct hsh_table *) h); +} + +static inline void * +const_hsh_insert (struct const_hsh_table *h, const void *item) +{ + return hsh_insert ( (struct hsh_table *) h, (void *) item); +} + +static inline void * +const_hsh_replace (struct const_hsh_table *h, const void *item) +{ + return hsh_replace ( (struct hsh_table *) h, (void *) item); +} + +static inline void * +const_hsh_find (struct const_hsh_table *h, const void *item) +{ + return hsh_find ( (struct hsh_table *) h, (void *) item); +} + +static inline bool +const_hsh_delete (struct const_hsh_table *h, const void *item) +{ + return hsh_delete ( (struct hsh_table *)h, (void *) item); +} + + +static inline void * +const_hsh_first (struct const_hsh_table *h, struct hsh_iterator *i) +{ + return hsh_first ( (struct hsh_table *) h, i); +} + +static inline void * +const_hsh_next (struct const_hsh_table *h, struct hsh_iterator *i) +{ + return hsh_next ( (struct hsh_table *) h, i); +} + + #endif /* hash_h */