mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (eval): warning during eval should not cause deadlock.
[ruby-talk:98651] * eval.c (rb_eval): raise TypeError exception for superclass mismatch. [ruby-dev:39567] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz
parent
7268344d38
commit
0cf6e773be
8 changed files with 62 additions and 27 deletions
|
|
@ -64,6 +64,14 @@ Mon May 10 21:44:42 2004 Dave Thomas <dave@pragprog.com>
|
|||
* lib/rdoc/generators/html_generator.rb: Change scheme for
|
||||
looking up symbols in HTML generator.
|
||||
|
||||
Mon May 10 16:45:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (eval): warning during eval should not cause deadlock.
|
||||
[ruby-talk:98651]
|
||||
|
||||
* eval.c (rb_eval): raise TypeError exception for superclass
|
||||
mismatch. [ruby-dev:39567]
|
||||
|
||||
Mon May 10 12:11:37 2004 Dave Thomas <dave@pragprog.com>
|
||||
|
||||
* lib/rdoc/generators/html_generator.rb: Hack to search parents
|
||||
|
|
|
|||
7
eval.c
7
eval.c
|
|
@ -3796,7 +3796,8 @@ rb_eval(self, n)
|
|||
if (super) {
|
||||
tmp = rb_class_real(RCLASS(klass)->super);
|
||||
if (tmp != super) {
|
||||
goto override_class;
|
||||
rb_raise(rb_eTypeError, "superclass mismatch for class %s",
|
||||
rb_id2name(cname));
|
||||
}
|
||||
super = 0;
|
||||
}
|
||||
|
|
@ -3805,7 +3806,6 @@ rb_eval(self, n)
|
|||
}
|
||||
}
|
||||
else {
|
||||
override_class:
|
||||
if (!super) super = rb_cObject;
|
||||
klass = rb_define_class_id(cname, super);
|
||||
rb_set_class_path(klass, cbase, rb_id2name(cname));
|
||||
|
|
@ -6029,6 +6029,7 @@ eval(self, src, scope, file, line)
|
|||
struct FRAME frame;
|
||||
NODE *nodesave = ruby_current_node;
|
||||
volatile int iter = ruby_frame->iter;
|
||||
volatile int safe = ruby_safe_level;
|
||||
int state;
|
||||
|
||||
if (!NIL_P(scope)) {
|
||||
|
|
@ -6082,6 +6083,7 @@ eval(self, src, scope, file, line)
|
|||
if ((state = EXEC_TAG()) == 0) {
|
||||
NODE *node;
|
||||
|
||||
ruby_safe_level = 0;
|
||||
result = ruby_errinfo;
|
||||
ruby_errinfo = Qnil;
|
||||
node = compile(src, file, line);
|
||||
|
|
@ -6094,6 +6096,7 @@ eval(self, src, scope, file, line)
|
|||
POP_TAG();
|
||||
POP_CLASS();
|
||||
ruby_in_eval--;
|
||||
ruby_safe_level = safe;
|
||||
if (!NIL_P(scope)) {
|
||||
int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
|
||||
|
||||
|
|
|
|||
|
|
@ -280,6 +280,14 @@ fdbm_values_at(argc, argv, obj)
|
|||
return new;
|
||||
}
|
||||
|
||||
static void
|
||||
fdbm_modify(obj)
|
||||
VALUE obj;
|
||||
{
|
||||
rb_secure(4);
|
||||
if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fdbm_delete(obj, keystr)
|
||||
VALUE obj, keystr;
|
||||
|
|
@ -289,7 +297,7 @@ fdbm_delete(obj, keystr)
|
|||
DBM *dbm;
|
||||
VALUE valstr;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
StringValue(keystr);
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
key.dsize = RSTRING(keystr)->len;
|
||||
|
|
@ -325,7 +333,7 @@ fdbm_shift(obj)
|
|||
DBM *dbm;
|
||||
VALUE keystr, valstr;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
dbmp->di_size = -1;
|
||||
|
|
@ -351,7 +359,7 @@ fdbm_delete_if(obj)
|
|||
VALUE ret, ary = rb_ary_new();
|
||||
int i, status = 0, n;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
n = dbmp->di_size;
|
||||
|
|
@ -388,7 +396,7 @@ fdbm_clear(obj)
|
|||
struct dbmdata *dbmp;
|
||||
DBM *dbm;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
dbmp->di_size = -1;
|
||||
|
|
@ -471,7 +479,7 @@ fdbm_store(obj, keystr, valstr)
|
|||
struct dbmdata *dbmp;
|
||||
DBM *dbm;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
keystr = rb_obj_as_string(keystr);
|
||||
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
|
|
|
|||
|
|
@ -387,6 +387,14 @@ fgdbm_values_at(argc, argv, obj)
|
|||
return new;
|
||||
}
|
||||
|
||||
static void
|
||||
rb_gdbm_modify(obj)
|
||||
VALUE obj;
|
||||
{
|
||||
rb_secure(4);
|
||||
if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
|
||||
}
|
||||
|
||||
static VALUE
|
||||
rb_gdbm_delete(obj, keystr)
|
||||
VALUE obj, keystr;
|
||||
|
|
@ -395,7 +403,7 @@ rb_gdbm_delete(obj, keystr)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
StringValue(keystr);
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
key.dsize = RSTRING(keystr)->len;
|
||||
|
|
@ -436,7 +444,7 @@ fgdbm_shift(obj)
|
|||
GDBM_FILE dbm;
|
||||
VALUE keystr, valstr;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
|
|
@ -458,7 +466,7 @@ fgdbm_delete_if(obj)
|
|||
VALUE ret, ary = rb_ary_new();
|
||||
int i, status = 0, n;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
n = dbmp->di_size;
|
||||
|
|
@ -489,7 +497,7 @@ fgdbm_clear(obj)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
dbmp->di_size = -1;
|
||||
|
|
@ -588,7 +596,7 @@ fgdbm_store(obj, keystr, valstr)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
StringValue(keystr);
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
key.dsize = RSTRING(keystr)->len;
|
||||
|
|
@ -830,7 +838,7 @@ fgdbm_reorganize(obj)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
gdbm_reorganize(dbm);
|
||||
|
|
@ -844,7 +852,7 @@ fgdbm_sync(obj)
|
|||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
rb_gdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
gdbm_sync(dbm);
|
||||
|
|
|
|||
|
|
@ -268,6 +268,14 @@ fsdbm_values_at(argc, argv, obj)
|
|||
return new;
|
||||
}
|
||||
|
||||
static void
|
||||
fdbm_modify(obj)
|
||||
VALUE obj;
|
||||
{
|
||||
rb_secure(4);
|
||||
if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fsdbm_delete(obj, keystr)
|
||||
VALUE obj, keystr;
|
||||
|
|
@ -277,7 +285,7 @@ fsdbm_delete(obj, keystr)
|
|||
DBM *dbm;
|
||||
VALUE valstr;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
StringValue(keystr);
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
key.dsize = RSTRING(keystr)->len;
|
||||
|
|
@ -314,7 +322,7 @@ fsdbm_shift(obj)
|
|||
DBM *dbm;
|
||||
VALUE keystr, valstr;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
|
|
@ -342,7 +350,7 @@ fsdbm_delete_if(obj)
|
|||
VALUE ret, ary = rb_ary_new();
|
||||
int i, status = 0, n;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
n = dbmp->di_size;
|
||||
|
|
@ -378,7 +386,7 @@ fsdbm_clear(obj)
|
|||
struct dbmdata *dbmp;
|
||||
DBM *dbm;
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
dbmp->di_size = -1;
|
||||
|
|
@ -466,7 +474,7 @@ fsdbm_store(obj, keystr, valstr)
|
|||
return Qnil;
|
||||
}
|
||||
|
||||
rb_secure(4);
|
||||
fdbm_modify(obj);
|
||||
keystr = rb_obj_as_string(keystr);
|
||||
|
||||
key.dptr = RSTRING(keystr)->ptr;
|
||||
|
|
|
|||
2
intern.h
2
intern.h
|
|
@ -211,7 +211,7 @@ void rb_thread_interrupt _((void));
|
|||
void rb_thread_trap_eval _((VALUE, int));
|
||||
void rb_thread_signal_raise _((char*));
|
||||
int rb_thread_select _((int, fd_set *, fd_set *, fd_set *, struct timeval *));
|
||||
void rb_thread_wait_for _((struct timeval time));
|
||||
void rb_thread_wait_for _((struct timeval));
|
||||
VALUE rb_thread_current _((void));
|
||||
VALUE rb_thread_main _((void));
|
||||
VALUE rb_thread_local_aref _((VALUE, ID));
|
||||
|
|
|
|||
6
time.c
6
time.c
|
|
@ -1895,11 +1895,11 @@ time_mdump(time)
|
|||
t = tobj->tv.tv_sec;
|
||||
tm = gmtime(&t);
|
||||
|
||||
if ((tm->tm_year & 0x1ffff) != tm->tm_year)
|
||||
if ((tm->tm_year & 0xffff) != tm->tm_year)
|
||||
rb_raise(rb_eArgError, "year too big to marshal");
|
||||
|
||||
p = 0x1 << 31 | /* 1 */
|
||||
tm->tm_year << 14 | /* 17 */
|
||||
tm->tm_year << 14 | /* 16 */
|
||||
tm->tm_mon << 10 | /* 4 */
|
||||
tm->tm_mday << 5 | /* 5 */
|
||||
tm->tm_hour; /* 5 */
|
||||
|
|
@ -1980,7 +1980,7 @@ time_mload(time, str)
|
|||
}
|
||||
else {
|
||||
p &= ~(1<<31);
|
||||
tm.tm_year = (p >> 14) & 0x1ffff;
|
||||
tm.tm_year = (p >> 14) & 0xffff;
|
||||
tm.tm_mon = (p >> 10) & 0xf;
|
||||
tm.tm_mday = (p >> 5) & 0x1f;
|
||||
tm.tm_hour = p & 0x1f;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#define RUBY_VERSION "1.8.1"
|
||||
#define RUBY_VERSION "1.8.2"
|
||||
#define RUBY_RELEASE_DATE "2004-05-14"
|
||||
#define RUBY_VERSION_CODE 181
|
||||
#define RUBY_VERSION_CODE 182
|
||||
#define RUBY_RELEASE_CODE 20040514
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 8
|
||||
#define RUBY_VERSION_TEENY 1
|
||||
#define RUBY_VERSION_TEENY 2
|
||||
#define RUBY_RELEASE_YEAR 2004
|
||||
#define RUBY_RELEASE_MONTH 5
|
||||
#define RUBY_RELEASE_MONTH 05
|
||||
#define RUBY_RELEASE_DAY 14
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue