summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--re.c10
2 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 898b54945e..dbbb6816ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* numeric.c (round): added declaration. [ruby-dev:39222]
diff --git a/re.c b/re.c
index 04761f080c..a6657b8c4d 100644
--- a/re.c
+++ b/re.c
@@ -813,8 +813,8 @@ update_char_offset(VALUE match)
{
struct rmatch *rm = RMATCH(match)->rmatch;
struct re_registers *regs;
- int num_regs;
- int i, num_pos, c;
+ int i, num_regs, num_pos;
+ long c;
char *s, *p, *q, *e;
rb_encoding *enc;
pair_t *pairs;
@@ -2568,7 +2568,7 @@ reg_match_pos(VALUE re, VALUE *strp, long pos)
rb_backref_set(Qnil);
return -1;
}
- *strp = str = reg_operand(str, Qtrue);
+ *strp = str = reg_operand(str, TRUE);
if (pos != 0) {
if (pos < 0) {
VALUE l = rb_str_length(str);
@@ -2662,7 +2662,7 @@ rb_reg_eqq(VALUE re, VALUE str)
{
long start;
- str = reg_operand(str, Qfalse);
+ str = reg_operand(str, FALSE);
if (NIL_P(str)) {
rb_backref_set(Qnil);
return Qfalse;
@@ -2960,7 +2960,7 @@ rb_reg_quote(VALUE str)
static VALUE
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