* ports.c (scm_port_closed_p): new procedure, implements

[bpt/guile.git] / libguile / snarf.h

diff --git a/libguile/snarf.h b/libguile/snarf.h
index 4304d99..dbb6c91 100644 (file)
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -1,3 +1,4 @@
+
 /* classes: h_files */
 
 /* Macros for snarfing initialization actions from C source. */
@@ -5,7 +6,7 @@
 #ifndef LIBGUILE_SNARF_H
 #define LIBGUILE_SNARF_H
 
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1997,1998, 1999 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
@@ -19,7 +20,8 @@
  * 
  * 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -48,31 +50,43 @@
 
 #ifndef SCM_MAGIC_SNARFER
 #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-       static char RANAME[]=STR
+       static const char RANAME[]=STR
+#define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF)  \
+       static const char RANAME[]=STR; \
+       static SCM GF = 0
 #define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
-       static char RANAME[]=STR
-#else
-#ifdef __cplusplus
-#if REQ == 0 && OPT == 0 && VAR == 0
-#define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*) ()) CFN)
+       static const char RANAME[]=STR
+#define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF) \
+       static const char RANAME[]=STR; \
+       static SCM GF = 0
 #else
+#if defined(__cplusplus) || defined(GUILE_CPLUSPLUS_SNARF)
 #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*) (SCM, ...)) CFN)
-#endif
-#if TYPE == scm_tc7_subr_0
+%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*)(...))CFN)
+#define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF)  \
+%%%    scm_make_gsubr_with_generic (RANAME, REQ, OPT, VAR, (SCM (*)(...))CFN, &GF)
 #define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
-%%%    scm_make_subr(RANAME, TYPE, (SCM (*)(...)) CFN)
+%%%    scm_make_subr(RANAME, TYPE, (SCM (*)(...))CFN)
+#define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF)  \
+%%%    scm_make_subr_with_generic(RANAME, TYPE, (SCM (*)(...))CFN, &GF)
 #else
-#define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
-%%%    scm_make_subr(RANAME, TYPE, (SCM (*)(...)) CFN)
-#endif
-#else /* __cplusplus */
 #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, CFN)
+%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*)()) CFN)
+#define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF)  \
+%%%    scm_make_gsubr_with_generic (RANAME, REQ, OPT, VAR, (SCM (*)()) CFN, &GF)
 #define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
 %%%    scm_make_subr(RANAME, TYPE, CFN)
-#endif /* __cplusplus */
+#define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF)  \
+%%%    scm_make_subr_with_generic(RANAME, TYPE, CFN, &GF)
+#endif
+#endif
+
+#ifndef SCM_MAGIC_SNARFER
+#define SCM_SYNTAX(RANAME, STR, TYPE, CFN)  \
+       static const char RANAME[]=STR
+#else
+#define SCM_SYNTAX(RANAME, STR, TYPE, CFN)  \
+%%%    scm_make_synt (RANAME, TYPE, CFN)
 #endif
 
 #ifndef SCM_MAGIC_SNARFER
@@ -83,22 +97,62 @@
 %%%    C_NAME = scm_permanent_object (SCM_CAR (scm_intern0 (SCHEME_NAME)))
 #endif
 
+#ifndef SCM_MAGIC_SNARFER
+#define SCM_GLOBAL_SYMBOL(c_name, scheme_name) \
+       SCM c_name = SCM_BOOL_F
+#else
+#define SCM_GLOBAL_SYMBOL(C_NAME, SCHEME_NAME) \
+%%%    C_NAME = scm_permanent_object (SCM_CAR (scm_intern0 (SCHEME_NAME)))
+#endif
+
+#ifndef SCM_MAGIC_SNARFER
+#define SCM_KEYWORD(c_name, scheme_name) \
+       static SCM c_name = SCM_BOOL_F
+#else
+#define SCM_KEYWORD(C_NAME, SCHEME_NAME) \
+%%%    C_NAME = scm_permanent_object (scm_c_make_keyword (SCHEME_NAME))
+#endif
+
+#ifndef SCM_MAGIC_SNARFER
+#define SCM_GLOBAL_KEYWORD(c_name, scheme_name) \
+       SCM c_name = SCM_BOOL_F
+#else
+#define SCM_GLOBAL_KEYWORD(C_NAME, SCHEME_NAME) \
+%%%    C_NAME = scm_permanent_object (scm_c_make_keyword (SCHEME_NAME))
+#endif
 
 #ifndef SCM_MAGIC_SNARFER
-#define SCM_GLOBAL(c_name, scheme_name) \
+#define SCM_VCELL(c_name, scheme_name) \
        static SCM c_name = SCM_BOOL_F
 #else
-#define SCM_GLOBAL(C_NAME, SCHEME_NAME) \
+#define SCM_VCELL(C_NAME, SCHEME_NAME) \
 %%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, SCM_BOOL_F)
 #endif
 
+#ifndef SCM_MAGIC_SNARFER
+#define SCM_GLOBAL_VCELL(c_name, scheme_name) \
+       SCM c_name = SCM_BOOL_F
+#else
+#define SCM_GLOBAL_VCELL(C_NAME, SCHEME_NAME) \
+%%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, SCM_BOOL_F)
+#endif
+
+#ifndef SCM_MAGIC_SNARFER
+#define SCM_VCELL_INIT(c_name, scheme_name, init_val) \
+       static SCM c_name = SCM_BOOL_F
+#else
+#define SCM_VCELL_INIT(C_NAME, SCHEME_NAME, init_val) \
+%%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, init_val)
+#endif
 
 #ifndef SCM_MAGIC_SNARFER
-#define SCM_CONST_LONG(C_NAME, SCHEME_NAME,VALUE) \
-       static SCM C_NAME = SCM_BOOL_F
+#define SCM_GLOBAL_VCELL_INIT(c_name, scheme_name, init_val) \
+       SCM c_name = SCM_BOOL_F
 #else
-#define SCM_CONST_LONG(C_NAME, SCHEME_NAME,VALUE) \
-%%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, scm_long2num (VALUE))
+#define SCM_GLOBAL_VCELL_INIT(C_NAME, SCHEME_NAME, init_val) \
+%%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, init_val)
 #endif
 
+#define SCM_CONST_LONG(C_NAME, SCHEME_NAME,VALUE) SCM_VCELL_INIT(C_NAME, SCHEME_NAME, scm_long2num(VALUE))
+
 #endif /* LIBGUILE_SNARF_H */