* guile.texi: change MANUAL_EDITION to MANUAL-EDITION so we don't

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

diff --git a/libguile/macros.h b/libguile/macros.h
index 7871be1..b41d4f2 100644 (file)
--- a/libguile/macros.h
+++ b/libguile/macros.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef MACROSH
-#define MACROSH
-/*     Copyright (C) 1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_MACROS_H
+#define SCM_MACROS_H
+
+/* Copyright (C) 1998,2000,2001,2002 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,
@@ -42,29 +43,38 @@
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
+
 \f
 
 #include "libguile/__scm.h"
 
 \f
 
-#define SCM_ASSYNT(_cond, _arg, _pos, _subr) if(!(_cond))scm_wta(_arg, (char *)_pos, _subr);
+#define SCM_ASSYNT(_cond, _msg, _subr) \
+  if (!(_cond)) scm_misc_error (_subr, _msg, SCM_EOL);
+
+#define SCM_MACROP(x) SCM_TYP16_PREDICATE (scm_tc16_macro, (x))
+#define SCM_MACRO_TYPE(m) (SCM_CELL_WORD_0 (m) >> 16)
+#define SCM_MACRO_CODE(m) SCM_CELL_OBJECT_1 (m)
+
+SCM_API scm_t_bits scm_tc16_macro;
 
-extern long scm_tc16_macro;
+SCM_API SCM scm_makacro (SCM code);
+SCM_API SCM scm_makmmacro (SCM code);
+SCM_API SCM scm_macro_p (SCM obj);
+SCM_API SCM scm_macro_type (SCM m);
+SCM_API SCM scm_macro_name (SCM m);
+SCM_API SCM scm_macro_transformer (SCM m);
+SCM_API SCM scm_make_synt (const char *name,
+                          SCM (*macroizer) (SCM),
+                          SCM (*fcn) ());
+SCM_API void scm_init_macros (void);
 
-extern SCM scm_makacro (SCM code);
-extern SCM scm_makmacro (SCM code);
-extern SCM scm_makmmacro (SCM code);
-extern SCM scm_macro_p (SCM obj);
-extern SCM scm_macro_type (SCM m);
-extern SCM scm_macro_name (SCM m);
-extern SCM scm_macro_transformer (SCM m);
-extern SCM scm_make_synt (const char *name,
-                          SCM (*macroizer) (SCM),
-                          SCM (*fcn) ());
-extern void scm_init_macros (void);
+#if SCM_ENABLE_DEPRECATED == 1
+SCM_API SCM scm_makmacro (SCM code);
+#endif
 
-#endif /* MACROSH */
+#endif  /* SCM_MACROS_H */
 
 /*
   Local Variables: