ruby
diff --git a/‎ChangeLog
Lines changed: 11 additions & 0 deletions b/‎ChangeLog
Lines changed: 11 additions & 0 deletions
diff --git a/‎MANIFEST
Lines changed: 1 addition & 0 deletions b/‎MANIFEST
Lines changed: 1 addition & 0 deletions
diff --git a/‎eval.c
Lines changed: 15 additions & 3 deletions b/‎eval.c
Lines changed: 15 additions & 3 deletions
diff --git a/‎ext/extmk.rb.in
Lines changed: 1 addition & 1 deletion b/‎ext/extmk.rb.in
Lines changed: 1 addition & 1 deletion
diff --git a/‎ext/marshal/marshal.c
Lines changed: 8 additions & 4 deletions b/‎ext/marshal/marshal.c
Lines changed: 8 additions & 4 deletions
@@ -1,5 +1,16 @@
+Fri Oct  3 10:51:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.0-971003
+
+	* eval.c (ruby_options): f_require() called too early.
+
+	* eval.c (rb_provide): module extentions should always be `.o'.
+
 Thu Oct  2 17:59:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
+	* ext/marshal/marshal.c (r_object): remove temporal regist for
+ 	  structs. (caused problem if structs form cycles.)
+
 	* version 1.0-971002
 
 Wed Oct  1 14:01:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
@@ -48,6 +48,7 @@ re.c
 re.h
 regex.c
 regex.h
+ruby.1
 ruby.c
 ruby.h
 sig.h
 
@@ -675,13 +675,14 @@ ruby_options(argc, argv)
 
     PUSH_TAG()
     if ((state = EXEC_TAG()) == 0) {
-	NODE *save = eval_tree;
+	NODE *save;
 
 	Init_ext();
 	ext_init = 1;
+	ruby_process_options(argc, argv);
+	save = eval_tree;
 	rb_require_modules();
 	eval_tree = save;
-	ruby_process_options(argc, argv);
     }
     POP_TAG();
     if (state) error_print();
@@ -3537,8 +3538,19 @@ void
 rb_provide(feature)
     char *feature;
 {
-    if (!rb_provided(feature))
+    char *buf, *ext;
+
+    if (!rb_provided(feature)) {
+	ext = strrchr(feature, '.');
+	if (strcmp(DLEXT, ext) == 0) {
+	    buf = ALLOCA_N(char, strlen(feature)+1);
+	    strcpy(buf, feature);
+	    ext = strrchr(buf, '.');
+	    strcpy(ext, ".o");
+	    feature = buf;
+	}
 	ary_push(rb_features, str_new2(feature));
+    }
 }
 
 VALUE
 
@@ -243,7 +243,7 @@ libdir = @libdir@/ruby/@arch@
   mfile.printf $objs.join(" ")
   mfile.printf "\n"
 
-  dots = if "@INSTALL@" =~ /^\// then "" else "#{$topdir}/" end
+  dots = if "@INSTALL@" =~ /^\// then "" else "#{$topdir}/ext" end
   mfile.printf "\
 TARGET = %s.%s
 
 
@@ -620,7 +620,9 @@ r_object(arg)
 
       case TYPE_FLOAT:
 	{
+#ifndef atof
 	    double atof();
+#endif
 	    char *buf;
 
 	    r_bytes(buf, arg);
@@ -695,15 +697,17 @@ r_object(arg)
 	    len = r_long(arg);
 
 	    values = ary_new2(len);
-	    i = 0;
+	    for (i=0; i<len; i++) {
+		ary_push(values, Qnil);
+	    }
+	    v = struct_alloc(class, values);
+	    r_regist(v, arg);
 	    for (i=0; i<len; i++) {
 		ID slot = r_symbol(arg);
 		if (RARRAY(mem)->ptr[i] != INT2FIX(slot))
 		    TypeError("struct not compatible");
-		ary_push(values, r_object(arg));
+		struct_aset(v, INT2FIX(i), r_object(arg));
 	    }
-	    v = struct_alloc(class, values);
-	    st_insert(arg->data, num, v); /* re-regist */
 	    return v;
 	}
 	break;
-Original file line number
+Diff line change
 re.h
 regex.c
 regex.h
 +ruby.1
 ruby.c
 ruby.h
 sig.h