2017-08-19 19:39:03 -04:00
|
|
|
require 'test/unit'
|
|
|
|
|
require '-test-/scan_args'
|
|
|
|
|
|
|
|
|
|
class TestScanArgs < Test::Unit::TestCase
|
|
|
|
|
def test_lead
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead()}
|
|
|
|
|
assert_equal([1, "a"], Bug::ScanArgs.lead("a"))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead("a", "b")}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt
|
|
|
|
|
assert_equal([0, nil], Bug::ScanArgs.opt())
|
|
|
|
|
assert_equal([1, "a"], Bug::ScanArgs.opt("a"))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt("a", "b")}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt()}
|
|
|
|
|
assert_equal([1, "a", nil], Bug::ScanArgs.lead_opt("a"))
|
|
|
|
|
assert_equal([2, "a", "b"], Bug::ScanArgs.lead_opt("a", "b"))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt("a", "b", "c")}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_var
|
|
|
|
|
assert_equal([0, []], Bug::ScanArgs.var())
|
|
|
|
|
assert_equal([3, ["a", "b", "c"]], Bug::ScanArgs.var("a", "b", "c"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_var
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var()}
|
|
|
|
|
assert_equal([3, "a", ["b", "c"]], Bug::ScanArgs.lead_var("a", "b", "c"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_var
|
|
|
|
|
assert_equal([0, nil, []], Bug::ScanArgs.opt_var())
|
|
|
|
|
assert_equal([3, "a", ["b", "c"]], Bug::ScanArgs.opt_var("a", "b", "c"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_var
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var()}
|
|
|
|
|
assert_equal([3, "a", "b", ["c"]], Bug::ScanArgs.lead_opt_var("a", "b", "c"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_trail
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail()}
|
|
|
|
|
assert_equal([2, "a", "b"], Bug::ScanArgs.opt_trail("a", "b"))
|
|
|
|
|
assert_equal([1, nil, "a"], Bug::ScanArgs.opt_trail("a"))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail("a", "b", "c")}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_trail
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail()}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail("a")}
|
|
|
|
|
assert_equal([2, "a", nil, "b"], Bug::ScanArgs.lead_opt_trail("a", "b"))
|
|
|
|
|
assert_equal([3, "a", "b", "c"], Bug::ScanArgs.lead_opt_trail("a", "b", "c"))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail("a", "b", "c", "d")}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_var_trail
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.var_trail()}
|
|
|
|
|
assert_equal([1, [], "a"], Bug::ScanArgs.var_trail("a"))
|
|
|
|
|
assert_equal([2, ["a"], "b"], Bug::ScanArgs.var_trail("a", "b"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_var_trail
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail("a")}
|
|
|
|
|
assert_equal([2, "a", [], "b"], Bug::ScanArgs.lead_var_trail("a", "b"))
|
|
|
|
|
assert_equal([3, "a", ["b"], "c"], Bug::ScanArgs.lead_var_trail("a", "b", "c"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_var_trail
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail()}
|
|
|
|
|
assert_equal([1, nil, [], "a"], Bug::ScanArgs.opt_var_trail("a"))
|
|
|
|
|
assert_equal([2, "a", [], "b"], Bug::ScanArgs.opt_var_trail("a", "b"))
|
|
|
|
|
assert_equal([3, "a", ["b"], "c"], Bug::ScanArgs.opt_var_trail("a", "b", "c"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_var_trail
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail("a")}
|
|
|
|
|
assert_equal([2, "a", nil, [], "b"], Bug::ScanArgs.lead_opt_var_trail("a", "b"))
|
|
|
|
|
assert_equal([3, "a", "b", [], "c"], Bug::ScanArgs.lead_opt_var_trail("a", "b", "c"))
|
|
|
|
|
assert_equal([4, "a", "b", ["c"], "d"], Bug::ScanArgs.lead_opt_var_trail("a", "b", "c", "d"))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_hash
|
|
|
|
|
assert_equal([0, nil], Bug::ScanArgs.hash())
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.hash("a")}
|
|
|
|
|
assert_equal([0, {a: 0}], Bug::ScanArgs.hash(a: 0))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash()}
|
|
|
|
|
assert_equal([1, "a", nil], Bug::ScanArgs.lead_hash("a"))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash("a", "b")}
|
|
|
|
|
assert_equal([1, "a", {b: 1}], Bug::ScanArgs.lead_hash("a", b: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(b: 1)}
|
Make rb_scan_args handle keywords more similar to Ruby methods (#2460)
Cfuncs that use rb_scan_args with the : entry suffer similar keyword
argument separation issues that Ruby methods suffer if the cfuncs
accept optional or variable arguments.
This makes the following changes to : handling.
* Treats as **kw, prompting keyword argument separation warnings
if called with a positional hash.
* Do not look for an option hash if empty keywords are provided.
For backwards compatibility, treat an empty keyword splat as a empty
mandatory positional hash argument, but emit a a warning, as this
behavior will be removed in Ruby 3. The argument number check
needs to be moved lower so it can correctly handle an empty
positional argument being added.
* If the last argument is nil and it is necessary to treat it as an option
hash in order to make sure all arguments are processed, continue to
treat the last argument as the option hash. Emit a warning in this case,
as this behavior will be removed in Ruby 3.
* If splitting the keyword hash into two hashes, issue a warning, as we
will not be splitting hashes in Ruby 3.
* If the keyword argument is required to fill a mandatory positional
argument, continue to do so, but emit a warning as this behavior will
be going away in Ruby 3.
* If keyword arguments are provided and the last argument is not a hash,
that indicates something wrong. This can happen if a cfunc is calling
rb_scan_args multiple times, and providing arguments that were not
passed to it from Ruby. Callers need to switch to the new
rb_scan_args_kw function, which allows passing of whether keywords
were provided.
This commit fixes all warnings caused by the changes above.
It switches some function calls to *_kw versions with appropriate
kw_splat flags. If delegating arguments, RB_PASS_CALLED_KEYWORDS
is used. If creating new arguments, RB_PASS_KEYWORDS is used if
the last argument is a hash to be treated as keywords.
In open_key_args in io.c, use rb_scan_args_kw.
In this case, the arguments provided come from another C
function, not Ruby. The last argument may or may not be a hash,
so we can't set keyword argument mode. However, if it is a
hash, we don't want to warn when treating it as keywords.
In Ruby files, make sure to appropriately use keyword splats
or literal keywords when calling Cfuncs that now issue keyword
argument separation warnings through rb_scan_args. Also, make
sure not to pass nil in place of an option hash.
Work around Kernel#warn warnings due to problems in the Rubygems
override of the method. There is an open pull request to fix
these issues in Rubygems, but part of the Rubygems tests for
their override fail on ruby-head due to rb_scan_args not
recognizing empty keyword splats, which this commit fixes.
Implementation wise, adding rb_scan_args_kw is kind of a pain,
because rb_scan_args takes a variable number of arguments.
In order to not duplicate all the code, the function internals need
to be split into two functions taking a va_list, and to avoid passing
in a ton of arguments, a single struct argument is used to handle
the variables previously local to the function.
2019-09-25 14:18:49 -04:00
|
|
|
assert_equal([1, {"a"=>0, b: 1}, nil], Bug::ScanArgs.lead_hash({"a"=>0, b: 1}, **{}))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(1, {"a"=>0, b: 1}, **{})}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(**{})}
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_hash
|
|
|
|
|
assert_equal([0, nil, nil], Bug::ScanArgs.opt_hash())
|
|
|
|
|
assert_equal([1, "a", nil], Bug::ScanArgs.opt_hash("a"))
|
|
|
|
|
assert_equal([0, nil, {b: 1}], Bug::ScanArgs.opt_hash(b: 1))
|
|
|
|
|
assert_equal([1, "a", {b: 1}], Bug::ScanArgs.opt_hash("a", b: 1))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_hash("a", "b")}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([0, nil, {"a"=>0, b: 1}], Bug::ScanArgs.opt_hash("a"=>0, b: 1))
|
Make rb_scan_args handle keywords more similar to Ruby methods (#2460)
Cfuncs that use rb_scan_args with the : entry suffer similar keyword
argument separation issues that Ruby methods suffer if the cfuncs
accept optional or variable arguments.
This makes the following changes to : handling.
* Treats as **kw, prompting keyword argument separation warnings
if called with a positional hash.
* Do not look for an option hash if empty keywords are provided.
For backwards compatibility, treat an empty keyword splat as a empty
mandatory positional hash argument, but emit a a warning, as this
behavior will be removed in Ruby 3. The argument number check
needs to be moved lower so it can correctly handle an empty
positional argument being added.
* If the last argument is nil and it is necessary to treat it as an option
hash in order to make sure all arguments are processed, continue to
treat the last argument as the option hash. Emit a warning in this case,
as this behavior will be removed in Ruby 3.
* If splitting the keyword hash into two hashes, issue a warning, as we
will not be splitting hashes in Ruby 3.
* If the keyword argument is required to fill a mandatory positional
argument, continue to do so, but emit a warning as this behavior will
be going away in Ruby 3.
* If keyword arguments are provided and the last argument is not a hash,
that indicates something wrong. This can happen if a cfunc is calling
rb_scan_args multiple times, and providing arguments that were not
passed to it from Ruby. Callers need to switch to the new
rb_scan_args_kw function, which allows passing of whether keywords
were provided.
This commit fixes all warnings caused by the changes above.
It switches some function calls to *_kw versions with appropriate
kw_splat flags. If delegating arguments, RB_PASS_CALLED_KEYWORDS
is used. If creating new arguments, RB_PASS_KEYWORDS is used if
the last argument is a hash to be treated as keywords.
In open_key_args in io.c, use rb_scan_args_kw.
In this case, the arguments provided come from another C
function, not Ruby. The last argument may or may not be a hash,
so we can't set keyword argument mode. However, if it is a
hash, we don't want to warn when treating it as keywords.
In Ruby files, make sure to appropriately use keyword splats
or literal keywords when calling Cfuncs that now issue keyword
argument separation warnings through rb_scan_args. Also, make
sure not to pass nil in place of an option hash.
Work around Kernel#warn warnings due to problems in the Rubygems
override of the method. There is an open pull request to fix
these issues in Rubygems, but part of the Rubygems tests for
their override fail on ruby-head due to rb_scan_args not
recognizing empty keyword splats, which this commit fixes.
Implementation wise, adding rb_scan_args_kw is kind of a pain,
because rb_scan_args takes a variable number of arguments.
In order to not duplicate all the code, the function internals need
to be split into two functions taking a va_list, and to avoid passing
in a ton of arguments, a single struct argument is used to handle
the variables previously local to the function.
2019-09-25 14:18:49 -04:00
|
|
|
assert_equal([1, {"a"=>0, b: 1}, nil], Bug::ScanArgs.opt_hash({"a"=>0, b: 1}, **{}))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_hash
|
|
|
|
|
assert_equal([1, "a", nil, nil], Bug::ScanArgs.lead_opt_hash("a"))
|
|
|
|
|
assert_equal([2, "a", "b", nil], Bug::ScanArgs.lead_opt_hash("a", "b"))
|
|
|
|
|
assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.lead_opt_hash("a", c: 1))
|
|
|
|
|
assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash(c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash("a", "b", "c")}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([1, "a", nil, {"b"=>0, c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_var_hash
|
|
|
|
|
assert_equal([0, [], nil], Bug::ScanArgs.var_hash())
|
|
|
|
|
assert_equal([1, ["a"], nil], Bug::ScanArgs.var_hash("a"))
|
|
|
|
|
assert_equal([1, ["a"], {b: 1}], Bug::ScanArgs.var_hash("a", b: 1))
|
|
|
|
|
assert_equal([0, [], {b: 1}], Bug::ScanArgs.var_hash(b: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([0, [], {"a"=>0, b: 1}], Bug::ScanArgs.var_hash("a"=>0, b: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_var_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_hash()}
|
|
|
|
|
assert_equal([1, "a", [], nil], Bug::ScanArgs.lead_var_hash("a"))
|
|
|
|
|
assert_equal([2, "a", ["b"], nil], Bug::ScanArgs.lead_var_hash("a", "b"))
|
|
|
|
|
assert_equal([2, "a", ["b"], {c: 1}], Bug::ScanArgs.lead_var_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.lead_var_hash("a", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_hash(c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.lead_var_hash("a", "b", "c"))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([1, "a", [], {"b"=>0, c: 1}], Bug::ScanArgs.lead_var_hash("a", "b"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_var_hash
|
|
|
|
|
assert_equal([0, nil, [], nil], Bug::ScanArgs.opt_var_hash())
|
|
|
|
|
assert_equal([1, "a", [], nil], Bug::ScanArgs.opt_var_hash("a"))
|
|
|
|
|
assert_equal([2, "a", ["b"], nil], Bug::ScanArgs.opt_var_hash("a", "b"))
|
|
|
|
|
assert_equal([2, "a", ["b"], {c: 1}], Bug::ScanArgs.opt_var_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.opt_var_hash("a", c: 1))
|
|
|
|
|
assert_equal([0, nil, [], {c: 1}], Bug::ScanArgs.opt_var_hash(c: 1))
|
|
|
|
|
assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.opt_var_hash("a", "b", "c"))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([1, "a", [], {"b"=>0, c: 1}], Bug::ScanArgs.opt_var_hash("a", "b"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_var_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_hash()}
|
|
|
|
|
assert_equal([1, "a", nil, [], nil], Bug::ScanArgs.lead_opt_var_hash("a"))
|
|
|
|
|
assert_equal([2, "a", "b", [], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b"))
|
|
|
|
|
assert_equal([2, "a", "b", [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([1, "a", nil, [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_hash(c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([3, "a", "b", ["c"], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"))
|
|
|
|
|
assert_equal([3, "a", "b", ["c"], {d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c", d: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([2, "a", "b", [], {"c"=>0, d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"=>0, d: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_trail_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash()}
|
|
|
|
|
assert_equal([1, nil, "a", nil], Bug::ScanArgs.opt_trail_hash("a"))
|
|
|
|
|
assert_equal([2, "a", "b", nil], Bug::ScanArgs.opt_trail_hash("a", "b"))
|
|
|
|
|
assert_equal([1, nil, "a", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", c: 1))
|
|
|
|
|
assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash(c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash("a", "b", "c")}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([1, nil, "a", {"b"=>0, c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_trail_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash()}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a")}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash(c: 1)}
|
|
|
|
|
assert_equal([2, "a", nil, "b", nil], Bug::ScanArgs.lead_opt_trail_hash("a", "b"))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a", c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([2, "a", nil, "b", {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([3, "a", "b", "c", nil], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"))
|
|
|
|
|
assert_equal([3, "a", "b", "c", {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c", c: 1))
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c", "d")}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([2, "a", nil, "b", {"c"=>0, c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_var_trail_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.var_trail_hash()}
|
|
|
|
|
assert_equal([1, [], "a", nil], Bug::ScanArgs.var_trail_hash("a"))
|
|
|
|
|
assert_equal([2, ["a"], "b", nil], Bug::ScanArgs.var_trail_hash("a", "b"))
|
|
|
|
|
assert_equal([1, [], "a", {c: 1}], Bug::ScanArgs.var_trail_hash("a", c: 1))
|
|
|
|
|
assert_equal([2, ["a"], "b", {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.var_trail_hash(c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([3, ["a", "b"], "c", nil], Bug::ScanArgs.var_trail_hash("a", "b", "c"))
|
|
|
|
|
assert_equal([3, ["a", "b"], "c", {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([2, ["a"], "b", {"c"=>0, c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_var_trail_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash()}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash("a")}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash(c: 1)}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash("a", c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([2, "a", [], "b", nil], Bug::ScanArgs.lead_var_trail_hash("a", "b"))
|
|
|
|
|
assert_equal([2, "a", [], "b", {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([3, "a", ["b"], "c", nil], Bug::ScanArgs.lead_var_trail_hash("a", "b", "c"))
|
|
|
|
|
assert_equal([3, "a", ["b"], "c", {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", "c", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([2, "a", [], "b", {"c"=>0, c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1, "c"=>0))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_opt_var_trail_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail_hash()}
|
|
|
|
|
assert_equal([1, nil, [], "a", nil], Bug::ScanArgs.opt_var_trail_hash("a"))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail_hash(c: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([1, nil, [], "a", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", c: 1))
|
|
|
|
|
assert_equal([2, "a", [], "b", nil], Bug::ScanArgs.opt_var_trail_hash("a", "b"))
|
|
|
|
|
assert_equal([2, "a", [], "b", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([3, "a", ["b"], "c", nil], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"))
|
|
|
|
|
assert_equal([3, "a", ["b"], "c", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c", c: 1))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([2, "a", [], "b", {"c"=>0, c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_lead_opt_var_trail_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash()}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash("a")}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash("a", b: 1)}
|
2017-08-19 19:39:03 -04:00
|
|
|
assert_equal([2, "a", nil, [], "b", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b"))
|
|
|
|
|
assert_equal([2, "a", nil, [], "b", {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([3, "a", "b", [], "c", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c"))
|
|
|
|
|
assert_equal([3, "a", "b", [], "c", {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", c: 1))
|
|
|
|
|
assert_equal([4, "a", "b", ["c"], "d", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([3, "a", "b", [], "c", {"d"=>0, c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"=>0, c: 1))
|
Make rb_scan_args handle keywords more similar to Ruby methods (#2460)
Cfuncs that use rb_scan_args with the : entry suffer similar keyword
argument separation issues that Ruby methods suffer if the cfuncs
accept optional or variable arguments.
This makes the following changes to : handling.
* Treats as **kw, prompting keyword argument separation warnings
if called with a positional hash.
* Do not look for an option hash if empty keywords are provided.
For backwards compatibility, treat an empty keyword splat as a empty
mandatory positional hash argument, but emit a a warning, as this
behavior will be removed in Ruby 3. The argument number check
needs to be moved lower so it can correctly handle an empty
positional argument being added.
* If the last argument is nil and it is necessary to treat it as an option
hash in order to make sure all arguments are processed, continue to
treat the last argument as the option hash. Emit a warning in this case,
as this behavior will be removed in Ruby 3.
* If splitting the keyword hash into two hashes, issue a warning, as we
will not be splitting hashes in Ruby 3.
* If the keyword argument is required to fill a mandatory positional
argument, continue to do so, but emit a warning as this behavior will
be going away in Ruby 3.
* If keyword arguments are provided and the last argument is not a hash,
that indicates something wrong. This can happen if a cfunc is calling
rb_scan_args multiple times, and providing arguments that were not
passed to it from Ruby. Callers need to switch to the new
rb_scan_args_kw function, which allows passing of whether keywords
were provided.
This commit fixes all warnings caused by the changes above.
It switches some function calls to *_kw versions with appropriate
kw_splat flags. If delegating arguments, RB_PASS_CALLED_KEYWORDS
is used. If creating new arguments, RB_PASS_KEYWORDS is used if
the last argument is a hash to be treated as keywords.
In open_key_args in io.c, use rb_scan_args_kw.
In this case, the arguments provided come from another C
function, not Ruby. The last argument may or may not be a hash,
so we can't set keyword argument mode. However, if it is a
hash, we don't want to warn when treating it as keywords.
In Ruby files, make sure to appropriately use keyword splats
or literal keywords when calling Cfuncs that now issue keyword
argument separation warnings through rb_scan_args. Also, make
sure not to pass nil in place of an option hash.
Work around Kernel#warn warnings due to problems in the Rubygems
override of the method. There is an open pull request to fix
these issues in Rubygems, but part of the Rubygems tests for
their override fail on ruby-head due to rb_scan_args not
recognizing empty keyword splats, which this commit fixes.
Implementation wise, adding rb_scan_args_kw is kind of a pain,
because rb_scan_args takes a variable number of arguments.
In order to not duplicate all the code, the function internals need
to be split into two functions taking a va_list, and to avoid passing
in a ton of arguments, a single struct argument is used to handle
the variables previously local to the function.
2019-09-25 14:18:49 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_k_lead_opt_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.k_lead_opt_hash}
|
|
|
|
|
assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", c: 1))
|
|
|
|
|
assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", {c: 1}))
|
|
|
|
|
assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b", {c: 1}))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.k_lead_opt_hash(c: 1)}
|
|
|
|
|
assert_equal([1, "a", nil, {"b"=>0, c: 1}], Bug::ScanArgs.k_lead_opt_hash("a", "b"=>0, c: 1))
|
Make rb_scan_args handle keywords more similar to Ruby methods (#2460)
Cfuncs that use rb_scan_args with the : entry suffer similar keyword
argument separation issues that Ruby methods suffer if the cfuncs
accept optional or variable arguments.
This makes the following changes to : handling.
* Treats as **kw, prompting keyword argument separation warnings
if called with a positional hash.
* Do not look for an option hash if empty keywords are provided.
For backwards compatibility, treat an empty keyword splat as a empty
mandatory positional hash argument, but emit a a warning, as this
behavior will be removed in Ruby 3. The argument number check
needs to be moved lower so it can correctly handle an empty
positional argument being added.
* If the last argument is nil and it is necessary to treat it as an option
hash in order to make sure all arguments are processed, continue to
treat the last argument as the option hash. Emit a warning in this case,
as this behavior will be removed in Ruby 3.
* If splitting the keyword hash into two hashes, issue a warning, as we
will not be splitting hashes in Ruby 3.
* If the keyword argument is required to fill a mandatory positional
argument, continue to do so, but emit a warning as this behavior will
be going away in Ruby 3.
* If keyword arguments are provided and the last argument is not a hash,
that indicates something wrong. This can happen if a cfunc is calling
rb_scan_args multiple times, and providing arguments that were not
passed to it from Ruby. Callers need to switch to the new
rb_scan_args_kw function, which allows passing of whether keywords
were provided.
This commit fixes all warnings caused by the changes above.
It switches some function calls to *_kw versions with appropriate
kw_splat flags. If delegating arguments, RB_PASS_CALLED_KEYWORDS
is used. If creating new arguments, RB_PASS_KEYWORDS is used if
the last argument is a hash to be treated as keywords.
In open_key_args in io.c, use rb_scan_args_kw.
In this case, the arguments provided come from another C
function, not Ruby. The last argument may or may not be a hash,
so we can't set keyword argument mode. However, if it is a
hash, we don't want to warn when treating it as keywords.
In Ruby files, make sure to appropriately use keyword splats
or literal keywords when calling Cfuncs that now issue keyword
argument separation warnings through rb_scan_args. Also, make
sure not to pass nil in place of an option hash.
Work around Kernel#warn warnings due to problems in the Rubygems
override of the method. There is an open pull request to fix
these issues in Rubygems, but part of the Rubygems tests for
their override fail on ruby-head due to rb_scan_args not
recognizing empty keyword splats, which this commit fixes.
Implementation wise, adding rb_scan_args_kw is kind of a pain,
because rb_scan_args takes a variable number of arguments.
In order to not duplicate all the code, the function internals need
to be split into two functions taking a va_list, and to avoid passing
in a ton of arguments, a single struct argument is used to handle
the variables previously local to the function.
2019-09-25 14:18:49 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def test_n_lead_opt_hash
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash}
|
|
|
|
|
assert_equal([1, "a", nil, nil], Bug::ScanArgs.n_lead_opt_hash("a"))
|
|
|
|
|
assert_equal([2, "a", "b", nil], Bug::ScanArgs.n_lead_opt_hash("a", "b"))
|
|
|
|
|
assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", c: 1))
|
|
|
|
|
assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", {c: 1}))
|
|
|
|
|
assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b", c: 1))
|
|
|
|
|
assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b", {c: 1}))
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash(c: 1)}
|
|
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash({c: 1})}
|
Make rb_scan_args handle keywords more similar to Ruby methods (#2460)
Cfuncs that use rb_scan_args with the : entry suffer similar keyword
argument separation issues that Ruby methods suffer if the cfuncs
accept optional or variable arguments.
This makes the following changes to : handling.
* Treats as **kw, prompting keyword argument separation warnings
if called with a positional hash.
* Do not look for an option hash if empty keywords are provided.
For backwards compatibility, treat an empty keyword splat as a empty
mandatory positional hash argument, but emit a a warning, as this
behavior will be removed in Ruby 3. The argument number check
needs to be moved lower so it can correctly handle an empty
positional argument being added.
* If the last argument is nil and it is necessary to treat it as an option
hash in order to make sure all arguments are processed, continue to
treat the last argument as the option hash. Emit a warning in this case,
as this behavior will be removed in Ruby 3.
* If splitting the keyword hash into two hashes, issue a warning, as we
will not be splitting hashes in Ruby 3.
* If the keyword argument is required to fill a mandatory positional
argument, continue to do so, but emit a warning as this behavior will
be going away in Ruby 3.
* If keyword arguments are provided and the last argument is not a hash,
that indicates something wrong. This can happen if a cfunc is calling
rb_scan_args multiple times, and providing arguments that were not
passed to it from Ruby. Callers need to switch to the new
rb_scan_args_kw function, which allows passing of whether keywords
were provided.
This commit fixes all warnings caused by the changes above.
It switches some function calls to *_kw versions with appropriate
kw_splat flags. If delegating arguments, RB_PASS_CALLED_KEYWORDS
is used. If creating new arguments, RB_PASS_KEYWORDS is used if
the last argument is a hash to be treated as keywords.
In open_key_args in io.c, use rb_scan_args_kw.
In this case, the arguments provided come from another C
function, not Ruby. The last argument may or may not be a hash,
so we can't set keyword argument mode. However, if it is a
hash, we don't want to warn when treating it as keywords.
In Ruby files, make sure to appropriately use keyword splats
or literal keywords when calling Cfuncs that now issue keyword
argument separation warnings through rb_scan_args. Also, make
sure not to pass nil in place of an option hash.
Work around Kernel#warn warnings due to problems in the Rubygems
override of the method. There is an open pull request to fix
these issues in Rubygems, but part of the Rubygems tests for
their override fail on ruby-head due to rb_scan_args not
recognizing empty keyword splats, which this commit fixes.
Implementation wise, adding rb_scan_args_kw is kind of a pain,
because rb_scan_args takes a variable number of arguments.
In order to not duplicate all the code, the function internals need
to be split into two functions taking a va_list, and to avoid passing
in a ton of arguments, a single struct argument is used to handle
the variables previously local to the function.
2019-09-25 14:18:49 -04:00
|
|
|
assert_raise(ArgumentError) {Bug::ScanArgs.n_lead_opt_hash("a", "b", "c")}
|
2019-10-04 18:41:13 -04:00
|
|
|
assert_equal([1, "a", nil, {"b"=>0, c: 1}], Bug::ScanArgs.n_lead_opt_hash("a", "b"=>0, c: 1))
|
2017-08-19 19:39:03 -04:00
|
|
|
end
|
|
|
|
|
end
|