From ee0f10607a276ce239ba9ee61420809b766c5715 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 19 Apr 2015 10:59:29 -0700 Subject: Bugfix: throwing error when trying to print valid regexps. * regex.c (print_rec): Only dianose "bad object in regex syntax" for some atom other than nil, which denotes an empty (sub)expression, like what results from #// or #/a|/ and such. --- ChangeLog | 8 ++++++++ regex.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 60472e7c..416496b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-04-19 Kaz Kylheku + + Bugfix: throwing error when trying to print valid regexps. + + * regex.c (print_rec): Only dianose "bad object in regex syntax" + for some atom other than nil, which denotes an empty (sub)expression, + like what results from #// or #/a|/ and such. + 2015-04-19 Kaz Kylheku Do not allow unrecognized escapes in regex. diff --git a/regex.c b/regex.c index fade9449..b8e7daec 100644 --- a/regex.c +++ b/regex.c @@ -1831,7 +1831,7 @@ static void print_rec(val exp, val stream) } else { uw_throwf(error_s, lit("bad operator in regex syntax: ~s"), sym, nao); } - } else { + } else if (exp != nil) { uw_throwf(error_s, lit("bad object in regex syntax: ~s"), exp, nao); } } -- cgit v1.2.3