From 8a4f514ccc2b297cdae0a11818b63f8e9a046aff Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 16 Feb 2008 20:08:35 +0000 Subject: * include/ruby/re.h (struct rmatch_offset): new struct for character offsets. (struct rmatch): new struct. (struct RMatch): reference struct rmatch. (RMATCH_REGS): new macro. * re.c (match_alloc): initialize struct rmatch. (pair_byte_cmp): new function. (update_char_offset): update character offsets. (match_init_copy): copy regexp and character offsets. (match_sublen): removed. (match_offset): use update_char_offset. (match_begin): ditto. (match_end): ditto. (rb_reg_search): make character offset updated flag false. (match_size): use RMATCH_REGS. (match_backref_number): ditto. (rb_reg_nth_defined): ditto. (rb_reg_nth_match): ditto. (rb_reg_match_pre): ditto. (rb_reg_match_post): ditto. (rb_reg_match_last): ditto. (match_array): ditto. (match_aref): ditto. (match_values_at): ditto. (match_inspect): ditto. * string.c (rb_str_subpat_set): use RMATCH_REGS. (rb_str_sub_bang): ditto. (str_gsub): ditto. (rb_str_split_m): ditto. (scan_once): ditto. * gc.c (obj_free): free character offsets. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/re.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'include/ruby') diff --git a/include/ruby/re.h b/include/ruby/re.h index 07c08614d..cc7f6025a 100644 --- a/include/ruby/re.h +++ b/include/ruby/re.h @@ -26,14 +26,28 @@ extern "C" { typedef struct re_pattern_buffer Regexp; +struct rmatch_offset { + int beg; + int end; +}; + +struct rmatch { + struct re_registers regs; + + int char_offset_updated; + int char_offset_num_allocated; + struct rmatch_offset *char_offset; +}; + struct RMatch { struct RBasic basic; VALUE str; - struct re_registers *regs; + struct rmatch *rmatch; VALUE regexp; /* RRegexp */ }; #define RMATCH(obj) (R_CAST(RMatch)(obj)) +#define RMATCH_REGS(obj) (&(R_CAST(RMatch)(obj))->rmatch->regs) VALUE rb_reg_regcomp(VALUE); int rb_reg_search(VALUE, VALUE, int, int); -- cgit