2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
marshal.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Thu Apr 27 16:30:01 JST 1995
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-24 23:29:39 -04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 05:42:38 -04:00
|
|
|
|
|
|
|
**********************************************************************/
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/io.h"
|
|
|
|
#include "ruby/st.h"
|
|
|
|
#include "ruby/util.h"
|
2007-10-19 07:08:16 -04:00
|
|
|
#include "ruby/encoding.h"
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2003-01-15 01:29:05 -05:00
|
|
|
#include <math.h>
|
2003-04-20 11:11:20 -04:00
|
|
|
#ifdef HAVE_FLOAT_H
|
|
|
|
#include <float.h>
|
|
|
|
#endif
|
2003-12-22 03:23:55 -05:00
|
|
|
#ifdef HAVE_IEEEFP_H
|
|
|
|
#include <ieeefp.h>
|
|
|
|
#endif
|
2003-01-15 01:29:05 -05:00
|
|
|
|
2001-08-29 02:28:51 -04:00
|
|
|
#define BITSPERSHORT (2*CHAR_BIT)
|
2000-10-31 03:37:47 -05:00
|
|
|
#define SHORTMASK ((1<<BITSPERSHORT)-1)
|
|
|
|
#define SHORTDN(x) RSHIFT(x,BITSPERSHORT)
|
|
|
|
|
|
|
|
#if SIZEOF_SHORT == SIZEOF_BDIGITS
|
|
|
|
#define SHORTLEN(x) (x)
|
|
|
|
#else
|
2009-05-26 00:58:15 -04:00
|
|
|
static long
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
shortlen(long len, BDIGIT *ds)
|
2000-10-31 03:37:47 -05:00
|
|
|
{
|
|
|
|
BDIGIT num;
|
|
|
|
int offset = 0;
|
|
|
|
|
|
|
|
num = ds[len-1];
|
|
|
|
while (num) {
|
|
|
|
num = SHORTDN(num);
|
|
|
|
offset++;
|
|
|
|
}
|
2001-08-29 02:28:51 -04:00
|
|
|
return (len - 1)*sizeof(BDIGIT)/2 + offset;
|
2000-10-31 03:37:47 -05:00
|
|
|
}
|
|
|
|
#define SHORTLEN(x) shortlen((x),d)
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
#define MARSHAL_MAJOR 4
|
* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,
object.c, string.c, variable.c, vm_macro.def: revert private
instance variable feature, which is postponed until next major
release.
* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
8th version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-22 21:49:41 -05:00
|
|
|
#define MARSHAL_MINOR 8
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
#define TYPE_NIL '0'
|
|
|
|
#define TYPE_TRUE 'T'
|
|
|
|
#define TYPE_FALSE 'F'
|
|
|
|
#define TYPE_FIXNUM 'i'
|
|
|
|
|
2002-09-05 05:42:56 -04:00
|
|
|
#define TYPE_EXTENDED 'e'
|
1998-01-16 07:19:09 -05:00
|
|
|
#define TYPE_UCLASS 'C'
|
|
|
|
#define TYPE_OBJECT 'o'
|
2002-09-05 05:42:56 -04:00
|
|
|
#define TYPE_DATA 'd'
|
1998-01-16 07:19:09 -05:00
|
|
|
#define TYPE_USERDEF 'u'
|
2003-04-20 11:11:20 -04:00
|
|
|
#define TYPE_USRMARSHAL 'U'
|
1998-01-16 07:19:09 -05:00
|
|
|
#define TYPE_FLOAT 'f'
|
|
|
|
#define TYPE_BIGNUM 'l'
|
|
|
|
#define TYPE_STRING '"'
|
|
|
|
#define TYPE_REGEXP '/'
|
|
|
|
#define TYPE_ARRAY '['
|
|
|
|
#define TYPE_HASH '{'
|
1999-12-01 04:24:48 -05:00
|
|
|
#define TYPE_HASH_DEF '}'
|
1998-01-16 07:19:09 -05:00
|
|
|
#define TYPE_STRUCT 'S'
|
1999-12-01 04:24:48 -05:00
|
|
|
#define TYPE_MODULE_OLD 'M'
|
|
|
|
#define TYPE_CLASS 'c'
|
|
|
|
#define TYPE_MODULE 'm'
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
#define TYPE_SYMBOL ':'
|
|
|
|
#define TYPE_SYMLINK ';'
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
#define TYPE_IVAR 'I'
|
1998-01-16 07:19:09 -05:00
|
|
|
#define TYPE_LINK '@'
|
|
|
|
|
2003-07-29 14:26:55 -04:00
|
|
|
static ID s_dump, s_load, s_mdump, s_mload;
|
2008-10-01 06:11:51 -04:00
|
|
|
static ID s_dump_data, s_load_data, s_alloc, s_call;
|
2008-01-25 11:37:53 -05:00
|
|
|
static ID s_getbyte, s_read, s_write, s_binmode;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2007-10-19 07:08:16 -04:00
|
|
|
ID rb_id_encoding(void);
|
|
|
|
|
2007-09-08 11:07:18 -04:00
|
|
|
typedef struct {
|
|
|
|
VALUE newclass;
|
|
|
|
VALUE oldclass;
|
|
|
|
VALUE (*dumper)(VALUE);
|
|
|
|
VALUE (*loader)(VALUE, VALUE);
|
|
|
|
} marshal_compat_t;
|
|
|
|
|
|
|
|
static st_table *compat_allocator_tbl;
|
2007-09-26 15:12:04 -04:00
|
|
|
static VALUE compat_allocator_tbl_wrapper;
|
|
|
|
|
|
|
|
static int
|
|
|
|
mark_marshal_compat_i(st_data_t key, st_data_t value)
|
|
|
|
{
|
|
|
|
marshal_compat_t *p = (marshal_compat_t *)value;
|
|
|
|
rb_gc_mark(p->newclass);
|
|
|
|
rb_gc_mark(p->oldclass);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
mark_marshal_compat_t(void *tbl)
|
|
|
|
{
|
|
|
|
if (!tbl) return;
|
|
|
|
st_foreach(tbl, mark_marshal_compat_i, 0);
|
|
|
|
}
|
2007-09-08 11:07:18 -04:00
|
|
|
|
|
|
|
void
|
|
|
|
rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE))
|
|
|
|
{
|
|
|
|
marshal_compat_t *compat;
|
|
|
|
rb_alloc_func_t allocator = rb_get_alloc_func(newclass);
|
|
|
|
|
|
|
|
if (!allocator) {
|
|
|
|
rb_raise(rb_eTypeError, "no allocator");
|
|
|
|
}
|
|
|
|
|
|
|
|
compat = ALLOC(marshal_compat_t);
|
|
|
|
compat->newclass = Qnil;
|
|
|
|
compat->oldclass = Qnil;
|
|
|
|
compat->newclass = newclass;
|
|
|
|
compat->oldclass = oldclass;
|
|
|
|
compat->dumper = dumper;
|
|
|
|
compat->loader = loader;
|
|
|
|
|
|
|
|
st_insert(compat_allocator_tbl, (st_data_t)allocator, (st_data_t)compat);
|
|
|
|
}
|
|
|
|
|
2010-06-23 16:44:44 -04:00
|
|
|
#define MARSHAL_INFECTION (FL_TAINT|FL_UNTRUSTED)
|
|
|
|
typedef char ruby_check_marshal_viral_flags[MARSHAL_INFECTION == (int)MARSHAL_INFECTION ? 1 : -1];
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
struct dump_arg {
|
2002-10-17 06:20:52 -04:00
|
|
|
VALUE str, dest;
|
2003-08-06 17:50:06 -04:00
|
|
|
st_table *symbols;
|
1998-01-16 07:19:09 -05:00
|
|
|
st_table *data;
|
2007-09-08 11:07:18 -04:00
|
|
|
st_table *compat_tbl;
|
2007-10-19 07:08:16 -04:00
|
|
|
st_table *encodings;
|
2010-06-23 16:44:44 -04:00
|
|
|
int infection;
|
1998-01-16 07:19:09 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
struct dump_call_arg {
|
|
|
|
VALUE obj;
|
|
|
|
struct dump_arg *arg;
|
|
|
|
int limit;
|
|
|
|
};
|
|
|
|
|
2008-05-22 07:20:56 -04:00
|
|
|
static void
|
2008-10-01 06:11:51 -04:00
|
|
|
check_dump_arg(struct dump_arg *arg, ID sym)
|
2008-05-22 07:20:56 -04:00
|
|
|
{
|
2009-10-04 06:30:56 -04:00
|
|
|
if (!arg->symbols) {
|
2008-10-01 06:11:51 -04:00
|
|
|
rb_raise(rb_eRuntimeError, "Marshal.dump reentered at %s",
|
|
|
|
rb_id2name(sym));
|
2008-05-22 07:20:56 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
static void clear_dump_arg(struct dump_arg *arg);
|
|
|
|
|
2007-09-26 15:40:49 -04:00
|
|
|
static void
|
|
|
|
mark_dump_arg(void *ptr)
|
|
|
|
{
|
|
|
|
struct dump_arg *p = ptr;
|
2009-10-07 03:42:30 -04:00
|
|
|
if (!p->symbols)
|
2007-11-18 06:50:25 -05:00
|
|
|
return;
|
2007-09-26 15:40:49 -04:00
|
|
|
rb_mark_set(p->data);
|
|
|
|
rb_mark_hash(p->compat_tbl);
|
2009-11-25 17:27:44 -05:00
|
|
|
rb_gc_mark(p->str);
|
2007-09-26 15:40:49 -04:00
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
static void
|
|
|
|
free_dump_arg(void *ptr)
|
|
|
|
{
|
|
|
|
clear_dump_arg(ptr);
|
|
|
|
xfree(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
memsize_dump_arg(const void *ptr)
|
|
|
|
{
|
|
|
|
return ptr ? sizeof(struct dump_arg) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const rb_data_type_t dump_arg_data = {
|
|
|
|
"dump_arg",
|
|
|
|
mark_dump_arg, free_dump_arg, memsize_dump_arg
|
|
|
|
};
|
|
|
|
|
2009-08-09 18:02:31 -04:00
|
|
|
static const char *
|
2009-08-09 17:55:55 -04:00
|
|
|
must_not_be_anonymous(const char *type, VALUE path)
|
2004-01-16 00:33:39 -05:00
|
|
|
{
|
2006-08-31 06:47:44 -04:00
|
|
|
char *n = RSTRING_PTR(path);
|
2004-01-16 00:33:39 -05:00
|
|
|
|
2009-08-09 17:55:55 -04:00
|
|
|
if (!rb_enc_asciicompat(rb_enc_get(path))) {
|
|
|
|
/* cannot occur? */
|
|
|
|
rb_raise(rb_eTypeError, "can't dump non-ascii %s name", type);
|
|
|
|
}
|
2004-01-17 10:23:59 -05:00
|
|
|
if (n[0] == '#') {
|
2009-08-09 18:02:31 -04:00
|
|
|
rb_raise(rb_eTypeError, "can't dump anonymous %s %.*s", type,
|
2009-08-09 17:55:55 -04:00
|
|
|
(int)RSTRING_LEN(path), n);
|
2004-01-17 10:23:59 -05:00
|
|
|
}
|
2009-08-09 18:02:31 -04:00
|
|
|
return n;
|
2009-08-09 17:55:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
class2path(VALUE klass)
|
|
|
|
{
|
|
|
|
VALUE path = rb_class_path(klass);
|
2009-08-09 18:02:31 -04:00
|
|
|
const char *n;
|
2009-08-09 17:55:55 -04:00
|
|
|
|
2009-08-09 18:02:31 -04:00
|
|
|
n = must_not_be_anonymous((TYPE(klass) == T_CLASS ? "class" : "module"), path);
|
2009-08-09 17:55:55 -04:00
|
|
|
if (rb_path_to_class(path) != rb_class_real(klass)) {
|
2009-02-10 03:55:40 -05:00
|
|
|
rb_raise(rb_eTypeError, "%s can't be referred to", n);
|
2004-01-16 00:33:39 -05:00
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
static void w_long(long, struct dump_arg*);
|
2009-08-07 17:18:33 -04:00
|
|
|
static void w_encoding(VALUE obj, long num, struct dump_call_arg *arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2002-10-17 06:20:52 -04:00
|
|
|
static void
|
2009-05-26 00:58:15 -04:00
|
|
|
w_nbyte(const char *s, long n, struct dump_arg *arg)
|
2002-10-17 06:20:52 -04:00
|
|
|
{
|
2003-03-03 02:20:17 -05:00
|
|
|
VALUE buf = arg->str;
|
|
|
|
rb_str_buf_cat(buf, s, n);
|
2010-06-23 16:44:44 -04:00
|
|
|
RBASIC(buf)->flags |= arg->infection;
|
2006-08-31 06:47:44 -04:00
|
|
|
if (arg->dest && RSTRING_LEN(buf) >= BUFSIZ) {
|
2003-03-03 02:20:17 -05:00
|
|
|
rb_io_write(arg->dest, buf);
|
|
|
|
rb_str_resize(buf, 0);
|
2002-10-17 06:20:52 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_byte(char c, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2003-03-03 02:20:17 -05:00
|
|
|
w_nbyte(&c, 1, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-05-26 00:58:15 -04:00
|
|
|
w_bytes(const char *s, long n, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
w_long(n, arg);
|
2003-03-03 02:20:17 -05:00
|
|
|
w_nbyte(s, n, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2010-05-13 00:30:07 -04:00
|
|
|
#define w_cstr(s, arg) w_bytes(s, strlen(s), arg)
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_short(int x, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2007-03-21 07:38:42 -04:00
|
|
|
w_byte((char)((x >> 0) & 0xff), arg);
|
|
|
|
w_byte((char)((x >> 8) & 0xff), arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_long(long x, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
char buf[sizeof(long)+1];
|
|
|
|
int i, len = 0;
|
|
|
|
|
2000-12-05 04:36:54 -05:00
|
|
|
#if SIZEOF_LONG > 4
|
2001-08-29 02:28:51 -04:00
|
|
|
if (!(RSHIFT(x, 31) == 0 || RSHIFT(x, 31) == -1)) {
|
2000-12-05 04:36:54 -05:00
|
|
|
/* big long does not fit in 4 bytes */
|
|
|
|
rb_raise(rb_eTypeError, "long too big to dump");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
if (x == 0) {
|
|
|
|
w_byte(0, arg);
|
|
|
|
return;
|
|
|
|
}
|
2000-12-05 04:36:54 -05:00
|
|
|
if (0 < x && x < 123) {
|
2007-03-21 07:38:42 -04:00
|
|
|
w_byte((char)(x + 5), arg);
|
2000-12-05 04:36:54 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (-124 < x && x < 0) {
|
2007-03-21 07:38:42 -04:00
|
|
|
w_byte((char)((x - 5)&0xff), arg);
|
2000-12-05 04:36:54 -05:00
|
|
|
return;
|
|
|
|
}
|
2009-05-26 00:58:15 -04:00
|
|
|
for (i=1;i<(int)sizeof(long)+1;i++) {
|
* array.c, bignum.c, dln.c, error.c, gc.c, io.c, marshal.c,
numeric.c, pack.c, strftime.c, string.c, thread.c, transcode.c,
transcode_data.h, util.c, variable.c, vm_dump.c,
include/ruby/encoding.h, missing/crypt.c, missing/vsnprintf.c:
suppress VC type warnings. [ruby-core:22726]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-12 05:16:15 -04:00
|
|
|
buf[i] = (char)(x & 0xff);
|
1998-01-16 07:19:09 -05:00
|
|
|
x = RSHIFT(x,8);
|
|
|
|
if (x == 0) {
|
|
|
|
buf[0] = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (x == -1) {
|
|
|
|
buf[0] = -i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
len = i;
|
|
|
|
for (i=0;i<=len;i++) {
|
|
|
|
w_byte(buf[i], arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-04-20 11:11:20 -04:00
|
|
|
#ifdef DBL_MANT_DIG
|
2003-04-22 06:08:57 -04:00
|
|
|
#define DECIMAL_MANT (53-16) /* from IEEE754 double precision */
|
|
|
|
|
|
|
|
#if DBL_MANT_DIG > 32
|
|
|
|
#define MANT_BITS 32
|
|
|
|
#elif DBL_MANT_DIG > 24
|
|
|
|
#define MANT_BITS 24
|
|
|
|
#elif DBL_MANT_DIG > 16
|
|
|
|
#define MANT_BITS 16
|
|
|
|
#else
|
|
|
|
#define MANT_BITS 8
|
|
|
|
#endif
|
|
|
|
|
2003-04-20 11:11:20 -04:00
|
|
|
static double
|
2009-05-26 00:58:15 -04:00
|
|
|
load_mantissa(double d, const char *buf, long len)
|
2003-04-20 11:11:20 -04:00
|
|
|
{
|
2009-05-26 00:58:15 -04:00
|
|
|
if (!len) return d;
|
2003-04-22 06:08:57 -04:00
|
|
|
if (--len > 0 && !*buf++) { /* binary mantissa mark */
|
|
|
|
int e, s = d < 0, dig = 0;
|
|
|
|
unsigned long m;
|
|
|
|
|
|
|
|
modf(ldexp(frexp(fabs(d), &e), DECIMAL_MANT), &d);
|
|
|
|
do {
|
|
|
|
m = 0;
|
|
|
|
switch (len) {
|
|
|
|
default: m = *buf++ & 0xff;
|
|
|
|
#if MANT_BITS > 24
|
|
|
|
case 3: m = (m << 8) | (*buf++ & 0xff);
|
|
|
|
#endif
|
|
|
|
#if MANT_BITS > 16
|
|
|
|
case 2: m = (m << 8) | (*buf++ & 0xff);
|
|
|
|
#endif
|
|
|
|
#if MANT_BITS > 8
|
|
|
|
case 1: m = (m << 8) | (*buf++ & 0xff);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
dig -= len < MANT_BITS / 8 ? 8 * (unsigned)len : MANT_BITS;
|
|
|
|
d += ldexp((double)m, dig);
|
|
|
|
} while ((len -= MANT_BITS / 8) > 0);
|
|
|
|
d = ldexp(d, e - DECIMAL_MANT);
|
2003-04-20 11:11:20 -04:00
|
|
|
if (s) d = -d;
|
|
|
|
}
|
|
|
|
return d;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define load_mantissa(d, buf, len) (d)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef DBL_DIG
|
2003-04-21 09:02:08 -04:00
|
|
|
#define FLOAT_DIG (DBL_DIG+2)
|
2003-04-20 11:11:20 -04:00
|
|
|
#else
|
|
|
|
#define FLOAT_DIG 17
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_float(double d, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2010-05-20 23:26:00 -04:00
|
|
|
char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve);
|
2007-09-12 02:19:06 -04:00
|
|
|
char buf[FLOAT_DIG + (DECIMAL_MANT + 7) / 8 + 10];
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2001-11-19 00:03:03 -05:00
|
|
|
if (isinf(d)) {
|
2010-05-13 00:30:07 -04:00
|
|
|
if (d < 0) w_cstr("-inf", arg);
|
|
|
|
else w_cstr("inf", arg);
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
|
|
|
else if (isnan(d)) {
|
2010-05-13 00:30:07 -04:00
|
|
|
w_cstr("nan", arg);
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
2001-11-27 05:00:35 -05:00
|
|
|
else if (d == 0.0) {
|
2010-05-13 00:30:07 -04:00
|
|
|
if (1.0/d < 0) w_cstr("-0", arg);
|
|
|
|
else w_cstr("0", arg);
|
2001-11-27 05:00:35 -05:00
|
|
|
}
|
2001-11-19 00:03:03 -05:00
|
|
|
else {
|
2010-05-20 23:26:00 -04:00
|
|
|
int decpt, sign, digs, len = 0;
|
|
|
|
char *e, *p = ruby_dtoa(d, 0, 0, &decpt, &sign, &e);
|
|
|
|
if (sign) buf[len++] = '-';
|
|
|
|
digs = (int)(e - p);
|
|
|
|
if (decpt < -3 || decpt > digs) {
|
|
|
|
buf[len++] = p[0];
|
|
|
|
buf[len++] = '.';
|
|
|
|
memcpy(buf + len, p + 1, --digs);
|
|
|
|
len += digs;
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, "e%d", decpt - 1);
|
|
|
|
}
|
|
|
|
else if (decpt > 0) {
|
|
|
|
memcpy(buf + len, p, decpt);
|
|
|
|
len += decpt;
|
|
|
|
if ((digs -= decpt) > 0) {
|
|
|
|
buf[len++] = '.';
|
|
|
|
memcpy(buf + len, p + decpt, digs);
|
|
|
|
len += digs;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
buf[len++] = '0';
|
|
|
|
buf[len++] = '.';
|
|
|
|
if (decpt) {
|
|
|
|
memset(buf + len, '0', -decpt);
|
|
|
|
len -= decpt;
|
|
|
|
}
|
|
|
|
memcpy(buf + len, p, digs);
|
|
|
|
len += digs;
|
|
|
|
}
|
|
|
|
xfree(p);
|
2010-05-13 18:27:10 -04:00
|
|
|
w_bytes(buf, len, arg);
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_symbol(ID id, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2009-08-07 17:18:33 -04:00
|
|
|
VALUE sym;
|
2003-08-16 10:58:34 -04:00
|
|
|
st_data_t num;
|
2009-08-07 17:18:33 -04:00
|
|
|
int encidx = -1;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2003-08-06 17:50:06 -04:00
|
|
|
if (st_lookup(arg->symbols, id, &num)) {
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_SYMLINK, arg);
|
2003-08-16 10:58:34 -04:00
|
|
|
w_long((long)num, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
else {
|
2009-08-07 17:18:33 -04:00
|
|
|
sym = rb_id2str(id);
|
2007-09-26 15:12:04 -04:00
|
|
|
if (!sym) {
|
|
|
|
rb_raise(rb_eTypeError, "can't dump anonymous ID %ld", id);
|
|
|
|
}
|
2009-08-07 17:18:33 -04:00
|
|
|
encidx = rb_enc_get_index(sym);
|
2010-01-07 23:12:29 -05:00
|
|
|
if (encidx == rb_usascii_encindex() ||
|
|
|
|
rb_enc_str_coderange(sym) == ENC_CODERANGE_7BIT) {
|
2009-08-07 17:18:33 -04:00
|
|
|
encidx = -1;
|
|
|
|
}
|
2010-01-07 23:12:29 -05:00
|
|
|
else {
|
2009-08-07 17:18:33 -04:00
|
|
|
w_byte(TYPE_IVAR, arg);
|
|
|
|
}
|
* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,
object.c, string.c, variable.c, vm_macro.def: revert private
instance variable feature, which is postponed until next major
release.
* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
8th version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-22 21:49:41 -05:00
|
|
|
w_byte(TYPE_SYMBOL, arg);
|
2009-08-07 17:18:33 -04:00
|
|
|
w_bytes(RSTRING_PTR(sym), RSTRING_LEN(sym), arg);
|
2009-10-20 04:57:33 -04:00
|
|
|
st_add_direct(arg->symbols, id, arg->symbols->num_entries);
|
2009-08-07 17:18:33 -04:00
|
|
|
if (encidx != -1) {
|
|
|
|
struct dump_call_arg c_arg;
|
|
|
|
c_arg.limit = 1;
|
|
|
|
c_arg.arg = arg;
|
|
|
|
w_encoding(sym, 0, &c_arg);
|
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-08-09 17:55:55 -04:00
|
|
|
w_unique(VALUE s, struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2009-08-09 17:55:55 -04:00
|
|
|
must_not_be_anonymous("class", s);
|
|
|
|
w_symbol(rb_intern_str(s), arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
static void w_object(VALUE,struct dump_arg*,int);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
hash_each(VALUE key, VALUE value, struct dump_call_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2003-10-09 13:45:53 -04:00
|
|
|
w_object(key, arg->arg, arg->limit);
|
|
|
|
w_object(value, arg->arg, arg->limit);
|
1998-01-16 07:19:09 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_extended(VALUE klass, struct dump_arg *arg, int check)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2007-03-20 10:00:07 -04:00
|
|
|
if (check && FL_TEST(klass, FL_SINGLETON)) {
|
2007-09-28 02:21:46 -04:00
|
|
|
if (RCLASS_M_TBL(klass)->num_entries ||
|
|
|
|
(RCLASS_IV_TBL(klass) && RCLASS_IV_TBL(klass)->num_entries > 1)) {
|
2002-08-27 04:31:08 -04:00
|
|
|
rb_raise(rb_eTypeError, "singleton can't be dumped");
|
|
|
|
}
|
2007-09-28 02:21:46 -04:00
|
|
|
klass = RCLASS_SUPER(klass);
|
2002-08-27 04:31:08 -04:00
|
|
|
}
|
2002-09-05 05:42:56 -04:00
|
|
|
while (BUILTIN_TYPE(klass) == T_ICLASS) {
|
2009-08-09 17:55:55 -04:00
|
|
|
VALUE path = rb_class_name(RBASIC(klass)->klass);
|
2002-09-05 05:42:56 -04:00
|
|
|
w_byte(TYPE_EXTENDED, arg);
|
|
|
|
w_unique(path, arg);
|
2007-09-28 02:21:46 -04:00
|
|
|
klass = RCLASS_SUPER(klass);
|
2002-09-05 05:42:56 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2005-10-21 02:46:41 -04:00
|
|
|
w_class(char type, VALUE obj, struct dump_arg *arg, int check)
|
2002-09-05 05:42:56 -04:00
|
|
|
{
|
2009-08-09 17:55:55 -04:00
|
|
|
VALUE path;
|
2007-09-26 15:12:04 -04:00
|
|
|
st_data_t real_obj;
|
2007-09-08 11:07:18 -04:00
|
|
|
VALUE klass;
|
2002-09-05 05:42:56 -04:00
|
|
|
|
2007-09-26 15:12:04 -04:00
|
|
|
if (st_lookup(arg->compat_tbl, (st_data_t)obj, &real_obj)) {
|
|
|
|
obj = (VALUE)real_obj;
|
2007-09-08 11:07:18 -04:00
|
|
|
}
|
|
|
|
klass = CLASS_OF(obj);
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
w_extended(klass, arg, check);
|
2002-09-05 05:42:56 -04:00
|
|
|
w_byte(type, arg);
|
2009-08-09 17:55:55 -04:00
|
|
|
path = class2path(rb_class_real(klass));
|
2002-08-27 04:31:08 -04:00
|
|
|
w_unique(path, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-21 20:17:52 -05:00
|
|
|
w_uclass(VALUE obj, VALUE super, struct dump_arg *arg)
|
2002-08-27 04:31:08 -04:00
|
|
|
{
|
|
|
|
VALUE klass = CLASS_OF(obj);
|
|
|
|
|
2009-07-18 04:05:32 -04:00
|
|
|
w_extended(klass, arg, TRUE);
|
2003-08-06 17:50:06 -04:00
|
|
|
klass = rb_class_real(klass);
|
2007-11-21 20:17:52 -05:00
|
|
|
if (klass != super) {
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_UCLASS, arg);
|
2009-08-09 17:55:55 -04:00
|
|
|
w_unique(class2path(klass), arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-10-04 13:51:11 -04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_obj_each(ID id, VALUE value, struct dump_call_arg *arg)
|
2003-10-04 13:51:11 -04:00
|
|
|
{
|
2007-10-19 07:08:16 -04:00
|
|
|
if (id == rb_id_encoding()) return ST_CONTINUE;
|
2009-05-27 12:31:51 -04:00
|
|
|
if (id == rb_intern("E")) return ST_CONTINUE;
|
2003-10-04 13:51:11 -04:00
|
|
|
w_symbol(id, arg->arg);
|
2003-10-09 13:45:53 -04:00
|
|
|
w_object(value, arg->arg, arg->limit);
|
2003-10-04 13:51:11 -04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
static void
|
2007-10-19 07:08:16 -04:00
|
|
|
w_encoding(VALUE obj, long num, struct dump_call_arg *arg)
|
2000-01-04 23:41:21 -05:00
|
|
|
{
|
2007-10-19 07:08:16 -04:00
|
|
|
int encidx = rb_enc_get_index(obj);
|
|
|
|
rb_encoding *enc = 0;
|
|
|
|
st_data_t name;
|
|
|
|
|
|
|
|
if (encidx <= 0 || !(enc = rb_enc_from_index(encidx))) {
|
|
|
|
w_long(num, arg->arg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
w_long(num + 1, arg->arg);
|
2009-05-27 12:31:51 -04:00
|
|
|
|
|
|
|
/* special treatment for US-ASCII and UTF-8 */
|
|
|
|
if (encidx == rb_usascii_encindex()) {
|
|
|
|
w_symbol(rb_intern("E"), arg->arg);
|
2009-06-30 19:46:20 -04:00
|
|
|
w_object(Qfalse, arg->arg, arg->limit + 1);
|
2009-05-27 12:31:51 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (encidx == rb_utf8_encindex()) {
|
|
|
|
w_symbol(rb_intern("E"), arg->arg);
|
2009-06-30 19:46:20 -04:00
|
|
|
w_object(Qtrue, arg->arg, arg->limit + 1);
|
2009-05-27 12:31:51 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-10-19 07:08:16 -04:00
|
|
|
w_symbol(rb_id_encoding(), arg->arg);
|
|
|
|
do {
|
|
|
|
if (!arg->arg->encodings)
|
|
|
|
arg->arg->encodings = st_init_strcasetable();
|
|
|
|
else if (st_lookup(arg->arg->encodings, (st_data_t)rb_enc_name(enc), &name))
|
|
|
|
break;
|
|
|
|
name = (st_data_t)rb_str_new2(rb_enc_name(enc));
|
|
|
|
st_insert(arg->arg->encodings, (st_data_t)rb_enc_name(enc), name);
|
|
|
|
} while (0);
|
2009-06-30 19:46:20 -04:00
|
|
|
w_object(name, arg->arg, arg->limit + 1);
|
2007-10-19 07:08:16 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
w_ivar(VALUE obj, st_table *tbl, struct dump_call_arg *arg)
|
|
|
|
{
|
|
|
|
long num = tbl ? tbl->num_entries : 0;
|
|
|
|
|
|
|
|
w_encoding(obj, num, arg);
|
2000-01-04 23:41:21 -05:00
|
|
|
if (tbl) {
|
2004-09-29 01:15:33 -04:00
|
|
|
st_foreach_safe(tbl, w_obj_each, (st_data_t)arg);
|
2000-01-04 23:41:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-28 02:21:46 -04:00
|
|
|
static void
|
|
|
|
w_objivar(VALUE obj, struct dump_call_arg *arg)
|
|
|
|
{
|
|
|
|
VALUE *ptr;
|
|
|
|
long i, len, num;
|
|
|
|
|
2008-02-25 11:18:18 -05:00
|
|
|
len = ROBJECT_NUMIV(obj);
|
|
|
|
ptr = ROBJECT_IVPTR(obj);
|
2007-09-28 02:21:46 -04:00
|
|
|
num = 0;
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
if (ptr[i] != Qundef)
|
|
|
|
num += 1;
|
|
|
|
|
2007-10-19 07:08:16 -04:00
|
|
|
w_encoding(obj, num, arg);
|
2007-09-28 02:21:46 -04:00
|
|
|
if (num != 0) {
|
|
|
|
rb_ivar_foreach(obj, w_obj_each, (st_data_t)arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
w_object(VALUE obj, struct dump_arg *arg, int limit)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
struct dump_call_arg c_arg;
|
2000-01-17 03:37:53 -05:00
|
|
|
st_table *ivtbl = 0;
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
st_data_t num;
|
2007-10-19 07:08:16 -04:00
|
|
|
int hasiv = 0;
|
|
|
|
#define has_ivars(obj, ivtbl) ((ivtbl = rb_generic_ivar_table(obj)) != 0 || \
|
2008-01-06 21:49:01 -05:00
|
|
|
(!SPECIAL_CONST_P(obj) && !ENCODING_IS_ASCII8BIT(obj)))
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
if (limit == 0) {
|
2000-01-31 22:12:21 -05:00
|
|
|
rb_raise(rb_eArgError, "exceed depth limit");
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2003-08-06 17:50:06 -04:00
|
|
|
|
2003-08-07 23:48:33 -04:00
|
|
|
limit--;
|
|
|
|
c_arg.limit = limit;
|
|
|
|
c_arg.arg = arg;
|
|
|
|
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
if (st_lookup(arg->data, obj, &num)) {
|
|
|
|
w_byte(TYPE_LINK, arg);
|
|
|
|
w_long((long)num, arg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-10-19 07:08:16 -04:00
|
|
|
if ((hasiv = has_ivars(obj, ivtbl)) != 0) {
|
2003-08-06 17:50:06 -04:00
|
|
|
w_byte(TYPE_IVAR, arg);
|
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
if (obj == Qnil) {
|
|
|
|
w_byte(TYPE_NIL, arg);
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
else if (obj == Qtrue) {
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_TRUE, arg);
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
else if (obj == Qfalse) {
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_FALSE, arg);
|
|
|
|
}
|
|
|
|
else if (FIXNUM_P(obj)) {
|
|
|
|
#if SIZEOF_LONG <= 4
|
|
|
|
w_byte(TYPE_FIXNUM, arg);
|
|
|
|
w_long(FIX2INT(obj), arg);
|
|
|
|
#else
|
2001-08-23 02:02:15 -04:00
|
|
|
if (RSHIFT((long)obj, 31) == 0 || RSHIFT((long)obj, 31) == -1) {
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_FIXNUM, arg);
|
1999-01-19 23:59:39 -05:00
|
|
|
w_long(FIX2LONG(obj), arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
else {
|
2003-10-09 13:45:53 -04:00
|
|
|
w_object(rb_int2big(FIX2LONG(obj)), arg, limit);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2000-03-07 03:37:59 -05:00
|
|
|
else if (SYMBOL_P(obj)) {
|
2000-04-10 01:48:43 -04:00
|
|
|
w_symbol(SYM2ID(obj), arg);
|
2000-03-07 03:37:59 -05:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
else {
|
2010-06-23 16:44:44 -04:00
|
|
|
arg->infection |= FL_TEST(obj, MARSHAL_INFECTION);
|
2000-07-21 04:45:34 -04:00
|
|
|
|
2008-06-17 23:05:33 -04:00
|
|
|
if (rb_respond_to(obj, s_mdump)) {
|
2008-04-10 19:10:49 -04:00
|
|
|
volatile VALUE v;
|
2003-07-29 14:26:55 -04:00
|
|
|
|
2008-04-10 04:41:46 -04:00
|
|
|
st_add_direct(arg->data, obj, arg->data->num_entries);
|
|
|
|
|
2003-07-30 03:24:11 -04:00
|
|
|
v = rb_funcall(obj, s_mdump, 0, 0);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_dump_arg(arg, s_mdump);
|
2009-07-18 04:05:32 -04:00
|
|
|
w_class(TYPE_USRMARSHAL, obj, arg, FALSE);
|
2003-10-09 13:45:53 -04:00
|
|
|
w_object(v, arg, limit);
|
2009-12-07 00:11:10 -05:00
|
|
|
if (hasiv) w_ivar(obj, ivtbl, &c_arg);
|
2003-07-29 14:26:55 -04:00
|
|
|
return;
|
|
|
|
}
|
2008-06-17 23:05:33 -04:00
|
|
|
if (rb_respond_to(obj, s_dump)) {
|
1998-01-16 07:19:09 -05:00
|
|
|
VALUE v;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 04:09:38 -05:00
|
|
|
st_table *ivtbl2 = 0;
|
|
|
|
int hasiv2;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
v = rb_funcall(obj, s_dump, 1, INT2NUM(limit));
|
2008-10-01 06:11:51 -04:00
|
|
|
check_dump_arg(arg, s_dump);
|
2003-07-31 04:42:44 -04:00
|
|
|
if (TYPE(v) != T_STRING) {
|
|
|
|
rb_raise(rb_eTypeError, "_dump() must return string");
|
|
|
|
}
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 04:09:38 -05:00
|
|
|
if ((hasiv2 = has_ivars(v, ivtbl2)) != 0 && !hasiv) {
|
2003-10-09 13:45:53 -04:00
|
|
|
w_byte(TYPE_IVAR, arg);
|
|
|
|
}
|
2009-07-18 04:05:32 -04:00
|
|
|
w_class(TYPE_USERDEF, obj, arg, FALSE);
|
2006-08-31 06:47:44 -04:00
|
|
|
w_bytes(RSTRING_PTR(v), RSTRING_LEN(v), arg);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 04:09:38 -05:00
|
|
|
if (hasiv2) {
|
2008-01-26 05:31:11 -05:00
|
|
|
w_ivar(v, ivtbl2, &c_arg);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 04:09:38 -05:00
|
|
|
}
|
|
|
|
else if (hasiv) {
|
2007-10-19 07:08:16 -04:00
|
|
|
w_ivar(obj, ivtbl, &c_arg);
|
2003-10-09 13:45:53 -04:00
|
|
|
}
|
2008-04-10 04:41:46 -04:00
|
|
|
st_add_direct(arg->data, obj, arg->data->num_entries);
|
1998-01-16 07:19:09 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-04-10 04:41:46 -04:00
|
|
|
st_add_direct(arg->data, obj, arg->data->num_entries);
|
|
|
|
|
|
|
|
{
|
|
|
|
st_data_t compat_data;
|
|
|
|
rb_alloc_func_t allocator = rb_get_alloc_func(RBASIC(obj)->klass);
|
|
|
|
if (st_lookup(compat_allocator_tbl,
|
|
|
|
(st_data_t)allocator,
|
|
|
|
&compat_data)) {
|
|
|
|
marshal_compat_t *compat = (marshal_compat_t*)compat_data;
|
|
|
|
VALUE real_obj = obj;
|
|
|
|
obj = compat->dumper(real_obj);
|
|
|
|
st_insert(arg->compat_tbl, (st_data_t)obj, (st_data_t)real_obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
|
|
|
case T_CLASS:
|
2001-05-11 01:24:59 -04:00
|
|
|
if (FL_TEST(obj, FL_SINGLETON)) {
|
|
|
|
rb_raise(rb_eTypeError, "singleton class can't be dumped");
|
|
|
|
}
|
1999-12-01 04:24:48 -05:00
|
|
|
w_byte(TYPE_CLASS, arg);
|
|
|
|
{
|
2007-02-04 14:17:33 -05:00
|
|
|
volatile VALUE path = class2path(obj);
|
2006-08-31 06:47:44 -04:00
|
|
|
w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
break;
|
1999-12-01 04:24:48 -05:00
|
|
|
|
|
|
|
case T_MODULE:
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_MODULE, arg);
|
|
|
|
{
|
2004-01-16 00:33:39 -05:00
|
|
|
VALUE path = class2path(obj);
|
2006-08-31 06:47:44 -04:00
|
|
|
w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case T_FLOAT:
|
|
|
|
w_byte(TYPE_FLOAT, arg);
|
* include/ruby/ruby.h: introduce 2 macros:
RFLOAT_VALUE(v), DOUBLE2NUM(dbl).
Rename RFloat#value -> RFloat#double_value.
Do not touch RFloat#double_value directly.
* bignum.c, insns.def, marshal.c, math.c, numeric.c, object.c,
pack.c, parse.y, process.c, random.c, sprintf.c, string.c,
time.c: apply above changes.
* ext/dl/mkcallback.rb, ext/json/ext/generator/generator.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-13 11:00:53 -05:00
|
|
|
w_float(RFLOAT_VALUE(obj), arg);
|
2000-01-04 23:41:21 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case T_BIGNUM:
|
|
|
|
w_byte(TYPE_BIGNUM, arg);
|
|
|
|
{
|
2007-09-01 08:02:36 -04:00
|
|
|
char sign = RBIGNUM_SIGN(obj) ? '+' : '-';
|
|
|
|
long len = RBIGNUM_LEN(obj);
|
|
|
|
BDIGIT *d = RBIGNUM_DIGITS(obj);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
w_byte(sign, arg);
|
2000-11-20 02:31:55 -05:00
|
|
|
w_long(SHORTLEN(len), arg); /* w_short? */
|
1998-01-16 07:19:09 -05:00
|
|
|
while (len--) {
|
2000-10-31 03:37:47 -05:00
|
|
|
#if SIZEOF_BDIGITS > SIZEOF_SHORT
|
|
|
|
BDIGIT num = *d;
|
|
|
|
int i;
|
|
|
|
|
2001-03-26 03:57:16 -05:00
|
|
|
for (i=0; i<SIZEOF_BDIGITS; i+=SIZEOF_SHORT) {
|
2000-10-31 03:37:47 -05:00
|
|
|
w_short(num & SHORTMASK, arg);
|
|
|
|
num = SHORTDN(num);
|
2001-03-26 03:57:16 -05:00
|
|
|
if (len == 0 && num == 0) break;
|
2000-10-31 03:37:47 -05:00
|
|
|
}
|
|
|
|
#else
|
1998-01-16 07:19:09 -05:00
|
|
|
w_short(*d, arg);
|
2000-10-31 03:37:47 -05:00
|
|
|
#endif
|
1998-01-16 07:19:09 -05:00
|
|
|
d++;
|
|
|
|
}
|
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case T_STRING:
|
1999-01-19 23:59:39 -05:00
|
|
|
w_uclass(obj, rb_cString, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_STRING, arg);
|
2006-08-31 06:47:44 -04:00
|
|
|
w_bytes(RSTRING_PTR(obj), RSTRING_LEN(obj), arg);
|
2000-01-04 23:41:21 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case T_REGEXP:
|
2008-06-28 08:25:45 -04:00
|
|
|
w_uclass(obj, rb_cRegexp, arg);
|
|
|
|
w_byte(TYPE_REGEXP, arg);
|
|
|
|
{
|
|
|
|
int opts = rb_reg_options(obj);
|
|
|
|
w_bytes(RREGEXP_SRC_PTR(obj), RREGEXP_SRC_LEN(obj), arg);
|
|
|
|
w_byte((char)opts, arg);
|
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case T_ARRAY:
|
1999-01-19 23:59:39 -05:00
|
|
|
w_uclass(obj, rb_cArray, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
w_byte(TYPE_ARRAY, arg);
|
|
|
|
{
|
2008-06-02 11:29:11 -04:00
|
|
|
long i, len = RARRAY_LEN(obj);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
w_long(len, arg);
|
2008-06-02 11:29:11 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(obj); i++) {
|
|
|
|
w_object(RARRAY_PTR(obj)[i], arg, limit);
|
|
|
|
if (len != RARRAY_LEN(obj)) {
|
|
|
|
rb_raise(rb_eRuntimeError, "array modified during dump");
|
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_HASH:
|
1999-01-19 23:59:39 -05:00
|
|
|
w_uclass(obj, rb_cHash, arg);
|
2009-11-10 19:36:04 -05:00
|
|
|
if (NIL_P(RHASH_IFNONE(obj))) {
|
2002-08-29 05:08:18 -04:00
|
|
|
w_byte(TYPE_HASH, arg);
|
|
|
|
}
|
|
|
|
else if (FL_TEST(obj, FL_USER2)) {
|
|
|
|
/* FL_USER2 means HASH_PROC_DEFAULT (see hash.c) */
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eTypeError, "can't dump hash with default proc");
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
|
|
|
else {
|
2002-08-29 05:08:18 -04:00
|
|
|
w_byte(TYPE_HASH_DEF, arg);
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
2007-08-29 19:12:21 -04:00
|
|
|
w_long(RHASH_SIZE(obj), arg);
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(obj, hash_each, (st_data_t)&c_arg);
|
2009-11-10 19:36:04 -05:00
|
|
|
if (!NIL_P(RHASH_IFNONE(obj))) {
|
|
|
|
w_object(RHASH_IFNONE(obj), arg, limit);
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_STRUCT:
|
2009-07-18 04:05:32 -04:00
|
|
|
w_class(TYPE_STRUCT, obj, arg, TRUE);
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2006-02-05 09:40:01 -05:00
|
|
|
long len = RSTRUCT_LEN(obj);
|
1998-01-16 07:19:09 -05:00
|
|
|
VALUE mem;
|
2000-11-20 02:31:55 -05:00
|
|
|
long i;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
w_long(len, arg);
|
2004-09-27 00:46:54 -04:00
|
|
|
mem = rb_struct_members(obj);
|
1998-01-16 07:19:09 -05:00
|
|
|
for (i=0; i<len; i++) {
|
2006-09-02 10:42:08 -04:00
|
|
|
w_symbol(SYM2ID(RARRAY_PTR(mem)[i]), arg);
|
2006-02-05 09:40:01 -05:00
|
|
|
w_object(RSTRUCT_PTR(obj)[i], arg, limit);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_OBJECT:
|
2009-07-18 04:05:32 -04:00
|
|
|
w_class(TYPE_OBJECT, obj, arg, TRUE);
|
2007-09-28 02:21:46 -04:00
|
|
|
w_objivar(obj, &c_arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
break;
|
|
|
|
|
2003-04-09 01:08:25 -04:00
|
|
|
case T_DATA:
|
|
|
|
{
|
|
|
|
VALUE v;
|
|
|
|
|
2008-06-17 23:05:33 -04:00
|
|
|
if (!rb_respond_to(obj, s_dump_data)) {
|
2003-04-09 01:08:25 -04:00
|
|
|
rb_raise(rb_eTypeError,
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
"no marshal_dump is defined for class %s",
|
2003-04-09 01:08:25 -04:00
|
|
|
rb_obj_classname(obj));
|
|
|
|
}
|
|
|
|
v = rb_funcall(obj, s_dump_data, 0);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_dump_arg(arg, s_dump_data);
|
2009-07-18 04:05:32 -04:00
|
|
|
w_class(TYPE_DATA, obj, arg, TRUE);
|
2003-10-09 13:45:53 -04:00
|
|
|
w_object(v, arg, limit);
|
2003-04-09 01:08:25 -04:00
|
|
|
}
|
|
|
|
break;
|
2002-04-24 00:54:16 -04:00
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
default:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eTypeError, "can't dump %s",
|
2003-01-30 23:00:17 -05:00
|
|
|
rb_obj_classname(obj));
|
1998-01-16 07:19:09 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-10-19 07:08:16 -04:00
|
|
|
if (hasiv) {
|
|
|
|
w_ivar(obj, ivtbl, &c_arg);
|
2000-01-04 23:41:21 -05:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
static void
|
|
|
|
clear_dump_arg(struct dump_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2009-10-04 06:30:56 -04:00
|
|
|
if (!arg->symbols) return;
|
2003-08-06 17:50:06 -04:00
|
|
|
st_free_table(arg->symbols);
|
2009-10-04 06:30:56 -04:00
|
|
|
arg->symbols = 0;
|
1998-01-16 07:19:09 -05:00
|
|
|
st_free_table(arg->data);
|
2009-10-07 03:42:30 -04:00
|
|
|
arg->data = 0;
|
2007-09-26 15:12:04 -04:00
|
|
|
st_free_table(arg->compat_tbl);
|
2009-10-07 03:42:30 -04:00
|
|
|
arg->compat_tbl = 0;
|
2009-10-04 06:30:56 -04:00
|
|
|
if (arg->encodings) {
|
|
|
|
st_free_table(arg->encodings);
|
|
|
|
arg->encodings = 0;
|
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 11:07:43 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* dump( obj [, anIO] , limit=--1 ) -> anIO
|
2003-12-27 11:07:43 -05:00
|
|
|
*
|
2009-11-03 12:46:28 -05:00
|
|
|
* Serializes obj and all descendant objects. If anIO is
|
2003-12-27 11:07:43 -05:00
|
|
|
* specified, the serialized data will be written to it, otherwise the
|
|
|
|
* data will be returned as a String. If limit is specified, the
|
|
|
|
* traversal of subobjects will be limited to that depth. If limit is
|
|
|
|
* negative, no checking of depth will be performed.
|
|
|
|
*
|
|
|
|
* class Klass
|
|
|
|
* def initialize(str)
|
|
|
|
* @str = str
|
|
|
|
* end
|
|
|
|
* def sayHello
|
|
|
|
* @str
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* (produces no output)
|
|
|
|
*
|
|
|
|
* o = Klass.new("hello\n")
|
|
|
|
* data = Marshal.dump(o)
|
|
|
|
* obj = Marshal.load(data)
|
|
|
|
* obj.sayHello #=> "hello\n"
|
2009-11-04 08:42:03 -05:00
|
|
|
*
|
|
|
|
* Marshal can't dump following objects:
|
|
|
|
* * anonymous Class/Module.
|
2010-05-25 22:50:58 -04:00
|
|
|
* * objects which related to its system (ex: Dir, File::Stat, IO, File, Socket
|
|
|
|
* and so on)
|
|
|
|
* * an instance of MatchData, Data, Method, UnboundMethod, Proc, Thread,
|
|
|
|
* ThreadGroup, Continuation
|
2009-11-04 08:42:03 -05:00
|
|
|
* * objects which defines singleton methods
|
2003-12-27 11:07:43 -05:00
|
|
|
*/
|
1998-01-16 07:19:09 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
marshal_dump(int argc, VALUE *argv)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
VALUE obj, port, a1, a2;
|
|
|
|
int limit = -1;
|
2009-10-04 06:30:56 -04:00
|
|
|
struct dump_arg *arg;
|
2009-10-10 11:14:40 -04:00
|
|
|
volatile VALUE wrapper;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2003-04-08 01:40:29 -04:00
|
|
|
port = Qnil;
|
1998-01-16 07:19:09 -05:00
|
|
|
rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
|
|
|
|
if (argc == 3) {
|
2000-04-12 01:06:23 -04:00
|
|
|
if (!NIL_P(a2)) limit = NUM2INT(a2);
|
2003-04-08 01:40:29 -04:00
|
|
|
if (NIL_P(a1)) goto type_error;
|
1998-01-16 07:19:09 -05:00
|
|
|
port = a1;
|
|
|
|
}
|
|
|
|
else if (argc == 2) {
|
|
|
|
if (FIXNUM_P(a1)) limit = FIX2INT(a1);
|
2003-04-08 01:40:29 -04:00
|
|
|
else if (NIL_P(a1)) goto type_error;
|
1998-01-16 07:19:09 -05:00
|
|
|
else port = a1;
|
|
|
|
}
|
2009-10-04 06:30:56 -04:00
|
|
|
wrapper = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg);
|
|
|
|
arg->dest = 0;
|
|
|
|
arg->symbols = st_init_numtable();
|
|
|
|
arg->data = st_init_numtable();
|
2010-06-23 16:44:44 -04:00
|
|
|
arg->infection = 0;
|
2009-10-04 06:30:56 -04:00
|
|
|
arg->compat_tbl = st_init_numtable();
|
|
|
|
arg->encodings = 0;
|
2009-11-21 02:38:51 -05:00
|
|
|
arg->str = rb_str_buf_new(0);
|
2003-04-08 01:40:29 -04:00
|
|
|
if (!NIL_P(port)) {
|
2008-06-17 23:05:33 -04:00
|
|
|
if (!rb_respond_to(port, s_write)) {
|
2003-04-08 01:40:29 -04:00
|
|
|
type_error:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eTypeError, "instance of IO needed");
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2009-10-04 06:30:56 -04:00
|
|
|
arg->dest = port;
|
2008-06-17 23:05:33 -04:00
|
|
|
if (rb_respond_to(port, s_binmode)) {
|
2003-03-03 02:20:17 -05:00
|
|
|
rb_funcall2(port, s_binmode, 0, 0);
|
2009-10-04 06:30:56 -04:00
|
|
|
check_dump_arg(arg, s_binmode);
|
2003-03-03 02:20:17 -05:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
else {
|
2009-10-04 06:30:56 -04:00
|
|
|
port = arg->str;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
w_byte(MARSHAL_MAJOR, arg);
|
|
|
|
w_byte(MARSHAL_MINOR, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
w_object(obj, arg, limit);
|
|
|
|
if (arg->dest) {
|
|
|
|
rb_io_write(arg->dest, arg->str);
|
|
|
|
rb_str_resize(arg->str, 0);
|
|
|
|
}
|
|
|
|
clear_dump_arg(arg);
|
|
|
|
RB_GC_GUARD(wrapper);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
return port;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct load_arg {
|
2004-10-04 21:37:46 -04:00
|
|
|
VALUE src;
|
|
|
|
long offset;
|
2003-08-06 17:50:06 -04:00
|
|
|
st_table *symbols;
|
2008-09-01 22:47:38 -04:00
|
|
|
st_table *data;
|
1998-01-16 07:19:09 -05:00
|
|
|
VALUE proc;
|
2007-09-08 11:07:18 -04:00
|
|
|
st_table *compat_tbl;
|
2010-06-23 16:44:44 -04:00
|
|
|
int infection;
|
1998-01-16 07:19:09 -05:00
|
|
|
};
|
|
|
|
|
2008-05-22 07:20:56 -04:00
|
|
|
static void
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(struct load_arg *arg, ID sym)
|
2008-05-22 07:20:56 -04:00
|
|
|
{
|
2009-10-04 06:30:56 -04:00
|
|
|
if (!arg->symbols) {
|
2008-10-01 06:11:51 -04:00
|
|
|
rb_raise(rb_eRuntimeError, "Marshal.load reentered at %s",
|
|
|
|
rb_id2name(sym));
|
2008-05-22 07:20:56 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
static void clear_load_arg(struct load_arg *arg);
|
|
|
|
|
2008-09-01 22:47:38 -04:00
|
|
|
static void
|
|
|
|
mark_load_arg(void *ptr)
|
|
|
|
{
|
|
|
|
struct load_arg *p = ptr;
|
2009-10-07 03:42:30 -04:00
|
|
|
if (!p->symbols)
|
2008-09-01 22:47:38 -04:00
|
|
|
return;
|
|
|
|
rb_mark_tbl(p->data);
|
|
|
|
rb_mark_hash(p->compat_tbl);
|
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
static void
|
|
|
|
free_load_arg(void *ptr)
|
|
|
|
{
|
|
|
|
clear_load_arg(ptr);
|
|
|
|
xfree(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
memsize_load_arg(const void *ptr)
|
|
|
|
{
|
|
|
|
return ptr ? sizeof(struct load_arg) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const rb_data_type_t load_arg_data = {
|
|
|
|
"load_arg",
|
|
|
|
mark_load_arg, free_load_arg, memsize_load_arg
|
|
|
|
};
|
|
|
|
|
2009-10-17 09:11:05 -04:00
|
|
|
#define r_entry(v, arg) r_entry0(v, (arg)->data->num_entries, arg)
|
|
|
|
static VALUE r_entry0(VALUE v, st_index_t num, struct load_arg *arg);
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
static VALUE r_object(struct load_arg *arg);
|
2009-08-07 17:18:33 -04:00
|
|
|
static ID r_symbol(struct load_arg *arg);
|
2009-08-09 17:55:55 -04:00
|
|
|
static VALUE path2class(VALUE path);
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2009-10-17 09:11:05 -04:00
|
|
|
static st_index_t
|
|
|
|
r_prepare(struct load_arg *arg)
|
|
|
|
{
|
|
|
|
st_index_t idx = arg->data->num_entries;
|
|
|
|
|
|
|
|
st_insert(arg->data, (st_data_t)idx, (st_data_t)Qundef);
|
|
|
|
return idx;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_byte(struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
int c;
|
|
|
|
|
2004-10-04 21:37:46 -04:00
|
|
|
if (TYPE(arg->src) == T_STRING) {
|
2006-08-31 06:47:44 -04:00
|
|
|
if (RSTRING_LEN(arg->src) > arg->offset) {
|
|
|
|
c = (unsigned char)RSTRING_PTR(arg->src)[arg->offset++];
|
2004-10-04 21:37:46 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eArgError, "marshal data too short");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE src = arg->src;
|
2008-01-25 11:37:53 -05:00
|
|
|
VALUE v = rb_funcall2(src, s_getbyte, 0, 0);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(arg, s_getbyte);
|
2002-10-17 06:20:52 -04:00
|
|
|
if (NIL_P(v)) rb_eof_error();
|
2006-08-16 04:47:18 -04:00
|
|
|
c = (unsigned char)NUM2CHR(v);
|
2002-10-17 06:20:52 -04:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
return c;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
long_toobig(int size)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2008-07-12 09:17:29 -04:00
|
|
|
rb_raise(rb_eTypeError, "long too big for this architecture (size "
|
|
|
|
STRINGIZE(SIZEOF_LONG)", given %d)", size);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2001-08-29 02:28:51 -04:00
|
|
|
#undef SIGN_EXTEND_CHAR
|
|
|
|
#if __STDC__
|
|
|
|
# define SIGN_EXTEND_CHAR(c) ((signed char)(c))
|
|
|
|
#else /* not __STDC__ */
|
|
|
|
/* As in Harbison and Steele. */
|
|
|
|
# define SIGN_EXTEND_CHAR(c) ((((unsigned char)(c)) ^ 128) - 128)
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static long
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_long(struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
register long x;
|
2001-08-29 02:28:51 -04:00
|
|
|
int c = SIGN_EXTEND_CHAR(r_byte(arg));
|
|
|
|
long i;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
if (c == 0) return 0;
|
|
|
|
if (c > 0) {
|
2000-12-05 04:36:54 -05:00
|
|
|
if (4 < c && c < 128) {
|
|
|
|
return c - 5;
|
|
|
|
}
|
2009-05-26 00:58:15 -04:00
|
|
|
if (c > (int)sizeof(long)) long_toobig(c);
|
1998-01-16 07:19:09 -05:00
|
|
|
x = 0;
|
|
|
|
for (i=0;i<c;i++) {
|
|
|
|
x |= (long)r_byte(arg) << (8*i);
|
|
|
|
}
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
else {
|
2000-12-05 04:36:54 -05:00
|
|
|
if (-129 < c && c < -4) {
|
|
|
|
return c + 5;
|
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
c = -c;
|
2009-05-26 00:58:15 -04:00
|
|
|
if (c > (int)sizeof(long)) long_toobig(c);
|
1998-01-16 07:19:09 -05:00
|
|
|
x = -1;
|
|
|
|
for (i=0;i<c;i++) {
|
2001-08-29 02:28:51 -04:00
|
|
|
x &= ~((long)0xff << (8*i));
|
1998-01-16 07:19:09 -05:00
|
|
|
x |= (long)r_byte(arg) << (8*i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
2002-09-04 02:37:39 -04:00
|
|
|
#define r_bytes(arg) r_bytes0(r_long(arg), (arg))
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2002-09-04 02:37:39 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_bytes0(long len, struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2002-09-04 02:37:39 -04:00
|
|
|
VALUE str;
|
|
|
|
|
2004-08-17 05:02:40 -04:00
|
|
|
if (len == 0) return rb_str_new(0, 0);
|
2004-10-04 21:37:46 -04:00
|
|
|
if (TYPE(arg->src) == T_STRING) {
|
2007-10-14 22:45:14 -04:00
|
|
|
if (RSTRING_LEN(arg->src) - arg->offset >= len) {
|
2006-08-31 06:47:44 -04:00
|
|
|
str = rb_str_new(RSTRING_PTR(arg->src)+arg->offset, len);
|
2004-10-04 21:37:46 -04:00
|
|
|
arg->offset += len;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
too_short:
|
|
|
|
rb_raise(rb_eArgError, "marshal data too short");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE src = arg->src;
|
2002-10-17 06:20:52 -04:00
|
|
|
VALUE n = LONG2NUM(len);
|
|
|
|
str = rb_funcall2(src, s_read, 1, &n);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(arg, s_read);
|
2002-10-17 06:20:52 -04:00
|
|
|
if (NIL_P(str)) goto too_short;
|
2002-12-19 04:20:20 -05:00
|
|
|
StringValue(str);
|
2006-08-31 06:47:44 -04:00
|
|
|
if (RSTRING_LEN(str) != len) goto too_short;
|
2010-06-23 16:44:44 -04:00
|
|
|
arg->infection |= FL_TEST(str, MARSHAL_INFECTION);
|
2002-10-17 06:20:52 -04:00
|
|
|
}
|
2002-09-04 02:37:39 -04:00
|
|
|
return str;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2009-08-07 17:18:33 -04:00
|
|
|
static int
|
2010-02-24 09:16:59 -05:00
|
|
|
id2encidx(ID id, VALUE val)
|
2009-08-07 17:18:33 -04:00
|
|
|
{
|
|
|
|
if (id == rb_id_encoding()) {
|
2009-10-17 09:11:05 -04:00
|
|
|
int idx = rb_enc_find_index(StringValueCStr(val));
|
|
|
|
return idx;
|
2009-08-07 17:18:33 -04:00
|
|
|
}
|
|
|
|
else if (id == rb_intern("E")) {
|
|
|
|
if (val == Qfalse) return rb_usascii_encindex();
|
|
|
|
else if (val == Qtrue) return rb_utf8_encindex();
|
|
|
|
/* bogus ignore */
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static ID
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_symlink(struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
ID id;
|
2000-11-20 02:31:55 -05:00
|
|
|
long num = r_long(arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2003-08-06 17:50:06 -04:00
|
|
|
if (st_lookup(arg->symbols, num, &id)) {
|
2000-04-10 01:48:43 -04:00
|
|
|
return id;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2003-05-22 04:30:58 -04:00
|
|
|
rb_raise(rb_eArgError, "bad symbol");
|
2000-04-10 01:48:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static ID
|
2009-08-07 17:18:33 -04:00
|
|
|
r_symreal(struct load_arg *arg, int ivar)
|
2000-04-10 01:48:43 -04:00
|
|
|
{
|
2006-08-31 06:47:44 -04:00
|
|
|
volatile VALUE s = r_bytes(arg);
|
2009-08-07 17:18:33 -04:00
|
|
|
ID id;
|
|
|
|
int idx = -1;
|
2009-10-20 04:57:33 -04:00
|
|
|
st_index_t n = arg->symbols->num_entries;
|
2007-02-04 14:17:33 -05:00
|
|
|
|
2009-10-20 04:57:33 -04:00
|
|
|
st_insert(arg->symbols, (st_data_t)n, (st_data_t)0);
|
2009-08-07 17:18:33 -04:00
|
|
|
if (ivar) {
|
|
|
|
long num = r_long(arg);
|
|
|
|
while (num-- > 0) {
|
|
|
|
id = r_symbol(arg);
|
2010-02-24 09:16:59 -05:00
|
|
|
idx = id2encidx(id, r_object(arg));
|
2009-08-07 17:18:33 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (idx < 0) idx = rb_usascii_encindex();
|
|
|
|
rb_enc_associate_index(s, idx);
|
|
|
|
id = rb_intern_str(s);
|
2009-10-20 04:57:33 -04:00
|
|
|
st_insert(arg->symbols, (st_data_t)n, (st_data_t)id);
|
2007-02-04 14:17:33 -05:00
|
|
|
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2000-04-10 01:48:43 -04:00
|
|
|
static ID
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_symbol(struct load_arg *arg)
|
2000-04-10 01:48:43 -04:00
|
|
|
{
|
2009-08-07 17:18:33 -04:00
|
|
|
int type, ivar = 0;
|
2007-02-04 14:17:33 -05:00
|
|
|
|
2009-08-07 17:18:33 -04:00
|
|
|
again:
|
2007-02-04 14:17:33 -05:00
|
|
|
switch ((type = r_byte(arg))) {
|
2009-08-07 17:18:33 -04:00
|
|
|
case TYPE_IVAR:
|
|
|
|
ivar = 1;
|
|
|
|
goto again;
|
2007-02-04 14:17:33 -05:00
|
|
|
case TYPE_SYMBOL:
|
2009-08-07 17:18:33 -04:00
|
|
|
return r_symreal(arg, ivar);
|
2007-02-04 14:17:33 -05:00
|
|
|
case TYPE_SYMLINK:
|
2009-08-07 17:18:33 -04:00
|
|
|
if (ivar) {
|
|
|
|
rb_raise(rb_eArgError, "dump format error (symlink with encoding)");
|
|
|
|
}
|
2000-04-10 01:48:43 -04:00
|
|
|
return r_symlink(arg);
|
2007-02-04 14:17:33 -05:00
|
|
|
default:
|
2009-08-07 17:18:33 -04:00
|
|
|
rb_raise(rb_eArgError, "dump format error for symbol(0x%x)", type);
|
2007-02-04 14:17:33 -05:00
|
|
|
break;
|
2000-04-10 01:48:43 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-09 17:55:55 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_unique(struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2009-08-09 17:55:55 -04:00
|
|
|
return rb_id2str(r_symbol(arg));
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_string(struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2002-09-04 02:37:39 -04:00
|
|
|
return r_bytes(arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-10-17 09:11:05 -04:00
|
|
|
r_entry0(VALUE v, st_index_t num, struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2007-09-26 15:12:04 -04:00
|
|
|
st_data_t real_obj = (VALUE)Qundef;
|
|
|
|
if (st_lookup(arg->compat_tbl, v, &real_obj)) {
|
2009-10-17 09:11:05 -04:00
|
|
|
st_insert(arg->data, num, (st_data_t)real_obj);
|
2007-09-08 11:07:18 -04:00
|
|
|
}
|
|
|
|
else {
|
2009-10-17 09:11:05 -04:00
|
|
|
st_insert(arg->data, num, (st_data_t)v);
|
2007-09-08 11:07:18 -04:00
|
|
|
}
|
2010-06-23 16:44:44 -04:00
|
|
|
if (arg->infection) {
|
|
|
|
FL_SET(v, arg->infection);
|
|
|
|
if ((VALUE)real_obj != Qundef)
|
|
|
|
FL_SET((VALUE)real_obj, arg->infection);
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 03:25:05 -04:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2007-09-08 11:07:18 -04:00
|
|
|
static VALUE
|
|
|
|
r_leave(VALUE v, struct load_arg *arg)
|
|
|
|
{
|
2007-09-26 15:12:04 -04:00
|
|
|
st_data_t data;
|
|
|
|
if (st_lookup(arg->compat_tbl, v, &data)) {
|
|
|
|
VALUE real_obj = (VALUE)data;
|
2007-09-08 11:07:18 -04:00
|
|
|
rb_alloc_func_t allocator = rb_get_alloc_func(CLASS_OF(real_obj));
|
|
|
|
st_data_t key = v;
|
2007-09-26 15:12:04 -04:00
|
|
|
if (st_lookup(compat_allocator_tbl, (st_data_t)allocator, &data)) {
|
|
|
|
marshal_compat_t *compat = (marshal_compat_t*)data;
|
2007-09-08 11:07:18 -04:00
|
|
|
compat->loader(real_obj, v);
|
|
|
|
}
|
|
|
|
st_delete(arg->compat_tbl, &key, 0);
|
2007-09-29 04:17:48 -04:00
|
|
|
v = real_obj;
|
|
|
|
}
|
|
|
|
if (arg->proc) {
|
2008-10-01 06:11:51 -04:00
|
|
|
v = rb_funcall(arg->proc, s_call, 1, v);
|
|
|
|
check_load_arg(arg, s_call);
|
2007-09-08 11:07:18 -04:00
|
|
|
}
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
static void
|
2010-02-11 00:37:43 -05:00
|
|
|
r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
|
2000-01-04 23:41:21 -05:00
|
|
|
{
|
2000-11-20 02:31:55 -05:00
|
|
|
long len;
|
2000-01-04 23:41:21 -05:00
|
|
|
|
|
|
|
len = r_long(arg);
|
|
|
|
if (len > 0) {
|
2009-06-12 20:58:30 -04:00
|
|
|
do {
|
2000-01-04 23:41:21 -05:00
|
|
|
ID id = r_symbol(arg);
|
|
|
|
VALUE val = r_object(arg);
|
2010-02-24 09:16:59 -05:00
|
|
|
int idx = id2encidx(id, val);
|
2009-08-07 17:18:33 -04:00
|
|
|
if (idx >= 0) {
|
|
|
|
rb_enc_associate_index(obj, idx);
|
2010-02-11 00:37:43 -05:00
|
|
|
if (has_encoding) *has_encoding = TRUE;
|
2009-05-27 12:31:51 -04:00
|
|
|
}
|
2007-11-08 23:37:36 -05:00
|
|
|
else {
|
|
|
|
rb_ivar_set(obj, id, val);
|
|
|
|
}
|
2009-06-12 20:58:30 -04:00
|
|
|
} while (--len > 0);
|
2000-01-04 23:41:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-05 05:42:56 -04:00
|
|
|
static VALUE
|
2009-08-09 17:55:55 -04:00
|
|
|
path2class(VALUE path)
|
2002-09-05 05:42:56 -04:00
|
|
|
{
|
2009-08-09 17:55:55 -04:00
|
|
|
VALUE v = rb_path_to_class(path);
|
2002-09-05 05:42:56 -04:00
|
|
|
|
|
|
|
if (TYPE(v) != T_CLASS) {
|
2009-08-09 17:55:55 -04:00
|
|
|
rb_raise(rb_eArgError, "%.*s does not refer to class",
|
|
|
|
(int)RSTRING_LEN(path), RSTRING_PTR(path));
|
2002-09-05 05:42:56 -04:00
|
|
|
}
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-08-09 17:55:55 -04:00
|
|
|
path2module(VALUE path)
|
2002-09-05 05:42:56 -04:00
|
|
|
{
|
2009-08-09 17:55:55 -04:00
|
|
|
VALUE v = rb_path_to_class(path);
|
2002-09-05 05:42:56 -04:00
|
|
|
|
|
|
|
if (TYPE(v) != T_MODULE) {
|
2009-08-09 17:55:55 -04:00
|
|
|
rb_raise(rb_eArgError, "%.*s does not refer to module",
|
|
|
|
(int)RSTRING_LEN(path), RSTRING_PTR(path));
|
2002-09-05 05:42:56 -04:00
|
|
|
}
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2007-09-08 11:07:18 -04:00
|
|
|
static VALUE
|
2009-08-09 17:55:55 -04:00
|
|
|
obj_alloc_by_path(VALUE path, struct load_arg *arg)
|
2007-09-08 11:07:18 -04:00
|
|
|
{
|
|
|
|
VALUE klass;
|
2007-09-26 15:12:04 -04:00
|
|
|
st_data_t data;
|
2007-09-08 11:07:18 -04:00
|
|
|
rb_alloc_func_t allocator;
|
|
|
|
|
|
|
|
klass = path2class(path);
|
|
|
|
|
|
|
|
allocator = rb_get_alloc_func(klass);
|
2007-09-26 15:12:04 -04:00
|
|
|
if (st_lookup(compat_allocator_tbl, (st_data_t)allocator, &data)) {
|
|
|
|
marshal_compat_t *compat = (marshal_compat_t*)data;
|
2007-09-08 11:07:18 -04:00
|
|
|
VALUE real_obj = rb_obj_alloc(klass);
|
|
|
|
VALUE obj = rb_obj_alloc(compat->oldclass);
|
|
|
|
st_insert(arg->compat_tbl, (st_data_t)obj, (st_data_t)real_obj);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rb_obj_alloc(klass);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
static VALUE
|
2006-10-22 18:24:14 -04:00
|
|
|
r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2002-02-26 01:48:59 -05:00
|
|
|
VALUE v = Qnil;
|
1998-01-16 07:19:09 -05:00
|
|
|
int type = r_byte(arg);
|
1999-10-20 03:10:23 -04:00
|
|
|
long id;
|
2008-09-01 22:47:38 -04:00
|
|
|
st_data_t link;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case TYPE_LINK:
|
1999-10-20 03:10:23 -04:00
|
|
|
id = r_long(arg);
|
2008-09-01 22:47:38 -04:00
|
|
|
if (!st_lookup(arg->data, (st_data_t)id, &link)) {
|
1999-10-27 00:20:00 -04:00
|
|
|
rb_raise(rb_eArgError, "dump format error (unlinked)");
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2008-09-01 22:47:38 -04:00
|
|
|
v = (VALUE)link;
|
2006-10-22 18:24:14 -04:00
|
|
|
if (arg->proc) {
|
2008-10-01 06:11:51 -04:00
|
|
|
v = rb_funcall(arg->proc, s_call, 1, v);
|
|
|
|
check_load_arg(arg, s_call);
|
2006-10-22 18:24:14 -04:00
|
|
|
}
|
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
case TYPE_IVAR:
|
2003-10-02 04:25:00 -04:00
|
|
|
{
|
2009-07-18 04:05:32 -04:00
|
|
|
int ivar = TRUE;
|
2003-10-02 04:25:00 -04:00
|
|
|
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_object0(arg, &ivar, extmod);
|
2010-02-11 00:37:43 -05:00
|
|
|
if (ivar) r_ivar(v, NULL, arg);
|
2003-10-02 04:25:00 -04:00
|
|
|
}
|
2002-08-28 11:58:35 -04:00
|
|
|
break;
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2002-09-05 05:42:56 -04:00
|
|
|
case TYPE_EXTENDED:
|
|
|
|
{
|
|
|
|
VALUE m = path2module(r_unique(arg));
|
|
|
|
|
2003-10-19 22:06:42 -04:00
|
|
|
if (NIL_P(extmod)) extmod = rb_ary_new2(0);
|
|
|
|
rb_ary_push(extmod, m);
|
2003-10-14 22:27:56 -04:00
|
|
|
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_object0(arg, 0, extmod);
|
2006-09-02 10:42:08 -04:00
|
|
|
while (RARRAY_LEN(extmod) > 0) {
|
2003-10-19 22:06:42 -04:00
|
|
|
m = rb_ary_pop(extmod);
|
2003-10-14 22:27:56 -04:00
|
|
|
rb_extend_object(v, m);
|
|
|
|
}
|
2002-09-05 05:42:56 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
case TYPE_UCLASS:
|
|
|
|
{
|
2002-09-05 05:42:56 -04:00
|
|
|
VALUE c = path2class(r_unique(arg));
|
2001-10-03 03:19:19 -04:00
|
|
|
|
2002-12-12 02:29:14 -05:00
|
|
|
if (FL_TEST(c, FL_SINGLETON)) {
|
|
|
|
rb_raise(rb_eTypeError, "singleton can't be loaded");
|
|
|
|
}
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_object0(arg, 0, extmod);
|
2001-10-22 02:48:18 -04:00
|
|
|
if (rb_special_const_p(v) || TYPE(v) == T_OBJECT || TYPE(v) == T_CLASS) {
|
|
|
|
format_error:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eArgError, "dump format error (user class)");
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2004-10-18 10:37:42 -04:00
|
|
|
if (TYPE(v) == T_MODULE || !RTEST(rb_class_inherited_p(c, RBASIC(v)->klass))) {
|
2001-10-22 02:48:18 -04:00
|
|
|
VALUE tmp = rb_obj_alloc(c);
|
|
|
|
|
|
|
|
if (TYPE(v) != TYPE(tmp)) goto format_error;
|
2001-10-03 03:19:19 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
RBASIC(v)->klass = c;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-08-28 11:58:35 -04:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_NIL:
|
2002-02-26 01:48:59 -05:00
|
|
|
v = Qnil;
|
2008-01-31 01:10:56 -05:00
|
|
|
v = r_leave(v, arg);
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_TRUE:
|
2002-02-26 01:48:59 -05:00
|
|
|
v = Qtrue;
|
2008-01-31 01:10:56 -05:00
|
|
|
v = r_leave(v, arg);
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_FALSE:
|
2002-02-26 01:48:59 -05:00
|
|
|
v = Qfalse;
|
2008-01-31 01:10:56 -05:00
|
|
|
v = r_leave(v, arg);
|
2002-02-28 01:53:33 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_FIXNUM:
|
|
|
|
{
|
2000-11-20 02:31:55 -05:00
|
|
|
long i = r_long(arg);
|
2002-08-21 11:47:54 -04:00
|
|
|
v = LONG2FIX(i);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2008-01-31 01:10:56 -05:00
|
|
|
v = r_leave(v, arg);
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_FLOAT:
|
|
|
|
{
|
2009-03-12 05:09:15 -04:00
|
|
|
double d;
|
2002-09-04 02:37:39 -04:00
|
|
|
VALUE str = r_bytes(arg);
|
2006-08-31 06:47:44 -04:00
|
|
|
const char *ptr = RSTRING_PTR(str);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2003-04-20 11:11:20 -04:00
|
|
|
if (strcmp(ptr, "nan") == 0) {
|
2009-12-29 02:05:39 -05:00
|
|
|
d = NAN;
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
2003-04-20 11:11:20 -04:00
|
|
|
else if (strcmp(ptr, "inf") == 0) {
|
2009-12-29 02:05:39 -05:00
|
|
|
d = INFINITY;
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
2003-04-20 11:11:20 -04:00
|
|
|
else if (strcmp(ptr, "-inf") == 0) {
|
2009-12-29 02:05:39 -05:00
|
|
|
d = -INFINITY;
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
|
|
|
else {
|
2003-04-20 11:11:20 -04:00
|
|
|
char *e;
|
|
|
|
d = strtod(ptr, &e);
|
2006-08-31 06:47:44 -04:00
|
|
|
d = load_mantissa(d, e, RSTRING_LEN(str) - (e - ptr));
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
2008-09-05 14:24:21 -04:00
|
|
|
v = DBL2NUM(d);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_BIGNUM:
|
|
|
|
{
|
2000-11-20 02:31:55 -05:00
|
|
|
long len;
|
2000-10-31 03:37:47 -05:00
|
|
|
BDIGIT *digits;
|
2005-12-13 22:04:14 -05:00
|
|
|
volatile VALUE data;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
NEWOBJ(big, struct RBignum);
|
1999-01-19 23:59:39 -05:00
|
|
|
OBJSETUP(big, rb_cBignum, T_BIGNUM);
|
2007-09-01 08:02:36 -04:00
|
|
|
RBIGNUM_SET_SIGN(big, (r_byte(arg) == '+'));
|
2000-10-31 03:37:47 -05:00
|
|
|
len = r_long(arg);
|
2002-10-17 06:20:52 -04:00
|
|
|
data = r_bytes0(len * 2, arg);
|
2001-03-22 03:59:26 -05:00
|
|
|
#if SIZEOF_BDIGITS == SIZEOF_SHORT
|
2007-09-01 08:02:36 -04:00
|
|
|
rb_big_resize((VALUE)big, len);
|
2001-03-22 03:59:26 -05:00
|
|
|
#else
|
2007-09-01 08:02:36 -04:00
|
|
|
rb_big_resize((VALUE)big, (len + 1) * 2 / sizeof(BDIGIT));
|
2001-03-22 03:59:26 -05:00
|
|
|
#endif
|
2007-09-01 08:02:36 -04:00
|
|
|
digits = RBIGNUM_DIGITS(big);
|
2006-08-31 06:47:44 -04:00
|
|
|
MEMCPY(digits, RSTRING_PTR(data), char, len * 2);
|
2000-10-31 03:37:47 -05:00
|
|
|
#if SIZEOF_BDIGITS > SIZEOF_SHORT
|
2002-10-17 06:20:52 -04:00
|
|
|
MEMZERO((char *)digits + len * 2, char,
|
2007-09-01 08:02:36 -04:00
|
|
|
RBIGNUM_LEN(big) * sizeof(BDIGIT) - len * 2);
|
2002-10-17 06:20:52 -04:00
|
|
|
#endif
|
2007-09-01 08:02:36 -04:00
|
|
|
len = RBIGNUM_LEN(big);
|
2002-10-17 06:20:52 -04:00
|
|
|
while (len > 0) {
|
|
|
|
unsigned char *p = (unsigned char *)digits;
|
2000-10-31 03:37:47 -05:00
|
|
|
BDIGIT num = 0;
|
2002-10-17 06:20:52 -04:00
|
|
|
#if SIZEOF_BDIGITS > SIZEOF_SHORT
|
2000-10-31 03:37:47 -05:00
|
|
|
int shift = 0;
|
|
|
|
int i;
|
|
|
|
|
2002-10-17 06:20:52 -04:00
|
|
|
for (i=0; i<SIZEOF_BDIGITS; i++) {
|
|
|
|
num |= (int)p[i] << shift;
|
|
|
|
shift += 8;
|
2000-10-31 03:37:47 -05:00
|
|
|
}
|
|
|
|
#else
|
2002-10-17 06:20:52 -04:00
|
|
|
num = p[0] | (p[1] << 8);
|
2000-10-31 03:37:47 -05:00
|
|
|
#endif
|
2002-10-17 06:20:52 -04:00
|
|
|
*digits++ = num;
|
|
|
|
len--;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 23:52:21 -05:00
|
|
|
v = rb_big_norm((VALUE)big);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_STRING:
|
2003-10-02 04:25:00 -04:00
|
|
|
v = r_entry(r_string(arg), arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_REGEXP:
|
|
|
|
{
|
2002-09-04 02:37:39 -04:00
|
|
|
volatile VALUE str = r_bytes(arg);
|
|
|
|
int options = r_byte(arg);
|
2010-02-11 00:37:43 -05:00
|
|
|
int has_encoding = FALSE;
|
2010-02-24 09:16:59 -05:00
|
|
|
st_index_t idx = r_prepare(arg);
|
2009-10-11 14:49:41 -04:00
|
|
|
|
2010-02-11 00:37:43 -05:00
|
|
|
if (ivp) {
|
|
|
|
r_ivar(str, &has_encoding, arg);
|
|
|
|
*ivp = FALSE;
|
|
|
|
}
|
|
|
|
if (!has_encoding) {
|
2010-02-11 00:43:19 -05:00
|
|
|
/* 1.8 compatibility; remove escapes undefined in 1.8 */
|
|
|
|
char *ptr = RSTRING_PTR(str), *dst = ptr, *src = ptr;
|
|
|
|
long len = RSTRING_LEN(str);
|
|
|
|
long bs = 0;
|
|
|
|
for (; len-- > 0; *dst++ = *src++) {
|
|
|
|
switch (*src) {
|
|
|
|
case '\\': bs++; break;
|
|
|
|
case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
|
|
|
|
case 'm': case 'o': case 'p': case 'q': case 'u': case 'y':
|
|
|
|
case 'E': case 'F': case 'H': case 'I': case 'J': case 'K':
|
|
|
|
case 'L': case 'N': case 'O': case 'P': case 'Q': case 'R':
|
|
|
|
case 'S': case 'T': case 'U': case 'V': case 'X': case 'Y':
|
|
|
|
if (bs & 1) --dst;
|
|
|
|
default: bs = 0; break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rb_str_set_len(str, dst - ptr);
|
2009-07-09 10:47:22 -04:00
|
|
|
}
|
2010-02-24 09:16:59 -05:00
|
|
|
v = r_entry0(rb_reg_new_str(str, options), idx, arg);
|
2009-09-18 10:51:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_ARRAY:
|
|
|
|
{
|
2000-11-20 02:31:55 -05:00
|
|
|
volatile long len = r_long(arg); /* gcc 2.7.2.3 -O2 bug?? */
|
1999-08-24 04:21:56 -04:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
v = rb_ary_new2(len);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
while (len--) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_ary_push(v, r_object(arg));
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_HASH:
|
1999-12-01 04:24:48 -05:00
|
|
|
case TYPE_HASH_DEF:
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2000-11-20 02:31:55 -05:00
|
|
|
long len = r_long(arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
v = rb_hash_new();
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
while (len--) {
|
|
|
|
VALUE key = r_object(arg);
|
|
|
|
VALUE value = r_object(arg);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_aset(v, key, value);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
1999-12-02 01:58:52 -05:00
|
|
|
if (type == TYPE_HASH_DEF) {
|
2009-11-10 19:36:04 -05:00
|
|
|
RHASH_IFNONE(v) = r_object(arg);
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
case TYPE_STRUCT:
|
|
|
|
{
|
2009-10-17 09:11:05 -04:00
|
|
|
VALUE mem, values;
|
2000-11-20 02:31:55 -05:00
|
|
|
volatile long i; /* gcc 2.7.2.3 -O2 bug?? */
|
1998-01-16 07:19:09 -05:00
|
|
|
ID slot;
|
2009-10-17 09:11:05 -04:00
|
|
|
st_index_t idx = r_prepare(arg);
|
|
|
|
VALUE klass = path2class(r_unique(arg));
|
|
|
|
long len = r_long(arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2007-09-09 12:23:27 -04:00
|
|
|
v = rb_obj_alloc(klass);
|
|
|
|
if (TYPE(v) != T_STRUCT) {
|
|
|
|
rb_raise(rb_eTypeError, "class %s not a struct", rb_class2name(klass));
|
|
|
|
}
|
|
|
|
mem = rb_struct_s_members(klass);
|
2007-09-08 11:07:18 -04:00
|
|
|
if (RARRAY_LEN(mem) != len) {
|
|
|
|
rb_raise(rb_eTypeError, "struct %s not compatible (struct size differs)",
|
|
|
|
rb_class2name(klass));
|
|
|
|
}
|
|
|
|
|
2009-10-17 09:11:05 -04:00
|
|
|
v = r_entry0(v, idx, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
values = rb_ary_new2(len);
|
1998-01-16 07:19:09 -05:00
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
slot = r_symbol(arg);
|
|
|
|
|
2006-09-02 10:42:08 -04:00
|
|
|
if (RARRAY_PTR(mem)[i] != ID2SYM(slot)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eTypeError, "struct %s not compatible (:%s for :%s)",
|
|
|
|
rb_class2name(klass),
|
|
|
|
rb_id2name(slot),
|
2006-09-02 10:42:08 -04:00
|
|
|
rb_id2name(SYM2ID(RARRAY_PTR(mem)[i])));
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2007-09-08 11:07:18 -04:00
|
|
|
rb_ary_push(values, r_object(arg));
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2007-09-08 12:19:13 -04:00
|
|
|
rb_struct_initialize(v, values);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TYPE_USERDEF:
|
|
|
|
{
|
2002-09-05 05:42:56 -04:00
|
|
|
VALUE klass = path2class(r_unique(arg));
|
2003-10-02 04:25:00 -04:00
|
|
|
VALUE data;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2008-06-17 23:05:33 -04:00
|
|
|
if (!rb_respond_to(klass, s_load)) {
|
2002-02-26 01:48:59 -05:00
|
|
|
rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
|
|
|
|
rb_class2name(klass));
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2003-10-02 04:25:00 -04:00
|
|
|
data = r_string(arg);
|
|
|
|
if (ivp) {
|
2010-02-11 00:37:43 -05:00
|
|
|
r_ivar(data, NULL, arg);
|
2009-07-18 04:05:32 -04:00
|
|
|
*ivp = FALSE;
|
2003-10-02 04:25:00 -04:00
|
|
|
}
|
|
|
|
v = rb_funcall(klass, s_load, 1, data);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(arg, s_load);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-07-29 14:26:55 -04:00
|
|
|
case TYPE_USRMARSHAL:
|
|
|
|
{
|
|
|
|
VALUE klass = path2class(r_unique(arg));
|
2003-10-02 04:25:00 -04:00
|
|
|
VALUE data;
|
2003-07-29 14:26:55 -04:00
|
|
|
|
|
|
|
v = rb_obj_alloc(klass);
|
2007-03-20 10:00:07 -04:00
|
|
|
if (!NIL_P(extmod)) {
|
2006-09-02 10:42:08 -04:00
|
|
|
while (RARRAY_LEN(extmod) > 0) {
|
2003-10-19 22:06:42 -04:00
|
|
|
VALUE m = rb_ary_pop(extmod);
|
2003-10-14 22:27:56 -04:00
|
|
|
rb_extend_object(v, m);
|
|
|
|
}
|
|
|
|
}
|
2008-06-17 23:05:33 -04:00
|
|
|
if (!rb_respond_to(v, s_mload)) {
|
2003-07-29 14:26:55 -04:00
|
|
|
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
|
|
|
|
rb_class2name(klass));
|
|
|
|
}
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2003-10-02 04:25:00 -04:00
|
|
|
data = r_object(arg);
|
|
|
|
rb_funcall(v, s_mload, 1, data);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(arg, s_mload);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
2003-07-29 14:26:55 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
case TYPE_OBJECT:
|
|
|
|
{
|
2009-10-17 09:11:05 -04:00
|
|
|
st_index_t idx = r_prepare(arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = obj_alloc_by_path(r_unique(arg), arg);
|
2001-10-03 03:19:19 -04:00
|
|
|
if (TYPE(v) != T_OBJECT) {
|
|
|
|
rb_raise(rb_eArgError, "dump format error");
|
|
|
|
}
|
2009-10-17 09:11:05 -04:00
|
|
|
v = r_entry0(v, idx, arg);
|
2010-02-11 00:37:43 -05:00
|
|
|
r_ivar(v, NULL, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2002-04-24 00:54:16 -04:00
|
|
|
case TYPE_DATA:
|
|
|
|
{
|
2002-09-05 05:42:56 -04:00
|
|
|
VALUE klass = path2class(r_unique(arg));
|
2008-06-17 23:05:33 -04:00
|
|
|
if (rb_respond_to(klass, s_alloc)) {
|
2009-07-18 04:05:32 -04:00
|
|
|
static int warn = TRUE;
|
2002-08-29 05:08:18 -04:00
|
|
|
if (warn) {
|
|
|
|
rb_warn("define `allocate' instead of `_alloc'");
|
2009-07-18 04:05:32 -04:00
|
|
|
warn = FALSE;
|
2002-08-29 05:08:18 -04:00
|
|
|
}
|
|
|
|
v = rb_funcall(klass, s_alloc, 0);
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(arg, s_alloc);
|
2002-04-24 00:54:16 -04:00
|
|
|
}
|
2002-08-29 05:08:18 -04:00
|
|
|
else {
|
|
|
|
v = rb_obj_alloc(klass);
|
|
|
|
}
|
2002-04-24 00:54:16 -04:00
|
|
|
if (TYPE(v) != T_DATA) {
|
|
|
|
rb_raise(rb_eArgError, "dump format error");
|
|
|
|
}
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2008-06-17 23:05:33 -04:00
|
|
|
if (!rb_respond_to(v, s_load_data)) {
|
2002-04-24 00:54:16 -04:00
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"class %s needs to have instance method `_load_data'",
|
|
|
|
rb_class2name(klass));
|
|
|
|
}
|
2006-10-22 18:24:14 -04:00
|
|
|
rb_funcall(v, s_load_data, 1, r_object0(arg, 0, extmod));
|
2008-10-01 06:11:51 -04:00
|
|
|
check_load_arg(arg, s_load_data);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
2002-04-24 00:54:16 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-12-01 04:24:48 -05:00
|
|
|
case TYPE_MODULE_OLD:
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2003-04-18 14:05:11 -04:00
|
|
|
volatile VALUE str = r_bytes(arg);
|
2002-09-05 05:42:56 -04:00
|
|
|
|
2009-08-09 17:55:55 -04:00
|
|
|
v = rb_path_to_class(str);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
1999-12-01 04:24:48 -05:00
|
|
|
case TYPE_CLASS:
|
|
|
|
{
|
2003-04-18 14:05:11 -04:00
|
|
|
volatile VALUE str = r_bytes(arg);
|
2002-09-05 05:42:56 -04:00
|
|
|
|
2009-08-09 17:55:55 -04:00
|
|
|
v = path2class(str);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
1999-12-01 04:24:48 -05:00
|
|
|
|
|
|
|
case TYPE_MODULE:
|
|
|
|
{
|
2003-04-18 14:05:11 -04:00
|
|
|
volatile VALUE str = r_bytes(arg);
|
2002-09-05 05:42:56 -04:00
|
|
|
|
2009-08-09 17:55:55 -04:00
|
|
|
v = path2module(str);
|
2006-10-22 18:24:14 -04:00
|
|
|
v = r_entry(v, arg);
|
2007-09-08 11:07:18 -04:00
|
|
|
v = r_leave(v, arg);
|
1999-12-01 04:24:48 -05:00
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
break;
|
2000-04-10 01:48:43 -04:00
|
|
|
|
2000-03-07 03:37:59 -05:00
|
|
|
case TYPE_SYMBOL:
|
2009-08-07 17:18:33 -04:00
|
|
|
if (ivp) {
|
|
|
|
v = ID2SYM(r_symreal(arg, *ivp));
|
|
|
|
*ivp = FALSE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
v = ID2SYM(r_symreal(arg, 0));
|
|
|
|
}
|
2008-01-31 01:10:56 -05:00
|
|
|
v = r_leave(v, arg);
|
2002-02-26 23:52:21 -05:00
|
|
|
break;
|
2000-04-10 01:48:43 -04:00
|
|
|
|
|
|
|
case TYPE_SYMLINK:
|
2006-10-22 18:24:14 -04:00
|
|
|
v = ID2SYM(r_symlink(arg));
|
2006-10-27 18:57:19 -04:00
|
|
|
break;
|
1999-12-01 04:24:48 -05:00
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
default:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eArgError, "dump format error(0x%x)", type);
|
1998-01-16 07:19:09 -05:00
|
|
|
break;
|
|
|
|
}
|
2002-02-26 01:48:59 -05:00
|
|
|
return v;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2002-08-28 11:58:35 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
r_object(struct load_arg *arg)
|
2002-08-28 11:58:35 -04:00
|
|
|
{
|
2006-10-22 18:24:14 -04:00
|
|
|
return r_object0(arg, 0, Qnil);
|
2002-08-28 11:58:35 -04:00
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
static void
|
|
|
|
clear_load_arg(struct load_arg *arg)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2009-10-04 06:30:56 -04:00
|
|
|
if (!arg->symbols) return;
|
2003-08-06 17:50:06 -04:00
|
|
|
st_free_table(arg->symbols);
|
2009-10-04 06:30:56 -04:00
|
|
|
arg->symbols = 0;
|
2008-09-01 22:47:38 -04:00
|
|
|
st_free_table(arg->data);
|
2009-10-07 03:42:30 -04:00
|
|
|
arg->data = 0;
|
2007-09-26 15:12:04 -04:00
|
|
|
st_free_table(arg->compat_tbl);
|
2009-10-07 03:42:30 -04:00
|
|
|
arg->compat_tbl = 0;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 11:07:43 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* load( source [, proc] ) -> obj
|
|
|
|
* restore( source [, proc] ) -> obj
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-27 11:07:43 -05:00
|
|
|
* Returns the result of converting the serialized data in source into a
|
|
|
|
* Ruby object (possibly with associated subordinate objects). source
|
|
|
|
* may be either an instance of IO or an object that responds to
|
|
|
|
* to_str. If proc is specified, it will be passed each object as it
|
|
|
|
* is deserialized.
|
|
|
|
*/
|
1998-01-16 07:19:09 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
marshal_load(int argc, VALUE *argv)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
|
|
|
VALUE port, proc;
|
2010-06-23 16:44:44 -04:00
|
|
|
int major, minor, infection = 0;
|
2009-10-10 11:14:40 -04:00
|
|
|
VALUE v;
|
|
|
|
volatile VALUE wrapper;
|
2009-10-04 06:30:56 -04:00
|
|
|
struct load_arg *arg;
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &port, &proc);
|
2008-05-27 23:52:44 -04:00
|
|
|
v = rb_check_string_type(port);
|
|
|
|
if (!NIL_P(v)) {
|
2010-06-23 16:44:44 -04:00
|
|
|
infection = FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
|
2008-05-27 23:52:44 -04:00
|
|
|
port = v;
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2008-06-17 23:05:33 -04:00
|
|
|
else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
|
|
|
|
if (rb_respond_to(port, s_binmode)) {
|
2003-03-03 02:20:17 -05:00
|
|
|
rb_funcall2(port, s_binmode, 0, 0);
|
|
|
|
}
|
2010-06-23 16:44:44 -04:00
|
|
|
infection = FL_TAINT | FL_TEST(port, FL_UNTRUSTED);
|
2002-10-17 06:20:52 -04:00
|
|
|
}
|
1998-01-16 07:19:09 -05:00
|
|
|
else {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eTypeError, "instance of IO needed");
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2009-10-04 06:30:56 -04:00
|
|
|
wrapper = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg);
|
2010-06-23 16:44:44 -04:00
|
|
|
arg->infection = infection;
|
2009-10-04 06:30:56 -04:00
|
|
|
arg->src = port;
|
|
|
|
arg->offset = 0;
|
|
|
|
arg->symbols = st_init_numtable();
|
|
|
|
arg->data = st_init_numtable();
|
|
|
|
arg->compat_tbl = st_init_numtable();
|
|
|
|
arg->proc = 0;
|
|
|
|
|
|
|
|
major = r_byte(arg);
|
|
|
|
minor = r_byte(arg);
|
2000-11-21 09:31:11 -05:00
|
|
|
if (major != MARSHAL_MAJOR || minor > MARSHAL_MINOR) {
|
2009-10-04 06:30:56 -04:00
|
|
|
clear_load_arg(arg);
|
2000-11-20 02:31:55 -05:00
|
|
|
rb_raise(rb_eTypeError, "incompatible marshal file format (can't be read)\n\
|
|
|
|
\tformat version %d.%d required; %d.%d given",
|
|
|
|
MARSHAL_MAJOR, MARSHAL_MINOR, major, minor);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2001-07-31 02:24:45 -04:00
|
|
|
if (RTEST(ruby_verbose) && minor != MARSHAL_MINOR) {
|
2000-11-20 02:31:55 -05:00
|
|
|
rb_warn("incompatible marshal file format (can be read)\n\
|
|
|
|
\tformat version %d.%d required; %d.%d given",
|
|
|
|
MARSHAL_MAJOR, MARSHAL_MINOR, major, minor);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
|
|
|
|
2009-10-04 06:30:56 -04:00
|
|
|
if (!NIL_P(proc)) arg->proc = proc;
|
|
|
|
v = r_object(arg);
|
|
|
|
clear_load_arg(arg);
|
|
|
|
RB_GC_GUARD(wrapper);
|
2000-11-20 02:31:55 -05:00
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2003-12-27 11:07:43 -05:00
|
|
|
/*
|
|
|
|
* The marshaling library converts collections of Ruby objects into a
|
|
|
|
* byte stream, allowing them to be stored outside the currently
|
|
|
|
* active script. This data may subsequently be read and the original
|
|
|
|
* objects reconstituted.
|
2010-05-25 22:50:58 -04:00
|
|
|
*
|
2003-12-27 11:07:43 -05:00
|
|
|
* Marshaled data has major and minor version numbers stored along
|
|
|
|
* with the object information. In normal use, marshaling can only
|
|
|
|
* load data written with the same major version number and an equal
|
|
|
|
* or lower minor version number. If Ruby's ``verbose'' flag is set
|
|
|
|
* (normally using -d, -v, -w, or --verbose) the major and minor
|
|
|
|
* numbers must match exactly. Marshal versioning is independent of
|
|
|
|
* Ruby's version numbers. You can extract the version by reading the
|
|
|
|
* first two bytes of marshaled data.
|
|
|
|
*
|
|
|
|
* str = Marshal.dump("thing")
|
2008-03-08 20:04:46 -05:00
|
|
|
* RUBY_VERSION #=> "1.9.0"
|
|
|
|
* str[0].ord #=> 4
|
|
|
|
* str[1].ord #=> 8
|
2003-12-27 11:07:43 -05:00
|
|
|
*
|
|
|
|
* Some objects cannot be dumped: if the objects to be dumped include
|
|
|
|
* bindings, procedure or method objects, instances of class IO, or
|
|
|
|
* singleton objects, a TypeError will be raised.
|
2010-05-25 22:50:58 -04:00
|
|
|
*
|
2003-12-27 11:07:43 -05:00
|
|
|
* If your class has special serialization needs (for example, if you
|
|
|
|
* want to serialize in some specific format), or if it contains
|
|
|
|
* objects that would otherwise not be serializable, you can implement
|
2010-05-25 22:50:58 -04:00
|
|
|
* your own serialization strategy.
|
|
|
|
*
|
|
|
|
* There are two methods of doing this, your object can define either
|
|
|
|
* marshal_dump and marshal_load or _dump and _load. marshal_dump will take
|
|
|
|
* precedence over _dump if both are defined. marshal_dump may result in
|
|
|
|
* smaller Marshal strings.
|
|
|
|
*
|
|
|
|
* == marshal_dump and marshal_load
|
|
|
|
*
|
|
|
|
* When dumping an object the method marshal_dump will be called.
|
|
|
|
* marshal_dump must return a result containing the information necessary for
|
|
|
|
* marshal_load to reconstitute the object. The result can be any object.
|
|
|
|
*
|
|
|
|
* When loading an object dumped using marshal_dump the object is first
|
|
|
|
* allocated then marshal_load is called with the result from marshal_dump.
|
|
|
|
* marshal_load must recreate the object from the information in the result.
|
|
|
|
*
|
|
|
|
* Example:
|
|
|
|
*
|
|
|
|
* class MyObj
|
|
|
|
* def initialize name, version, data
|
|
|
|
* @name = name
|
|
|
|
* @version = version
|
|
|
|
* @data = data
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* def marshal_dump
|
|
|
|
* [@name, @version]
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* def marshal_load array
|
|
|
|
* @name, @version = array
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* == _dump and _load
|
|
|
|
*
|
|
|
|
* Use _dump and _load when you need to allocate the object you're restoring
|
|
|
|
* yourself.
|
|
|
|
*
|
|
|
|
* When dumping an object the instance method _dump is called with an Integer
|
|
|
|
* which indicates the maximum depth of objects to dump (a value of -1 implies
|
|
|
|
* that you should disable depth checking). _dump must return a String
|
|
|
|
* containing the information necessary to reconstitute the object.
|
|
|
|
*
|
|
|
|
* The class method _load should take a String and use it to return an object
|
|
|
|
* of the same class.
|
|
|
|
*
|
|
|
|
* Example:
|
|
|
|
*
|
|
|
|
* class MyObj
|
|
|
|
* def initialize name, version, data
|
|
|
|
* @name = name
|
|
|
|
* @version = version
|
|
|
|
* @data = data
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* def _dump level
|
|
|
|
* [@name, @version].join ':'
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* def self._load args
|
|
|
|
* new(*args.split(':'))
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* Since Marhsal.dump outputs a string you can have _dump return a Marshal
|
|
|
|
* string which is Marshal.loaded in _load for complex objects.
|
2003-12-27 11:07:43 -05:00
|
|
|
*/
|
1999-01-19 23:59:39 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
Init_marshal(void)
|
1998-01-16 07:19:09 -05:00
|
|
|
{
|
2008-06-09 05:25:32 -04:00
|
|
|
#undef rb_intern
|
2008-08-15 20:20:31 -04:00
|
|
|
#define rb_intern(str) rb_intern_const(str)
|
2008-06-09 05:25:32 -04:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_mMarshal = rb_define_module("Marshal");
|
1998-01-16 07:19:09 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
s_dump = rb_intern("_dump");
|
|
|
|
s_load = rb_intern("_load");
|
2003-07-29 14:26:55 -04:00
|
|
|
s_mdump = rb_intern("marshal_dump");
|
|
|
|
s_mload = rb_intern("marshal_load");
|
2002-04-24 00:54:16 -04:00
|
|
|
s_dump_data = rb_intern("_dump_data");
|
|
|
|
s_load_data = rb_intern("_load_data");
|
|
|
|
s_alloc = rb_intern("_alloc");
|
2008-10-01 06:11:51 -04:00
|
|
|
s_call = rb_intern("call");
|
2008-01-25 11:37:53 -05:00
|
|
|
s_getbyte = rb_intern("getbyte");
|
2002-10-17 06:20:52 -04:00
|
|
|
s_read = rb_intern("read");
|
|
|
|
s_write = rb_intern("write");
|
2003-03-03 02:20:17 -05:00
|
|
|
s_binmode = rb_intern("binmode");
|
2002-10-17 06:20:52 -04:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_module_function(rb_mMarshal, "dump", marshal_dump, -1);
|
|
|
|
rb_define_module_function(rb_mMarshal, "load", marshal_load, -1);
|
2000-06-23 03:05:59 -04:00
|
|
|
rb_define_module_function(rb_mMarshal, "restore", marshal_load, -1);
|
2001-07-31 02:24:45 -04:00
|
|
|
|
2001-07-31 04:33:17 -04:00
|
|
|
rb_define_const(rb_mMarshal, "MAJOR_VERSION", INT2FIX(MARSHAL_MAJOR));
|
|
|
|
rb_define_const(rb_mMarshal, "MINOR_VERSION", INT2FIX(MARSHAL_MINOR));
|
2007-09-08 11:07:18 -04:00
|
|
|
|
|
|
|
compat_allocator_tbl = st_init_numtable();
|
2007-09-26 15:12:04 -04:00
|
|
|
compat_allocator_tbl_wrapper =
|
|
|
|
Data_Wrap_Struct(rb_cData, mark_marshal_compat_t, 0, compat_allocator_tbl);
|
* gc.c, include/ruby/ruby.h: rename rb_register_mark_object()
to rb_gc_register_mark_object().
* eval.c, vm.c: initialize vm->mark_object_ary at
Init_top_self().
* bignum.c, complex.c, encoding.c, ext/win32ole/win32ole.c,
io.c, load.c, marshal.c, rational.c, ruby.c, vm.c:
use rb_gc_register_mark_object() instead of
rb_global_variable() or rb_gc_register_address().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-15 10:59:14 -04:00
|
|
|
rb_gc_register_mark_object(compat_allocator_tbl_wrapper);
|
1998-01-16 07:19:09 -05:00
|
|
|
}
|
2001-07-03 03:29:00 -04:00
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_marshal_dump(VALUE obj, VALUE port)
|
2001-07-03 03:29:00 -04:00
|
|
|
{
|
|
|
|
int argc = 1;
|
|
|
|
VALUE argv[2];
|
|
|
|
|
|
|
|
argv[0] = obj;
|
|
|
|
argv[1] = port;
|
|
|
|
if (!NIL_P(port)) argc = 2;
|
|
|
|
return marshal_dump(argc, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_marshal_load(VALUE port)
|
2001-07-03 03:29:00 -04:00
|
|
|
{
|
|
|
|
return marshal_load(1, &port);
|
|
|
|
}
|