@@ -176,13 +176,13 @@ static void
176
176
check_modifiable (struct StringIO * ptr )
177
177
{
178
178
if (NIL_P (ptr -> string )) {
179
- /* Null device StringIO */
179
+ /* Null device StringIO */
180
180
}
181
181
else if (rb_str_chilled_p (ptr -> string )) {
182
- rb_str_modify (ptr -> string );
182
+ rb_str_modify (ptr -> string );
183
183
}
184
184
else if (OBJ_FROZEN_RAW (ptr -> string )) {
185
- rb_raise (rb_eIOError , "not modifiable string" );
185
+ rb_raise (rb_eIOError , "not modifiable string" );
186
186
}
187
187
}
188
188
@@ -989,10 +989,10 @@ strio_ungetbyte(VALUE self, VALUE c)
989
989
if (NIL_P (ptr -> string )) return Qnil ;
990
990
if (NIL_P (c )) return Qnil ;
991
991
if (RB_INTEGER_TYPE_P (c )) {
992
- /* rb_int_and() not visible from exts */
993
- VALUE v = rb_funcall (c , '&' , 1 , INT2FIX (0xff ));
994
- const char cc = NUM2INT (v ) & 0xFF ;
995
- strio_unget_bytes (ptr , & cc , 1 );
992
+ /* rb_int_and() not visible from exts */
993
+ VALUE v = rb_funcall (c , '&' , 1 , INT2FIX (0xff ));
994
+ const char cc = NUM2INT (v ) & 0xFF ;
995
+ strio_unget_bytes (ptr , & cc , 1 );
996
996
}
997
997
else {
998
998
long cl ;
@@ -1173,41 +1173,41 @@ prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VA
1173
1173
break ;
1174
1174
1175
1175
case 1 :
1176
- if (!NIL_P (rs ) && !RB_TYPE_P (rs , T_STRING )) {
1177
- VALUE tmp = rb_check_string_type (rs );
1176
+ if (!NIL_P (rs ) && !RB_TYPE_P (rs , T_STRING )) {
1177
+ VALUE tmp = rb_check_string_type (rs );
1178
1178
if (NIL_P (tmp )) {
1179
- limit = NUM2LONG (rs );
1180
- rs = rb_rs ;
1179
+ limit = NUM2LONG (rs );
1180
+ rs = rb_rs ;
1181
1181
}
1182
1182
else {
1183
- rs = tmp ;
1183
+ rs = tmp ;
1184
1184
}
1185
1185
}
1186
1186
break ;
1187
1187
1188
1188
case 2 :
1189
- if (!NIL_P (rs )) StringValue (rs );
1189
+ if (!NIL_P (rs )) StringValue (rs );
1190
1190
if (!NIL_P (lim )) limit = NUM2LONG (lim );
1191
1191
break ;
1192
1192
}
1193
1193
if (!NIL_P (ptr -> string ) && !NIL_P (rs )) {
1194
- rb_encoding * enc_rs , * enc_io ;
1195
- enc_rs = rb_enc_get (rs );
1196
- enc_io = get_enc (ptr );
1197
- if (enc_rs != enc_io &&
1198
- (rb_enc_str_coderange (rs ) != ENC_CODERANGE_7BIT ||
1199
- (RSTRING_LEN (rs ) > 0 && !rb_enc_asciicompat (enc_io )))) {
1200
- if (rs == rb_rs ) {
1201
- rs = rb_enc_str_new (0 , 0 , enc_io );
1202
- rb_str_buf_cat_ascii (rs , "\n" );
1203
- rs = rs ;
1204
- }
1205
- else {
1206
- rb_raise (rb_eArgError , "encoding mismatch: %s IO with %s RS" ,
1207
- rb_enc_name (enc_io ),
1208
- rb_enc_name (enc_rs ));
1209
- }
1210
- }
1194
+ rb_encoding * enc_rs , * enc_io ;
1195
+ enc_rs = rb_enc_get (rs );
1196
+ enc_io = get_enc (ptr );
1197
+ if (enc_rs != enc_io &&
1198
+ (rb_enc_str_coderange (rs ) != ENC_CODERANGE_7BIT ||
1199
+ (RSTRING_LEN (rs ) > 0 && !rb_enc_asciicompat (enc_io )))) {
1200
+ if (rs == rb_rs ) {
1201
+ rs = rb_enc_str_new (0 , 0 , enc_io );
1202
+ rb_str_buf_cat_ascii (rs , "\n" );
1203
+ rs = rs ;
1204
+ }
1205
+ else {
1206
+ rb_raise (rb_eArgError , "encoding mismatch: %s IO with %s RS" ,
1207
+ rb_enc_name (enc_io ),
1208
+ rb_enc_name (enc_rs ));
1209
+ }
1210
+ }
1211
1211
}
1212
1212
arg -> rs = rs ;
1213
1213
arg -> limit = limit ;
@@ -1219,9 +1219,9 @@ prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VA
1219
1219
keywords [0 ] = rb_intern_const ("chomp" );
1220
1220
}
1221
1221
rb_get_kwargs (opts , keywords , 0 , 1 , & vchomp );
1222
- if (respect_chomp ) {
1222
+ if (respect_chomp ) {
1223
1223
arg -> chomp = (vchomp != Qundef ) && RTEST (vchomp );
1224
- }
1224
+ }
1225
1225
}
1226
1226
return arg ;
1227
1227
}
@@ -1261,7 +1261,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
1261
1261
str = strio_substr (ptr , ptr -> pos , e - s - w , enc );
1262
1262
}
1263
1263
else if ((n = RSTRING_LEN (str )) == 0 ) {
1264
- const char * paragraph_end = NULL ;
1264
+ const char * paragraph_end = NULL ;
1265
1265
p = s ;
1266
1266
while (p [(p + 1 < e ) && (* p == '\r' ) && 0 ] == '\n' ) {
1267
1267
p += * p == '\r' ;
@@ -1271,18 +1271,18 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
1271
1271
}
1272
1272
s = p ;
1273
1273
while ((p = memchr (p , '\n' , e - p )) && (p != e )) {
1274
- p ++ ;
1275
- if (!((p < e && * p == '\n' ) ||
1276
- (p + 1 < e && * p == '\r' && * (p + 1 ) == '\n' ))) {
1277
- continue ;
1278
- }
1279
- paragraph_end = p - ((* (p - 2 ) == '\r' ) ? 2 : 1 );
1280
- while ((p < e && * p == '\n' ) ||
1281
- (p + 1 < e && * p == '\r' && * (p + 1 ) == '\n' )) {
1282
- p += (* p == '\r' ) ? 2 : 1 ;
1283
- }
1284
- e = p ;
1285
- break ;
1274
+ p ++ ;
1275
+ if (!((p < e && * p == '\n' ) ||
1276
+ (p + 1 < e && * p == '\r' && * (p + 1 ) == '\n' ))) {
1277
+ continue ;
1278
+ }
1279
+ paragraph_end = p - ((* (p - 2 ) == '\r' ) ? 2 : 1 );
1280
+ while ((p < e && * p == '\n' ) ||
1281
+ (p + 1 < e && * p == '\r' && * (p + 1 ) == '\n' )) {
1282
+ p += (* p == '\r' ) ? 2 : 1 ;
1283
+ }
1284
+ e = p ;
1285
+ break ;
1286
1286
}
1287
1287
if (arg -> chomp && paragraph_end ) {
1288
1288
w = e - paragraph_end ;
@@ -1606,7 +1606,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
1606
1606
}
1607
1607
break ;
1608
1608
default :
1609
- rb_error_arity (argc , 0 , 2 );
1609
+ rb_error_arity (argc , 0 , 2 );
1610
1610
}
1611
1611
if (NIL_P (str )) {
1612
1612
rb_encoding * enc = binary ? rb_ascii8bit_encoding () : get_enc (ptr );
@@ -1642,28 +1642,28 @@ strio_pread(int argc, VALUE *argv, VALUE self)
1642
1642
long offset = NUM2LONG (rb_offset );
1643
1643
1644
1644
if (len < 0 ) {
1645
- rb_raise (rb_eArgError , "negative string size (or size too big): %" PRIsVALUE , rb_len );
1645
+ rb_raise (rb_eArgError , "negative string size (or size too big): %" PRIsVALUE , rb_len );
1646
1646
}
1647
1647
1648
1648
if (len == 0 ) {
1649
- if (NIL_P (rb_buf )) {
1650
- return rb_str_new ("" , 0 );
1651
- }
1652
- return rb_buf ;
1649
+ if (NIL_P (rb_buf )) {
1650
+ return rb_str_new ("" , 0 );
1651
+ }
1652
+ return rb_buf ;
1653
1653
}
1654
1654
1655
1655
if (offset < 0 ) {
1656
- rb_syserr_fail_str (EINVAL , rb_sprintf ("pread: Invalid offset argument: %" PRIsVALUE , rb_offset ));
1656
+ rb_syserr_fail_str (EINVAL , rb_sprintf ("pread: Invalid offset argument: %" PRIsVALUE , rb_offset ));
1657
1657
}
1658
1658
1659
1659
struct StringIO * ptr = readable (self );
1660
1660
1661
1661
if (offset >= RSTRING_LEN (ptr -> string )) {
1662
- rb_eof_error ();
1662
+ rb_eof_error ();
1663
1663
}
1664
1664
1665
1665
if (NIL_P (rb_buf )) {
1666
- return strio_substr (ptr , offset , len , rb_ascii8bit_encoding ());
1666
+ return strio_substr (ptr , offset , len , rb_ascii8bit_encoding ());
1667
1667
}
1668
1668
1669
1669
long rest = RSTRING_LEN (ptr -> string ) - offset ;
0 commit comments