summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--re.c2
-rw-r--r--string.c2
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 619c616be7..b088bfa725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb 6 11:44:40 2003 MoonWolf <moonwolf@moonwolf.com>
+
+ * re.c (rb_reg_initialize_m): 3rd argument was ignored.
+
+Thu Feb 6 01:09:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_count): return 0 for empty string (was
+ returning nil).
+
Wed Feb 5 19:41:37 2003 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb: dispatch code restructured to make it openable
@@ -8,7 +17,7 @@ Wed Feb 5 19:41:37 2003 Tanaka Akira <akr@m17n.org>
Wed Feb 5 17:11:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (yylex): no .<digit> floating literal anymore.
+ * parse.y (yylex): no .<digit> float literal anymore.
Tue Feb 4 16:11:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/re.c b/re.c
index 830a227732..b837da8c3f 100644
--- a/re.c
+++ b/re.c
@@ -1265,7 +1265,7 @@ rb_reg_initialize_m(argc, argv, self)
if (FIXNUM_P(argv[1])) flags = FIX2INT(argv[1]);
else if (RTEST(argv[1])) flags = RE_OPTION_IGNORECASE;
}
- else if (argc == 3) {
+ if (argc == 3) {
char *kcode = StringValuePtr(argv[2]);
switch (kcode[0]) {
diff --git a/string.c b/string.c
index d2fdc44806..0cadd61fe2 100644
--- a/string.c
+++ b/string.c
@@ -2478,7 +2478,7 @@ rb_str_count(argc, argv, str)
}
s = RSTRING(str)->ptr;
- if (!s || RSTRING(str)->len == 0) return Qnil;
+ if (!s || RSTRING(str)->len == 0) return INT2FIX(0);
send = s + RSTRING(str)->len;
i = 0;
while (s < send) {