aboutsummaryrefslogtreecommitdiffstats
path: root/rgx.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 /rgx.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 'rgx.c')
-rw-r--r--rgx.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/rgx.c b/rgx.c
index 0c1c377..1f3b4f0 100644
--- a/rgx.c
+++ b/rgx.c
@@ -55,7 +55,7 @@
#endif
static char rcsid[] =
- "$Id: rgx.c,v 1.15 2002/04/13 20:41:02 jaffer Exp $";
+ "$Id: rgx.c,v 1.16 2002/11/25 20:34:31 jaffer Exp $";
#ifdef HAVE_ALLOCA
# include <alloca.h>
@@ -161,7 +161,7 @@ SCM lregerror(scode)
int len;
#endif
SCM str;
- ASSERT(INUMP(scode), scode, ARG1, s_regerror);
+ ASRTER(INUMP(scode), scode, ARG1, s_regerror);
code = INUM(scode);
if (code < 0)
return makfromstr("Invalid code", sizeof("Invalid code")-1);
@@ -192,8 +192,8 @@ SCM lregcomp(pattern, flags)
char *err_msg;
#endif
- ASSERT(NIMP(pattern) && STRINGP(pattern), pattern, ARG1, s_regcomp);
- ASSERT(UNBNDP(flags) || (NIMP(flags) && STRINGP(flags)),
+ ASRTER(NIMP(pattern) && STRINGP(pattern), pattern, ARG1, s_regcomp);
+ ASRTER(UNBNDP(flags) || (NIMP(flags) && STRINGP(flags)),
flags, ARG2, s_regcomp);
DEFER_INTS;
z = must_malloc_cell((long)sizeof(regex_info), (SCM)tc16_rgx, s_regex);
@@ -302,8 +302,8 @@ SCM lregexec(prog, str)
ALLOCA_PROTECT;
FIXUP_REGEXP(prog);
- ASSERT(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_regexec);
- ASSERT(NIMP(str) && STRINGP(str), str, ARG2, s_regexec);
+ ASRTER(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_regexec);
+ ASRTER(NIMP(str) && STRINGP(str), str, ARG2, s_regexec);
#ifdef _GNU_SOURCE
return lregsearchv(prog, str, EOL);
@@ -334,8 +334,8 @@ SCM lregmatp(prog, str)
SCM prog, str;
{
FIXUP_REGEXP(prog);
- ASSERT(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_regmatp);
- ASSERT(NIMP(str) && STRINGP(str), str, ARG2, s_regmatp);
+ ASRTER(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_regmatp);
+ ASRTER(NIMP(str) && STRINGP(str), str, ARG2, s_regmatp);
#ifdef _GNU_SOURCE
return (lregsearch(prog, str, EOL)==BOOL_F)?BOOL_F:BOOL_T;
@@ -367,11 +367,11 @@ SCM lregsearchmatch(prog, str, args, search, vector)
ALLOCA_PROTECT;
FIXUP_REGEXP(prog);
- ASSERT(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_regsearch);
- ASSERT(NIMP(str) && STRINGP(str), str, ARG2, s_regsearch);
- ASSERT(len<=2, args, WNA, s_regsearch);
- ASSERT((len<1)||(INUMP(CAR(args))), CAR(args), ARG3, s_regsearch);
- ASSERT((len<2)||(INUMP(CAR(CDR(args)))), CAR(CDR(args)), ARG4, s_regsearch);
+ ASRTER(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_regsearch);
+ ASRTER(NIMP(str) && STRINGP(str), str, ARG2, s_regsearch);
+ ASRTER(len<=2, args, WNA, s_regsearch);
+ ASRTER((len<1)||(INUMP(CAR(args))), CAR(args), ARG3, s_regsearch);
+ ASRTER((len<2)||(INUMP(CAR(CDR(args)))), CAR(CDR(args)), ARG4, s_regsearch);
start = (len>=1)?(INUM(CAR(args))):0;
size = (len>=2)?(INUM(CAR(CDR(args)))):LENGTH(str);
@@ -503,8 +503,8 @@ SCM stringsplitutil(prog, str, vector)
SCM st_start, st_end;
FIXUP_REGEXP(prog);
- ASSERT(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_stringsplit);
- ASSERT(NIMP(str) && STRINGP(str), str, ARG2, s_stringsplit);
+ ASRTER(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_stringsplit);
+ ASRTER(NIMP(str) && STRINGP(str), str, ARG2, s_stringsplit);
substrings = EOL;
anchor = 0;
@@ -599,16 +599,16 @@ SCM lstringedit(prog, editspec, args)
args_len = ilength(args);
FIXUP_REGEXP(prog);
- ASSERT(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_stringedit);
- ASSERT(NIMP(editspec) && STRINGP(editspec), editspec, ARG2, s_stringedit);
- ASSERT((args_len==1)||(args_len==2), args, WNA, s_stringedit);
+ ASRTER(NIMP(prog) && tc16_rgx==CAR(prog), prog, ARG1, s_stringedit);
+ ASRTER(NIMP(editspec) && STRINGP(editspec), editspec, ARG2, s_stringedit);
+ ASRTER((args_len==1)||(args_len==2), args, WNA, s_stringedit);
str = CAR(args);
- ASSERT(NIMP(str)&&STRINGP(str), str, ARG3, s_stringedit);
+ ASRTER(NIMP(str)&&STRINGP(str), str, ARG3, s_stringedit);
if (args_len==2) {
count = CAR(CDR(args));
- ASSERT(INUMP(count)||(count==BOOL_T), count, ARG4, s_stringedit);
+ ASRTER(INUMP(count)||(count==BOOL_T), count, ARG4, s_stringedit);
} else
count = MAKINUM(1);