summaryrefslogtreecommitdiffstats
path: root/debug.c
diff options
context:
space:
mode:
authorThomas Bushnell <tb@debian.org>2007-12-28 15:56:00 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:38 -0800
commit967ca9f9b4c42630fb0feb1e5b9186266fa4d854 (patch)
tree8bbb64f76bd25bf5dc59c856167f46f67cfca2e9 /debug.c
parent25fbaa7f8700665d5aea046956175a35035f7fd5 (diff)
parent710a97992705d67c3ded0d4b270c5978ce29b11f (diff)
downloadscm-967ca9f9b4c42630fb0feb1e5b9186266fa4d854.tar.gz
scm-967ca9f9b4c42630fb0feb1e5b9186266fa4d854.zip
Import Debian changes 5e4-1debian/5e4-1
scm (5e4-1) unstable; urgency=low * New upstream release. * debian/control: Require at least version 3a5 of slib. * debian/postrm: New file to remove /usr/lib/scm/implcat and /usr/lib/scm/slibcat upon purge. (Closes: #455124). Thanks to Kumar Appaiah for the fix. * debian/control (Architecture): Add armel and armeb. (Closes: #408792). * debian/rules (install): Don't use -s when installing. dh_strip should be sufficient, and this should make the nostrip build option work. (Closes: #438004). * continue.h: Repeat change from 5e1-2. * xgen.scm: Repeat change from 5e2-4. * scm.1: Repeat change from 5e2-4. * build.scm: Repeat change from 5e3-5.
Diffstat (limited to 'debug.c')
-rw-r--r--debug.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/debug.c b/debug.c
index e270a7a..5d34581 100644
--- a/debug.c
+++ b/debug.c
@@ -135,7 +135,7 @@ static SCM prinhead(x, port, writing)
int writing;
{
lputc('(', port);
- iprin1(CAR(x), port, writing);
+ scm_iprin1(CAR(x), port, writing);
lputc(' ', port);
return CDR(x);
}
@@ -148,7 +148,7 @@ static void prinbindings(names, inits, init_env,
lputc('(', port);
while (NIMP(names) && NIMP(inits)) {
lputc('(', port);
- iprin1(CAR(names), port, writing);
+ scm_iprin1(CAR(names), port, writing);
lputc(' ', port);
scm_princode(CAR(inits), init_env, port, writing);
if (NIMP(steps)) {
@@ -170,7 +170,7 @@ void scm_princode(code, env, port, writing)
{
SCM oenv = env, name, init, bdgs, x = code;
if (UNBNDP(env)) {
- iprin1(code, port, writing);
+ scm_iprin1(code, port, writing);
return;
}
tail:
@@ -180,19 +180,19 @@ void scm_princode(code, env, port, writing)
name = scm_env_rlookup(x, env, "princode");
if (FALSEP(name)) goto gencase;
lputs("#@", port);
- iprin1(name, port, writing);
+ scm_iprin1(name, port, writing);
return;
}
else
goto gencase;
}
if (SCM_GLOCP(x)) {
- iprin1(x, port, writing);
+ scm_iprin1(x, port, writing);
return;
}
switch (TYP7(x)) {
default: gencase:
- iprin1(x, port, writing);
+ scm_iprin1(x, port, writing);
return;
gencode:
case tcs_cons_gloc:
@@ -209,7 +209,7 @@ void scm_princode(code, env, port, writing)
for (; NNULLP(x); x = CDR(x)) {
if (IMP(x) || NECONSP(x)) {
lputs(" . ", port);
- iprin1(x, port, writing);
+ scm_iprin1(x, port, writing);
break;
}
lputc(' ', port);
@@ -222,19 +222,19 @@ void scm_princode(code, env, port, writing)
env = CAR(x);
bdgs = SCM_ENV_FORMALS(env);
if (IMP(bdgs) || NECONSP(bdgs))
- iprin1(bdgs, port, writing);
+ scm_iprin1(bdgs, port, writing);
else {
lputc('(', port);
while (!0) {
if (NECONSP(bdgs)) break;
- iprin1(CAR(bdgs), port, writing);
+ scm_iprin1(CAR(bdgs), port, writing);
if (NIMP(bdgs = CDR(bdgs)))
lputc(' ', port);
else break;
}
if (NIMP(bdgs)) {
lputs(". ", port);
- iprin1(bdgs, port, writing);
+ scm_iprin1(bdgs, port, writing);
}
lputc(')', port);
}
@@ -259,7 +259,7 @@ void scm_princode(code, env, port, writing)
bdgs = CDR(bdgs);
env = CAR(bdgs);
lputc('(', port);
- iprin1(SCM_ENV_FORMALS(env), port, writing);
+ scm_iprin1(SCM_ENV_FORMALS(env), port, writing);
lputc(' ', port);
scm_princode(init, oenv, port, writing);
oenv = env;
@@ -320,7 +320,7 @@ void scm_princlosure(proc, port, writing)
env = CAR(proc);
#ifdef CAUTIOUS
if (NIMP(env=scm_env_getprop(SCM_ENV_PROCNAME, env))) {
- iprin1(CAR(env), port, 1);
+ scm_iprin1(CAR(env), port, 1);
lputc(' ', port);
env = CDR(env);
if (NIMP(env) && SCM_LINUMP(CAR(env)))
@@ -333,9 +333,9 @@ void scm_princlosure(proc, port, writing)
scm_line_msg(CAR(env), linum, port);
#endif
env = CAR(proc);
- iprin1(SCM_ENV_FORMALS(env), port, writing);
+ scm_iprin1(SCM_ENV_FORMALS(env), port, writing);
if (writing) {
- for(proc = CDR(proc); NIMP(proc); proc = CDR(proc)) {
+ for (proc = CDR(proc); NIMP(proc); proc = CDR(proc)) {
lputc(' ', port);
scm_princode(CAR(proc), env, port, writing);
}
@@ -451,7 +451,7 @@ SCM stacktrace1(estk, i)
/* The usual C setjmp, not SCM's setjump. */
if (0==setjmp(SAFEP_JMPBUF(sys_safep))) {
lputc('\n', cur_errp);
- intprint((long)n, -10, sys_safep);
+ scm_intprint((long)n, -10, sys_safep);
lputs("; ", sys_safep);
scm_princode(ste, env, sys_safep, 1);
}
@@ -572,7 +572,7 @@ SCM scm_scope_trace(env)
if (NCONSP(env)) {
badenv:
lputs("\n; corrupted environment ", cur_errp);
- iprin1(env, cur_errp, 1);
+ scm_iprin1(env, cur_errp, 1);
return UNSPECIFIED;
}
ef = CAR(env);
@@ -589,19 +589,19 @@ SCM scm_scope_trace(env)
default: break;
case SCM_ENV_PROCNAME:
lputs(" procedure ", cur_errp);
- iprin1(CAR(env), cur_errp, 1);
+ scm_iprin1(CAR(env), cur_errp, 1);
break;
}
#endif
}
else if (NIMP(ef) && CONSP(ef) && NIMP(CAR(ef)) && CONSP(CAR(ef))) {
lputs("\n; ", cur_errp);
- iprin1(CAR(ef), cur_errp, 1);
+ scm_iprin1(CAR(ef), cur_errp, 1);
lputs(" syntax bindings", cur_errp);
}
else {
lputs("\n; ", cur_errp);
- iprin1(ef, cur_errp, 1);
+ scm_iprin1(ef, cur_errp, 1);
}
}
#ifdef CAUTIOUS
@@ -609,7 +609,7 @@ SCM scm_scope_trace(env)
lputs("\n; defined by ", cur_errp);
if (NIMP(file) && STRINGP(file))
lputs("load: ", cur_errp);
- iprin1(file, cur_errp, 1);
+ scm_iprin1(file, cur_errp, 1);
lputc('\n', cur_errp);
}
#endif