[ViewVC] Diff of: cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.32 by root, Sat Nov 28 10:56:45 2015 UTC vs.
Revision 1.33 by root, Sat Nov 28 10:59:14 2015 UTC

 /* ========== oblist implementation  ========== */
 #ifndef USE_OBJECT_LIST
+static int
-static int hash_fn (const char *key, int table_size);
+hash_fn (const char *key, int table_size)
+{
+  const unsigned char *p = key;
+  uint32_t hash = 2166136261;
+  while (*p)
+    hash = (hash ^ *p++) * 16777619;
+  return hash % table_size;
+}
 static pointer
 oblist_initial_value (SCHEME_P)
 {
   return mk_vector (SCHEME_A_ 461);     /* probably should be bigger */
 #define is_true(p)       ((p) != S_F)
 #define is_false(p)      ((p) == S_F)
 /* ========== Environment implementation  ========== */
-#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
-static int
-hash_fn (const char *key, int table_size)
-{
-  const unsigned char *p = key;
-  uint32_t hash = 2166136261;
-  while (*p)
-    hash = (hash ^ *p++) * 16777619;
-  return hash % table_size;
-}
-#endif
 #ifndef USE_ALIST_ENV
 /*
  * In this implementation, each frame of the environment may be
  * a hash table: a vector of alists hashed by variable name.
 sym_hash (pointer sym, uint32_t size)
 {
   uintptr_t ptr = (uintptr_t)sym;
 #if 0
-  /* tqable size is prime, so why mix */
+  /* table size is prime, so why mix */
   ptr += ptr >> 32;
   ptr += ptr >> 16;
   ptr += ptr >>  8;
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines