summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukihiro Matsumoto <matz@ruby-lang.org>1997-11-25 15:03:28 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2019-08-17 22:09:33 +0900
commitab261638f5b87384fa2bda5678cb38ae9a505209 (patch)
treeb93a5710992f99f4a108736e7ef0fd8bc710f609
parentcfd31fa21b67c4992a0360d7c605de1c6add874e (diff)
version 1.0-971125v1_0_971125
https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971125.tar.gz Tue Nov 25 15:03:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * version 1.0-971125 Fri Nov 21 13:17:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * parse.y (yylex): skip multibyte characters in comments. Wed Nov 19 17:19:20 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * parse.y (call_args): wrong node generation.
-rw-r--r--ChangeLog14
-rw-r--r--ext/dbm/dbm.c1
-rw-r--r--parse.y9
-rw-r--r--version.h4
4 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index cf892967cb..20cf65f4aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Nov 25 15:03:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * version 1.0-971125
+
+Fri Nov 21 13:17:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * parse.y (yylex): skip multibyte characters in comments.
+
+Wed Nov 19 17:19:20 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * parse.y (call_args): wrong node generation.
+
Tue Nov 18 13:59:59 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-971118
@@ -23,8 +35,6 @@ Thu Oct 30 16:54:01 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* string.c (str_chop_bang): "".chop caused SEGV.
- * string.c (str_chomp_bang): method to chop out last newline.
-
Mon Oct 27 13:49:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ext/extmk.rb.in: library may have pathname contains `.'
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index f0522f2d48..5107aab279 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -206,6 +206,7 @@ fdbm_delete_if(obj)
rb_secure(4);
GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
keystr = str_taint(str_new(key.dptr, key.dsize));
diff --git a/parse.y b/parse.y
index 50e6db2b39..b7abb1bb58 100644
--- a/parse.y
+++ b/parse.y
@@ -695,6 +695,7 @@ call_args0 : args
}
| STAR arg
{
+ value_expr($2);
$$ = $2;
}
@@ -730,12 +731,15 @@ mrhs : args
}
| STAR arg
{
+ value_expr($2);
$$ = $2;
}
ret_args : call_args0
{
- if ($1 && $1->nd_next == 0) {
+ if ($1 &&
+ nd_type($1) == NODE_ARRAY &&
+ $1->nd_next == 0) {
$$ = $1->nd_head;
}
else {
@@ -1977,10 +1981,11 @@ retry:
while ((c = nextc()) != '\n') {
if (c == -1)
return 0;
- if (c == '\\') { /* skip a char */
+ if (c == '\\') { /* skip a char */
c = nextc();
if (c == '\n') sourceline++;
}
+ if (ismbchar(c)) c = nextc();
}
/* fall through */
case '\n':
diff --git a/version.h b/version.h
index 3f0a1ff88b..ae1a0cda4a 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define RUBY_VERSION "1.0-971118"
-#define VERSION_DATE "97/11/18"
+#define RUBY_VERSION "1.0-971125"
+#define VERSION_DATE "97/11/25"