summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ToDo1
-rw-r--r--eval.c2
-rw-r--r--lib/cgi/session.rb2
-rw-r--r--marshal.c2
-rw-r--r--mkconfig.rb10
-rw-r--r--ruby.c7
-rw-r--r--version.h4
8 files changed, 26 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 1941000..cb9a695 100644
--- a/ChangeLog
+++ b/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.
diff --git a/ToDo b/ToDo
index 6ccbd17..1e9cd7f 100644
--- a/ToDo
+++ b/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(?)
diff --git a/eval.c b/eval.c
index f1a5a8d..00006ae 100644
--- a/eval.c
+++ b/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);
}
}
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index c584fdb..edbae8c 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -1,5 +1,5 @@
-require 'CGI'
+require 'cgi'
require 'final'
class CGI
diff --git a/marshal.c b/marshal.c
index fa2fa4b..fe29385 100644
--- a/marshal.c
+++ b/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;
diff --git a/mkconfig.rb b/mkconfig.rb
index 093d023..671e9bd 100644
--- a/mkconfig.rb
+++ b/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
diff --git a/ruby.c b/ruby.c
index a38a5f1..1987985 100644
--- a/ruby.c
+++ b/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] = '$';
diff --git a/version.h b/version.h
index 9384782..6baa265 100644
--- a/version.h
+++ b/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