From 28e86a2a592732eb8c7cee6ece7cf6dc2d87119a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Oct 2023 12:17:09 +0900 Subject: [PATCH 1/2] Remove old checks These functions already have been available since 1.9.0 at least. --- ext/racc/cparse/extconf.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb index 18c5689a..6e82d5af 100644 --- a/ext/racc/cparse/extconf.rb +++ b/ext/racc/cparse/extconf.rb @@ -1,9 +1,6 @@ -# frozen_string_literal: false +# frozen_string_literal: true # require 'mkmf' -have_func('rb_block_call') -have_func('rb_ary_subseq') - create_makefile 'racc/cparse' From 67053edc822a486b6d6d19603c31bd083dfee2d3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 31 Oct 2023 12:22:31 +0900 Subject: [PATCH 2/2] Remove fallback code --- ext/racc/cparse/cparse.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c index 84f591c7..ed9cca19 100644 --- a/ext/racc/cparse/cparse.c +++ b/ext/racc/cparse/cparse.c @@ -70,10 +70,6 @@ static ID id_d_e_pop; # define LONG2NUM(i) INT2NUM(i) #endif -#ifndef HAVE_RB_ARY_SUBSEQ -# define rb_ary_subseq(ary, beg, len) rb_ary_new4(len, RARRAY_PTR(ary) + beg) -#endif - static ID value_to_id _((VALUE v)); static inline long num_to_long _((VALUE n)); @@ -278,28 +274,11 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug) return v->retval; } -#ifdef HAVE_RB_BLOCK_CALL static void call_lexer(struct cparse_params *v) { rb_block_call(v->lexer, v->lexmid, 0, NULL, lexer_i, v->value_v); } -#else -static VALUE -lexer_iter(VALUE data) -{ - struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type); - - rb_funcall(v->lexer, v->lexmid, 0); - return Qnil; -} - -static void -call_lexer(struct cparse_params *v) -{ - rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v); -} -#endif static VALUE lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data))