* Re: [PATCH] Update respond_to? calls for second argument.
@ 2017-05-21 4:38 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2017-05-21 4:38 UTC (permalink / raw)
To: Pat Allan; +Cc: clogger-public
Pat Allan <pat@freelancing-gods.com> wrote:
> Rack (since v2) has started explicitly listing the second
> (optional) argument for respond_to?, which matches the
> underlying Ruby spec. This patch fixes the calls in both C and
> Ruby approaches.
Thanks for noticing this!
> However, rb_respond_to only accepts a single argument -
> differing from the Ruby side of things - so perhaps this patch
> isn't quite perfect (and my C skills are very limited, so the
> whole thing could use a review).
No worries. I think the following should work:
-----8<------
Subject: [PATCH] SQUASH/WIP - use rb_funcallv to handle second respond_to arg
While we're at it, avoid mixing declarations and code
in case there's still compiler compatibility problems.
(We will add a check for -Wdeclaration-after-statement support
in a separate commit)
---
Also pushed to the respond_to-priv branch at
git://bogomips.org/clogger
commit 7b3ed7c0bed876efe5298232a49f8542b8b340a0
Do you think you can write a test? No obligation, I can take
care of it, too. Thanks again!
ext/clogger_ext/clogger.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c
index 622c98c..daed91a 100644
--- a/ext/clogger_ext/clogger.c
+++ b/ext/clogger_ext/clogger.c
@@ -965,16 +965,19 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig)
*/
static VALUE respond_to(int argc, VALUE *argv, VALUE self)
{
- VALUE method, include_all;
- rb_scan_args(argc, argv, "11", &method, &include_all);
- if (NIL_P(include_all)) include_all = Qfalse;
-
struct clogger *c = clogger_get(self);
- ID id = rb_to_id(method);
+ VALUE method, include_all;
+ ID id;
+ rb_scan_args(argc, argv, "11", &method, &include_all);
+ id = rb_to_id(method);
if (close_id == id)
return Qtrue;
- return rb_respond_to(c->body, id);
+
+ if (argc == 1)
+ return rb_respond_to(c->body, id);
+
+ return rb_funcallv(c->body, respond_to_id, argc, argv);
}
/*
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2017-05-21 4:01 [PATCH] Update respond_to? calls for second argument Pat Allan
2017-05-21 4:38 7% ` Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/clogger.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).