X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/0f2d19dd46f83f41177f61d585732b32a866d613..26c22ea816ee20058ee60e526e9b2d5e4f415d02:/libguile/symbols.h

diff --git a/libguile/symbols.h b/libguile/symbols.h
index b1486ce7a..81a616e31 100644
--- a/libguile/symbols.h
+++ b/libguile/symbols.h
@@ -1,8 +1,8 @@
 /* classes: h_files */
 
-#ifndef SYMBOLSH
-#define SYMBOLSH
-/*	Copyright (C) 1995,1996 Free Software Foundation, Inc.
+#ifndef SCM_SYMBOLS_H
+#define SCM_SYMBOLS_H
+/* Copyright (C) 1995,1996,1997,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
@@ -16,7 +16,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.
@@ -40,102 +41,121 @@
  *
  * 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.  
+ * 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 */
+
+
+#include "libguile/__scm.h"
+
+
+/* SCM_SYMBOL_LENGTH(SYM) is the length of SYM's name in characters, and
+ * SCM_SYMBOL_CHARS(SYM) is the address of the first character of SYM's name.
  */
+
+#define SCM_SYMBOLP(x)              (SCM_NIMP (x) && (SCM_TYP7 (x) == scm_tc7_symbol))
+#define SCM_SYMBOL_LENGTH(x)        (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
+#define SCM_SET_SYMBOL_LENGTH(s, l) (SCM_SET_CELL_WORD_0 ((s), ((l) << 8) + scm_tc7_symbol))
+#define SCM_SYMBOL_CHARS(x)         ((char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_SET_SYMBOL_CHARS(s, c)  (SCM_SET_CELL_WORD_1 ((s), (c)))
+#define SCM_SYMBOL_HASH(X)          ((unsigned long) SCM_CELL_WORD_2 (X))
+#define SCM_SET_SYMBOL_HASH(X, v)   (SCM_SET_CELL_WORD_2 ((X), (v)))
+
+#define SCM_PROP_SLOTS(X)           (SCM_CELL_OBJECT_3 (X))
+#define SCM_SET_PROP_SLOTS(X, v)    (SCM_SET_CELL_OBJECT_3 ((X), (v)))
+#define SCM_SYMBOL_FUNC(X)	    (SCM_CAR (SCM_CELL_OBJECT_3 (X)))
+#define SCM_SET_SYMBOL_FUNC(X, v)   (SCM_SETCAR (SCM_CELL_OBJECT_3 (X), (v)))
+#define SCM_SYMBOL_PROPS(X)	    (SCM_CDR (SCM_CELL_OBJECT_3 (X)))
+#define SCM_SET_SYMBOL_PROPS(X, v)  (SCM_SETCDR (SCM_CELL_OBJECT_3 (X), (v)))
+
 
 
-#include "__scm.h"
+#ifdef GUILE_DEBUG
+extern SCM scm_sys_symbols (void);
+#endif
+extern SCM scm_mem2symbol (const char*, size_t);
+extern SCM scm_str2symbol (const char*);
+
+extern SCM scm_symbol_p (SCM x);
+extern SCM scm_symbol_to_string (SCM s);
+extern SCM scm_string_to_symbol (SCM s);
+
+extern SCM scm_symbol_fref (SCM s);
+extern SCM scm_symbol_pref (SCM s);
+extern SCM scm_symbol_fset_x (SCM s, SCM val);
+extern SCM scm_symbol_pset_x (SCM s, SCM val);
+
+extern SCM scm_symbol_hash (SCM s);
+extern SCM scm_gensym (SCM prefix);
+
+extern void scm_symbols_prehistory (void);
+extern void scm_init_symbols (void);
+
 
 
-extern int scm_symhash_dim;
+#if (SCM_DEBUG_DEPRECATED == 0)
 
-#define SCM_SYMBOLP(x) (SCM_TYP7S(x)==scm_tc7_ssymbol)
-#define SCM_LENGTH(x) (((unsigned long)SCM_CAR(x))>>8)
-#define SCM_LENGTH_MAX (0xffffffL)
-#define SCM_SETLENGTH(x, v, t) SCM_CAR(x) = ((v)<<8)+(t)
-#define SCM_SETCHARS SCM_SETCDR
-#define SCM_CHARS(x) ((char *)(SCM_CDR(x)))
-#define SCM_UCHARS(x) ((unsigned char *)(SCM_CDR(x)))
-#define SCM_SLOTS(x) ((SCM *) (* ((SCM *)SCM_CHARS(x) - 1)))
-#define SCM_SYMBOL_SLOTS 5
-#define SCM_SYMBOL_FUNC(X) (SCM_SLOTS(X)[0])
-#define SCM_SYMBOL_PROPS(X) (SCM_SLOTS(X)[1])
-#define SCM_SYMBOL_HASH(X) (*(unsigned long*)(&SCM_SLOTS(X)[2]))
-#define SCM_SYMBOL_MULTI_BYTE_SCM_STRINGP(X) (*(unsigned long*)(&SCM_SLOTS(X)[3]))
-
-#define SCM_ROSTRINGP(x) ((SCM_TYP7SD(x)==scm_tc7_string) || (SCM_TYP7S(x) == scm_tc7_ssymbol))
-#define SCM_ROCHARS(x) ((SCM_TYP7(x) == scm_tc7_substring) \
-			? SCM_INUM (SCM_CADR (x)) + SCM_CHARS (SCM_CDDR (x))  \
-			: SCM_CHARS (x))
-#define SCM_ROUCHARS(x) ((SCM_TYP7(x) == scm_tc7_substring) \
-			 ? SCM_INUM (SCM_CADR (x)) + SCM_UCHARS (SCM_CDDR (x))  \
-			 : SCM_UCHARS (x))
-#define SCM_ROLENGTH(x) SCM_LENGTH (x)
-#define SCM_SUBSTRP(x) ((SCM_TYP7S(x) == scm_tc7_substring))
+#define SCM_CHARS(x) ((char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_UCHARS(x) ((unsigned char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_SETCHARS(x, v) (SCM_SET_CELL_WORD_1 ((x), (scm_t_bits) (v)))
+#define SCM_SLOPPY_SUBSTRP(x) (SCM_SUBSTRP (x))
 #define SCM_SUBSTR_STR(x) (SCM_CDDR (x))
 #define SCM_SUBSTR_OFFSET(x) (SCM_CADR (x))
+#define SCM_LENGTH_MAX (0xffffffL)
+#define SCM_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
+#define SCM_SETLENGTH(x, v, t) (SCM_SET_CELL_WORD_0 ((x), ((v) << 8) + (t)))
+#define SCM_ROSTRINGP(x) (SCM_NIMP(x) && ((SCM_TYP7S(x)==scm_tc7_string) \
+			  || (SCM_TYP7(x) == scm_tc7_symbol)))
+#define SCM_ROLENGTH(x) SCM_LENGTH (x)
+#define SCM_ROCHARS(x) ((SCM_TYP7 (x) == scm_tc7_substring) \
+			? (SCM_INUM (SCM_CADR (x)) + SCM_STRING_CHARS (SCM_CDDR (x))) \
+			: ((SCM_TYP7 (x) == scm_tc7_string) \
+			   ? SCM_STRING_CHARS (x) \
+			   : SCM_SYMBOL_CHARS (x)))
+#define SCM_ROUCHARS(x) ((SCM_TYP7 (x) == scm_tc7_substring) \
+			 ? (SCM_INUM (SCM_CADR (x)) + SCM_STRING_UCHARS (SCM_CDDR (x))) \
+			 : ((SCM_TYP7 (x) == scm_tc7_string) \
+			    ? SCM_STRING_UCHARS (x) \
+			    : (unsigned char *) SCM_SYMBOL_CHARS (x)))
+#define SCM_SUBSTRP(x) (SCM_NIMP (x) && (SCM_TYP7 (x) == scm_tc7_substring))
+#define SCM_COERCE_SUBSTR(x) SCM_STRING_COERCE_0TERMINATION_X (x)
+#define scm_strhash(str, len, n) (scm_string_hash ((str), (len)) % (n))
 
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
+
+#if SCM_ENABLE_VCELLS
 
-
-#ifdef __STDC__
-extern unsigned long scm_strhash (unsigned char *str, scm_sizet len, unsigned long n);
 extern SCM scm_sym2vcell (SCM sym, SCM thunk, SCM definep);
 extern SCM scm_sym2ovcell_soft (SCM sym, SCM obarray);
 extern SCM scm_sym2ovcell (SCM sym, SCM obarray);
-extern SCM scm_intern_obarray_soft (char *name, scm_sizet len, SCM obarray, int softness);
-extern SCM scm_intern_obarray (char *name, scm_sizet len, SCM obarray);
-extern SCM scm_intern (char *name, scm_sizet len);
-extern SCM scm_intern0 (char * name);
-extern SCM scm_sysintern (char *name, SCM val);
-extern SCM scm_symbol_p(SCM x);
-extern SCM scm_symbol_to_string(SCM s);
-extern SCM scm_string_to_symbol(SCM s);
-extern SCM scm_string_to_obarray_symbol(SCM o, SCM s, SCM softp);
-extern SCM scm_intern_symbol(SCM o, SCM s);
-extern SCM scm_unintern_symbol(SCM o, SCM s);
+extern SCM scm_intern_obarray_soft (const char *name, size_t len, SCM obarray, unsigned int softness);
+extern SCM scm_intern_obarray (const char *name, size_t len, SCM obarray);
+extern SCM scm_intern (const char *name, size_t len);
+extern SCM scm_intern0 (const char *name);
+extern SCM scm_sysintern (const char *name, SCM val);
+extern SCM scm_sysintern0 (const char *name);
+extern SCM scm_sysintern0_no_module_lookup (const char *name);
+extern SCM scm_symbol_value0 (const char *name);
+
+extern SCM scm_string_to_obarray_symbol (SCM o, SCM s, SCM softp);
+extern SCM scm_intern_symbol (SCM o, SCM s);
+extern SCM scm_unintern_symbol (SCM o, SCM s);
 extern SCM scm_symbol_binding (SCM o, SCM s);
 extern SCM scm_symbol_interned_p (SCM o, SCM s);
 extern SCM scm_symbol_bound_p (SCM o, SCM s);
 extern SCM scm_symbol_set_x (SCM o, SCM s, SCM v);
-extern SCM scm_symbol_fref (SCM s);
-extern SCM scm_symbol_pref (SCM s);
-extern SCM scm_symbol_fset_x (SCM s, SCM val);
-extern SCM scm_symbol_pset_x (SCM s, SCM val);
-extern SCM scm_symbol_hash (SCM s);
-extern void scm_init_symbols (void);
 
-#else /* STDC */
-extern unsigned long scm_strhash ();
-extern SCM scm_sym2vcell ();
-extern SCM scm_sym2ovcell_soft ();
-extern SCM scm_sym2ovcell ();
-extern SCM scm_intern_obarray_soft ();
-extern SCM scm_intern_obarray ();
-extern SCM scm_intern ();
-extern SCM scm_intern0 ();
-extern SCM scm_sysintern ();
-extern SCM scm_symbol_p();
-extern SCM scm_symbol_to_string();
-extern SCM scm_string_to_symbol();
-extern SCM scm_string_to_obarray_symbol();
-extern SCM scm_intern_symbol();
-extern SCM scm_unintern_symbol();
-extern SCM scm_symbol_binding ();
-extern SCM scm_symbol_interned_p ();
-extern SCM scm_symbol_bound_p ();
-extern SCM scm_symbol_set_x ();
-extern SCM scm_symbol_fref ();
-extern SCM scm_symbol_pref ();
-extern SCM scm_symbol_fset_x ();
-extern SCM scm_symbol_pset_x ();
-extern SCM scm_symbol_hash ();
-extern void scm_init_symbols ();
-
-#endif /* STDC */
-
-
-
-
-
-
-#endif  /* SYMBOLSH */
+extern SCM scm_gentemp (SCM prefix, SCM obarray);
+
+extern void scm_init_symbols_deprecated (void);
+
+#endif /* SCM_ENABLE_VCELLS */
+
+#endif  /* SCM_SYMBOLS_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/