19991292

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

ChangeLog

@@ -1,3 +1,11 @@
+Thu Dec  2 10:21:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_loading_done): wrong parameter to st_delete().
+
+Wed Dec  1 11:24:06 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ruby.c (process_sflag): process -s properly (should not force `--').
+
 Wed Dec  1 09:47:33 1999  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
 
 	* string.c (rb_str_split_method): should increment end too.

ToDo

@@ -42,6 +42,7 @@ Standard Libraries
 - Dir.glob(pat){|f|...}
 - sprintf/printf's $ to specify argument order
 - Dir.glob("**/*.c") ala zsh
+* SyntaxError and NameError should not be subclasses of StandardError, maybe.
 * debugger for thread programming
 * Struct::new([name,]member,...) ??
 * String#scanf(?)

eval.c

@@ -7377,7 +7377,7 @@ rb_thread_loading_done(feature)
     const char *feature;
 {
     if (loading_tbl) {
-	st_delete(loading_tbl, feature, 0);
+	st_delete(loading_tbl, &feature, 0);
     }
 }
 

lib/cgi/session.rb

@@ -1,5 +1,5 @@
 
-require 'CGI'
+require 'cgi'
 require 'final'
 
 class CGI

marshal.c

@@ -735,7 +735,7 @@ r_object(arg)
 		VALUE value = r_object(arg);
 		rb_hash_aset(v, key, value);
 	    }
-	    if (type = TYPE_HASH_DEF) {
+	    if (type == TYPE_HASH_DEF) {
 		RHASH(v)->ifnone = r_object(arg);
 	    }
 	    return v;

mkconfig.rb

@@ -75,15 +75,21 @@ end
 print v_fast, v_others
 print <<EOS
   CONFIG["compile_dir"] = "#{Dir.pwd}"
-  CONFIG.each_value do |val|
+  MAKEFILE_CONFIG = {}
+  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
+  def Config::expand(val)
     val.gsub!(/\\$\\(([^()]+)\\)/) do |var|
       key = $1
       if CONFIG.key? key
-        "\#{CONFIG[\\\"\#{key}\\\"]}"
+        "\#{Config::expand(CONFIG[\\\"\#{key}\\\"])}"
       else
 	var
       end
     end
+    val
+  end
+  CONFIG.each_value do |val|
+    Config::expand(val)
   end
 end
 EOS

ruby.c

@@ -266,11 +266,12 @@ process_sflag()
 
 	n = RARRAY(rb_argv)->len;
 	args = RARRAY(rb_argv)->ptr;
-	while (n--) {
-	    char *s = STR2CSTR(*args);
+	while (n > 0) {
+	    char *s = STR2CSTR(*args++);
 	    char *p;
 
-	    if (s[0] != '-') continue;
+	    if (s[0] != '-') break;
+	    n--;
 	    if (s[1] == '-' && s[2] == '\0') break;
 
 	    s[0] = '$';

version.h

@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.5.0"
-#define RUBY_RELEASE_DATE "1999-12-01"
+#define RUBY_RELEASE_DATE "1999-12-02"
 #define RUBY_VERSION_CODE 150
-#define RUBY_RELEASE_CODE 19991201
+#define RUBY_RELEASE_CODE 19991202