From a1afdedf94350c89007df2f65d79be6fc7b835e3 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 10 Sep 2017 03:49:10 +0000 Subject: merge revision(s) 59624,59626: [Backport #13830] ruby.h: fix rb_scan_args_trail_idx * include/ruby/ruby.h (rb_scan_args_trail_idx): fix the case both of optional and rest arguments are defined. [ruby-core:82427] [Bug #13830] * include/ruby/ruby.h (rb_scan_args_n_trail): ditto. non-keywords hash * class.c (rb_scan_args), include/ruby/ruby.h (rb_scan_args_set): return non-keywords elements only in the last hash when keyword arguments are extracted from it, as well as methods defined in ruby level. [ruby-core:82427] [Bug #13830] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/-test-/scan_args/extconf.rb | 1 + ext/-test-/scan_args/scan_args.c | 286 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 287 insertions(+) create mode 100755 ext/-test-/scan_args/extconf.rb create mode 100644 ext/-test-/scan_args/scan_args.c (limited to 'ext') diff --git a/ext/-test-/scan_args/extconf.rb b/ext/-test-/scan_args/extconf.rb new file mode 100755 index 0000000000..6cae9c2779 --- /dev/null +++ b/ext/-test-/scan_args/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/scan_args") diff --git a/ext/-test-/scan_args/scan_args.c b/ext/-test-/scan_args/scan_args.c new file mode 100644 index 0000000000..dca353f643 --- /dev/null +++ b/ext/-test-/scan_args/scan_args.c @@ -0,0 +1,286 @@ +#include + +#ifndef numberof +#define numberof(array) (int)(sizeof(array) / sizeof((array)[0])) +#endif + +static VALUE +scan_args_lead(int argc, VALUE *argv, VALUE self) +{ + VALUE args[2]; + int n = rb_scan_args(argc, argv, "1", args+1); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt(int argc, VALUE *argv, VALUE self) +{ + VALUE args[2]; + int n = rb_scan_args(argc, argv, "01", args+1); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "11", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +/* var */ +static VALUE +scan_args_var(int argc, VALUE *argv, VALUE self) +{ + VALUE args[2]; + int n = rb_scan_args(argc, argv, "*", args+1); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_var(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "1*", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt_var(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "01*", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_var(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "11*", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +/* trail */ +static VALUE +scan_args_opt_trail(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "011", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_trail(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "111", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_var_trail(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "*1", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_var_trail(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "1*1", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt_var_trail(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "01*1", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_var_trail(int argc, VALUE *argv, VALUE self) +{ + VALUE args[5]; + int n = rb_scan_args(argc, argv, "11*1", args+1, args+2, args+3, args+4); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +/* hash */ +static VALUE +scan_args_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[2]; + int n = rb_scan_args(argc, argv, ":", args+1); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "1:", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "01:", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "11:", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_var_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[3]; + int n = rb_scan_args(argc, argv, "*:", args+1, args+2); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_var_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "1*:", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt_var_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "01*:", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_var_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[5]; + int n = rb_scan_args(argc, argv, "11*:", args+1, args+2, args+3, args+4); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt_trail_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "011:", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_trail_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[5]; + int n = rb_scan_args(argc, argv, "111:", args+1, args+2, args+3, args+4); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_var_trail_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[4]; + int n = rb_scan_args(argc, argv, "*1:", args+1, args+2, args+3); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_var_trail_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[5]; + int n = rb_scan_args(argc, argv, "1*1:", args+1, args+2, args+3, args+4); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_opt_var_trail_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[5]; + int n = rb_scan_args(argc, argv, "01*1:", args+1, args+2, args+3, args+4); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +static VALUE +scan_args_lead_opt_var_trail_hash(int argc, VALUE *argv, VALUE self) +{ + VALUE args[6]; + int n = rb_scan_args(argc, argv, "11*1:", args+1, args+2, args+3, args+4, args+5); + args[0] = INT2NUM(n); + return rb_ary_new_from_values(numberof(args), args); +} + +void +Init_scan_args(void) +{ + VALUE module = rb_define_module("Bug"); + module = rb_define_module_under(module, "ScanArgs"); + rb_define_singleton_method(module, "lead", scan_args_lead, -1); + rb_define_singleton_method(module, "opt", scan_args_opt, -1); + rb_define_singleton_method(module, "lead_opt", scan_args_lead_opt, -1); + rb_define_singleton_method(module, "var", scan_args_var, -1); + rb_define_singleton_method(module, "lead_var", scan_args_lead_var, -1); + rb_define_singleton_method(module, "opt_var", scan_args_opt_var, -1); + rb_define_singleton_method(module, "lead_opt_var", scan_args_lead_opt_var, -1); + rb_define_singleton_method(module, "opt_trail", scan_args_opt_trail, -1); + rb_define_singleton_method(module, "lead_opt_trail", scan_args_lead_opt_trail, -1); + rb_define_singleton_method(module, "var_trail", scan_args_var_trail, -1); + rb_define_singleton_method(module, "lead_var_trail", scan_args_lead_var_trail, -1); + rb_define_singleton_method(module, "opt_var_trail", scan_args_opt_var_trail, -1); + rb_define_singleton_method(module, "lead_opt_var_trail", scan_args_lead_opt_var_trail, -1); + rb_define_singleton_method(module, "hash", scan_args_hash, -1); + rb_define_singleton_method(module, "lead_hash", scan_args_lead_hash, -1); + rb_define_singleton_method(module, "opt_hash", scan_args_opt_hash, -1); + rb_define_singleton_method(module, "lead_opt_hash", scan_args_lead_opt_hash, -1); + rb_define_singleton_method(module, "var_hash", scan_args_var_hash, -1); + rb_define_singleton_method(module, "lead_var_hash", scan_args_lead_var_hash, -1); + rb_define_singleton_method(module, "opt_var_hash", scan_args_opt_var_hash, -1); + rb_define_singleton_method(module, "lead_opt_var_hash", scan_args_lead_opt_var_hash, -1); + rb_define_singleton_method(module, "opt_trail_hash", scan_args_opt_trail_hash, -1); + rb_define_singleton_method(module, "lead_opt_trail_hash", scan_args_lead_opt_trail_hash, -1); + rb_define_singleton_method(module, "var_trail_hash", scan_args_var_trail_hash, -1); + rb_define_singleton_method(module, "lead_var_trail_hash", scan_args_lead_var_trail_hash, -1); + rb_define_singleton_method(module, "opt_var_trail_hash", scan_args_opt_var_trail_hash, -1); + rb_define_singleton_method(module, "lead_opt_var_trail_hash", scan_args_lead_opt_var_trail_hash, -1); +} + -- cgit v1.2.3