Merge pull request #2506 from ZyX-I/shada

Replace viminfo with ShaDa files

1 files changed, 268 insertions, 165 deletions

diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h
index 96e7ea6df0..56be29d14c 100644
--- a/src/nvim/lib/khash.h
+++ b/src/nvim/lib/khash.h
@@ -114,8 +114,8 @@ int main() {
 */
 
 
-#ifndef __AC_KHASH_H
-#define __AC_KHASH_H
+#ifndef NVIM_LIB_KHASH_H
+#define NVIM_LIB_KHASH_H
 
 /*!
   @header
@@ -194,166 +194,229 @@ static const double __ac_HASH_UPPER = 0.77;
 		khval_t *vals; \
 	} kh_##name##_t;
 
-#define __KHASH_PROTOTYPES(name, khkey_t, khval_t)	 					\
-	extern kh_##name##_t *kh_init_##name(void);							\
-	extern void kh_destroy_##name(kh_##name##_t *h);					\
-	extern void kh_clear_##name(kh_##name##_t *h);						\
-	extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); 	\
-	extern void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
-	extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
-	extern void kh_del_##name(kh_##name##_t *h, khint_t x);
-
-#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
-	SCOPE kh_##name##_t *kh_init_##name(void) {							\
-		return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t));		\
-	}																	\
-	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
-		REAL_FATTR_UNUSED;                                      \
-	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
-	{																	\
-		if (h) {														\
-			kfree((void *)h->keys); kfree(h->flags);					\
-			kfree((void *)h->vals);										\
-			kfree(h);													\
-		}																\
-	}																	\
-	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
-		REAL_FATTR_UNUSED;                                    \
-	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
-	{																	\
-		if (h && h->flags) {											\
-			memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
-			h->size = h->n_occupied = 0;								\
-		}																\
-	}																	\
-	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
-		REAL_FATTR_UNUSED;                                    \
-	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
-	{																	\
-		if (h->n_buckets) {												\
-			khint_t k, i, last, mask, step = 0; \
-			mask = h->n_buckets - 1;									\
-			k = __hash_func(key); i = k & mask;							\
-			last = i; \
-			while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
-				i = (i + (++step)) & mask; \
-				if (i == last) return h->n_buckets;						\
-			}															\
-			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
-		} else return 0;												\
-	}																	\
-	SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
-		REAL_FATTR_UNUSED;                                    \
-	SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
-	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
-		khint32_t *new_flags = 0;										\
-		khint_t j = 1;													\
-		{																\
-			kroundup32(new_n_buckets); 									\
-			if (new_n_buckets < 4) new_n_buckets = 4;					\
-			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
-			else { /* hash table size to be changed (shrink or expand); rehash */ \
-				new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t));	\
-				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
-				if (h->n_buckets < new_n_buckets) {	/* expand */		\
-					khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
-					h->keys = new_keys;									\
-					if (kh_is_map) {									\
-						khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
-						h->vals = new_vals;								\
-					}													\
-				} /* otherwise shrink */								\
-			}															\
-		}																\
-		if (j) { /* rehashing is needed */								\
-			for (j = 0; j != h->n_buckets; ++j) {						\
-				if (__ac_iseither(h->flags, j) == 0) {					\
-					khkey_t key = h->keys[j];							\
-					khval_t val;										\
-					khint_t new_mask;									\
-					new_mask = new_n_buckets - 1; 						\
-					if (kh_is_map) val = h->vals[j];					\
-					__ac_set_isdel_true(h->flags, j);					\
-					while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
-						khint_t k, i, step = 0; \
-						k = __hash_func(key);							\
-						i = k & new_mask;								\
-						while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
-						__ac_set_isempty_false(new_flags, i);			\
-						if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
-							{ khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
-							if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
-							__ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
-						} else { /* write the element and jump out of the loop */ \
-							h->keys[i] = key;							\
-							if (kh_is_map) h->vals[i] = val;			\
-							break;										\
-						}												\
-					}													\
-				}														\
-			}															\
-			if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
-				h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
-				if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
-			}															\
-			kfree(h->flags); /* free the working space */				\
-			h->flags = new_flags;										\
-			h->n_buckets = new_n_buckets;								\
-			h->n_occupied = h->size;									\
-			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
-		}																\
-	}																	\
-	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
-		REAL_FATTR_UNUSED;                                    \
-	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
-	{																	\
-		khint_t x;														\
-		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
-			if (h->n_buckets > (h->size<<1)) {							\
-				kh_resize_##name(h, h->n_buckets - 1); /* clear "deleted" elements */ \
-			} else {                                                    \
-				kh_resize_##name(h, h->n_buckets + 1); /* expand the hash table */ \
-			}															\
-		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
-		{																\
-			khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
-			x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
-			if (__ac_isempty(h->flags, i)) x = i; /* for speed up */	\
-			else {														\
-				last = i; \
-				while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
-					if (__ac_isdel(h->flags, i)) site = i;				\
-					i = (i + (++step)) & mask; \
-					if (i == last) { x = site; break; }					\
-				}														\
-				if (x == h->n_buckets) {								\
-					if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
-					else x = i;											\
-				}														\
-			}															\
-		}																\
-		if (__ac_isempty(h->flags, x)) { /* not present at all */		\
-			h->keys[x] = key;											\
-			__ac_set_isboth_false(h->flags, x);							\
-			++h->size; ++h->n_occupied;									\
-			*ret = 1;													\
-		} else if (__ac_isdel(h->flags, x)) { /* deleted */				\
-			h->keys[x] = key;											\
-			__ac_set_isboth_false(h->flags, x);							\
-			++h->size;													\
-			*ret = 2;													\
-		} else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
-		return x;														\
-	}																	\
-	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
-		REAL_FATTR_UNUSED;                                    \
-	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
-	{																	\
-		if (x != h->n_buckets && !__ac_iseither(h->flags, x)) {			\
-			__ac_set_isdel_true(h->flags, x);							\
-			--h->size;													\
-		}																\
-	}
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \
+  extern kh_##name##_t *kh_init_##name(void); \
+  extern void kh_dealloc_##name(kh_##name##_t *h); \
+  extern void kh_destroy_##name(kh_##name##_t *h); \
+  extern void kh_clear_##name(kh_##name##_t *h); \
+  extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \
+  extern void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+  extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+  extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+
+#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, \
+                     __hash_equal) \
+  SCOPE kh_##name##_t *kh_init_##name(void) \
+    REAL_FATTR_UNUSED; \
+  SCOPE kh_##name##_t *kh_init_##name(void) { \
+    return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t)); \
+  } \
+  SCOPE void kh_dealloc_##name(kh_##name##_t *h) \
+    REAL_FATTR_UNUSED; \
+  SCOPE void kh_dealloc_##name(kh_##name##_t *h) \
+  { \
+    kfree(h->keys); \
+    kfree(h->flags); \
+    kfree(h->vals); \
+  } \
+  SCOPE void kh_destroy_##name(kh_##name##_t *h) \
+    REAL_FATTR_UNUSED; \
+  SCOPE void kh_destroy_##name(kh_##name##_t *h) \
+  { \
+    if (h) { \
+      kh_dealloc_##name(h); \
+      kfree(h); \
+    } \
+  } \
+  SCOPE void kh_clear_##name(kh_##name##_t *h) \
+    REAL_FATTR_UNUSED; \
+  SCOPE void kh_clear_##name(kh_##name##_t *h) \
+  { \
+    if (h && h->flags) { \
+      memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
+      h->size = h->n_occupied = 0; \
+    } \
+  } \
+  SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \
+    REAL_FATTR_UNUSED; \
+  SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \
+  { \
+    if (h->n_buckets) { \
+      khint_t k, i, last, mask, step = 0; \
+      mask = h->n_buckets - 1; \
+      k = __hash_func(key); i = k & mask; \
+      last = i; \
+      while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || \
+                                            !__hash_equal(h->keys[i], key))) { \
+        i = (i + (++step)) & mask; \
+        if (i == last) { \
+          return h->n_buckets; \
+        } \
+      } \
+      return __ac_iseither(h->flags, i) ? h->n_buckets : i; \
+    } else { \
+      return 0; \
+    } \
+  } \
+  SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+    REAL_FATTR_UNUSED; \
+  SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+  { /* This function uses 0.25*n_buckets bytes of working space instead of */ \
+    /* [sizeof(key_t+val_t)+.25]*n_buckets. */ \
+    khint32_t *new_flags = 0; \
+    khint_t j = 1; \
+    { \
+      kroundup32(new_n_buckets); \
+      if (new_n_buckets < 4) { \
+        new_n_buckets = 4; \
+      } \
+      /* requested size is too small */ \
+      if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) { \
+        j = 0; \
+      } else { /* hash table size to be changed (shrink or expand); rehash */ \
+        new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) \
+                                        * sizeof(khint32_t)); \
+        memset(new_flags, 0xaa, \
+               __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
+        if (h->n_buckets < new_n_buckets) { /* expand */ \
+          khkey_t *new_keys = (khkey_t*)krealloc( \
+              (void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+          h->keys = new_keys; \
+          if (kh_is_map) { \
+            khval_t *new_vals = (khval_t*)krealloc( \
+                (void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+            h->vals = new_vals; \
+          } \
+        } /* otherwise shrink */ \
+      } \
+    } \
+    if (j) { /* rehashing is needed */ \
+      for (j = 0; j != h->n_buckets; ++j) { \
+        if (__ac_iseither(h->flags, j) == 0) { \
+          khkey_t key = h->keys[j]; \
+          khval_t val; \
+          khint_t new_mask; \
+          new_mask = new_n_buckets - 1; \
+          if (kh_is_map) { \
+            val = h->vals[j]; \
+          } \
+          __ac_set_isdel_true(h->flags, j); \
+          /* kick-out process; sort of like in Cuckoo hashing */ \
+          while (1) { \
+            khint_t k, i, step = 0; \
+            k = __hash_func(key); \
+            i = k & new_mask; \
+            while (!__ac_isempty(new_flags, i)) { \
+              i = (i + (++step)) & new_mask; \
+            } \
+            __ac_set_isempty_false(new_flags, i); \
+            /* kick out the existing element */ \
+            if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { \
+              { \
+                khkey_t tmp = h->keys[i]; \
+                h->keys[i] = key; \
+                key = tmp; \
+              } \
+              if (kh_is_map) { \
+                khval_t tmp = h->vals[i]; \
+                h->vals[i] = val; \
+                val = tmp; \
+              } \
+              /* mark it as deleted in the old hash table */ \
+              __ac_set_isdel_true(h->flags, i); \
+            } else { /* write the element and jump out of the loop */ \
+              h->keys[i] = key; \
+              if (kh_is_map) { \
+                h->vals[i] = val; \
+              } \
+              break; \
+            } \
+          } \
+        } \
+      } \
+      if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
+        h->keys = (khkey_t*)krealloc((void *)h->keys, \
+                                     new_n_buckets * sizeof(khkey_t)); \
+        if (kh_is_map) { \
+          h->vals = (khval_t*)krealloc((void *)h->vals, \
+                                       new_n_buckets * sizeof(khval_t)); \
+        } \
+      } \
+      kfree(h->flags); /* free the working space */ \
+      h->flags = new_flags; \
+      h->n_buckets = new_n_buckets; \
+      h->n_occupied = h->size; \
+      h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
+    } \
+  } \
+  SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+    REAL_FATTR_UNUSED; \
+  SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+  { \
+    khint_t x; \
+    if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
+      if (h->n_buckets > (h->size << 1)) { \
+        kh_resize_##name(h, h->n_buckets - 1); /* clear "deleted" elements */ \
+      } else { \
+        kh_resize_##name(h, h->n_buckets + 1); /* expand the hash table */ \
+      } \
+    } /* TODO: implement automatically shrinking; */ \
+      /* resize() already support shrinking */ \
+    { \
+      khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
+      x = site = h->n_buckets; \
+      k = __hash_func(key); \
+      i = k & mask; \
+      if (__ac_isempty(h->flags, i)) { \
+        x = i; /* for speed up */ \
+      } else { \
+        last = i; \
+        while (!__ac_isempty(h->flags, i) \
+               && (__ac_isdel(h->flags, i) \
+                   || !__hash_equal(h->keys[i], key))) { \
+          if (__ac_isdel(h->flags, i)) { \
+            site = i; \
+          } \
+          i = (i + (++step)) & mask; \
+          if (i == last) { \
+            x = site; \
+            break; \
+          } \
+        } \
+        if (x == h->n_buckets) { \
+          if (__ac_isempty(h->flags, i) && site != h->n_buckets) { \
+            x = site; \
+          } else { \
+            x = i; \
+          } \
+        } \
+      } \
+    } \
+    if (__ac_isempty(h->flags, x)) { /* not present at all */ \
+      h->keys[x] = key; \
+      __ac_set_isboth_false(h->flags, x); \
+      h->size++; \
+      h->n_occupied++; \
+      *ret = 1; \
+    } else if (__ac_isdel(h->flags, x)) { /* deleted */ \
+      h->keys[x] = key; \
+      __ac_set_isboth_false(h->flags, x); \
+      h->size++; \
+      *ret = 2; \
+    } else { \
+      *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
+    } \
+    return x; \
+  } \
+  SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x) \
+    REAL_FATTR_UNUSED; \
+  SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x) \
+  { \
+    if (x != h->n_buckets && !__ac_iseither(h->flags, x)) { \
+      __ac_set_isdel_true(h->flags, x); \
+      --h->size; \
+    } \
+  }
 
 #define KHASH_DECLARE(name, khkey_t, khval_t)		 					\
 	__KHASH_TYPE(name, khkey_t, khval_t) 								\
@@ -447,6 +510,13 @@ static kh_inline khint_t __ac_Wang_hash(khint_t key)
 #define kh_destroy(name, h) kh_destroy_##name(h)
 
 /*! @function
+  @abstract     Free memory referenced directly inside a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_dealloc(name, h) kh_dealloc_##name(h)
+
+/*! @function
   @abstract     Reset a hash table without deallocating memory.
   @param  name  Name of the hash table [symbol]
   @param  h     Pointer to the hash table [khash_t(name)*]
@@ -577,6 +647,24 @@ static kh_inline khint_t __ac_Wang_hash(khint_t key)
 		code;												\
 	} }
 
+/*! @function
+  @abstract     Iterate over the keys in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  kvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach_key(h, kvar, code) \
+  { \
+    khint_t __i; \
+    for (__i = kh_begin(h); __i != kh_end(h); __i++) { \
+      if (!kh_exist(h, __i)) { \
+        continue; \
+      } \
+      (kvar) = kh_key(h, __i); \
+      code; \
+    } \
+  }
+
 /* More conenient interfaces */
 
 /*! @function
@@ -622,6 +710,21 @@ typedef const char *kh_cstr_t;
   @param  name  Name of the hash table [symbol]
   @param  khval_t  Type of values [type]
  */
-#define KHASH_MAP_INIT_STR(name, khval_t)								\
-	KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
-#endif /* __AC_KHASH_H */
+#define KHASH_MAP_INIT_STR(name, khval_t) \
+  KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
+
+/*! @function
+  @abstract     Return a literal for an empty hash table.
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_EMPTY_TABLE(name) \
+  ((kh_##name##_t) { \
+    .n_buckets = 0, \
+    .size = 0, \
+    .n_occupied = 0, \
+    .upper_bound = 0, \
+    .flags = NULL, \
+    .keys = NULL, \
+    .vals = NULL, \
+  })
+#endif  // NVIM_LIB_KHASH_H