Skip to content

Remove methods have been obsolete over two decades #168

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
merged 1 commit into from
Nov 4, 2025
+0 −168
Merged

Remove methods have been obsolete over two decades #168

Show file tree
Hide file tree
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
55 changes: 0 additions & 55 deletions ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,6 @@ public IRubyObject terminate(ThreadContext context) {
return this;
}

@JRubyMethod(name = "clear")
public IRubyObject clear(ThreadContext context) {
check(context);
Ruby runtime = context.runtime;
if (runtime.isVerbose()) {
runtime.getWarnings().warning(ID.DEPRECATED_METHOD, "StringScanner#clear is obsolete; use #terminate instead");
}
return terminate(context);
}

@JRubyMethod(name = "string")
public RubyString string() {
return str;
Expand Down Expand Up @@ -504,15 +494,6 @@ public IRubyObject get_byte(ThreadContext context) {
adjustRegisterPosition(regs.getEnd(0)));
}

@JRubyMethod(name = "getbyte")
public IRubyObject getbyte(ThreadContext context) {
Ruby runtime = context.runtime;
if (runtime.isVerbose()) {
runtime.getWarnings().warning(ID.DEPRECATED_METHOD, "StringScanner#getbyte is obsolete; use #get_byte instead");
}
return get_byte(context);
}

@JRubyMethod(name = "scan_byte")
public IRubyObject scan_byte(ThreadContext context) {
Ruby runtime = context.runtime;
Expand Down Expand Up @@ -558,15 +539,6 @@ public IRubyObject peek(ThreadContext context, IRubyObject length) {
return extractBegLen(context.runtime, curr, len);
}

@JRubyMethod(name = "peep")
public IRubyObject peep(ThreadContext context, IRubyObject length) {
Ruby runtime = context.runtime;
if (runtime.isVerbose()) {
runtime.getWarnings().warning(ID.DEPRECATED_METHOD, "StringScanner#peep is obsolete; use #peek instead");
}
return peek(context, length);
}

@JRubyMethod(name = "scan_base10_integer", visibility = PRIVATE)
public IRubyObject scan_base10_integer(ThreadContext context) {
final Ruby runtime = context.runtime;
Expand Down Expand Up @@ -697,15 +669,6 @@ public RubyBoolean eos_p(ThreadContext context) {
return curr >= str.getByteList().getRealSize() ? context.tru : context.fals;
}

@JRubyMethod(name = "empty?")
public RubyBoolean empty_p(ThreadContext context) {
Ruby runtime = context.runtime;
if (runtime.isVerbose()) {
runtime.getWarnings().warning(ID.DEPRECATED_METHOD, "StringScanner#empty? is obsolete; use #eos? instead");
}
return eos_p(context);
}

@JRubyMethod(name = "rest?")
public RubyBoolean rest_p(ThreadContext context) {
check(context);
Expand Down Expand Up @@ -734,15 +697,6 @@ public IRubyObject matched_size(ThreadContext context) {
return RubyFixnum.newFixnum(context.runtime, regs.getEnd(0) - regs.getBeg(0));
}

@JRubyMethod(name = "matchedsize")
public IRubyObject matchedsize(ThreadContext context) {
Ruby runtime = context.runtime;
if (runtime.isVerbose()) {
runtime.getWarnings().warning(ID.DEPRECATED_METHOD, "StringScanner#matchedsize is obsolete; use #matched_size instead");
}
return matched_size(context);
}

@JRubyMethod(name = "[]")
public IRubyObject op_aref(ThreadContext context, IRubyObject idx) {
check(context);
Expand Down Expand Up @@ -827,15 +781,6 @@ public RubyFixnum rest_size(ThreadContext context) {
return RubyFixnum.newFixnum(runtime, realSize - curr);
}

@JRubyMethod(name = "restsize")
public RubyFixnum restsize(ThreadContext context) {
Ruby runtime = context.runtime;
if (runtime.isVerbose()) {
runtime.getWarnings().warning(ID.DEPRECATED_METHOD, "StringScanner#restsize is obsolete; use #rest_size instead");
}
return rest_size(context);
}

@JRubyMethod(name = "inspect")
@Override
public IRubyObject inspect() {
Expand Down
113 changes: 0 additions & 113 deletions ext/strscan/strscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ static VALUE strscan_init_copy _((VALUE vself, VALUE vorig));

static VALUE strscan_s_mustc _((VALUE self));
static VALUE strscan_terminate _((VALUE self));
static VALUE strscan_clear _((VALUE self));
static VALUE strscan_get_string _((VALUE self));
static VALUE strscan_set_string _((VALUE self, VALUE str));
static VALUE strscan_concat _((VALUE self, VALUE str));
Expand All @@ -118,15 +117,11 @@ static VALUE strscan_search_full _((VALUE self, VALUE re,
static void adjust_registers_to_matched _((struct strscanner *p));
static VALUE strscan_getch _((VALUE self));
static VALUE strscan_get_byte _((VALUE self));
static VALUE strscan_getbyte _((VALUE self));
static VALUE strscan_peek _((VALUE self, VALUE len));
static VALUE strscan_peep _((VALUE self, VALUE len));
static VALUE strscan_scan_base10_integer _((VALUE self));
static VALUE strscan_unscan _((VALUE self));
static VALUE strscan_bol_p _((VALUE self));
static VALUE strscan_eos_p _((VALUE self));
static VALUE strscan_empty_p _((VALUE self));
static VALUE strscan_rest_p _((VALUE self));
static VALUE strscan_matched_p _((VALUE self));
static VALUE strscan_matched _((VALUE self));
static VALUE strscan_matched_size _((VALUE self));
Expand Down Expand Up @@ -384,21 +379,6 @@ strscan_terminate(VALUE self)
return self;
}

/*
* call-seq:
* clear -> self
*
* This method is obsolete; use the equivalent method StringScanner#terminate.
*/

/* :nodoc: */
static VALUE
strscan_clear(VALUE self)
{
rb_warning("StringScanner#clear is obsolete; use #terminate instead");
return strscan_terminate(self);
}

/*
* :markup: markdown
* :include: strscan/link_refs.txt
Expand Down Expand Up @@ -1217,22 +1197,6 @@ strscan_get_byte(VALUE self)
adjust_register_position(p, p->regs.end[0]));
}

/*
* call-seq:
* getbyte
*
* Equivalent to #get_byte.
* This method is obsolete; use #get_byte instead.
*/

/* :nodoc: */
static VALUE
strscan_getbyte(VALUE self)
{
rb_warning("StringScanner#getbyte is obsolete; use #get_byte instead");
return strscan_get_byte(self);
}

/*
* :markup: markdown
* :include: strscan/link_refs.txt
Expand Down Expand Up @@ -1268,22 +1232,6 @@ strscan_peek(VALUE self, VALUE vlen)
return extract_beg_len(p, p->curr, len);
}

/*
* call-seq:
* peep
*
* Equivalent to #peek.
* This method is obsolete; use #peek instead.
*/

/* :nodoc: */
static VALUE
strscan_peep(VALUE self, VALUE vlen)
{
rb_warning("StringScanner#peep is obsolete; use #peek instead");
return strscan_peek(self, vlen);
}

static VALUE
strscan_parse_integer(struct strscanner *p, int base, long len)
{
Expand Down Expand Up @@ -1523,45 +1471,6 @@ strscan_eos_p(VALUE self)
return EOS_P(p) ? Qtrue : Qfalse;
}

/*
* call-seq:
* empty?
*
* Equivalent to #eos?.
* This method is obsolete, use #eos? instead.
*/

/* :nodoc: */
static VALUE
strscan_empty_p(VALUE self)
{
rb_warning("StringScanner#empty? is obsolete; use #eos? instead");
return strscan_eos_p(self);
}

/*
* call-seq:
* rest?
*
* Returns true if and only if there is more data in the string. See #eos?.
* This method is obsolete; use #eos? instead.
*
* s = StringScanner.new('test string')
* # These two are opposites
* s.eos? # => false
* s.rest? # => true
*/

/* :nodoc: */
static VALUE
strscan_rest_p(VALUE self)
{
struct strscanner *p;

GET_SCANNER(self, p);
return EOS_P(p) ? Qfalse : Qtrue;
}

/*
* :markup: markdown
* :include: strscan/link_refs.txt
Expand Down Expand Up @@ -2052,22 +1961,6 @@ strscan_rest_size(VALUE self)
return INT2FIX(i);
}

/*
* call-seq:
* restsize
*
* <tt>s.restsize</tt> is equivalent to <tt>s.rest_size</tt>.
* This method is obsolete; use #rest_size instead.
*/

/* :nodoc: */
static VALUE
strscan_restsize(VALUE self)
{
rb_warning("StringScanner#restsize is obsolete; use #rest_size instead");
return strscan_rest_size(self);
}

#define INSPECT_LENGTH 5

/*
Expand Down Expand Up @@ -2308,7 +2201,6 @@ Init_strscan(void)
rb_define_singleton_method(StringScanner, "must_C_version", strscan_s_mustc, 0);
rb_define_method(StringScanner, "reset", strscan_reset, 0);
rb_define_method(StringScanner, "terminate", strscan_terminate, 0);
rb_define_method(StringScanner, "clear", strscan_clear, 0);
rb_define_method(StringScanner, "string", strscan_get_string, 0);
rb_define_method(StringScanner, "string=", strscan_set_string, 1);
rb_define_method(StringScanner, "concat", strscan_concat, 1);
Expand All @@ -2333,11 +2225,9 @@ Init_strscan(void)

rb_define_method(StringScanner, "getch", strscan_getch, 0);
rb_define_method(StringScanner, "get_byte", strscan_get_byte, 0);
rb_define_method(StringScanner, "getbyte", strscan_getbyte, 0);
rb_define_method(StringScanner, "scan_byte", strscan_scan_byte, 0);
rb_define_method(StringScanner, "peek", strscan_peek, 1);
rb_define_method(StringScanner, "peek_byte", strscan_peek_byte, 0);
rb_define_method(StringScanner, "peep", strscan_peep, 1);

rb_define_private_method(StringScanner, "scan_base10_integer", strscan_scan_base10_integer, 0);
rb_define_private_method(StringScanner, "scan_base16_integer", strscan_scan_base16_integer, 0);
Expand All @@ -2347,8 +2237,6 @@ Init_strscan(void)
rb_define_method(StringScanner, "beginning_of_line?", strscan_bol_p, 0);
rb_alias(StringScanner, rb_intern("bol?"), rb_intern("beginning_of_line?"));
rb_define_method(StringScanner, "eos?", strscan_eos_p, 0);
rb_define_method(StringScanner, "empty?", strscan_empty_p, 0);
rb_define_method(StringScanner, "rest?", strscan_rest_p, 0);

rb_define_method(StringScanner, "matched?", strscan_matched_p, 0);
rb_define_method(StringScanner, "matched", strscan_matched, 0);
Expand All @@ -2362,7 +2250,6 @@ Init_strscan(void)

rb_define_method(StringScanner, "rest", strscan_rest, 0);
rb_define_method(StringScanner, "rest_size", strscan_rest_size, 0);
rb_define_method(StringScanner, "restsize", strscan_restsize, 0);

rb_define_method(StringScanner, "inspect", strscan_inspect, 0);

Expand Down