Skip to content

Adopt rb_len_t #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobu merged 1 commit into from
Oct 10, 2026
Merged

Adopt rb_len_t #228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 68 additions & 55 deletions ext/stringio/stringio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ STRINGIO_VERSION = "3.2.1";
#include <sys/fcntl.h>
#endif

#ifndef SIZEOF_RB_LEN_T
# define SIZEOF_RB_LEN_T SIZEOF_LONG
# define RB_LEN_MAX LONG_MAX
# define NUM2LEN(num) NUM2LONG(num)
# define NUM2ULEN(num) NUM2ULONG(num)
# define LEN2NUM(num) LONG2NUM(num)
# define ULEN2NUM(num) ULONG2NUM(num)
typedef long rb_len_t;
typedef unsigned long rb_ulen_t;
#endif

#ifndef RB_INTEGER_TYPE_P
# define RB_INTEGER_TYPE_P(c) (FIXNUM_P(c) || RB_TYPE_P(c, T_BIGNUM))
#endif
Expand Down Expand Up @@ -73,16 +84,16 @@ typedef int rb_io_mode_t;
struct StringIO {
VALUE string;
rb_encoding *enc;
long pos;
long lineno;
rb_len_t pos;
rb_len_t lineno;
rb_io_mode_t flags;
strio_refcnt_t count;
};

static struct StringIO *get_strio_for_read(VALUE self);
static VALUE strio_init(int, VALUE *, struct StringIO *, VALUE);
static VALUE strio_unget_bytes(struct StringIO *, const char *, long);
static long strio_write(VALUE self, VALUE str);
static VALUE strio_unget_bytes(struct StringIO *, const char *, rb_len_t);
static rb_len_t strio_write(VALUE self, VALUE str);

#define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
#define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
Expand Down Expand Up @@ -159,18 +170,18 @@ get_strio_for_read(VALUE self)
}

static VALUE
enc_subseq(VALUE str, long pos, long len, rb_encoding *enc)
enc_subseq(VALUE str, rb_len_t pos, rb_len_t len, rb_encoding *enc)
{
str = rb_str_subseq(str, pos, len);
rb_enc_associate(str, enc);
return str;
}

static VALUE
strio_substr(struct StringIO *ptr, long pos, long len, rb_encoding *enc)
strio_substr(struct StringIO *ptr, rb_len_t pos, rb_len_t len, rb_encoding *enc)
{
VALUE str = ptr->string;
long rlen = RSTRING_LEN(str) - pos;
rb_len_t rlen = RSTRING_LEN(str) - pos;

if (len > rlen) len = rlen;
if (len < 0) len = 0;
Expand Down Expand Up @@ -252,7 +263,7 @@ check_modifiable(struct StringIO *ptr)
}

static inline bool
outside_p(struct StringIO *ptr, long pos)
outside_p(struct StringIO *ptr, rb_len_t pos)
{
return NIL_P(ptr->string) || pos >= RSTRING_LEN(ptr->string);
}
Expand Down Expand Up @@ -316,7 +327,7 @@ static int
detect_bom(VALUE str, int *bomlen)
{
const char *p;
long len;
rb_len_t len;

RSTRING_GETMEM(str, p, len);
if (len < 1) return 0;
Expand Down Expand Up @@ -801,7 +812,7 @@ strio_copy(VALUE copy, VALUE orig)
static VALUE
strio_get_lineno(VALUE self)
{
return LONG2NUM(StringIOForRead(self)->lineno);
return LEN2NUM(StringIOForRead(self)->lineno);
}

/*
Expand All @@ -814,7 +825,7 @@ strio_get_lineno(VALUE self)
static VALUE
strio_set_lineno(VALUE self, VALUE lineno)
{
StringIO(self)->lineno = NUM2LONG(lineno);
StringIO(self)->lineno = NUM2LEN(lineno);
return lineno;
}

Expand Down Expand Up @@ -889,7 +900,7 @@ strio_reopen(int argc, VALUE *argv, VALUE self)
static VALUE
strio_get_pos(VALUE self)
{
return LONG2NUM(StringIOForRead(self)->pos);
return LEN2NUM(StringIOForRead(self)->pos);
}

/*
Expand All @@ -903,7 +914,7 @@ static VALUE
strio_set_pos(VALUE self, VALUE pos)
{
struct StringIO *ptr = StringIO(self);
long p = NUM2LONG(pos);
rb_len_t p = NUM2LEN(pos);
if (p < 0) {
error_inval(0);
}
Expand Down Expand Up @@ -941,31 +952,33 @@ strio_seek(int argc, VALUE *argv, VALUE self)
{
VALUE whence;
struct StringIO *ptr = StringIO(self);
long amount, offset;
rb_len_t amount, offset;

rb_scan_args(argc, argv, "11", NULL, &whence);
amount = NUM2LONG(argv[0]);
amount = NUM2LEN(argv[0]);
if (CLOSED(self)) {
rb_raise(rb_eIOError, "closed stream");
}
switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
case 0:
switch (whence) {
case Qnil:
case INT2FIX(0):
offset = 0;
break;
case 1:
case INT2FIX(1):
offset = ptr->pos;
break;
case 2:
case INT2FIX(2):
if (NIL_P(ptr->string)) {
offset = 0;
} else {
}
else {
offset = RSTRING_LEN(ptr->string);
}
break;
default:
error_inval("invalid whence");
}
if (amount > LONG_MAX - offset || amount + offset < 0) {
if (amount > RB_LEN_MAX - offset || amount + offset < 0) {
error_inval(0);
}
ptr->pos = amount + offset;
Expand Down Expand Up @@ -1024,7 +1037,7 @@ strio_getc(VALUE self)
struct StringIO *ptr = readable(self);
rb_encoding *enc = get_enc(ptr);
VALUE str = ptr->string;
long pos = ptr->pos;
rb_len_t pos = ptr->pos;
int len;
char *p;

Expand Down Expand Up @@ -1057,11 +1070,11 @@ strio_getbyte(VALUE self)
}

static void
strio_extend(struct StringIO *ptr, long pos, long len)
strio_extend(struct StringIO *ptr, rb_len_t pos, rb_len_t len)
{
long olen;
rb_len_t olen;

if (len > LONG_MAX - pos)
if (len > RB_LEN_MAX - pos)
rb_raise(rb_eArgError, "string size too big");

check_modifiable(ptr);
Expand All @@ -1077,7 +1090,7 @@ static void
strio_unget_string(struct StringIO *ptr, VALUE c)
{
const char *cp = NULL;
long cl = RSTRING_LEN(c);
rb_len_t cl = RSTRING_LEN(c);
if (cl > 0) {
if (c != ptr->string) cp = RSTRING_PTR(c);
strio_unget_bytes(ptr, cp, cl);
Expand Down Expand Up @@ -1156,16 +1169,16 @@ strio_ungetbyte(VALUE self, VALUE c)
}

static VALUE
strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
strio_unget_bytes(struct StringIO *ptr, const char *cp, rb_len_t cl)
{
long pos = ptr->pos, len, rest;
rb_len_t pos = ptr->pos, len, rest;
VALUE str = ptr->string;
char *s;

len = RSTRING_LEN(str);
rest = pos - len;
if (cl > pos) {
long ex = cl - (rest < 0 ? pos : len);
rb_len_t ex = cl - (rest < 0 ? pos : len);
rb_str_modify_expand(str, ex);
rb_str_set_len(str, len + ex);
s = RSTRING_PTR(str);
Expand Down Expand Up @@ -1268,7 +1281,7 @@ strio_each_codepoint(VALUE self)

/* Boyer-Moore search: copied from regex.c */
static void
bm_init_skip(long *skip, const char *pat, long m)
bm_init_skip(rb_len_t *skip, const char *pat, rb_len_t m)
{
int c;

Expand All @@ -1280,10 +1293,10 @@ bm_init_skip(long *skip, const char *pat, long m)
}
}

static long
bm_search(const char *little, long llen, const char *big, long blen, const long *skip)
static rb_len_t
bm_search(const char *little, rb_len_t llen, const char *big, rb_len_t blen, const rb_len_t *skip)
{
long i, j, k;
rb_len_t i, j, k;

i = llen - 1;
while (i < blen) {
Expand All @@ -1301,15 +1314,15 @@ bm_search(const char *little, long llen, const char *big, long blen, const long

struct getline_arg {
VALUE rs;
long limit;
rb_len_t limit;
unsigned int chomp: 1;
};

static struct getline_arg *
prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VALUE *argv)
{
VALUE rs, lim, opts;
long limit = -1;
rb_len_t limit = -1;
int respect_chomp;

argc = rb_scan_args(argc, argv, "02:", &rs, &lim, &opts);
Expand All @@ -1323,7 +1336,7 @@ prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VA
if (!NIL_P(rs) && !RB_TYPE_P(rs, T_STRING)) {
VALUE tmp = rb_check_string_type(rs);
if (NIL_P(tmp)) {
limit = NUM2LONG(rs);
limit = NUM2LEN(rs);
rs = rb_rs;
}
else {
Expand All @@ -1334,7 +1347,7 @@ prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VA

case 2:
if (!NIL_P(rs)) StringValue(rs);
if (!NIL_P(lim)) limit = NUM2LONG(lim);
if (!NIL_P(lim)) limit = NUM2LEN(lim);
break;
}
if (!NIL_P(ptr->string) && !NIL_P(rs)) {
Expand Down Expand Up @@ -1387,9 +1400,9 @@ static VALUE
strio_getline(struct getline_arg *arg, struct StringIO *ptr)
{
const char *s, *e, *p;
long n, limit = arg->limit;
rb_len_t n, limit = arg->limit;
VALUE str = arg->rs;
long w = 0;
rb_len_t w = 0;
rb_encoding *enc = get_enc(ptr);

if (NIL_P(ptr->string) || ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
Expand Down Expand Up @@ -1456,7 +1469,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
}
}
else {
long skip[1 << CHAR_BIT], pos;
rb_len_t skip[1 << CHAR_BIT], pos;
p = RSTRING_PTR(str);
bm_init_skip(skip, p, n);
if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
Expand Down Expand Up @@ -1584,19 +1597,19 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
static VALUE
strio_write_m(int argc, VALUE *argv, VALUE self)
{
long len = 0;
rb_len_t len = 0;
while (argc-- > 0) {
/* StringIO can't exceed long limit */
/* StringIO can't exceed rb_len_t limit */
len += strio_write(self, *argv++);
}
return LONG2NUM(len);
return LEN2NUM(len);
}

static long
static rb_len_t
strio_write(VALUE self, VALUE str)
{
struct StringIO *ptr = writable(self);
long len, olen;
rb_len_t len, olen;
rb_encoding *enc, *enc2;
rb_encoding *const ascii8bit = rb_ascii8bit_encoding();
rb_encoding *usascii = 0;
Expand Down Expand Up @@ -1710,7 +1723,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
{
struct StringIO *ptr = readable(self);
VALUE str = Qnil;
long len;
rb_len_t len;
int binary = 0;

switch (argc) {
Expand All @@ -1719,7 +1732,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
/* fall through */
case 1:
if (!NIL_P(argv[0])) {
len = NUM2LONG(argv[0]);
len = NUM2LEN(argv[0]);
if (len < 0) {
rb_raise(rb_eArgError, "negative length %ld given", len);
}
Expand Down Expand Up @@ -1757,7 +1770,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
str = strio_substr(ptr, ptr->pos, len, enc);
}
else {
long rest = RSTRING_LEN(ptr->string) - ptr->pos;
rb_len_t rest = RSTRING_LEN(ptr->string) - ptr->pos;
if (len > rest) len = rest;
rb_str_resize(str, len);
MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
Expand All @@ -1783,8 +1796,8 @@ strio_pread(int argc, VALUE *argv, VALUE self)
struct StringIO *ptr = readable(self);

rb_scan_args(argc, argv, "21", &rb_len, &rb_offset, &rb_buf);
long len = NUM2LONG(rb_len);
long offset = NUM2LONG(rb_offset);
rb_len_t len = NUM2LEN(rb_len);
rb_len_t offset = NUM2LEN(rb_offset);

if (len < 0) {
rb_raise(rb_eArgError, "negative string size (or size too big): %" PRIsVALUE, rb_len);
Expand All @@ -1811,7 +1824,7 @@ strio_pread(int argc, VALUE *argv, VALUE self)
return strio_substr(ptr, offset, len, rb_ascii8bit_encoding());
}

long rest = RSTRING_LEN(ptr->string) - offset;
rb_len_t rest = RSTRING_LEN(ptr->string) - offset;
if (len > rest) len = rest;
rb_str_resize(rb_buf, len);
rb_enc_associate(rb_buf, rb_ascii8bit_encoding());
Expand Down Expand Up @@ -1905,7 +1918,7 @@ strio_size(VALUE self)
if (NIL_P(string)) {
return INT2FIX(0);
}
return ULONG2NUM(RSTRING_LEN(string));
return ULEN2NUM((rb_ulen_t)RSTRING_LEN(string));
}

/*
Expand All @@ -1919,8 +1932,8 @@ static VALUE
strio_truncate(VALUE self, VALUE len)
{
VALUE string = writable(self)->string;
long l = NUM2LONG(len);
long plen;
rb_len_t l = NUM2LEN(len);
rb_len_t plen;
if (l < 0) {
error_inval("negative length");
}
Expand Down Expand Up @@ -2052,7 +2065,7 @@ Init_stringio(void)
rb_define_alloc_func(StringIO, strio_s_allocate);

/* Maximum length that a StringIO instance can hold */
rb_define_const(StringIO, "MAX_LENGTH", LONG2NUM(LONG_MAX));
rb_define_const(StringIO, "MAX_LENGTH", LEN2NUM(RB_LEN_MAX));

rb_define_singleton_method(StringIO, "new", strio_s_new, -1);
rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
Expand Down
Loading