2002-01-28 Stefan Jahn <stefan@lkcc.org>
[bpt/guile.git] / libguile / root.h
index 682caca..ca4a7ef 100644 (file)
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef ROOTH
-#define ROOTH
+#ifndef SCM_ROOT_H
+#define SCM_ROOT_H
 
-/*     Copyright (C) 1996,1998 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1996,1998,2000,2001 Free Software Foundation, Inc.
+ *
  * 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, 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 software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-\f
-
 \f
 
 #include "libguile/__scm.h"
 #define scm_undefineds scm_sys_protects[2]
 #define scm_nullvect scm_sys_protects[3]
 #define scm_nullstr scm_sys_protects[4]
-#define scm_symhash scm_sys_protects[5]
-#define scm_weak_symhash scm_sys_protects[6]
-#define scm_symhash_vars scm_sys_protects[7]
-#define scm_keyword_obarray scm_sys_protects[8]
-#define scm_type_obj_list scm_sys_protects[9]
-#define scm_first_type scm_sys_protects[10]
-#define scm_stand_in_procs scm_sys_protects[11]
-#define scm_object_whash scm_sys_protects[12]
-#define scm_permobjs scm_sys_protects[13]
-#define scm_asyncs scm_sys_protects[14]
-#define scm_protects scm_sys_protects[15]
+#define scm_keyword_obarray scm_sys_protects[5]
+#define scm_stand_in_procs scm_sys_protects[6]
+#define scm_object_whash scm_sys_protects[7]
+#define scm_permobjs scm_sys_protects[8]
+#define scm_asyncs scm_sys_protects[9]
+#define scm_protects scm_sys_protects[10]
+#define scm_properties_whash scm_sys_protects[11]
+#define scm_gc_registered_roots scm_sys_protects[12]
 #ifdef DEBUG_EXTENSIONS
-#define scm_source_whash scm_sys_protects[16]
-#define SCM_NUM_PROTECTS 17
+#define scm_source_whash scm_sys_protects[13]
+#define SCM_NUM_PROTECTS 14
 #else
-#define SCM_NUM_PROTECTS 16
+#define SCM_NUM_PROTECTS 13
 #endif
 
-extern SCM scm_sys_protects[];
+SCM_API SCM scm_sys_protects[];
 
 \f
 
-extern long scm_tc16_root;
+SCM_API scm_t_bits scm_tc16_root;
 
-#define SCM_ROOTP(obj) (SCM_NIMP(obj) && (scm_tc16_root == SCM_TYP16 (obj)))
-#define SCM_ROOT_STATE(root) ((scm_root_state *) SCM_CDR (root))
+#define SCM_ROOTP(obj)       SCM_TYP16_PREDICATE (scm_tc16_root, obj)
+#define SCM_ROOT_STATE(root) ((scm_root_state *) SCM_CELL_WORD_1 (root))
 
 typedef struct scm_root_state
 {
@@ -96,11 +89,9 @@ typedef struct scm_root_state
 
   SCM rootcont;
   SCM dynwinds;
-  SCM continuation_stack;
-  SCM continuation_stack_ptr;
 #ifdef DEBUG_EXTENSIONS
   /* It is very inefficient to have this variable in the root state. */
-  scm_debug_frame *last_debug_frame;
+  scm_t_debug_frame *last_debug_frame;
 #endif
 
   SCM progargs;                        /* vestigial */
@@ -116,9 +107,6 @@ typedef struct scm_root_state
 
   SCM fluids;
 
-  SCM system_transformer;
-  SCM top_level_lookup_closure_var;
-
   SCM handle;                  /* The root object for this root state */
   SCM parent;                  /* The parent root object */
 } scm_root_state;
@@ -129,8 +117,6 @@ typedef struct scm_root_state
 
 #define scm_rootcont                   (scm_root->rootcont)
 #define scm_dynwinds                   (scm_root->dynwinds)
-#define scm_continuation_stack         (scm_root->continuation_stack)
-#define scm_continuation_stack_ptr     (scm_root->continuation_stack_ptr)
 #define scm_progargs                   (scm_root->progargs)
 #ifdef USE_THREADS
 #define scm_last_debug_frame           (scm_root->last_debug_frame)
@@ -143,33 +129,29 @@ typedef struct scm_root_state
 #define scm_def_outp                   (scm_root->def_outp)
 #define scm_def_errp                   (scm_root->def_errp)
 #define scm_cur_loadp                  (scm_root->cur_loadp)
-#define scm_top_level_lookup_closure_var \
-                                       (scm_root->top_level_lookup_closure_var)
-#define scm_system_transformer         (scm_root->system_transformer)
      
 #ifdef USE_THREADS
 #define scm_root ((scm_root_state *) SCM_THREAD_LOCAL_DATA)
 #define scm_set_root(new_root) SCM_SET_THREAD_LOCAL_DATA (new_root)
 #else /* USE_THREADS */
-extern struct scm_root_state *scm_root;
+SCM_API struct scm_root_state *scm_root;
 #define scm_set_root(new_root) (scm_root = (new_root))
 #endif /* USE_THREADS */
 
 \f
 
-extern SCM scm_make_root (SCM parent);
-extern SCM scm_internal_cwdr (scm_catch_body_t body,
-                              void *body_data,
-                              scm_catch_handler_t handler,
-                              void *handler_data,
-                              SCM_STACKITEM *stack_start);
-extern SCM scm_call_with_dynamic_root (SCM thunk, SCM handler);
-extern SCM scm_dynamic_root (void);
-extern SCM scm_apply_with_dynamic_root (SCM proc, SCM a1, SCM args, SCM handler);
-extern SCM scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void * closure);
-extern void scm_init_root (void);
-
-#endif  /* ROOTH */
+SCM_API SCM scm_make_root (SCM parent);
+SCM_API SCM scm_internal_cwdr (scm_t_catch_body body,
+                              void *body_data,
+                              scm_t_catch_handler handler,
+                              void *handler_data,
+                              SCM_STACKITEM *stack_start);
+SCM_API SCM scm_call_with_dynamic_root (SCM thunk, SCM handler);
+SCM_API SCM scm_dynamic_root (void);
+SCM_API SCM scm_apply_with_dynamic_root (SCM proc, SCM a1, SCM args, SCM handler);
+SCM_API void scm_init_root (void);
+
+#endif  /* SCM_ROOT_H */
 
 /*
   Local Variables: