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

Regexp flag enhancements

Browse source
This commit is contained in:
Tim Pierce 1997-06-28 08:50:43 +00:00
parent 9159ebecb4
commit 5d4774bcf6
2 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libguile/ChangeLog
View file

@ -1,3 +1,12 @@
Sat Jun 28 03:45:25 1997 Tim Pierce <twp@twp.tezcat.com>
* regex-posix.c (scm_make_regexp): Make `flags' a variable-length
argument and logior its components together, so the user doesn't
have to do this explicitly. Also, if regexp/basic is supplied, then
turn off REG_EXTENDED.
(scm_init_regex_posix): New regexp/basic symbol.
(REG_BASIC): #define this if it is not already present.
Fri Jun 27 20:36:35 1997 Tim Pierce <twpierce@bio-5.bsd.uchicago.edu>
* Makefile.am (libguile_la_LIBADD): Include @ALLOCA@.

30
libguile/regex-posix.c
View file

@ -70,6 +70,11 @@
#include "regex-posix.h"
/* This is defined by some regex libraries and omitted by others. */
#ifndef REG_BASIC
#define REG_BASIC 0
#endif
long scm_tc16_regex_t;
static size_t
@ -141,28 +146,38 @@ scm_regexp_p (x)
return (SCM_NIMP (x) && SCM_RGXP (x) ? SCM_BOOL_T : SCM_BOOL_F);
}
SCM_PROC (s_make_regexp, "make-regexp", 1, 1, 0, scm_make_regexp);
SCM_PROC (s_make_regexp, "make-regexp", 1, 0, 1, scm_make_regexp);
SCM
scm_make_regexp (SCM pat, SCM flags)
{
SCM result;
SCM result, flag;
regex_t *rx;
int status;
int status, cflags;
SCM_ASSERT (SCM_NIMP(pat) && SCM_ROSTRINGP(pat), pat, SCM_ARG1,
s_make_regexp);
SCM_COERCE_SUBSTR (pat);
if (SCM_UNBNDP (flags))
flags = SCM_MAKINUM (REG_EXTENDED);
SCM_ASSERT (SCM_INUMP (flags), flags, SCM_ARG2, s_make_regexp);
/* Examine list of regexp flags. If REG_BASIC is supplied, then
turn off REG_EXTENDED flag (on by default). */
cflags = REG_EXTENDED;
flag = flags;
while (SCM_NNULLP (flag))
{
if (SCM_INUM (SCM_CAR (flag)) == REG_BASIC)
cflags &= ~REG_EXTENDED;
else
cflags |= SCM_INUM (SCM_CAR (flag));
flag = SCM_CDR (flag);
}
SCM_DEFER_INTS;
rx = (regex_t *) scm_must_malloc (sizeof (regex_t), s_make_regexp);
status = regcomp (rx, SCM_ROCHARS (pat),
/* Make sure they're not passing REG_NOSUB;
regexp-exec assumes we're getting match data. */
(SCM_INUM (flags) & ~REG_NOSUB));
cflags & ~REG_NOSUB);
if (status != 0)
{
SCM_ALLOW_INTS;
@ -248,6 +263,7 @@ scm_init_regex_posix ()
scm_tc16_regex_t = scm_newsmob (&regex_t_smob);
/* Compilation flags. */
scm_sysintern ("regexp/basic", scm_long2num (REG_BASIC));
scm_sysintern ("regexp/extended", scm_long2num (REG_EXTENDED));
scm_sysintern ("regexp/icase", scm_long2num (REG_ICASE));
scm_sysintern ("regexp/newline", scm_long2num (REG_NEWLINE));