2002-07-20 Han-Wen <hanwen@cs.uu.nl>

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

diff --git a/libguile/variable.h b/libguile/variable.h
index b9d84fd..7d03509 100644 (file)
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -1,22 +1,24 @@
 /* classes: h_files */
 
-#ifndef VARIABLEH
-#define VARIABLEH
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
- * 
+#ifndef SCM_VARIABLE_H
+#define SCM_VARIABLE_H
+
+/* Copyright (C) 1995,1996,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, 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.
@@ -40,48 +42,39 @@
  *
  * 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 "__scm.h"
+ * If you do not wish that, delete this exception notice.  */
 
 \f
 
+#include "libguile/__scm.h"
+#include "libguile/smob.h"
+
+\f
 
 /* Variables 
  */
-extern int scm_tc16_variable;
-
-#define SCM_VARVCELL(V)        SCM_CDR(V)
-#define SCM_VARIABLEP(X)       (scm_tc16_variable == SCM_CAR(X))
-#define SCM_UDSCM_VARIABLEP(X)         (SCM_VARIABLEP(X) && SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
-#define SCM_DEFSCM_VARIABLEP(X)        (SCM_VARIABLEP(X) && !SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
+#define SCM_VARIABLEP(X)      (!SCM_IMP (X) && SCM_TYP7(X) == scm_tc7_variable)
+#define SCM_VARIABLE_REF(V)   SCM_CELL_OBJECT_1 (V)
+#define SCM_VARIABLE_SET(V, X) SCM_SET_CELL_OBJECT_1 (V, X)
+#define SCM_VARIABLE_LOC(V)   ((SCM *) SCM_CELL_WORD_LOC ((V), 1))
 
 \f
-#ifdef __STDC__
-extern SCM scm_make_variable (SCM init, SCM name_hint);
-extern SCM scm_make_udvariable (SCM name_hint);
-extern SCM scm_variable_p (SCM obj);
-extern SCM scm_variable_ref (SCM var);
-extern SCM scm_variable_set_x (SCM var, SCM val);
-extern SCM scm_builtin_variable (SCM name);
-extern SCM scm_variable_bound_p (SCM var);
-extern void scm_init_variable (void);
-
-#else /* STDC */
-extern SCM scm_make_variable ();
-extern SCM scm_make_udvariable ();
-extern SCM scm_variable_p ();
-extern SCM scm_variable_ref ();
-extern SCM scm_variable_set_x ();
-extern SCM scm_builtin_variable ();
-extern SCM scm_variable_bound_p ();
-extern void scm_init_variable ();
-
-#endif /* STDC */
 
+SCM_API SCM scm_make_variable (SCM init);
+SCM_API SCM scm_make_undefined_variable (void);
+SCM_API SCM scm_variable_p (SCM obj);
+SCM_API SCM scm_variable_ref (SCM var);
+SCM_API SCM scm_variable_set_x (SCM var, SCM val);
+SCM_API SCM scm_variable_bound_p (SCM var);
 
+SCM_API void scm_i_variable_print (SCM var, SCM port, scm_print_state *pstate);
 
+SCM_API void scm_init_variable (void);
 
+#endif  /* SCM_VARIABLE_H */
 
-#endif  /* VARIABLEH */
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/