2002-03-11 06:58:07 -05:00
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
stringio.c -
|
|
|
|
|
|
|
|
$Author$
|
2002-03-13 22:35:52 -05:00
|
|
|
$RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
|
2002-03-11 06:58:07 -05:00
|
|
|
created at: Tue Feb 19 04:10:38 JST 2002
|
|
|
|
|
|
|
|
All the files in this distribution are covered under the Ruby's
|
|
|
|
license (see the file COPYING).
|
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
#include "ruby.h"
|
* 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
|
|
|
#include "ruby/io.h"
|
2008-10-21 10:14:13 -04:00
|
|
|
#include "ruby/encoding.h"
|
2004-11-17 21:27:00 -05:00
|
|
|
#if defined(HAVE_FCNTL_H) || defined(_WIN32)
|
|
|
|
#include <fcntl.h>
|
|
|
|
#elif defined(HAVE_SYS_FCNTL_H)
|
|
|
|
#include <sys/fcntl.h>
|
|
|
|
#endif
|
2002-03-11 06:58:07 -05:00
|
|
|
|
|
|
|
struct StringIO {
|
|
|
|
VALUE string;
|
|
|
|
long pos;
|
|
|
|
long lineno;
|
|
|
|
int flags;
|
|
|
|
int count;
|
|
|
|
};
|
|
|
|
|
2007-09-21 16:19:51 -04:00
|
|
|
static void strio_init(int, VALUE *, struct StringIO *);
|
2002-03-11 06:58:07 -05:00
|
|
|
|
2011-03-29 11:25:25 -04:00
|
|
|
#define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
|
2002-03-11 06:58:07 -05:00
|
|
|
#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
|
|
|
|
|
|
|
|
static struct StringIO *
|
2009-10-27 09:14:52 -04:00
|
|
|
strio_alloc(void)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = ALLOC(struct StringIO);
|
|
|
|
ptr->string = Qnil;
|
|
|
|
ptr->pos = 0;
|
|
|
|
ptr->lineno = 0;
|
|
|
|
ptr->flags = 0;
|
|
|
|
ptr->count = 1;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-10-27 09:14:52 -04:00
|
|
|
strio_mark(void *p)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2009-10-27 09:14:52 -04:00
|
|
|
struct StringIO *ptr = p;
|
2002-04-23 12:22:25 -04:00
|
|
|
if (ptr) {
|
|
|
|
rb_gc_mark(ptr->string);
|
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-10-27 09:14:52 -04:00
|
|
|
strio_free(void *p)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2009-10-27 09:14:52 -04:00
|
|
|
struct StringIO *ptr = p;
|
2002-03-11 06:58:07 -05:00
|
|
|
if (--ptr->count <= 0) {
|
|
|
|
xfree(ptr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-27 09:14:52 -04:00
|
|
|
static size_t
|
|
|
|
strio_memsize(const void *p)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2009-10-27 09:14:52 -04:00
|
|
|
const struct StringIO *ptr = p;
|
|
|
|
if (!ptr) return 0;
|
|
|
|
return sizeof(struct StringIO);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2009-10-27 09:14:52 -04:00
|
|
|
static const rb_data_type_t strio_data_type = {
|
|
|
|
"strio",
|
2010-07-18 03:31:54 -04:00
|
|
|
{
|
|
|
|
strio_mark,
|
|
|
|
strio_free,
|
|
|
|
strio_memsize,
|
|
|
|
},
|
2009-10-27 09:14:52 -04:00
|
|
|
};
|
|
|
|
|
2011-03-29 11:25:25 -04:00
|
|
|
#define check_strio(self) ((struct StringIO*)rb_check_typeddata((self), &strio_data_type))
|
2009-10-27 09:14:52 -04:00
|
|
|
|
2002-03-11 06:58:07 -05:00
|
|
|
static struct StringIO*
|
2006-06-20 14:02:17 -04:00
|
|
|
get_strio(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2011-01-05 15:14:43 -05:00
|
|
|
struct StringIO *ptr = check_strio(rb_io_taint_check(self));
|
2002-03-11 06:58:07 -05:00
|
|
|
|
|
|
|
if (!ptr) {
|
|
|
|
rb_raise(rb_eIOError, "uninitialized stream");
|
|
|
|
}
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
* 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
|
|
|
static VALUE
|
2009-04-05 21:47:15 -04:00
|
|
|
strio_substr(struct StringIO *ptr, long pos, long len)
|
* 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
|
|
|
{
|
|
|
|
VALUE str = ptr->string;
|
|
|
|
rb_encoding *enc = rb_enc_get(str);
|
2009-04-05 21:47:15 -04:00
|
|
|
long rlen = RSTRING_LEN(str) - pos;
|
* 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
|
|
|
|
|
|
|
if (len > rlen) len = rlen;
|
|
|
|
if (len < 0) len = 0;
|
|
|
|
return rb_enc_str_new(RSTRING_PTR(str)+pos, len, enc);
|
|
|
|
}
|
|
|
|
|
2002-03-11 06:58:07 -05:00
|
|
|
#define StringIO(obj) get_strio(obj)
|
|
|
|
|
2005-08-13 05:36:12 -04:00
|
|
|
#define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
|
|
|
|
#define READABLE(ptr) ((ptr)->flags & FMODE_READABLE)
|
|
|
|
#define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
|
2002-03-13 22:35:52 -05:00
|
|
|
|
2002-03-11 06:58:07 -05:00
|
|
|
static struct StringIO*
|
2006-06-20 14:02:17 -04:00
|
|
|
readable(struct StringIO *ptr)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2002-03-13 22:35:52 -05:00
|
|
|
if (!READABLE(ptr)) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_raise(rb_eIOError, "not opened for reading");
|
|
|
|
}
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct StringIO*
|
2006-06-20 14:02:17 -04:00
|
|
|
writable(struct StringIO *ptr)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2002-03-13 22:35:52 -05:00
|
|
|
if (!WRITABLE(ptr)) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_raise(rb_eIOError, "not opened for writing");
|
|
|
|
}
|
|
|
|
if (!OBJ_TAINTED(ptr->string)) {
|
|
|
|
rb_secure(4);
|
|
|
|
}
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2002-03-18 08:21:01 -05:00
|
|
|
static void
|
2006-06-20 14:02:17 -04:00
|
|
|
check_modifiable(struct StringIO *ptr)
|
2002-03-13 22:35:52 -05:00
|
|
|
{
|
|
|
|
if (OBJ_FROZEN(ptr->string)) {
|
|
|
|
rb_raise(rb_eIOError, "not modifiable string");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2007-08-14 20:33:33 -04:00
|
|
|
strio_s_allocate(VALUE klass)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2009-10-27 09:14:52 -04:00
|
|
|
return TypedData_Wrap_Struct(klass, &strio_data_type, 0);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq: StringIO.new(string=""[, mode])
|
|
|
|
*
|
|
|
|
* Creates new StringIO instance from with _string_ and _mode_.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_initialize(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = check_strio(self);
|
|
|
|
|
|
|
|
if (!ptr) {
|
|
|
|
DATA_PTR(self) = ptr = strio_alloc();
|
|
|
|
}
|
|
|
|
rb_call_super(0, 0);
|
2007-09-21 16:19:51 -04:00
|
|
|
strio_init(argc, argv, ptr);
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
strio_init(int argc, VALUE *argv, struct StringIO *ptr)
|
|
|
|
{
|
|
|
|
VALUE string, mode;
|
2009-04-05 21:47:15 -04:00
|
|
|
int trunc = 0;
|
2007-09-21 16:19:51 -04:00
|
|
|
|
2002-03-11 06:58:07 -05:00
|
|
|
switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
|
|
|
|
case 2:
|
2004-11-17 20:11:01 -05:00
|
|
|
if (FIXNUM_P(mode)) {
|
|
|
|
int flags = FIX2INT(mode);
|
|
|
|
ptr->flags = rb_io_modenum_flags(flags);
|
|
|
|
trunc = flags & O_TRUNC;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const char *m = StringValueCStr(mode);
|
|
|
|
ptr->flags = rb_io_mode_flags(m);
|
|
|
|
trunc = *m == 'w';
|
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
StringValue(string);
|
2002-09-08 22:27:01 -04:00
|
|
|
if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
|
2002-03-13 22:35:52 -05:00
|
|
|
errno = EACCES;
|
|
|
|
rb_sys_fail(0);
|
|
|
|
}
|
2004-11-17 20:11:01 -05:00
|
|
|
if (trunc) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_str_resize(string, 0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
StringValue(string);
|
2002-03-13 22:35:52 -05:00
|
|
|
ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
|
2002-03-11 06:58:07 -05:00
|
|
|
break;
|
|
|
|
case 0:
|
2008-01-17 10:03:56 -05:00
|
|
|
string = rb_enc_str_new("", 0, rb_default_external_encoding());
|
2002-03-11 06:58:07 -05:00
|
|
|
ptr->flags = FMODE_READWRITE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ptr->string = string;
|
2008-06-11 13:50:03 -04:00
|
|
|
ptr->pos = 0;
|
|
|
|
ptr->lineno = 0;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_finalize(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
ptr->string = Qnil;
|
|
|
|
ptr->flags &= ~FMODE_READWRITE;
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2007-08-14 20:33:33 -04:00
|
|
|
/*
|
|
|
|
* call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
|
|
|
|
*
|
|
|
|
* Equivalent to StringIO.new except that when it is called with a block, it
|
|
|
|
* yields with the new instance and closes it, and returns the result which
|
|
|
|
* returned from the block.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
strio_s_open(int argc, VALUE *argv, VALUE klass)
|
|
|
|
{
|
|
|
|
VALUE obj = rb_class_new_instance(argc, argv, klass);
|
|
|
|
if (!rb_block_given_p()) return obj;
|
|
|
|
return rb_ensure(rb_yield, obj, strio_finalize, obj);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Returns +false+. Just for compatibility to IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_false(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Returns +nil+. Just for compatibility to IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_nil(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Returns *strio* itself. Just for compatibility to IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_self(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Returns 0. Just for compatibility to IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_0(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Returns the argument unchanged. Just for compatibility to IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_first(VALUE self, VALUE arg)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
return arg;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Raises NotImplementedError.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_unimpl(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
rb_notimplement();
|
|
|
|
return Qnil; /* not reached */
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq: strio.string -> string
|
|
|
|
*
|
|
|
|
* Returns underlying String object, the subject of IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_get_string(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
return StringIO(self)->string;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.string = string -> string
|
|
|
|
*
|
|
|
|
* Changes underlying String object, the subject of IO.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_set_string(VALUE self, VALUE string)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
|
2011-01-05 15:14:43 -05:00
|
|
|
rb_io_taint_check(self);
|
2002-09-08 22:27:01 -04:00
|
|
|
ptr->flags &= ~FMODE_READWRITE;
|
2005-08-13 05:36:12 -04:00
|
|
|
StringValue(string);
|
|
|
|
ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
|
2002-09-08 22:27:01 -04:00
|
|
|
ptr->pos = 0;
|
|
|
|
ptr->lineno = 0;
|
2002-03-11 06:58:07 -05:00
|
|
|
return ptr->string = string;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.close -> nil
|
|
|
|
*
|
2010-04-22 04:04:13 -04:00
|
|
|
* Closes strio. The *strio* is unavailable for any further data
|
2005-03-15 09:52:59 -05:00
|
|
|
* operations; an +IOError+ is raised if such an attempt is made.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_close(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
2005-08-13 05:36:12 -04:00
|
|
|
if (CLOSED(ptr)) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_raise(rb_eIOError, "closed stream");
|
|
|
|
}
|
|
|
|
ptr->flags &= ~FMODE_READWRITE;
|
2005-02-03 09:43:07 -05:00
|
|
|
return Qnil;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.close_read -> nil
|
|
|
|
*
|
|
|
|
* Closes the read end of a StringIO. Will raise an +IOError+ if the
|
|
|
|
* *strio* is not readable.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_close_read(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2002-03-13 22:35:52 -05:00
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
if (!READABLE(ptr)) {
|
|
|
|
rb_raise(rb_eIOError, "closing non-duplex IO for reading");
|
|
|
|
}
|
2005-08-11 10:29:46 -04:00
|
|
|
ptr->flags &= ~FMODE_READABLE;
|
2005-02-03 09:43:07 -05:00
|
|
|
return Qnil;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.close_write -> nil
|
|
|
|
*
|
|
|
|
* Closes the write end of a StringIO. Will raise an +IOError+ if the
|
|
|
|
* *strio* is not writeable.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_close_write(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2002-03-13 22:35:52 -05:00
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
if (!WRITABLE(ptr)) {
|
|
|
|
rb_raise(rb_eIOError, "closing non-duplex IO for writing");
|
|
|
|
}
|
2005-08-11 10:29:46 -04:00
|
|
|
ptr->flags &= ~FMODE_WRITABLE;
|
2005-02-03 09:43:07 -05:00
|
|
|
return Qnil;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.closed? -> true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if *strio* is completely closed, +false+ otherwise.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_closed(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
2002-03-13 22:35:52 -05:00
|
|
|
if (!CLOSED(ptr)) return Qfalse;
|
2002-03-11 06:58:07 -05:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.closed_read? -> true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if *strio* is not readable, +false+ otherwise.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_closed_read(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
2002-03-13 22:35:52 -05:00
|
|
|
if (READABLE(ptr)) return Qfalse;
|
2002-03-11 06:58:07 -05:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.closed_write? -> true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if *strio* is not writable, +false+ otherwise.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_closed_write(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
2002-03-13 22:35:52 -05:00
|
|
|
if (WRITABLE(ptr)) return Qfalse;
|
2002-03-11 06:58:07 -05:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.eof -> true or false
|
|
|
|
* strio.eof? -> true or false
|
|
|
|
*
|
2010-04-22 04:04:13 -04:00
|
|
|
* Returns true if *strio* is at end of file. The stringio must be
|
2005-03-15 09:52:59 -05:00
|
|
|
* opened for reading or an +IOError+ will be raised.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_eof(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2002-03-13 22:35:52 -05:00
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
2006-08-31 06:30:33 -04:00
|
|
|
if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
|
2002-03-11 06:58:07 -05:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* :nodoc: */
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
strio_copy(VALUE copy, VALUE orig)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2002-09-08 22:27:01 -04:00
|
|
|
struct StringIO *ptr;
|
2002-09-03 01:20:14 -04:00
|
|
|
|
2002-09-08 22:27:01 -04:00
|
|
|
orig = rb_convert_type(orig, T_DATA, "StringIO", "to_strio");
|
|
|
|
if (copy == orig) return copy;
|
|
|
|
ptr = StringIO(orig);
|
|
|
|
if (check_strio(copy)) {
|
|
|
|
strio_free(DATA_PTR(copy));
|
2002-09-03 01:20:14 -04:00
|
|
|
}
|
|
|
|
DATA_PTR(copy) = ptr;
|
2003-11-05 20:17:59 -05:00
|
|
|
OBJ_INFECT(copy, orig);
|
2002-03-11 06:58:07 -05:00
|
|
|
++ptr->count;
|
2002-09-03 01:20:14 -04:00
|
|
|
return copy;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.lineno -> integer
|
|
|
|
*
|
|
|
|
* Returns the current line number in *strio*. The stringio must be
|
|
|
|
* opened for reading. +lineno+ counts the number of times +gets+ is
|
|
|
|
* called, rather than the number of newlines encountered. The two
|
|
|
|
* values will differ if +gets+ is called with a separator other than
|
|
|
|
* newline. See also the <code>$.</code> variable.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_get_lineno(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
return LONG2NUM(StringIO(self)->lineno);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.lineno = integer -> integer
|
|
|
|
*
|
|
|
|
* Manually sets the current line number to the given value.
|
|
|
|
* <code>$.</code> is updated only on the next read.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_set_lineno(VALUE self, VALUE lineno)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self)->lineno = NUM2LONG(lineno);
|
|
|
|
return lineno;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.binmode -> true */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_binmode strio_self
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.fcntl */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_fcntl strio_unimpl
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.flush -> strio */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_flush strio_self
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.fsync -> 0 */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_fsync strio_0
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.reopen(other_StrIO) -> strio
|
|
|
|
* strio.reopen(string, mode) -> strio
|
|
|
|
*
|
2010-04-22 04:04:13 -04:00
|
|
|
* Reinitializes *strio* with the given <i>other_StrIO</i> or _string_
|
2005-03-15 09:52:59 -05:00
|
|
|
* and _mode_ (see StringIO#new).
|
|
|
|
*/
|
2002-09-08 22:27:01 -04:00
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
strio_reopen(int argc, VALUE *argv, VALUE self)
|
2002-09-08 22:27:01 -04:00
|
|
|
{
|
2011-01-05 15:14:43 -05:00
|
|
|
rb_io_taint_check(self);
|
2002-09-08 22:27:01 -04:00
|
|
|
if (argc == 1 && TYPE(*argv) != T_STRING) {
|
2002-12-10 21:31:59 -05:00
|
|
|
return strio_copy(self, *argv);
|
2002-09-08 22:27:01 -04:00
|
|
|
}
|
2007-09-21 16:19:51 -04:00
|
|
|
strio_init(argc, argv, StringIO(self));
|
|
|
|
return self;
|
2002-09-08 22:27:01 -04:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.pos -> integer
|
|
|
|
* strio.tell -> integer
|
|
|
|
*
|
|
|
|
* Returns the current offset (in bytes) of *strio*.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_get_pos(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
return LONG2NUM(StringIO(self)->pos);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.pos = integer -> integer
|
|
|
|
*
|
|
|
|
* Seeks to the given position (in bytes) in *strio*.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_set_pos(VALUE self, VALUE pos)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
long p = NUM2LONG(pos);
|
|
|
|
if (p < 0) {
|
|
|
|
error_inval(0);
|
|
|
|
}
|
|
|
|
ptr->pos = p;
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.rewind -> 0
|
|
|
|
*
|
|
|
|
* Positions *strio* to the beginning of input, resetting
|
|
|
|
* +lineno+ to zero.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_rewind(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
ptr->pos = 0;
|
|
|
|
ptr->lineno = 0;
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.seek(amount, whence=SEEK_SET) -> 0
|
|
|
|
*
|
|
|
|
* Seeks to a given offset _amount_ in the stream according to
|
|
|
|
* the value of _whence_ (see IO#seek).
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_seek(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
VALUE whence;
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
long offset;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", NULL, &whence);
|
|
|
|
offset = NUM2LONG(argv[0]);
|
2007-04-16 03:48:50 -04:00
|
|
|
if (CLOSED(ptr)) {
|
|
|
|
rb_raise(rb_eIOError, "closed stream");
|
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
offset += ptr->pos;
|
|
|
|
break;
|
|
|
|
case 2:
|
2006-08-31 06:30:33 -04:00
|
|
|
offset += RSTRING_LEN(ptr->string);
|
2002-03-11 06:58:07 -05:00
|
|
|
break;
|
|
|
|
default:
|
2007-04-16 03:48:50 -04:00
|
|
|
error_inval("invalid whence");
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
if (offset < 0) {
|
|
|
|
error_inval(0);
|
|
|
|
}
|
|
|
|
ptr->pos = offset;
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.sync -> true
|
|
|
|
*
|
|
|
|
* Returns +true+ always.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_get_sync(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
StringIO(self);
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.sync = boolean -> boolean */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_set_sync strio_first
|
|
|
|
|
|
|
|
#define strio_tell strio_get_pos
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.bytes {|byte| block } -> strio
|
|
|
|
* strio.bytes -> anEnumerator
|
|
|
|
*
|
2005-03-15 09:52:59 -05:00
|
|
|
* strio.each_byte {|byte| block } -> strio
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.each_byte -> anEnumerator
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#each_byte.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_each_byte(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
* ext/dbm/dbm.c (fdbm_each_value, fdbm_each_key, fdbm_each_pair):
GDBM#{each,each_pair,each_key,each_value}: Return an enumerator
if no block is given.
* ext/gdbm/gdbm.c (fgdbm_each_value, fgdbm_each_key,
fgdbm_each_pair): GDBM#{each,each_pair,each_key,each_value}:
Return an enumerator if no block is given.
* ext/openssl/ossl_config.c (ossl_config_each):
OpenSSL::Config#each: Return an enumerator if no block is given.
* ext/readline/readline.c (hist_each): Readline::HISTORY#each:
Return an enumerator if no block is given.
* ext/sdbm/init.c (fsdbm_each_value, fsdbm_each_key,
fsdbm_each_pair): SDBM#{each,each_pair,each_key,each_value}:
Return an enumerator if no block is given.
* ext/stringio/stringio.c (strio_each_byte, strio_each):
StringIO#{each,each_line,each_byte}: Return an enumerator if no
block is given.
* ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
which are aliases to #each_line and #each_byte, respectively.
* ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
enumerator if no block is given.
* ext/zlib/zlib.c (rb_gzreader_each_byte, rb_gzreader_each):
Zlib::GzipReader#{each,each_line,each_byte}: Return an
enumerator if no block is given.
* ext/zlib/zlib.c (Init_zlib): Add Zlib::GzipReader#lines and
#bytes, which are aliases to #each_line and #each_byte,
respectively.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-21 04:48:33 -04:00
|
|
|
|
|
|
|
RETURN_ENUMERATOR(self, 0, 0);
|
|
|
|
|
2006-08-31 06:30:33 -04:00
|
|
|
while (ptr->pos < RSTRING_LEN(ptr->string)) {
|
|
|
|
char c = RSTRING_PTR(ptr->string)[ptr->pos++];
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_yield(CHR2FIX(c));
|
|
|
|
}
|
2008-05-27 04:55:59 -04:00
|
|
|
return self;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
* 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
|
|
|
* strio.getc -> string or nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#getc.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_getc(VALUE self)
|
2007-08-14 20:33:33 -04:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
* 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
|
|
|
rb_encoding *enc = rb_enc_get(ptr->string);
|
|
|
|
int len;
|
|
|
|
char *p;
|
2007-08-14 20:33:33 -04:00
|
|
|
|
|
|
|
if (ptr->pos >= RSTRING_LEN(ptr->string)) {
|
|
|
|
return Qnil;
|
|
|
|
}
|
* 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
|
|
|
p = RSTRING_PTR(ptr->string)+ptr->pos;
|
2007-09-06 11:42:53 -04:00
|
|
|
len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
|
* 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
|
|
|
ptr->pos += len;
|
|
|
|
return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
|
2007-08-14 20:33:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.getbyte -> fixnum or nil
|
|
|
|
*
|
|
|
|
* See IO#getbyte.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
strio_getbyte(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
|
|
|
int c;
|
2006-08-31 06:30:33 -04:00
|
|
|
if (ptr->pos >= RSTRING_LEN(ptr->string)) {
|
2002-03-11 06:58:07 -05:00
|
|
|
return Qnil;
|
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
c = RSTRING_PTR(ptr->string)[ptr->pos++];
|
2002-03-11 06:58:07 -05:00
|
|
|
return CHR2FIX(c);
|
|
|
|
}
|
|
|
|
|
2005-02-03 09:43:07 -05:00
|
|
|
static void
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
strio_extend(struct StringIO *ptr, long pos, long len)
|
2005-02-03 09:43:07 -05:00
|
|
|
{
|
|
|
|
long olen;
|
|
|
|
|
|
|
|
check_modifiable(ptr);
|
2006-08-31 06:30:33 -04:00
|
|
|
olen = RSTRING_LEN(ptr->string);
|
2005-02-03 09:43:07 -05:00
|
|
|
if (pos + len > olen) {
|
|
|
|
rb_str_resize(ptr->string, pos + len);
|
|
|
|
if (pos > olen)
|
2006-08-31 06:30:33 -04:00
|
|
|
MEMZERO(RSTRING_PTR(ptr->string) + olen, char, pos - olen);
|
2005-02-03 09:43:07 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_modify(ptr->string);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-08-14 20:33:33 -04:00
|
|
|
* strio.ungetc(string) -> nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* Pushes back one character (passed as a parameter) onto *strio*
|
2009-12-03 23:14:37 -05:00
|
|
|
* such that a subsequent buffered read will return it. There is no
|
|
|
|
* limitation for multiple pushbacks including pushing back behind the
|
|
|
|
* beginning of the buffer string.
|
2005-03-15 09:52:59 -05:00
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2007-08-14 20:33:33 -04:00
|
|
|
strio_ungetc(VALUE self, VALUE c)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
* 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
|
|
|
long lpos, clen;
|
|
|
|
char *p, *pend;
|
2008-10-21 18:10:49 -04:00
|
|
|
rb_encoding *enc, *enc2;
|
2002-03-11 06:58:07 -05:00
|
|
|
|
2007-08-14 20:33:33 -04:00
|
|
|
if (NIL_P(c)) return Qnil;
|
|
|
|
if (FIXNUM_P(c)) {
|
* 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
|
|
|
int cc = FIX2INT(c);
|
|
|
|
char buf[16];
|
|
|
|
|
|
|
|
enc = rb_enc_get(ptr->string);
|
|
|
|
rb_enc_mbcput(cc, buf, enc);
|
|
|
|
c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
|
2007-08-14 20:33:33 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
SafeStringValue(c);
|
2008-10-21 18:10:49 -04:00
|
|
|
enc = rb_enc_get(ptr->string);
|
|
|
|
enc2 = rb_enc_get(c);
|
|
|
|
if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
|
|
|
|
c = rb_str_conv_enc(c, enc2, enc);
|
|
|
|
}
|
2007-08-14 20:33:33 -04:00
|
|
|
}
|
2010-02-05 11:57:54 -05:00
|
|
|
if (RSTRING_LEN(ptr->string) < ptr->pos) {
|
|
|
|
long len = RSTRING_LEN(ptr->string);
|
|
|
|
rb_str_resize(ptr->string, ptr->pos - 1);
|
|
|
|
memset(RSTRING_PTR(ptr->string) + len, 0, ptr->pos - len - 1);
|
|
|
|
rb_str_concat(ptr->string, c);
|
|
|
|
ptr->pos--;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* get logical position */
|
|
|
|
lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos;
|
|
|
|
for (;;) {
|
|
|
|
clen = rb_enc_mbclen(p, pend, enc);
|
|
|
|
if (p+clen >= pend) break;
|
|
|
|
p += clen;
|
|
|
|
lpos++;
|
|
|
|
}
|
|
|
|
clen = p - RSTRING_PTR(ptr->string);
|
|
|
|
rb_str_update(ptr->string, lpos, ptr->pos ? 1 : 0, c);
|
|
|
|
ptr->pos = clen;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
* 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
|
|
|
|
2002-03-11 06:58:07 -05:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-10-21 18:10:49 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.ungetbyte(fixnum) -> nil
|
|
|
|
*
|
|
|
|
* See IO#ungetbyte
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
strio_ungetbyte(VALUE self, VALUE c)
|
|
|
|
{
|
2009-05-14 03:07:55 -04:00
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
|
|
|
char buf[1], *cp = buf;
|
|
|
|
long pos = ptr->pos, cl = 1;
|
|
|
|
VALUE str = ptr->string;
|
|
|
|
|
|
|
|
if (NIL_P(c)) return Qnil;
|
|
|
|
if (FIXNUM_P(c)) {
|
|
|
|
buf[0] = (char)FIX2INT(c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
SafeStringValue(c);
|
|
|
|
cp = RSTRING_PTR(c);
|
|
|
|
cl = RSTRING_LEN(c);
|
|
|
|
if (cl == 0) return Qnil;
|
|
|
|
}
|
|
|
|
rb_str_modify(str);
|
|
|
|
if (cl > pos) {
|
|
|
|
char *s;
|
|
|
|
long rest = RSTRING_LEN(str) - pos;
|
|
|
|
rb_str_resize(str, rest + cl);
|
|
|
|
s = RSTRING_PTR(str);
|
|
|
|
memmove(s + cl, s + pos, rest);
|
|
|
|
pos = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
pos -= cl;
|
|
|
|
}
|
|
|
|
memcpy(RSTRING_PTR(str) + pos, cp, cl);
|
|
|
|
ptr->pos = pos;
|
|
|
|
RB_GC_GUARD(c);
|
|
|
|
return Qnil;
|
2008-10-21 18:10:49 -04:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-12-02 22:22:12 -05:00
|
|
|
* strio.readchar -> string
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#readchar.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_readchar(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
VALUE c = strio_getc(self);
|
|
|
|
if (NIL_P(c)) rb_eof_error();
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2007-08-14 20:33:33 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.readbyte -> fixnum
|
|
|
|
*
|
|
|
|
* See IO#readbyte.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
strio_readbyte(VALUE self)
|
|
|
|
{
|
|
|
|
VALUE c = strio_getbyte(self);
|
|
|
|
if (NIL_P(c)) rb_eof_error();
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2008-05-27 06:03:23 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.chars {|char| block } -> strio
|
|
|
|
* strio.chars -> anEnumerator
|
|
|
|
*
|
2008-05-27 06:03:23 -04:00
|
|
|
* strio.each_char {|char| block } -> strio
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.each_char -> anEnumerator
|
2008-05-27 06:03:23 -04:00
|
|
|
*
|
|
|
|
* See IO#each_char.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
strio_each_char(VALUE self)
|
|
|
|
{
|
|
|
|
VALUE c;
|
|
|
|
|
|
|
|
RETURN_ENUMERATOR(self, 0, 0);
|
|
|
|
|
|
|
|
while (!NIL_P(c = strio_getc(self))) {
|
|
|
|
rb_yield(c);
|
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2009-06-22 04:23:30 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.codepoints {|c| block } -> strio
|
|
|
|
* strio.codepoints -> anEnumerator
|
|
|
|
*
|
2009-06-22 04:23:30 -04:00
|
|
|
* strio.each_codepoint {|c| block } -> strio
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.each_codepoint -> anEnumerator
|
2009-06-22 04:23:30 -04:00
|
|
|
*
|
|
|
|
* See IO#each_codepoint.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
strio_each_codepoint(VALUE self)
|
|
|
|
{
|
|
|
|
struct StringIO *ptr;
|
|
|
|
rb_encoding *enc;
|
|
|
|
unsigned int c;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
RETURN_ENUMERATOR(self, 0, 0);
|
|
|
|
|
|
|
|
ptr = readable(StringIO(self));
|
|
|
|
enc = rb_enc_get(ptr->string);
|
|
|
|
for (;;) {
|
|
|
|
if (ptr->pos >= RSTRING_LEN(ptr->string)) {
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
c = rb_enc_codepoint_len(RSTRING_PTR(ptr->string)+ptr->pos,
|
|
|
|
RSTRING_END(ptr->string), &n, enc);
|
|
|
|
rb_yield(UINT2NUM(c));
|
|
|
|
ptr->pos += n;
|
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2007-08-14 20:33:33 -04:00
|
|
|
/* Boyer-Moore search: copied from regex.c */
|
2002-03-11 06:58:07 -05:00
|
|
|
static void
|
2006-06-20 14:02:17 -04:00
|
|
|
bm_init_skip(long *skip, const char *pat, long m)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
int c;
|
|
|
|
|
|
|
|
for (c = 0; c < (1 << CHAR_BIT); c++) {
|
|
|
|
skip[c] = m;
|
|
|
|
}
|
|
|
|
while (--m) {
|
|
|
|
skip[(unsigned char)*pat++] = m;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static long
|
2006-06-20 14:02:17 -04:00
|
|
|
bm_search(const char *little, long llen, const char *big, long blen, const long *skip)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
long i, j, k;
|
|
|
|
|
|
|
|
i = llen - 1;
|
|
|
|
while (i < blen) {
|
|
|
|
k = i;
|
|
|
|
j = llen - 1;
|
|
|
|
while (j >= 0 && big[k] == little[j]) {
|
|
|
|
k--;
|
|
|
|
j--;
|
|
|
|
}
|
|
|
|
if (j < 0) return k + 1;
|
|
|
|
i += skip[(unsigned char)big[i]];
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
const char *s, *e, *p;
|
2007-06-28 02:00:09 -04:00
|
|
|
long n, limit = 0;
|
2011-04-08 03:50:49 -04:00
|
|
|
VALUE str, lim;
|
2002-03-11 06:58:07 -05:00
|
|
|
|
2011-04-08 03:50:49 -04:00
|
|
|
rb_scan_args(argc, argv, "02", &str, &lim);
|
|
|
|
switch (argc) {
|
|
|
|
case 0:
|
2002-03-11 06:58:07 -05:00
|
|
|
str = rb_rs;
|
2011-04-08 03:50:49 -04:00
|
|
|
break;
|
2006-12-29 14:21:50 -05:00
|
|
|
|
2011-04-08 03:50:49 -04:00
|
|
|
case 1:
|
|
|
|
if (!NIL_P(str) && TYPE(str) != T_STRING) {
|
|
|
|
VALUE tmp = rb_check_string_type(str);
|
2006-12-29 14:21:50 -05:00
|
|
|
if (NIL_P(tmp)) {
|
|
|
|
limit = NUM2LONG(str);
|
|
|
|
if (limit == 0) return rb_str_new(0,0);
|
|
|
|
str = rb_rs;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
str = tmp;
|
|
|
|
}
|
|
|
|
}
|
2011-04-08 03:50:49 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
if (!NIL_P(str)) StringValue(str);
|
|
|
|
limit = NUM2LONG(lim);
|
|
|
|
break;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2006-08-31 06:30:33 -04:00
|
|
|
if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
|
2003-11-18 04:09:41 -05:00
|
|
|
return Qnil;
|
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
s = RSTRING_PTR(ptr->string);
|
|
|
|
e = s + RSTRING_LEN(ptr->string);
|
2002-03-11 06:58:07 -05:00
|
|
|
s += ptr->pos;
|
2006-12-29 14:21:50 -05:00
|
|
|
if (limit > 0 && s + limit < e) {
|
2010-12-02 17:08:45 -05:00
|
|
|
e = rb_enc_right_char_head(s, s + limit, e, rb_enc_get(ptr->string));
|
2006-12-29 14:21:50 -05:00
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
if (NIL_P(str)) {
|
* 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
|
|
|
str = strio_substr(ptr, ptr->pos, e - s);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
else if ((n = RSTRING_LEN(str)) == 0) {
|
2002-03-11 06:58:07 -05:00
|
|
|
p = s;
|
|
|
|
while (*p == '\n') {
|
2003-11-18 04:09:41 -05:00
|
|
|
if (++p == e) {
|
|
|
|
return Qnil;
|
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
s = p;
|
2005-04-30 00:11:33 -04:00
|
|
|
while ((p = memchr(p, '\n', e - p)) && (p != e)) {
|
2002-03-11 06:58:07 -05:00
|
|
|
if (*++p == '\n') {
|
2008-06-30 09:30:11 -04:00
|
|
|
e = p + 1;
|
2002-03-11 06:58:07 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2010-04-22 04:04:13 -04:00
|
|
|
str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
else if (n == 1) {
|
2006-08-31 06:30:33 -04:00
|
|
|
if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
|
2002-03-11 06:58:07 -05:00
|
|
|
e = p + 1;
|
|
|
|
}
|
* 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
|
|
|
str = strio_substr(ptr, ptr->pos, e - s);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
else {
|
2002-07-11 11:04:23 -04:00
|
|
|
if (n < e - s) {
|
|
|
|
if (e - s < 1024) {
|
2002-03-11 06:58:07 -05:00
|
|
|
for (p = s; p + n <= e; ++p) {
|
2006-08-31 06:30:33 -04:00
|
|
|
if (MEMCMP(p, RSTRING_PTR(str), char, n) == 0) {
|
2002-03-11 06:58:07 -05:00
|
|
|
e = p + n;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
long skip[1 << CHAR_BIT], pos;
|
2006-08-31 06:30:33 -04:00
|
|
|
p = RSTRING_PTR(str);
|
2002-03-11 06:58:07 -05:00
|
|
|
bm_init_skip(skip, p, n);
|
|
|
|
if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
|
|
|
|
e = s + pos + n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
* 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
|
|
|
str = strio_substr(ptr, ptr->pos, e - s);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
ptr->pos = e - RSTRING_PTR(ptr->string);
|
2002-03-11 06:58:07 -05:00
|
|
|
ptr->lineno++;
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-29 14:21:50 -05:00
|
|
|
* strio.gets(sep=$/) -> string or nil
|
|
|
|
* strio.gets(limit) -> string or nil
|
|
|
|
* strio.gets(sep, limit) -> string or nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#gets.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_gets(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
* ext/stringio/stringio.c (strio_getline): should not set $_ here.
* io.c (argf_to_s): argf.to_s returns "ARGF".
* io.c (set_defout_var, set_deferr_var): make $defout and $deferr
obsolete.
* io.c (set_input_var, set_output_var): allow $stdin, $stdout,
$stderr not to be instance of IO.
* io.c (rb_f_readline): forward method to current_file. gets,
readline, readlines, getc, readchar, tell, seek, pos=, rewind,
fileno, to_io, eof, each_line, each_byte, binmode, and closed?
as well.
* io.c (argf_forward): utility function to forward method to
current_file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-28 03:31:52 -04:00
|
|
|
VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
|
|
|
|
|
|
|
|
rb_lastline_set(str);
|
|
|
|
return str;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-29 14:21:50 -05:00
|
|
|
* strio.readline(sep=$/) -> string
|
|
|
|
* strio.readline(limit) -> string or nil
|
|
|
|
* strio.readline(sep, limit) -> string or nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#readline.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_readline(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
2008-06-15 18:14:51 -04:00
|
|
|
VALUE line = strio_gets(argc, argv, self);
|
2002-03-11 06:58:07 -05:00
|
|
|
if (NIL_P(line)) rb_eof_error();
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-29 14:21:50 -05:00
|
|
|
* strio.each(sep=$/) {|line| block } -> strio
|
|
|
|
* strio.each(limit) {|line| block } -> strio
|
|
|
|
* strio.each(sep, limit) {|line| block } -> strio
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.each(...) -> anEnumerator
|
|
|
|
*
|
2006-12-29 14:21:50 -05:00
|
|
|
* strio.each_line(sep=$/) {|line| block } -> strio
|
|
|
|
* strio.each_line(limit) {|line| block } -> strio
|
|
|
|
* strio.each_line(sep,limit) {|line| block } -> strio
|
2010-03-07 05:22:05 -05:00
|
|
|
* strio.each_line(...) -> anEnumerator
|
|
|
|
*
|
|
|
|
* strio.lines(sep=$/) {|line| block } -> strio
|
|
|
|
* strio.lines(limit) {|line| block } -> strio
|
|
|
|
* strio.lines(sep,limit) {|line| block } -> strio
|
|
|
|
* strio.lines(...) -> anEnumerator
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#each.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_each(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
VALUE line;
|
|
|
|
|
2011-04-09 10:28:06 -04:00
|
|
|
RETURN_ENUMERATOR(self, argc, argv);
|
|
|
|
|
2011-04-14 08:16:09 -04:00
|
|
|
if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
|
|
|
|
NUM2LONG(argv[argc-1]) == 0) {
|
2011-04-09 10:28:06 -04:00
|
|
|
rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
|
2011-04-09 09:01:23 -04:00
|
|
|
}
|
|
|
|
|
* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
* ext/stringio/stringio.c (strio_getline): should not set $_ here.
* io.c (argf_to_s): argf.to_s returns "ARGF".
* io.c (set_defout_var, set_deferr_var): make $defout and $deferr
obsolete.
* io.c (set_input_var, set_output_var): allow $stdin, $stdout,
$stderr not to be instance of IO.
* io.c (rb_f_readline): forward method to current_file. gets,
readline, readlines, getc, readchar, tell, seek, pos=, rewind,
fileno, to_io, eof, each_line, each_byte, binmode, and closed?
as well.
* io.c (argf_forward): utility function to forward method to
current_file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-28 03:31:52 -04:00
|
|
|
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_yield(line);
|
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-29 14:21:50 -05:00
|
|
|
* strio.readlines(sep=$/) -> array
|
|
|
|
* strio.readlines(limit) -> array
|
|
|
|
* strio.readlines(sep,limit) -> array
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#readlines.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_readlines(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = StringIO(self);
|
|
|
|
VALUE ary = rb_ary_new(), line;
|
2011-04-09 09:01:23 -04:00
|
|
|
|
2011-04-14 08:16:09 -04:00
|
|
|
if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
|
|
|
|
NUM2LONG(argv[argc-1]) == 0) {
|
2011-04-09 09:01:23 -04:00
|
|
|
rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
|
|
|
|
}
|
|
|
|
|
* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
* ext/stringio/stringio.c (strio_getline): should not set $_ here.
* io.c (argf_to_s): argf.to_s returns "ARGF".
* io.c (set_defout_var, set_deferr_var): make $defout and $deferr
obsolete.
* io.c (set_input_var, set_output_var): allow $stdin, $stdout,
$stderr not to be instance of IO.
* io.c (rb_f_readline): forward method to current_file. gets,
readline, readlines, getc, readchar, tell, seek, pos=, rewind,
fileno, to_io, eof, each_line, each_byte, binmode, and closed?
as well.
* io.c (argf_forward): utility function to forward method to
current_file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-28 03:31:52 -04:00
|
|
|
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_ary_push(ary, line);
|
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.write(string) -> integer
|
|
|
|
* strio.syswrite(string) -> integer
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* Appends the given string to the underlying buffer string of *strio*.
|
|
|
|
* The stream must be opened for writing. If the argument is not a
|
|
|
|
* string, it will be converted to a string using <code>to_s</code>.
|
|
|
|
* Returns the number of bytes written. See IO#write.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_write(VALUE self, VALUE str)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = writable(StringIO(self));
|
2004-09-08 05:44:46 -04:00
|
|
|
long len, olen;
|
2008-10-21 10:14:13 -04:00
|
|
|
rb_encoding *enc, *enc2;
|
2002-03-11 06:58:07 -05:00
|
|
|
|
2010-06-29 08:12:07 -04:00
|
|
|
RB_GC_GUARD(str);
|
2002-03-11 06:58:07 -05:00
|
|
|
if (TYPE(str) != T_STRING)
|
|
|
|
str = rb_obj_as_string(str);
|
2008-10-21 10:14:13 -04:00
|
|
|
enc = rb_enc_get(ptr->string);
|
|
|
|
enc2 = rb_enc_get(str);
|
|
|
|
if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
|
|
|
|
str = rb_str_conv_enc(str, enc2, enc);
|
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
len = RSTRING_LEN(str);
|
* 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
|
|
|
if (len == 0) return INT2FIX(0);
|
2002-03-13 22:35:52 -05:00
|
|
|
check_modifiable(ptr);
|
2006-08-31 06:30:33 -04:00
|
|
|
olen = RSTRING_LEN(ptr->string);
|
2004-10-06 13:57:19 -04:00
|
|
|
if (ptr->flags & FMODE_APPEND) {
|
2004-09-08 05:44:46 -04:00
|
|
|
ptr->pos = olen;
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
2004-09-08 05:44:46 -04:00
|
|
|
if (ptr->pos == olen) {
|
2006-08-31 06:30:33 -04:00
|
|
|
rb_str_cat(ptr->string, RSTRING_PTR(str), len);
|
2002-04-08 23:52:39 -04:00
|
|
|
}
|
|
|
|
else {
|
2005-02-03 09:43:07 -05:00
|
|
|
strio_extend(ptr, ptr->pos, len);
|
* 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
|
|
|
memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
|
|
|
|
OBJ_INFECT(ptr->string, str);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
2003-11-05 20:17:59 -05:00
|
|
|
OBJ_INFECT(ptr->string, self);
|
2002-03-11 06:58:07 -05:00
|
|
|
ptr->pos += len;
|
|
|
|
return LONG2NUM(len);
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio << obj -> strio
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#<<.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_addstr rb_io_addstr
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.print() -> nil
|
|
|
|
* strio.print(obj, ...) -> nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#print.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_print rb_io_print
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.printf(format_string [, obj, ...] ) -> nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#printf.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_printf rb_io_printf
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.putc(obj) -> obj
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#putc.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_putc(VALUE self, VALUE ch)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = writable(StringIO(self));
|
|
|
|
int c = NUM2CHR(ch);
|
2005-02-03 09:43:07 -05:00
|
|
|
long olen;
|
2002-03-11 06:58:07 -05:00
|
|
|
|
2002-03-13 22:35:52 -05:00
|
|
|
check_modifiable(ptr);
|
2006-08-31 06:30:33 -04:00
|
|
|
olen = RSTRING_LEN(ptr->string);
|
2004-10-06 13:57:19 -04:00
|
|
|
if (ptr->flags & FMODE_APPEND) {
|
2005-02-03 09:43:07 -05:00
|
|
|
ptr->pos = olen;
|
2002-04-08 23:52:39 -04:00
|
|
|
}
|
2005-02-03 09:43:07 -05:00
|
|
|
strio_extend(ptr, ptr->pos, 1);
|
2006-08-31 06:30:33 -04:00
|
|
|
RSTRING_PTR(ptr->string)[ptr->pos++] = c;
|
2003-11-05 20:17:59 -05:00
|
|
|
OBJ_INFECT(ptr->string, self);
|
2002-03-11 06:58:07 -05:00
|
|
|
return ch;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.puts(obj, ...) -> nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#puts.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_puts rb_io_puts
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.read([length [, buffer]]) -> string, buffer, or nil
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* See IO#read.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_read(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
struct StringIO *ptr = readable(StringIO(self));
|
2003-12-23 20:29:57 -05:00
|
|
|
VALUE str = Qnil;
|
2009-09-27 21:08:24 -04:00
|
|
|
long len;
|
2002-03-11 06:58:07 -05:00
|
|
|
|
|
|
|
switch (argc) {
|
2003-12-23 20:29:57 -05:00
|
|
|
case 2:
|
|
|
|
str = argv[1];
|
|
|
|
StringValue(str);
|
|
|
|
rb_str_modify(str);
|
2002-03-11 06:58:07 -05:00
|
|
|
case 1:
|
|
|
|
if (!NIL_P(argv[0])) {
|
2009-09-27 21:08:24 -04:00
|
|
|
len = NUM2LONG(argv[0]);
|
2003-11-18 04:09:41 -05:00
|
|
|
if (len < 0) {
|
|
|
|
rb_raise(rb_eArgError, "negative length %ld given", len);
|
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
if (len > 0 && ptr->pos >= RSTRING_LEN(ptr->string)) {
|
2003-12-24 00:23:32 -05:00
|
|
|
if (!NIL_P(str)) rb_str_resize(str, 0);
|
2003-11-18 04:23:07 -05:00
|
|
|
return Qnil;
|
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
case 0:
|
2006-08-31 06:30:33 -04:00
|
|
|
len = RSTRING_LEN(ptr->string);
|
2003-12-10 05:29:00 -05:00
|
|
|
if (len <= ptr->pos) {
|
2003-12-23 20:29:57 -05:00
|
|
|
if (NIL_P(str)) {
|
|
|
|
str = rb_str_new(0, 0);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_resize(str, 0);
|
|
|
|
}
|
|
|
|
return str;
|
2003-12-10 05:29:00 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
len -= ptr->pos;
|
2003-11-18 04:09:41 -05:00
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
break;
|
|
|
|
default:
|
2004-03-29 02:54:38 -05:00
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
2003-12-23 20:29:57 -05:00
|
|
|
if (NIL_P(str)) {
|
* 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
|
|
|
str = strio_substr(ptr, ptr->pos, len);
|
2009-09-27 21:08:24 -04:00
|
|
|
if (argc > 0) rb_enc_associate(str, rb_ascii8bit_encoding());
|
2003-12-23 20:29:57 -05:00
|
|
|
}
|
|
|
|
else {
|
2006-08-31 06:30:33 -04:00
|
|
|
long rest = RSTRING_LEN(ptr->string) - ptr->pos;
|
2003-12-23 20:29:57 -05:00
|
|
|
if (len > rest) len = rest;
|
|
|
|
rb_str_resize(str, len);
|
2006-08-31 06:30:33 -04:00
|
|
|
MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
|
2003-12-23 20:29:57 -05:00
|
|
|
}
|
2003-12-04 21:54:48 -05:00
|
|
|
if (NIL_P(str)) {
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
str = rb_str_new(0, 0);
|
2003-12-10 05:29:00 -05:00
|
|
|
len = 0;
|
2003-11-18 04:09:41 -05:00
|
|
|
}
|
2003-12-04 21:54:48 -05:00
|
|
|
else {
|
2006-08-31 06:30:33 -04:00
|
|
|
ptr->pos += len = RSTRING_LEN(str);
|
2003-12-04 21:54:48 -05:00
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.sysread(integer[, outbuf]) -> string
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* Similar to #read, but raises +EOFError+ at end of string instead of
|
|
|
|
* returning +nil+, as well as IO#sysread does.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
strio_sysread(int argc, VALUE *argv, VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
VALUE val = strio_read(argc, argv, self);
|
2008-06-14 09:52:41 -04:00
|
|
|
if (NIL_P(val)) {
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_eof_error();
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define strio_syswrite strio_write
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.isatty -> nil
|
|
|
|
* strio.tty? -> nil
|
|
|
|
*
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_isatty strio_false
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.pid -> nil */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_pid strio_nil
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/* call-seq: strio.fileno -> nil */
|
2002-03-11 06:58:07 -05:00
|
|
|
#define strio_fileno strio_nil
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.size -> integer
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* Returns the size of the buffer string.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_size(VALUE self)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
VALUE string = StringIO(self)->string;
|
|
|
|
if (NIL_P(string)) {
|
|
|
|
rb_raise(rb_eIOError, "not opened");
|
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
return ULONG2NUM(RSTRING_LEN(string));
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2005-03-15 10:43:29 -05:00
|
|
|
* strio.truncate(integer) -> 0
|
2005-03-15 09:52:59 -05:00
|
|
|
*
|
|
|
|
* Truncates the buffer string to at most _integer_ bytes. The *strio*
|
|
|
|
* must be opened for writing.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
strio_truncate(VALUE self, VALUE len)
|
2002-03-11 06:58:07 -05:00
|
|
|
{
|
|
|
|
VALUE string = writable(StringIO(self))->string;
|
|
|
|
long l = NUM2LONG(len);
|
2006-08-31 06:30:33 -04:00
|
|
|
long plen = RSTRING_LEN(string);
|
2002-03-11 06:58:07 -05:00
|
|
|
if (l < 0) {
|
|
|
|
error_inval("negative legnth");
|
|
|
|
}
|
|
|
|
rb_str_resize(string, l);
|
2005-02-02 09:53:36 -05:00
|
|
|
if (plen < l) {
|
2006-08-31 06:30:33 -04:00
|
|
|
MEMZERO(RSTRING_PTR(string) + plen, char, l - plen);
|
2005-02-02 09:53:36 -05:00
|
|
|
}
|
2002-03-11 06:58:07 -05:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2008-10-04 05:56:20 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.external_encoding => encoding
|
|
|
|
*
|
|
|
|
* Returns the Encoding object that represents the encoding of the file.
|
|
|
|
* If strio is write mode and no encoding is specified, returns <code>nil</code>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
strio_external_encoding(VALUE self)
|
|
|
|
{
|
|
|
|
return rb_enc_from_encoding(rb_enc_get(StringIO(self)->string));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* strio.internal_encoding => encoding
|
|
|
|
*
|
|
|
|
* Returns the Encoding of the internal string if conversion is
|
|
|
|
* specified. Otherwise returns nil.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
strio_internal_encoding(VALUE self)
|
|
|
|
{
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-10-05 04:47:01 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-10-10 17:54:22 -04:00
|
|
|
* strio.set_encoding(ext_enc, [int_enc[, opt]]) => strio
|
2008-10-05 04:47:01 -04:00
|
|
|
*
|
2010-10-10 17:54:22 -04:00
|
|
|
* Specify the encoding of the StringIO as <i>ext_enc</i>.
|
|
|
|
* Use the default external encoding if <i>ext_enc</i> is nil.
|
|
|
|
* 2nd argument <i>int_enc</i> and optional hash <i>opt</i> argument
|
|
|
|
* are ignored; they are for API compatibility to IO.
|
2008-10-05 04:47:01 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2010-10-10 17:54:22 -04:00
|
|
|
strio_set_encoding(int argc, VALUE *argv, VALUE self)
|
2008-10-05 04:47:01 -04:00
|
|
|
{
|
|
|
|
rb_encoding* enc;
|
|
|
|
VALUE str = StringIO(self)->string;
|
2010-10-10 17:54:22 -04:00
|
|
|
VALUE ext_enc, int_enc, opt;
|
|
|
|
|
|
|
|
argc = rb_scan_args(argc, argv, "11:", &ext_enc, &int_enc, &opt);
|
|
|
|
|
|
|
|
if (NIL_P(ext_enc)) {
|
|
|
|
enc = rb_default_external_encoding();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
enc = rb_to_encoding(ext_enc);
|
|
|
|
}
|
2008-10-05 04:47:01 -04:00
|
|
|
rb_enc_associate(str, enc);
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2005-03-15 09:52:59 -05:00
|
|
|
/*
|
|
|
|
* Pseudo I/O on String object.
|
|
|
|
*/
|
2002-03-11 06:58:07 -05:00
|
|
|
void
|
|
|
|
Init_stringio()
|
|
|
|
{
|
|
|
|
VALUE StringIO = rb_define_class("StringIO", rb_cData);
|
2003-07-26 01:14:17 -04:00
|
|
|
|
|
|
|
rb_include_module(StringIO, rb_mEnumerable);
|
* ext/curses/curses.c, ext/digest/digest.c, ext/dl/handle.c,
ext/dl/ptr.c, ext/dl/sym.c, ext/gdbm/gdbm.c, ext/iconv/iconv.c,
ext/stringio/stringio.c, ext/strscan/strscan.c,
ext/tcltklib/tcltklib.c, ext/win32ole/win32ole.c:
use rb_define_alloc_func().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-20 06:23:40 -05:00
|
|
|
rb_define_alloc_func(StringIO, strio_s_allocate);
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
|
|
|
|
rb_define_method(StringIO, "initialize", strio_initialize, -1);
|
2003-09-28 22:44:49 -04:00
|
|
|
rb_define_method(StringIO, "initialize_copy", strio_copy, 1);
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_define_method(StringIO, "reopen", strio_reopen, -1);
|
|
|
|
|
|
|
|
rb_define_method(StringIO, "string", strio_get_string, 0);
|
|
|
|
rb_define_method(StringIO, "string=", strio_set_string, 1);
|
|
|
|
rb_define_method(StringIO, "lineno", strio_get_lineno, 0);
|
|
|
|
rb_define_method(StringIO, "lineno=", strio_set_lineno, 1);
|
|
|
|
|
|
|
|
rb_define_method(StringIO, "binmode", strio_binmode, 0);
|
|
|
|
rb_define_method(StringIO, "close", strio_close, 0);
|
|
|
|
rb_define_method(StringIO, "close_read", strio_close_read, 0);
|
|
|
|
rb_define_method(StringIO, "close_write", strio_close_write, 0);
|
|
|
|
rb_define_method(StringIO, "closed?", strio_closed, 0);
|
|
|
|
rb_define_method(StringIO, "closed_read?", strio_closed_read, 0);
|
|
|
|
rb_define_method(StringIO, "closed_write?", strio_closed_write, 0);
|
|
|
|
rb_define_method(StringIO, "eof", strio_eof, 0);
|
|
|
|
rb_define_method(StringIO, "eof?", strio_eof, 0);
|
|
|
|
rb_define_method(StringIO, "fcntl", strio_fcntl, -1);
|
|
|
|
rb_define_method(StringIO, "flush", strio_flush, 0);
|
|
|
|
rb_define_method(StringIO, "fsync", strio_fsync, 0);
|
|
|
|
rb_define_method(StringIO, "pos", strio_get_pos, 0);
|
|
|
|
rb_define_method(StringIO, "pos=", strio_set_pos, 1);
|
|
|
|
rb_define_method(StringIO, "rewind", strio_rewind, 0);
|
|
|
|
rb_define_method(StringIO, "seek", strio_seek, -1);
|
|
|
|
rb_define_method(StringIO, "sync", strio_get_sync, 0);
|
|
|
|
rb_define_method(StringIO, "sync=", strio_set_sync, 1);
|
|
|
|
rb_define_method(StringIO, "tell", strio_tell, 0);
|
|
|
|
|
|
|
|
rb_define_method(StringIO, "each", strio_each, -1);
|
|
|
|
rb_define_method(StringIO, "each_line", strio_each, -1);
|
* ext/dbm/dbm.c (fdbm_each_value, fdbm_each_key, fdbm_each_pair):
GDBM#{each,each_pair,each_key,each_value}: Return an enumerator
if no block is given.
* ext/gdbm/gdbm.c (fgdbm_each_value, fgdbm_each_key,
fgdbm_each_pair): GDBM#{each,each_pair,each_key,each_value}:
Return an enumerator if no block is given.
* ext/openssl/ossl_config.c (ossl_config_each):
OpenSSL::Config#each: Return an enumerator if no block is given.
* ext/readline/readline.c (hist_each): Readline::HISTORY#each:
Return an enumerator if no block is given.
* ext/sdbm/init.c (fsdbm_each_value, fsdbm_each_key,
fsdbm_each_pair): SDBM#{each,each_pair,each_key,each_value}:
Return an enumerator if no block is given.
* ext/stringio/stringio.c (strio_each_byte, strio_each):
StringIO#{each,each_line,each_byte}: Return an enumerator if no
block is given.
* ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
which are aliases to #each_line and #each_byte, respectively.
* ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
enumerator if no block is given.
* ext/zlib/zlib.c (rb_gzreader_each_byte, rb_gzreader_each):
Zlib::GzipReader#{each,each_line,each_byte}: Return an
enumerator if no block is given.
* ext/zlib/zlib.c (Init_zlib): Add Zlib::GzipReader#lines and
#bytes, which are aliases to #each_line and #each_byte,
respectively.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-21 04:48:33 -04:00
|
|
|
rb_define_method(StringIO, "lines", strio_each, -1);
|
2008-05-27 06:03:23 -04:00
|
|
|
rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
|
|
|
|
rb_define_method(StringIO, "bytes", strio_each_byte, 0);
|
|
|
|
rb_define_method(StringIO, "each_char", strio_each_char, 0);
|
|
|
|
rb_define_method(StringIO, "chars", strio_each_char, 0);
|
2009-06-22 04:23:30 -04:00
|
|
|
rb_define_method(StringIO, "each_codepoint", strio_each_codepoint, 0);
|
|
|
|
rb_define_method(StringIO, "codepoints", strio_each_codepoint, 0);
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_define_method(StringIO, "getc", strio_getc, 0);
|
|
|
|
rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
|
2008-10-21 18:10:49 -04:00
|
|
|
rb_define_method(StringIO, "ungetbyte", strio_ungetbyte, 1);
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_define_method(StringIO, "readchar", strio_readchar, 0);
|
2007-08-14 20:33:33 -04:00
|
|
|
rb_define_method(StringIO, "getbyte", strio_getbyte, 0);
|
|
|
|
rb_define_method(StringIO, "readbyte", strio_readbyte, 0);
|
2002-03-11 06:58:07 -05:00
|
|
|
rb_define_method(StringIO, "gets", strio_gets, -1);
|
|
|
|
rb_define_method(StringIO, "readline", strio_readline, -1);
|
|
|
|
rb_define_method(StringIO, "readlines", strio_readlines, -1);
|
|
|
|
rb_define_method(StringIO, "read", strio_read, -1);
|
|
|
|
rb_define_method(StringIO, "sysread", strio_sysread, -1);
|
2004-08-26 23:15:44 -04:00
|
|
|
rb_define_method(StringIO, "readpartial", strio_sysread, -1);
|
2009-10-27 09:22:40 -04:00
|
|
|
rb_define_method(StringIO, "read_nonblock", strio_sysread, -1);
|
2002-03-11 06:58:07 -05:00
|
|
|
|
|
|
|
rb_define_method(StringIO, "write", strio_write, 1);
|
|
|
|
rb_define_method(StringIO, "<<", strio_addstr, 1);
|
|
|
|
rb_define_method(StringIO, "print", strio_print, -1);
|
|
|
|
rb_define_method(StringIO, "printf", strio_printf, -1);
|
|
|
|
rb_define_method(StringIO, "putc", strio_putc, 1);
|
|
|
|
rb_define_method(StringIO, "puts", strio_puts, -1);
|
|
|
|
rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
|
2009-10-27 09:22:40 -04:00
|
|
|
rb_define_method(StringIO, "write_nonblock", strio_syswrite, 1);
|
2002-03-11 06:58:07 -05:00
|
|
|
|
|
|
|
rb_define_method(StringIO, "isatty", strio_isatty, 0);
|
|
|
|
rb_define_method(StringIO, "tty?", strio_isatty, 0);
|
|
|
|
rb_define_method(StringIO, "pid", strio_pid, 0);
|
|
|
|
rb_define_method(StringIO, "fileno", strio_fileno, 0);
|
|
|
|
rb_define_method(StringIO, "size", strio_size, 0);
|
|
|
|
rb_define_method(StringIO, "length", strio_size, 0);
|
|
|
|
rb_define_method(StringIO, "truncate", strio_truncate, 1);
|
2008-10-04 05:56:20 -04:00
|
|
|
|
|
|
|
rb_define_method(StringIO, "external_encoding", strio_external_encoding, 0);
|
|
|
|
rb_define_method(StringIO, "internal_encoding", strio_internal_encoding, 0);
|
2010-10-10 17:54:22 -04:00
|
|
|
rb_define_method(StringIO, "set_encoding", strio_set_encoding, -1);
|
2002-03-11 06:58:07 -05:00
|
|
|
}
|