* Removed deprecated stuff.

* Some more renamings to SCM_<filename>_H.

1 files changed, 5 insertions, 64 deletions

diff --git a/libguile/symbols.h b/libguile/symbols.h
index f1417b4b5..e68ee1f9f 100644
--- a/libguile/symbols.h
+++ b/libguile/symbols.h
@@ -2,18 +2,19 @@
 
 #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
  * 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,
@@ -52,7 +53,7 @@
  * 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_SYMBOLP(x)              (!SCM_IMP (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)))
@@ -90,66 +91,6 @@ extern SCM scm_gensym (SCM prefix);
 extern void scm_symbols_prehistory (void);
 extern void scm_init_symbols (void);
 
-
-
-#if (SCM_DEBUG_DEPRECATED == 0)
-
-#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
-
-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 (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_gentemp (SCM prefix, SCM obarray);
-
-extern void scm_init_symbols_deprecated (void);
-
-#endif /* SCM_ENABLE_VCELLS */
-
 #endif  /* SCM_SYMBOLS_H */
 
 /*