summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2022-03-28 15:03:17 +0900
committerYusuke Endoh <mame@ruby-lang.org>2022-03-30 16:50:46 +0900
commit2ade40276be9f60ed06e7011b41a4c90f03e59b4 (patch)
tree5ec8dca55bc9589a1734b2effac2adeb3d6d0360 /re.c
parent34b288f8d471e3a3d34f2a63950b483594df282f (diff)
re.c: raise Regexp::TimeoutError instead of RuntimeError
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5703
Diffstat (limited to 're.c')
-rw-r--r--re.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/re.c b/re.c
index b2ba6b2ef6..bcd13ddf77 100644
--- a/re.c
+++ b/re.c
@@ -27,7 +27,7 @@
#include "ruby/re.h"
#include "ruby/util.h"
-VALUE rb_eRegexpError;
+VALUE rb_eRegexpError, rb_eRegexpTimeoutError;
typedef char onig_errmsg_buffer[ONIG_MAX_ERROR_MESSAGE_LEN];
#define errcpy(err, msg) strlcpy((err), (msg), ONIG_MAX_ERROR_MESSAGE_LEN)
@@ -4153,7 +4153,7 @@ rb_reg_check_timeout(regex_t *reg, void *end_time_)
else {
if (*end_time < rb_hrtime_now()) {
// timeout is exceeded
- rb_raise(rb_eRuntimeError, "regexp match timeout");
+ rb_raise(rb_eRegexpTimeoutError, "regexp match timeout");
}
}
}
@@ -4304,6 +4304,7 @@ Init_Regexp(void)
rb_define_method(rb_cRegexp, "named_captures", rb_reg_named_captures, 0);
rb_define_method(rb_cRegexp, "timeout", rb_reg_timeout_get, 0);
+ rb_eRegexpTimeoutError = rb_define_class_under(rb_cRegexp, "TimeoutError", rb_eRegexpError);
rb_define_singleton_method(rb_cRegexp, "timeout", rb_reg_s_timeout_get, 0);
rb_define_singleton_method(rb_cRegexp, "timeout=", rb_reg_s_timeout_set, 1);