mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-18 01:30:27 +02:00
Code Activity

Replace "scm_*_t" with "scm_t_*", except "scm_lisp_t".

Browse source
This commit is contained in:
Marius Vollmer 2001-06-14 20:14:09 +00:00
parent b629af45cb
commit 1385d8aee3
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/eval.c
View file

@ -1044,7 +1044,7 @@ scm_m_cont (SCM xorig, SCM env SCM_UNUSED)
/* Multi-language support */ /* Multi-language support */
SCM_GLOBAL_SYMBOL (scm_lisp_nil, "nil"); SCM_GLOBAL_SYMBOL (scm_lisp_nil, "nil");
SCM_GLOBAL_SYMBOL (scm_t_lisp, "t"); SCM_GLOBAL_SYMBOL (scm_lisp_t, "t");
SCM_SYNTAX (s_nil_cond, "nil-cond", scm_makmmacro, scm_m_nil_cond); SCM_SYNTAX (s_nil_cond, "nil-cond", scm_makmmacro, scm_m_nil_cond);
@ -2419,7 +2419,7 @@ dispatch:
case (SCM_ISYMNUM (SCM_IM_T_IFY)): case (SCM_ISYMNUM (SCM_IM_T_IFY)):
x = SCM_CDR (x); x = SCM_CDR (x);
RETURN (SCM_NFALSEP (EVALCAR (x, env)) ? scm_t_lisp : scm_lisp_nil) RETURN (SCM_NFALSEP (EVALCAR (x, env)) ? scm_lisp_t : scm_lisp_nil)
case (SCM_ISYMNUM (SCM_IM_0_COND)): case (SCM_ISYMNUM (SCM_IM_0_COND)):
proc = SCM_CDR (x); proc = SCM_CDR (x);
@ -4125,7 +4125,7 @@ scm_init_eval ()
#endif #endif
scm_c_define ("nil", scm_lisp_nil); scm_c_define ("nil", scm_lisp_nil);
scm_c_define ("t", scm_t_lisp); scm_c_define ("t", scm_lisp_t);
scm_add_feature ("delay"); scm_add_feature ("delay");
} }

4
libguile/lang.c
View file

@ -114,7 +114,7 @@ SCM_DEFINE (scm_null, "null", 1, 0, 0,
"return LISP's nil otherwise.") "return LISP's nil otherwise.")
#define FUNC_NAME s_scm_null #define FUNC_NAME s_scm_null
{ {
return (SCM_NILP (x) || SCM_NULLP (x) || SCM_FALSEP (x)) ? scm_t_lisp : scm_lisp_nil; return (SCM_NILP (x) || SCM_NULLP (x) || SCM_FALSEP (x)) ? scm_lisp_t : scm_lisp_nil;
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -146,7 +146,7 @@ SCM_DEFINE1 (scm_nil_eq, "nil-eq", scm_tc7_rpsubr,
return ((SCM_EQ_P (x, y) return ((SCM_EQ_P (x, y)
|| (SCM_NILP (x) && (SCM_NULLP (y) || SCM_FALSEP (y))) || (SCM_NILP (x) && (SCM_NULLP (y) || SCM_FALSEP (y)))
|| (SCM_NILP (y) && (SCM_NULLP (x) || SCM_FALSEP (x)))) || (SCM_NILP (y) && (SCM_NULLP (x) || SCM_FALSEP (x))))
? scm_t_lisp ? scm_lisp_t
: scm_lisp_nil); : scm_lisp_nil);
} }
#undef FUNC_NAME #undef FUNC_NAME

2
libguile/lang.h
View file

@ -49,7 +49,7 @@
extern SCM scm_lisp_nil; extern SCM scm_lisp_nil;
extern SCM scm_t_lisp; extern SCM scm_lisp_t;
#define SCM_NILP(x) (SCM_EQ_P ((x), scm_lisp_nil)) #define SCM_NILP(x) (SCM_EQ_P ((x), scm_lisp_nil))
#define SCM_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x)) #define SCM_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x))