nobu	2009-02-03 11:25:42 +0900 (Tue, 03 Feb 2009)

  New Revision: 21993

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21993

  Log:
    * load.c (load_lock): warn for circular require.  [ruby-core:20794],
      [ruby-core:20797]

  Modified files:
    trunk/ChangeLog
    trunk/load.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21992)
+++ ChangeLog	(revision 21993)
@@ -1,3 +1,8 @@
+Tue Feb  3 11:25:41 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* load.c (load_lock): warn for circular require.  [ruby-core:20794],
+	  [ruby-core:20797]
+
 Tue Feb  3 08:35:12 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets): extracted from
Index: load.c
===================================================================
--- load.c	(revision 21992)
+++ load.c	(revision 21993)
@@ -379,6 +379,7 @@
 	st_insert(loading_tbl, (st_data_t)ftptr, data);
 	return (char *)ftptr;
     }
+    rb_warning("loading in progress, circular require considered harmful - %s", ftptr);
     return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0;
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/