From 6d57fdf55c6a0292fb7ef47cda38c818b4197702 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Tue, 9 Mar 2021 16:04:16 -0600 Subject: [PATCH] Remove deprecations. callclosure was already used in the codebase and existed at least in 2015. rbcatch is super super old back into Ruby 1.8 support. There was an unused import to RubyContinuation not used in the source. --- ext/racc/com/headius/racc/Cparse.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ext/racc/com/headius/racc/Cparse.java b/ext/racc/com/headius/racc/Cparse.java index 27579c09..d4f00386 100644 --- a/ext/racc/com/headius/racc/Cparse.java +++ b/ext/racc/com/headius/racc/Cparse.java @@ -18,7 +18,6 @@ import org.jruby.RubyArray; import org.jruby.RubyBasicObject; import org.jruby.RubyClass; -import org.jruby.RubyContinuation; import org.jruby.RubyFixnum; import org.jruby.RubyHash; import org.jruby.RubyKernel; @@ -533,7 +532,7 @@ private void shift(ThreadContext context, int act, IRubyObject tok, IRubyObject private int reduce(ThreadContext context, int act) { ruleno = -act * 3; IRubyObject tag = context.runtime.newSymbol("racc_jump"); - IRubyObject code = RubyKernel.rbCatch19(context, this, + IRubyObject code = RubyKernel.rbCatch(context, this, tag, CallBlock19.newCallClosure(this, getMetaClass(), Signature.NO_ARGUMENTS, new BlockCallback() { @@ -784,7 +783,7 @@ public Throwable fillInStackTrace() { private void call_lexer(ThreadContext context, final CparseParams v) { final LexerUnroll lexerUnroll = new LexerUnroll(); try { - v.call_lexmid.call(context, v.lexer, v.lexer, CallBlock19.newCallClosure(v, v.getMetaClass(), Arity.ONE_ARGUMENT, new BlockCallback() { + v.call_lexmid.call(context, v.lexer, v.lexer, CallBlock19.newCallClosure(v, v.getMetaClass(), Signature.ONE_ARGUMENT, new BlockCallback() { @Override public IRubyObject call(ThreadContext context, IRubyObject[] args, Block block) { Ruby runtime = context.getRuntime();