Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
	libguile/continuations.c
	libguile/gc-freelist.c
	libguile/gc-mark.c
	libguile/symbols.c
	libguile/threads.c
	module/ice-9/boot-9.scm

diff --cc configure.in
Simple merge

diff --cc libguile/Makefile.am
Simple merge

diff --cc libguile/continuations.c
Simple merge

diff --cc libguile/debug.c
Simple merge

diff --cc libguile/dynwind.c
Simple merge

diff --cc libguile/eval.c
index 18cd3b1,48b2299..a1b352d
--- 1/libguile/eval.c
--- 2/libguile/eval.c
+++ b/libguile/eval.c
@@@ -3663,14 -3688,36 +3689,24 @@@ scm_closure (SCM code, SCM env
  
  scm_t_bits scm_tc16_promise;
  
- SCM 
- scm_makprom (SCM code)
- {
+ SCM_DEFINE (scm_make_promise, "make-promise", 1, 0, 0, 
+           (SCM thunk),
+           "Create a new promise object.\n\n"
+             "@code{make-promise} is a procedural form of @code{delay}.\n"
+             "These two expressions are equivalent:\n"
+             "@lisp\n"
+           "(delay @var{exp})\n"
+           "(make-promise (lambda () @var{exp}))\n"
+             "@end lisp\n")
+ #define FUNC_NAME s_scm_make_promise
+ {
+   SCM_VALIDATE_THUNK (1, thunk);
    SCM_RETURN_NEWSMOB2 (scm_tc16_promise,
-                      SCM_UNPACK (code),
+                      SCM_UNPACK (thunk),
                       scm_make_recursive_mutex ());
  }
+ #undef FUNC_NAME
  
 -static SCM
 -promise_mark (SCM promise)
 -{
 -  scm_gc_mark (SCM_PROMISE_MUTEX (promise));
 -  return SCM_PROMISE_DATA (promise);
 -}
 -
 -static size_t
 -promise_free (SCM promise)
 -{
 -  return 0;
 -}
  
  static int 
  promise_print (SCM exp, SCM port, scm_print_state *pstate)

diff --cc libguile/goops.c
Simple merge

diff --cc libguile/init.c
Simple merge

diff --cc libguile/load.c
Simple merge

diff --cc libguile/macros.c
Simple merge

diff --cc libguile/modules.c
Simple merge

diff --cc libguile/objects.c
Simple merge

diff --cc libguile/procs.c
Simple merge

diff --cc libguile/symbols.c
index 0814942,e208e5a..a15dfa4
--- 1/libguile/symbols.c
--- 2/libguile/symbols.c
+++ b/libguile/symbols.c
@@@ -147,13 -119,27 +147,31 @@@ lookup_interned_symbol (const char *nam
        ;
      }
  
 -  return SCM_BOOL_F;
 +  if (SCM_HASHTABLE_N_ITEMS (symbols) < SCM_HASHTABLE_LOWER (symbols))
 +    /* We removed many symbols in this pass so trigger a rehashing.  */
 +    scm_i_rehash (symbols, scm_i_hash_symbol, 0, "lookup_interned_symbol");
 +
 +  return result;
  }
  
+ /* Intern SYMBOL, an uninterned symbol.  */
+ static void
+ intern_symbol (SCM symbol)
+ {
+   SCM slot, cell;
+   unsigned long hash;
+ 
+   hash = scm_i_symbol_hash (symbol) % SCM_HASHTABLE_N_BUCKETS (symbols);
+   slot = SCM_HASHTABLE_BUCKET (symbols, hash);
+   cell = scm_cons (symbol, SCM_UNDEFINED);
+ 
+   SCM_SET_HASHTABLE_BUCKET (symbols, hash, scm_cons (cell, slot));
+   SCM_HASHTABLE_INCREMENT (symbols);
+ 
+   if (SCM_HASHTABLE_N_ITEMS (symbols) > SCM_HASHTABLE_UPPER (symbols))
+     scm_i_rehash (symbols, scm_i_hash_symbol, 0, "intern_symbol");
+ }
+ 
  static SCM
  scm_i_c_mem2symbol (const char *name, size_t len)
  {

diff --cc libguile/threads.c
index 8ba25f7,bb874e2..fc13179
--- 1/libguile/threads.c
--- 2/libguile/threads.c
+++ b/libguile/threads.c
@@@ -493,12 -528,11 +493,13 @@@ guilify_self_2 (SCM parent
  {
    scm_i_thread *t = SCM_I_CURRENT_THREAD;
  
 +  t->guile_mode = 1;
 +
    SCM_NEWSMOB (t->handle, scm_tc16_thread, t);
 -  scm_gc_register_collectable_memory (t, sizeof (scm_i_thread), "thread");
 +
    t->continuation_root = scm_cons (t->handle, SCM_EOL);
    t->continuation_base = t->base;
+   t->vm = SCM_BOOL_F;
  
    if (scm_is_true (parent))
      t->dynamic_state = scm_make_dynamic_state (parent);

diff --cc libguile/threads.h
Simple merge

diff --cc module/ice-9/boot-9.scm
index 1a0283d,29c89b1..bb284cf
--- 1/ice-9/boot-9.scm
--- 2/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; installed-scm-file
  
- ;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008
 -;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009
++;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
  ;;;; Free Software Foundation, Inc.
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or

diff --cc test-suite/Makefile.am
Simple merge