guile/guile-core/libguile lang.h lang.c eval.c

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/06/14 13:14:09

Modified files:
        guile-core/libguile: lang.h lang.c eval.c 

Log message:
        Replace "scm_*_t" with "scm_t_*", except "scm_lisp_t".

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/lang.h.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/lang.c.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/eval.c.diff?cvsroot=OldCVS&tr1=1.229&tr2=1.230&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/eval.c
diff -u guile/guile-core/libguile/eval.c:1.229 
guile/guile-core/libguile/eval.c:1.230
--- guile/guile-core/libguile/eval.c:1.229      Thu Jun 14 12:50:43 2001
+++ guile/guile-core/libguile/eval.c    Thu Jun 14 13:14:09 2001
@@ -1044,7 +1044,7 @@
 /* Multi-language support */
 
 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);
 
@@ -2419,7 +2419,7 @@
            
        case (SCM_ISYMNUM (SCM_IM_T_IFY)):
          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)):
          proc = SCM_CDR (x);
@@ -4125,7 +4125,7 @@
 #endif
 
   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");
 }
Index: guile/guile-core/libguile/lang.c
diff -u guile/guile-core/libguile/lang.c:1.20 
guile/guile-core/libguile/lang.c:1.21
--- guile/guile-core/libguile/lang.c:1.20       Thu Jun 14 12:50:43 2001
+++ guile/guile-core/libguile/lang.c    Thu Jun 14 13:14:09 2001
@@ -114,7 +114,7 @@
            "return LISP's nil otherwise.")
 #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
 
@@ -146,7 +146,7 @@
   return ((SCM_EQ_P (x, y)
           || (SCM_NILP (x) && (SCM_NULLP (y) || SCM_FALSEP (y)))
           || (SCM_NILP (y) && (SCM_NULLP (x) || SCM_FALSEP (x))))
-         ? scm_t_lisp
+         ? scm_lisp_t
          : scm_lisp_nil);
 }
 #undef FUNC_NAME
Index: guile/guile-core/libguile/lang.h
diff -u guile/guile-core/libguile/lang.h:1.7 
guile/guile-core/libguile/lang.h:1.8
--- guile/guile-core/libguile/lang.h:1.7        Thu Jun 14 12:50:43 2001
+++ guile/guile-core/libguile/lang.h    Thu Jun 14 13:14:09 2001
@@ -49,7 +49,7 @@
 
 
 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_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x))