summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-02-23 05:36:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-02-23 05:36:39 +0000
commitabf6499961c0cf0dd7a20323e915f9c82fcf8b4f (patch)
tree71222aae8d6db13f30e06558a63180b419791bc2
parent7aee4189a11d747fe80275f5bd931b2d0a897771 (diff)
*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@89 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--eval.c2
-rw-r--r--ext/tcltklib/extconf.rb5
-rw-r--r--io.c4
-rw-r--r--object.c2
-rw-r--r--re.c5
-rw-r--r--sample/rbc.rb2
7 files changed, 24 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e5bce8bf9a..6fdf517b0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Feb 23 12:11:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * re.c (reg_s_quote): needed to be mbchar aware.
+
+ * eval.c (proc_s_new): wrong iter mark.
+
+Sat Feb 21 22:59:30 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
+
+ * io.c (f_syscall): no argument check.
+
Fri Feb 20 10:17:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.1b8 released.
@@ -32,6 +42,7 @@ Wed Feb 18 00:41:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (str_sub_s): needed to be mbchar aware to increment one
character.
+
* regex.c (re_match): \Z matches newline just before the end of
the string.
diff --git a/eval.c b/eval.c
index 57aa51171d..570a4a490f 100644
--- a/eval.c
+++ b/eval.c
@@ -4442,7 +4442,7 @@ proc_s_new(klass)
#ifdef THREAD
data->orig_thread = thread_current();
#endif
- data->iter = f_iterator_p();
+ data->iter = data->prev?TRUE:FALSE;
data->frame.argv = ALLOC_N(VALUE, data->frame.argc);
MEMCPY(data->frame.argv, the_block->frame.argv, VALUE, data->frame.argc);
if (data->iter) {
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
index bb7327db0b..8032b1357b 100644
--- a/ext/tcltklib/extconf.rb
+++ b/ext/tcltklib/extconf.rb
@@ -43,7 +43,8 @@ search_header("X11/Xlib.h",
"/usr/include",
"/usr/X11*/include",
"/usr/include",
- "/usr/X11*/include")
+ "/usr/X11*/include",
+ "/usr/openwin/include")
$CFLAGS = "-Wall " + $includes.collect{|path| "-I" + path}.join(" ")
@@ -74,7 +75,7 @@ end
if have_header("tcl.h") && have_header("tk.h") &&
search_lib("libX11.{a,so}", "XOpenDisplay",
- "/usr/lib", "/usr/X11*/lib") &&
+ "/usr/lib", "/usr/X11*/lib", "/usr/openwin/lib") &&
search_lib("libtcl{,7*,8*}.{a,so}", "Tcl_FindExecutable",
"/usr/lib", "/usr/local/lib") &&
search_lib("libtk{,4*,8*}.{a,so}", "Tk_Init",
diff --git a/io.c b/io.c
index 6e4c7e7d76..d5b10ee141 100644
--- a/io.c
+++ b/io.c
@@ -1955,6 +1955,8 @@ f_syscall(argc, argv)
*/
rb_secure(2);
+ if (argc == 0)
+ ArgError("too few arguments for syscall");
arg[0] = NUM2INT(argv[0]); argv++;
while (items--) {
if (FIXNUM_P(*argv)) {
@@ -1968,8 +1970,6 @@ f_syscall(argc, argv)
i++;
}
switch (argc) {
- case 0:
- ArgError("Too few args to syscall");
case 1:
retval = syscall(arg[0]);
break;
diff --git a/object.c b/object.c
index 3339364d38..fe910d6441 100644
--- a/object.c
+++ b/object.c
@@ -212,7 +212,7 @@ obj_is_instance_of(obj, c)
}
cl = CLASS_OF(obj);
- while (FL_TEST(cl, FL_SINGLETON)) {
+ while (FL_TEST(cl, FL_SINGLETON) || TYPE(cl) == T_ICLASS) {
cl = RCLASS(cl)->super;
}
if (c == cl) return TRUE;
diff --git a/re.c b/re.c
index f977face5c..a7b6d69f42 100644
--- a/re.c
+++ b/re.c
@@ -816,6 +816,11 @@ reg_s_quote(re, str)
t = tmp;
for (; s != send; s++) {
+ if (ismbchar(*s)) {
+ *t++ = *s++;
+ *t++ = *s;
+ continue;
+ }
if (*s == '[' || *s == ']'
|| *s == '{' || *s == '}'
|| *s == '(' || *s == ')'
diff --git a/sample/rbc.rb b/sample/rbc.rb
index 7ab0edba12..a97f2a162e 100644
--- a/sample/rbc.rb
+++ b/sample/rbc.rb
@@ -849,7 +849,7 @@ module BC_APPLICATION__
return true
end
when /\.(so|o|sl)$/
- require_org(file_name)
+ rbc_require_org(file_name)
end
if load_sub(f = file_name + ".rb")