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

* re.c (update_char_offset):

Browse Source 
* re.c (rb_reg_equal):
* re.c (reg_match_pos):
* re.c (rb_reg_eqq):
* re.c (static VALUE):
* re.c (Init_Regexp):
[ruby-core:24748]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-09-04 23:49:18 +00:00
parent 15ec8e6548
commit 7633eb4c51
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sat Sep 5 08:49:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (update_char_offset):
* re.c (rb_reg_equal):
* re.c (reg_match_pos):
* re.c (rb_reg_eqq):
* re.c (static VALUE):
* re.c (Init_Regexp):
[ruby-core:24748]
Fri Sep 4 20:40:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Sep 4 20:40:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (round): added declaration. [ruby-dev:39222] * numeric.c (round): added declaration. [ruby-dev:39222]

10
re.c
View File

@ -813,8 +813,8 @@ update_char_offset(VALUE match)
{ {
struct rmatch *rm = RMATCH(match)->rmatch; struct rmatch *rm = RMATCH(match)->rmatch;
struct re_registers *regs; struct re_registers *regs;
int num_regs; int i, num_regs, num_pos;
int i, num_pos, c; long c;
char *s, *p, *q, *e; char *s, *p, *q, *e;
rb_encoding *enc; rb_encoding *enc;
pair_t *pairs; pair_t *pairs;
@ -2568,7 +2568,7 @@ reg_match_pos(VALUE re, VALUE *strp, long pos)
rb_backref_set(Qnil); rb_backref_set(Qnil);
return -1; return -1;
} }
*strp = str = reg_operand(str, Qtrue); *strp = str = reg_operand(str, TRUE);
if (pos != 0) { if (pos != 0) {
if (pos < 0) { if (pos < 0) {
VALUE l = rb_str_length(str); VALUE l = rb_str_length(str);
@ -2662,7 +2662,7 @@ rb_reg_eqq(VALUE re, VALUE str)
{ {
long start; long start;
str = reg_operand(str, Qfalse); str = reg_operand(str, FALSE);
if (NIL_P(str)) { if (NIL_P(str)) {
rb_backref_set(Qnil); rb_backref_set(Qnil);
return Qfalse; return Qfalse;
@ -2960,7 +2960,7 @@ rb_reg_quote(VALUE str)
static VALUE static VALUE
rb_reg_s_quote(VALUE c, VALUE str) rb_reg_s_quote(VALUE c, VALUE str)
{ {
return rb_reg_quote(reg_operand(str, Qtrue)); return rb_reg_quote(reg_operand(str, TRUE));
} }
int int