diff options
| author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-11-02 10:36:31 +0000 |
|---|---|---|
| committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-11-02 10:36:31 +0000 |
| commit | b24b5e13bf0de4825fcd8b5b36f454ef1ddc3493 (patch) | |
| tree | 0d6b82a4b681a98e5b09ce2e6beba80c4be8489e /libguile/symbols.h | |
| parent | 66460dfba3bbce33320df9d44652c47d545b4332 (diff) | |
| download | guile-b24b5e13bf0de4825fcd8b5b36f454ef1ddc3493.tar.gz | |
* Get rid of calls to SCM_ROSTRINGP.
* Fix some string/symbol output problems with regards to substrings.
* Fix error output to prefer procedure name parameters over stack data.
* Use SCM_(SET_)?FILENAME where appropriate.
* Prefer calling scm_remember over scm_protect/unprotect_object calls.
Diffstat (limited to 'libguile/symbols.h')
| -rw-r--r-- | libguile/symbols.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/symbols.h b/libguile/symbols.h index e742f18b5..6160afc49 100644 --- a/libguile/symbols.h +++ b/libguile/symbols.h @@ -75,8 +75,6 @@ extern int scm_symhash_dim; #define SCM_SYMBOL_HASH(X) (SCM_CELL_WORD_2 (X)) #define SCM_SET_SYMBOL_HASH(X, v) (SCM_SET_CELL_WORD_2 ((X), (v))) -#define SCM_ROSTRINGP(x) (SCM_NIMP(x) && ((SCM_TYP7S(x)==scm_tc7_string) \ - || (SCM_TYP7(x) == scm_tc7_symbol))) #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) \ @@ -133,6 +131,8 @@ extern void scm_init_symbols (void); #define SCM_SUBSTR_STR(x) (SCM_CDDR (x)) #define SCM_SUBSTR_OFFSET(x) (SCM_CADR (x)) #define SCM_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8) +#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_SUBSTRP(x) (SCM_NIMP (x) && (SCM_TYP7 (x) == scm_tc7_substring)) #define SCM_COERCE_SUBSTR(x) SCM_STRING_COERCE_0TERMINATION_X (x) |