diff options
-rw-r--r-- | libguile/ChangeLog | 5 | ||||
-rw-r--r-- | libguile/regex-posix.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 49d367882..482263449 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +2005-11-29 Han-Wen Nienhuys <hanwen@xs4all.nl> + + * regex-posix.c (s_scm_regexp_exec): list the offending pattern + upon error + 2005-12-29 Neil Jerram <neil@ossau.uklinux.net> * fluids.c (next_fluid_num): [From Ludovic Courtès:] Don't trigger diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c index 2e8dcd547..31f8c1d28 100644 --- a/libguile/regex-posix.c +++ b/libguile/regex-posix.c @@ -187,7 +187,8 @@ SCM_DEFINE (scm_make_regexp, "make-regexp", 1, 0, 1, scm_from_locale_string (FUNC_NAME), errmsg, SCM_BOOL_F, - SCM_BOOL_F); + scm_list_1 (pat)); + /* never returns */ } SCM_RETURN_NEWSMOB (scm_tc16_regex, rx); @@ -274,8 +275,7 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0, scm_error_scm (scm_regexp_error_key, scm_from_locale_string (FUNC_NAME), scm_regexp_error_msg (status, SCM_RGX (rx)), - SCM_BOOL_F, - SCM_BOOL_F); + SCM_BOOL_F, SCM_BOOL_F); return mvec; } #undef FUNC_NAME |