1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re.c: match_become based on (ruby-core:382, :386, :389)

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
michal 2002-08-30 08:22:09 +00:00
parent b4ea040b31
commit f5f30e580f
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
re.c
View File

@ -514,10 +514,11 @@ make_regexp(s, len, flags)
static VALUE rb_cMatch; static VALUE rb_cMatch;
static VALUE static VALUE
match_alloc() match_alloc(klass)
VALUE klass;
{ {
NEWOBJ(match, struct RMatch); NEWOBJ(match, struct RMatch);
OBJSETUP(match, rb_cMatch, T_MATCH); OBJSETUP(match, klass, T_MATCH);
match->str = 0; match->str = 0;
match->regs = 0; match->regs = 0;
@ -528,37 +529,20 @@ match_alloc()
} }
static VALUE static VALUE
match_clone(match) match_become(obj, orig)
VALUE match; VALUE obj, orig;
{ {
NEWOBJ(clone, struct RMatch); if (obj == orig) return obj;
CLONESETUP(clone, match);
clone->str = RMATCH(match)->str; if (!rb_obj_is_instance_of(orig, rb_obj_class(obj))) {
clone->regs = 0; rb_raise(rb_eTypeError, "wrong argument class");
}
RMATCH(obj)->str = RMATCH(orig)->str;
re_free_registers(RMATCH(obj)->regs);
RMATCH(obj)->regs->allocated = 0;
re_copy_registers(RMATCH(obj)->regs, RMATCH(orig)->regs);
clone->regs = ALLOC(struct re_registers); return obj;
clone->regs->allocated = 0;
re_copy_registers(clone->regs, RMATCH(match)->regs);
return (VALUE)clone;
}
static VALUE
match_dup(match)
VALUE match;
{
NEWOBJ(dup, struct RMatch);
DUPSETUP(dup, match);
dup->str = RMATCH(match)->str;
dup->regs = 0;
dup->regs = ALLOC(struct re_registers);
dup->regs->allocated = 0;
re_copy_registers(dup->regs, RMATCH(match)->regs);
return (VALUE)dup;
} }
static VALUE static VALUE
@ -741,7 +725,7 @@ rb_reg_search(re, str, pos, reverse)
match = rb_backref_get(); match = rb_backref_get();
if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) { if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) {
match = match_alloc(); match = match_alloc(rb_obj_class(re));
} }
else { else {
if (rb_safe_level() >= 3) if (rb_safe_level() >= 3)
@ -1601,13 +1585,10 @@ Init_Regexp()
rb_cMatch = rb_define_class("MatchData", rb_cObject); rb_cMatch = rb_define_class("MatchData", rb_cObject);
rb_define_global_const("MatchingData", rb_cMatch); rb_define_global_const("MatchingData", rb_cMatch);
rb_undef_method(CLASS_OF(rb_cMatch), "allocate"); rb_define_singleton_method(rb_cMatch, "allocate", match_alloc, 0);
rb_undef_method(CLASS_OF(rb_cMatch), "new"); rb_undef_method(CLASS_OF(rb_cMatch), "new");
/* to be replaced by allocation framework */ rb_define_method(rb_cMatch, "become", match_become, 1);
rb_define_method(rb_cMatch, "clone", match_clone, 0);
rb_define_method(rb_cMatch, "dup", match_dup, 0);
rb_define_method(rb_cMatch, "size", match_size, 0); rb_define_method(rb_cMatch, "size", match_size, 0);
rb_define_method(rb_cMatch, "length", match_size, 0); rb_define_method(rb_cMatch, "length", match_size, 0);
rb_define_method(rb_cMatch, "offset", match_offset, 1); rb_define_method(rb_cMatch, "offset", match_offset, 1);