aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-02 06:24:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-02 06:24:19 +0000
commitd2e214736fb34b149b43435164d1e1df5a2a6762 (patch)
tree5df0e375b0836379200688bdf776ec2d7e9d87c6
parent3e0512bd387f818305240e5bc1e377a3bdd8e9e3 (diff)
downloadruby-d2e214736fb34b149b43435164d1e1df5a2a6762.tar.gz
rb_check_arity returns argc now
* include/ruby/intern.h (rb_check_arity): returns argc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--include/ruby/intern.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 154dd56c34..2c523b69fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 2 15:24:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/intern.h (rb_check_arity): returns argc.
+
Fri Apr 1 20:58:33 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/unicode/case-folding.rb, casefold.h: Data generation to implement
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 816bc7e140..e6f893ecdd 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -294,11 +294,12 @@ VALUE rb_check_funcall(VALUE, ID, int, const VALUE*);
NORETURN(void rb_error_arity(int, int, int));
#define rb_check_arity rb_check_arity /* for ifdef */
-static inline void
+static inline int
rb_check_arity(int argc, int min, int max)
{
if ((argc < min) || (max != UNLIMITED_ARGUMENTS && argc > max))
rb_error_arity(argc, min, max);
+ return argc;
}
#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)