mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

fix type errors

Browse source 
* libguile/numbers.c (scm_logand): Fix a type error (comparing a SCM
  against an int, when we really wanted to compare the unpacked
  fixnum).

* libguile/ports.c (scm_i_set_conversion_strategy_x): Check
  scm_conversion_strategy_init, not scm_conversion_strategy.

* libguile/read.c (recsexpr): Fix loops to avoid strange test of SCM
  values.
This commit is contained in:
Andy Wingo 2011-05-13 10:32:46 +02:00
parent 210c0325d3
commit 2e16a342f2
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/numbers.c
View file

@ -4112,7 +4112,7 @@ SCM scm_logand (SCM n1, SCM n2)
else if SCM_BIGP (n2) else if SCM_BIGP (n2)
{ {
intbig: intbig:
if (n1 == 0) if (nn1 == 0)
return SCM_INUM0; return SCM_INUM0;
{ {
SCM result_z = scm_i_mkbig (); SCM result_z = scm_i_mkbig ();

2
libguile/ports.c
View file

@ -2317,7 +2317,7 @@ scm_i_set_conversion_strategy_x (SCM port,
if (scm_is_false (port)) if (scm_is_false (port))
{ {
/* Set the default encoding for future ports. */ /* Set the default encoding for future ports. */
if (!scm_conversion_strategy if (!scm_conversion_strategy_init
|| !scm_is_fluid (SCM_VARIABLE_REF (scm_conversion_strategy))) || !scm_is_fluid (SCM_VARIABLE_REF (scm_conversion_strategy)))
scm_misc_error (NULL, "tried to set conversion strategy fluid before it is initialized", scm_misc_error (NULL, "tried to set conversion strategy fluid before it is initialized",
SCM_EOL); SCM_EOL);

6
libguile/read.c
View file

@ -1557,7 +1557,7 @@ recsexpr (SCM obj, long line, int column, SCM filename)
if (!scm_is_pair(obj)) { if (!scm_is_pair(obj)) {
return obj; return obj;
} else { } else {
SCM tmp = obj, copy; SCM tmp, copy;
/* If this sexpr is visible in the read:sharp source, we want to /* If this sexpr is visible in the read:sharp source, we want to
keep that information, so only record non-constant cons cells keep that information, so only record non-constant cons cells
which haven't previously been read by the reader. */ which haven't previously been read by the reader. */
@ -1567,7 +1567,7 @@ recsexpr (SCM obj, long line, int column, SCM filename)
{ {
copy = scm_cons (recsexpr (SCM_CAR (obj), line, column, filename), copy = scm_cons (recsexpr (SCM_CAR (obj), line, column, filename),
SCM_UNDEFINED); SCM_UNDEFINED);
while ((tmp = SCM_CDR (tmp)) && scm_is_pair (tmp)) for (tmp = obj; scm_is_pair (tmp); tmp = SCM_CDR (tmp))
{ {
SCM_SETCDR (copy, scm_cons (recsexpr (SCM_CAR (tmp), SCM_SETCDR (copy, scm_cons (recsexpr (SCM_CAR (tmp),
line, line,
@ -1581,7 +1581,7 @@ recsexpr (SCM obj, long line, int column, SCM filename)
else else
{ {
recsexpr (SCM_CAR (obj), line, column, filename); recsexpr (SCM_CAR (obj), line, column, filename);
while ((tmp = SCM_CDR (tmp)) && scm_is_pair (tmp)) for (tmp = obj; scm_is_pair (tmp); tmp = SCM_CDR (tmp))
recsexpr (SCM_CAR (tmp), line, column, filename); recsexpr (SCM_CAR (tmp), line, column, filename);
copy = SCM_UNDEFINED; copy = SCM_UNDEFINED;
} }