mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-14 23:50:19 +02:00
Code Activity

* print.c (scm_iprin1): Rather than having one i, and using it in

Browse source 
several places, declare a fresh i local to each block where it is
used, and give it a signedness appropriate to its use in each case.
(scm_iprlist): Same.
* print.c (scm_iprin1): Add cast to avoid unsigned/signed
comparison warnings.
* print.c (ENTER_NESTED_DATA): Make i an unsigned long, to avoid
signed/unsigned clashes.
This commit is contained in:
Jim Blandy 1998-09-06 18:57:16 +00:00
parent 522158de92
commit 5ca6dc3947
1 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/print.c
View file

@ -137,7 +137,7 @@ scm_print_options (setting)
#define ENTER_NESTED_DATA(pstate, obj, label) \ #define ENTER_NESTED_DATA(pstate, obj, label) \
{ \ { \
register int i; \ register unsigned long i; \
for (i = 0; i < pstate->top; ++i) \ for (i = 0; i < pstate->top; ++i) \
if (pstate->ref_stack[i] == (obj)) \ if (pstate->ref_stack[i] == (obj)) \
goto label; \ goto label; \
@ -300,7 +300,6 @@ scm_iprin1 (exp, port, pstate)
SCM port; SCM port;
scm_print_state *pstate; scm_print_state *pstate;
{ {
register long i;
taloop: taloop:
switch (7 & (int) exp) switch (7 & (int) exp)
{ {
@ -311,6 +310,8 @@ taloop:
case 4: case 4:
if (SCM_ICHRP (exp)) if (SCM_ICHRP (exp))
{ {
register long i;
i = SCM_ICHR (exp); i = SCM_ICHR (exp);
if (SCM_WRITINGP (pstate)) if (SCM_WRITINGP (pstate))
{ {
@ -326,7 +327,7 @@ taloop:
scm_putc (i, port); scm_putc (i, port);
} }
else if (SCM_IFLAGP (exp) else if (SCM_IFLAGP (exp)
&& (SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *)))) && ((size_t) SCM_ISYMNUM (exp) < (sizeof scm_isymnames / sizeof (char *))))
scm_puts (SCM_ISYMCHARS (exp), port); scm_puts (SCM_ISYMCHARS (exp), port);
else if (SCM_ILOCP (exp)) else if (SCM_ILOCP (exp))
{ {
@ -446,6 +447,8 @@ taloop:
case scm_tc7_string: case scm_tc7_string:
if (SCM_WRITINGP (pstate)) if (SCM_WRITINGP (pstate))
{ {
scm_sizet i;
scm_putc ('"', port); scm_putc ('"', port);
for (i = 0; i < SCM_ROLENGTH (exp); ++i) for (i = 0; i < SCM_ROLENGTH (exp); ++i)
switch (SCM_ROCHARS (exp)[i]) switch (SCM_ROCHARS (exp)[i])
@ -555,6 +558,7 @@ taloop:
scm_puts ("#(", port); scm_puts ("#(", port);
common_vector_printer: common_vector_printer:
{ {
register long i;
int last = SCM_LENGTH (exp) - 1; int last = SCM_LENGTH (exp) - 1;
int cutp = 0; int cutp = 0;
if (pstate->fancyp && SCM_LENGTH (exp) > pstate->length) if (pstate->fancyp && SCM_LENGTH (exp) > pstate->length)
@ -612,13 +616,17 @@ taloop:
scm_putc ('>', port); scm_putc ('>', port);
break; break;
case scm_tc7_port: case scm_tc7_port:
i = SCM_PTOBNUM (exp); {
register long i = SCM_PTOBNUM (exp);
if (i < scm_numptob if (i < scm_numptob
&& scm_ptobs[i].print && scm_ptobs[i].print
&& (scm_ptobs[i].print) (exp, port, pstate)) && (scm_ptobs[i].print) (exp, port, pstate))
break; break;
goto punk; goto punk;
}
case scm_tc7_smob: case scm_tc7_smob:
{
register long i;
ENTER_NESTED_DATA (pstate, exp, circref); ENTER_NESTED_DATA (pstate, exp, circref);
i = SCM_SMOBNUM (exp); i = SCM_SMOBNUM (exp);
if (i < scm_numsmob && scm_smobs[i].print if (i < scm_numsmob && scm_smobs[i].print
@ -634,6 +642,7 @@ taloop:
down printing of other smobs. */ down printing of other smobs. */
if (SCM_TYP16 (exp) == scm_tc16_macro) if (SCM_TYP16 (exp) == scm_tc16_macro)
goto macros; goto macros;
}
default: default:
punk: punk:
scm_ipruk ("type", exp, port); scm_ipruk ("type", exp, port);
@ -749,7 +758,6 @@ scm_iprlist (hdr, exp, tlr, port, pstate)
SCM port; SCM port;
scm_print_state *pstate; scm_print_state *pstate;
{ {
register int i;
register SCM hare, tortoise; register SCM hare, tortoise;
int floor = pstate->top - 2; int floor = pstate->top - 2;
scm_puts (hdr, port); scm_puts (hdr, port);
@ -777,6 +785,8 @@ scm_iprlist (hdr, exp, tlr, port, pstate)
exp = SCM_CDR (exp); exp = SCM_CDR (exp);
for (; SCM_NIMP (exp); exp = SCM_CDR (exp)) for (; SCM_NIMP (exp); exp = SCM_CDR (exp))
{ {
register int i;
if (SCM_NECONSP (exp)) if (SCM_NECONSP (exp))
break; break;
for (i = floor; i >= 0; --i) for (i = floor; i >= 0; --i)
@ -806,6 +816,8 @@ fancy_printing:
exp = SCM_CDR (exp); --n; exp = SCM_CDR (exp); --n;
for (; SCM_NIMP (exp); exp = SCM_CDR (exp)) for (; SCM_NIMP (exp); exp = SCM_CDR (exp))
{ {
register unsigned long i;
if (SCM_NECONSP (exp)) if (SCM_NECONSP (exp))
break; break;
for (i = 0; i < pstate->top; ++i) for (i = 0; i < pstate->top; ++i)