Lots of fixes to make guile (at some time) compile with strict typing.

[bpt/guile.git] / libguile / read.c

diff --git a/libguile/read.c b/libguile/read.c
index 7af3b73..051e755 100644 (file)
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -407,7 +407,7 @@ tryagain_no_flush_ws:
                got = scm_apply (sharp,
                                 SCM_MAKE_CHAR (c),
                                 scm_acons (port, SCM_EOL, SCM_EOL));
-               if (SCM_UNSPECIFIED == got)
+               if (SCM_EQ_P (got, SCM_UNSPECIFIED))
                  goto unkshrp;
                if (SCM_RECORD_POSITIONS_P)
                  return *copy = recsexpr (got, line, column,
@@ -611,7 +611,7 @@ scm_lreadparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
   if (')' == c)
     return SCM_EOL;
   scm_ungetc (c, port);
-  if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+  if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
     {
       ans = scm_lreadr (tok_buf, port, copy);
     closeit:
@@ -623,7 +623,7 @@ scm_lreadparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
   while (')' != (c = scm_flush_ws (port, name)))
     {
       scm_ungetc (c, port);
-      if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+      if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
        {
          SCM_SETCDR (tl, scm_lreadr (tok_buf, port, copy));
          goto closeit;
@@ -650,7 +650,7 @@ scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
   if (')' == c)
     return SCM_EOL;
   scm_ungetc (c, port);
-  if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+  if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
     {
       ans = scm_lreadr (tok_buf, port, copy);
       if (')' != (c = scm_flush_ws (port, name)))
@@ -667,7 +667,7 @@ scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
   while (')' != (c = scm_flush_ws (port, name)))
     {
       scm_ungetc (c, port);
-      if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+      if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
        {
          SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy));
          if (SCM_COPY_SOURCE_P)
@@ -731,13 +731,13 @@ SCM_DEFINE (scm_read_hash_extend, "read-hash-extend", 2, 0, 0,
            }
          break;
        }
-      if (chr == SCM_CAAR (this))
+      if (SCM_EQ_P (chr, SCM_CAAR (this)))
        {
          /* already in the alist.  */
          if (SCM_FALSEP (proc))
            {
              /* remove it.  */
-             if (prev == SCM_BOOL_F)
+             if (SCM_FALSEP (prev))
                {
                  *scm_read_hash_procedures =
                    SCM_CDR (*scm_read_hash_procedures);