2000-06-14

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 31 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index f847b43109..b42556b219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+Wed Jun 14 13:17:02 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c: typo(ig/if).
+
+	* re.c: typo(re/reg). add rb_reg_check().
+
 Wed Jun 14 00:50:14 2000  Wakou Aoyama <wakou@fsinet.or.jp>
 
-	* lib/cig.rb: read_multipart(): if no content body then raise EOFError.
+	* lib/cgi.rb: read_multipart(): if no content body then raise EOFError.
 
 Fri Jun  9 15:11:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
diff --git a/io.c b/io.c
index d33db2b3e8..86d8c0a327 100644
--- a/io.c
+++ b/io.c
@@ -583,7 +583,7 @@ rb_io_gets_internal(argc, argv, io)
 		TRAP_END;
 		if (c == EOF) {
 		    if (ferror(f)) {
-			ig (errno == EINTR) continue;
+			if (errno == EINTR) continue;
 			rb_sys_fail(fptr->path);
 		    }
 		    break;
@@ -673,7 +673,7 @@ rb_io_gets(io)
 	TRAP_END;
 	if (c == EOF) {
 	    if (ferror(f)) {
-		ig (errno == EINTR) continue;
+		if (errno == EINTR) continue;
 		rb_sys_fail(fptr->path);
 	    }
 	    break;
diff --git a/re.c b/re.c
index 16930cdf2b..ffe3b60168 100644
--- a/re.c
+++ b/re.c
@@ -197,6 +197,15 @@ rb_mbclen2(c, re)
     return len;
 }
 
+static void
+rb_reg_check(re)
+    VALUE re;
+{
+    if (!RREGEXP(re)->ptr || !RREGEXP(re)->str) {
+	rb_raise(rb_eTypeError, "uninitialized Regexp");
+    }
+}
+
 extern int ruby_in_compile;
 
 static void
@@ -472,8 +481,8 @@ static int may_need_recompile;
 static VALUE matchcache;
 
 static void
-rb_reg_prepare_re(reg)
-    VALUE reg;
+rb_reg_prepare_re(re)
+    VALUE re;
 {
     int need_recompile = 0;
 
@@ -493,22 +502,22 @@ rb_reg_prepare_re(reg)
 	need_recompile = 1;
     }
 
-    if (!FL_TEST(reg, KCODE_FIXED) &&
-	(RBASIC(reg)->flags & KCODE_MASK) != reg_kcode) {
+    if (!FL_TEST(re, KCODE_FIXED) &&
+	(RBASIC(re)->flags & KCODE_MASK) != reg_kcode) {
 	need_recompile = 1;
-	RBASIC(reg)->flags &= ~KCODE_MASK;
-	RBASIC(reg)->flags |= reg_kcode;
+	RBASIC(re)->flags &= ~KCODE_MASK;
+	RBASIC(re)->flags |= reg_kcode;
     }
 
     if (need_recompile) {
 	char *err;
 
-	if (FL_TEST(reg, KCODE_FIXED))
-	    kcode_set_option(reg);
-	RREGEXP(reg)->ptr->fastmap_accurate = 0;
-	err = re_compile_pattern(RREGEXP(reg)->str, RREGEXP(reg)->len, RREGEXP(reg)->ptr);
+	if (FL_TEST(re, KCODE_FIXED))
+	    kcode_set_option(re);
+	RREGEXP(re)->ptr->fastmap_accurate = 0;
+	err = re_compile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr);
 	if (err != NULL) {
-	    rb_reg_raise(RREGEXP(reg)->str, RREGEXP(reg)->len, err, reg);
+	    rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len, err, re);
 	}
     }
 }
diff --git a/version.h b/version.h
index 62b80d5352..f34d4ec03e 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.4.4"
-#define RUBY_RELEASE_DATE "2000-06-13"
+#define RUBY_RELEASE_DATE "2000-06-14"
 #define RUBY_VERSION_CODE 144
-#define RUBY_RELEASE_CODE 20000613
+#define RUBY_RELEASE_CODE 20000614