summaryrefslogtreecommitdiffstats
path: root/sc2.c
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2004-12-07 23:23:48 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:28 -0800
commit37f2f5e0bb11a18deecf48c7ad6bcbf7bd932db2 (patch)
tree692caebb60ec5f80ce528a403b69351ca756d530 /sc2.c
parente21d47d7813159bb71e0671df9b52ec0470c358d (diff)
parentc7d035ae1a729232579a0fe41ed5affa131d3623 (diff)
downloadscm-37f2f5e0bb11a18deecf48c7ad6bcbf7bd932db2.tar.gz
scm-37f2f5e0bb11a18deecf48c7ad6bcbf7bd932db2.zip
Import Debian changes 5d9-4.1debian/5d9-4.1
scm (5d9-4.1) unstable; urgency=high * Non-maintainer upload. * High-urgency upload for sarge-targetted RC bugfix. * Revert upstream "CAUTIOUS" define, which causes the scm build to fail its test suite on alpha (and, it appears, powerpc as well). Closes: #245810. scm (5d9-4) unstable; urgency=low * Apply patch from 144062 to fix hppa build (Closes: #144062) * Change scm.1 section from Jan 4 200 to 1. (lintian) scm (5d9-3) unstable; urgency=low * Properly clean up info files. * Make and install Xlibscm.info. scm (5d9-2) unstable; urgency=low * Fix path problem in slibcat. Hack at mklibcat.scm. (Closes: #241510) scm (5d9-1) unstable; urgency=low * New upstream release * Merge NMU sparc changes (Closes: #191171, #191356) * SHORT_INT is defined for ia64 upstream (Closes: #141928) * Scheme imps now grouped in info file (has been for a while) (Closes: #115452)
Diffstat (limited to 'sc2.c')
-rw-r--r--sc2.c64
1 files changed, 33 insertions, 31 deletions
diff --git a/sc2.c b/sc2.c
index 3df2f1a..5749b63 100644
--- a/sc2.c
+++ b/sc2.c
@@ -50,7 +50,7 @@ SCM last_pair(sx)
{
register SCM res = sx;
register SCM x;
- ASSERT(NIMP(res) && CONSP(res), res, ARG1, s_last_pair);
+ ASRTER(NIMP(res) && CONSP(res), res, ARG1, s_last_pair);
while (!0) {
x = CDR(res);
if (IMP(x) || NCONSP(x)) return res;
@@ -59,7 +59,7 @@ SCM last_pair(sx)
if (IMP(x) || NCONSP(x)) return res;
res = x;
sx = CDR(sx);
- ASSERT(x != sx, sx, ARG1, s_last_pair);
+ ASRTER(x != sx, sx, ARG1, s_last_pair);
}
}
@@ -69,20 +69,20 @@ SCM subml(str1, start1, args)
{
SCM end1, str2, start2;
long i, j, e;
- ASSERT(3==ilength(args), args, WNA, s_subml);
+ ASRTER(3==ilength(args), args, WNA, s_subml);
end1 = CAR(args); args = CDR(args);
str2 = CAR(args); args = CDR(args);
start2 = CAR(args);
- ASSERT(NIMP(str1) && STRINGP(str1), str1, ARG1, s_subml);
- ASSERT(INUMP(start1), start1, ARG2, s_subml);
- ASSERT(INUMP(end1), end1, ARG3, s_subml);
- ASSERT(NIMP(str2) && STRINGP(str2), str2, ARG4, s_subml);
- ASSERT(INUMP(start2), start2, ARG5, s_subml);
+ ASRTER(NIMP(str1) && STRINGP(str1), str1, ARG1, s_subml);
+ ASRTER(INUMP(start1), start1, ARG2, s_subml);
+ ASRTER(INUMP(end1), end1, ARG3, s_subml);
+ ASRTER(NIMP(str2) && STRINGP(str2), str2, ARG4, s_subml);
+ ASRTER(INUMP(start2), start2, ARG5, s_subml);
i = INUM(start1), j = INUM(start2), e = INUM(end1);
- ASSERT(i <= LENGTH(str1) && i >= 0, start1, OUTOFRANGE, s_subml);
- ASSERT(j <= LENGTH(str2) && j >= 0, start2, OUTOFRANGE, s_subml);
- ASSERT(e <= LENGTH(str1) && e >= 0, end1, OUTOFRANGE, s_subml);
- ASSERT(e-i+j <= LENGTH(str2), start2, OUTOFRANGE, s_subml);
+ ASRTER(i <= LENGTH(str1) && i >= 0, start1, OUTOFRANGE, s_subml);
+ ASRTER(j <= LENGTH(str2) && j >= 0, start2, OUTOFRANGE, s_subml);
+ ASRTER(e <= LENGTH(str1) && e >= 0, end1, OUTOFRANGE, s_subml);
+ ASRTER(e-i+j <= LENGTH(str2), start2, OUTOFRANGE, s_subml);
while(i<e) CHARS(str2)[j++] = CHARS(str1)[i++];
return UNSPECIFIED;
}
@@ -92,20 +92,20 @@ SCM submr(str1, start1, args)
{
SCM end1, str2, start2;
long i, j, e;
- ASSERT(3==ilength(args), args, WNA, s_submr);
+ ASRTER(3==ilength(args), args, WNA, s_submr);
end1 = CAR(args); args = CDR(args);
str2 = CAR(args); args = CDR(args);
start2 = CAR(args);
- ASSERT(NIMP(str1) && STRINGP(str1), str1, ARG1, s_submr);
- ASSERT(INUMP(start1), start1, ARG2, s_submr);
- ASSERT(INUMP(end1), end1, ARG3, s_submr);
- ASSERT(NIMP(str2) && STRINGP(str2), str2, ARG4, s_submr);
- ASSERT(INUMP(start2), start2, ARG5, s_submr);
+ ASRTER(NIMP(str1) && STRINGP(str1), str1, ARG1, s_submr);
+ ASRTER(INUMP(start1), start1, ARG2, s_submr);
+ ASRTER(INUMP(end1), end1, ARG3, s_submr);
+ ASRTER(NIMP(str2) && STRINGP(str2), str2, ARG4, s_submr);
+ ASRTER(INUMP(start2), start2, ARG5, s_submr);
i = INUM(start1), j = INUM(start2), e = INUM(end1);
- ASSERT(i <= LENGTH(str1) && i >= 0, start1, OUTOFRANGE, s_submr);
- ASSERT(j <= LENGTH(str2) && j >= 0, start2, OUTOFRANGE, s_submr);
- ASSERT(e <= LENGTH(str1) && e >= 0, end1, OUTOFRANGE, s_submr);
- ASSERT((j = e-i+j) <= LENGTH(str2), start2, OUTOFRANGE, s_submr);
+ ASRTER(i <= LENGTH(str1) && i >= 0, start1, OUTOFRANGE, s_submr);
+ ASRTER(j <= LENGTH(str2) && j >= 0, start2, OUTOFRANGE, s_submr);
+ ASRTER(e <= LENGTH(str1) && e >= 0, end1, OUTOFRANGE, s_submr);
+ ASRTER((j = e-i+j) <= LENGTH(str2), start2, OUTOFRANGE, s_submr);
while(i<e) CHARS(str2)[--j] = CHARS(str1)[--e];
return UNSPECIFIED;
}
@@ -116,16 +116,16 @@ SCM subfl(str, start, args)
SCM end, fill;
long i, e;
char c;
- ASSERT(2==ilength(args), args, WNA, s_subfl);
+ ASRTER(2==ilength(args), args, WNA, s_subfl);
end = CAR(args); args = CDR(args);
fill = CAR(args);
- ASSERT(NIMP(str) && STRINGP(str), str, ARG1, s_subfl);
- ASSERT(INUMP(start), start, ARG2, s_subfl);
- ASSERT(INUMP(end), end, ARG3, s_subfl);
- ASSERT(ICHRP(fill), fill, ARG4, s_subfl);
+ ASRTER(NIMP(str) && STRINGP(str), str, ARG1, s_subfl);
+ ASRTER(INUMP(start), start, ARG2, s_subfl);
+ ASRTER(INUMP(end), end, ARG3, s_subfl);
+ ASRTER(ICHRP(fill), fill, ARG4, s_subfl);
i = INUM(start), e = INUM(end);c = ICHR(fill);
- ASSERT(i <= LENGTH(str) && i >= 0, start, OUTOFRANGE, s_subfl);
- ASSERT(e <= LENGTH(str) && e >= 0, end, OUTOFRANGE, s_subfl);
+ ASRTER(i <= LENGTH(str) && i >= 0, start, OUTOFRANGE, s_subfl);
+ ASRTER(e <= LENGTH(str) && e >= 0, end, OUTOFRANGE, s_subfl);
while(i<e) CHARS(str)[i++] = c;
return UNSPECIFIED;
}
@@ -134,7 +134,7 @@ static char s_strnullp[] = "string-null?";
SCM strnullp(str)
SCM str;
{
- ASSERT(NIMP(str) && STRINGP(str), str, ARG1, s_strnullp);
+ ASRTER(NIMP(str) && STRINGP(str), str, ARG1, s_strnullp);
if LENGTH(str) return BOOL_F;
else return BOOL_T;
}
@@ -150,7 +150,7 @@ SCM appendb(args)
args = CDR(args);
if NULLP(args) return arg;
if NULLP(arg) goto tail;
- ASSERT(NIMP(arg) && CONSP(arg), arg, ARG1, s_appendb);
+ ASRTER(NIMP(arg) && CONSP(arg), arg, ARG1, s_appendb);
CDR(last_pair(arg)) = appendb(args);
return arg;
}
@@ -161,6 +161,8 @@ static iproc lsubr2s[] = {
{s_subfl, subfl},
{0, 0}};
+SCM_DLL_EXPORT void init_sc2 P((void));
+
void init_sc2()
{
make_subr(s_last_pair, tc7_subr_1, last_pair);