mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

* arbiters.c, async.c, regex-posix.c: Use new smob interface.

Browse source 
* regex-posix.c, regex-posix.h: Renamed scm_tc16_regex_t -->
scm_tc16_regex.
This commit is contained in:
Mikael Djurfeldt 1999-05-23 09:57:08 +00:00
parent 4801c31151
commit 22580a48fe
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libguile/regex-posix.c
View file

@ -85,10 +85,10 @@
#define REG_BASIC 0 #define REG_BASIC 0
#endif #endif
long scm_tc16_regex_t; long scm_tc16_regex;
static scm_sizet static scm_sizet
scm_free_regex_t (obj) free_regex (obj)
SCM obj; SCM obj;
{ {
regfree (SCM_RGX (obj)); regfree (SCM_RGX (obj));
@ -96,23 +96,6 @@ scm_free_regex_t (obj)
return sizeof(regex_t); return sizeof(regex_t);
} }
static int
scm_print_regex_t (obj, port, pstate)
SCM obj;
SCM port;
scm_print_state *pstate;
{
regex_t *r;
r = SCM_RGX (obj);
scm_puts ("#<rgx ", port);
scm_intprint (obj, 16, port);
scm_puts (">", port);
return 1;
}
static scm_smobfuns regex_t_smob =
{ 0, scm_free_regex_t, scm_print_regex_t, 0 };
SCM_SYMBOL (scm_regexp_error_key, "regular-expression-syntax"); SCM_SYMBOL (scm_regexp_error_key, "regular-expression-syntax");
@ -182,7 +165,6 @@ scm_make_regexp (SCM pat, SCM flags)
flag = SCM_CDR (flag); flag = SCM_CDR (flag);
} }
SCM_DEFER_INTS;
rx = (regex_t *) scm_must_malloc (sizeof (regex_t), s_make_regexp); rx = (regex_t *) scm_must_malloc (sizeof (regex_t), s_make_regexp);
status = regcomp (rx, SCM_ROCHARS (pat), status = regcomp (rx, SCM_ROCHARS (pat),
/* Make sure they're not passing REG_NOSUB; /* Make sure they're not passing REG_NOSUB;
@ -190,7 +172,6 @@ scm_make_regexp (SCM pat, SCM flags)
cflags & ~REG_NOSUB); cflags & ~REG_NOSUB);
if (status != 0) if (status != 0)
{ {
SCM_ALLOW_INTS;
scm_error (scm_regexp_error_key, scm_error (scm_regexp_error_key,
s_make_regexp, s_make_regexp,
scm_regexp_error_msg (status, rx), scm_regexp_error_msg (status, rx),
@ -198,10 +179,7 @@ scm_make_regexp (SCM pat, SCM flags)
SCM_BOOL_F); SCM_BOOL_F);
/* never returns */ /* never returns */
} }
SCM_NEWCELL (result); SCM_NEWSMOB (result, scm_tc16_regex, rx);
SCM_SETCAR (result, scm_tc16_regex_t);
SCM_SETCDR (result, rx);
SCM_ALLOW_INTS;
return result; return result;
} }
@ -274,7 +252,8 @@ scm_regexp_exec (SCM rx, SCM str, SCM start, SCM flags)
void void
scm_init_regex_posix () scm_init_regex_posix ()
{ {
scm_tc16_regex_t = scm_newsmob (&regex_t_smob); scm_tc16_regex = scm_make_smob_type ("regexp", sizeof (regex_t));
scm_set_smob_free (scm_tc16_regex, free_regex);
/* Compilation flags. */ /* Compilation flags. */
scm_sysintern ("regexp/basic", scm_long2num (REG_BASIC)); scm_sysintern ("regexp/basic", scm_long2num (REG_BASIC));

6
libguile/regex-posix.h
View file

@ -46,9 +46,9 @@
#include "libguile/__scm.h" #include "libguile/__scm.h"
extern long scm_tc16_regex_t; extern long scm_tc16_regex;
#define SCM_RGX(X) ((regex_t *)SCM_CDR(X)) #define SCM_RGX(X) ((regex_t *) SCM_CDR(X))
#define SCM_RGXP(X) (SCM_CAR(X) == (SCM)scm_tc16_regex_t) #define SCM_RGXP(X) (SCM_CAR (X) == (SCM) scm_tc16_regex)
extern SCM scm_make_regexp SCM_P ((SCM pat, SCM flags)); extern SCM scm_make_regexp SCM_P ((SCM pat, SCM flags));
SCM scm_regexp_p SCM_P ((SCM x)); SCM scm_regexp_p SCM_P ((SCM x));