Skip to content

Error on positional-only parameters passed as keywords #1816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2020
Merged

Error on positional-only parameters passed as keywords #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
652231a
Error on positional-only parameters passed as keywords
coolreader18 Mar 14, 2020
aad2122
Add tests for positional/keyword only arguments
coolreader18 Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion tests/snippets/function_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def va2(*args, **kwargs):
assert args == (5, 4)
assert len(kwargs) == 0


va2(5, 4)
x = (5, 4)
va2(*x)
Expand Down Expand Up @@ -114,3 +113,19 @@ def f(a):
y = {'a': 2}
with assert_raises(TypeError):
f(**x, **y)


def f(a, b, /, c, d, *, e, f):
return a + b + c + d + e + f

assert f(1,2,3,4,e=5,f=6) == 21
assert f(1,2,3,d=4,e=5,f=6) == 21
assert f(1,2,c=3,d=4,e=5,f=6) == 21
with assert_raises(TypeError):
f(1,b=2,c=3,d=4,e=5,f=6)
with assert_raises(TypeError):
f(a=1,b=2,c=3,d=4,e=5,f=6)
with assert_raises(TypeError):
f(1,2,3,4,5,f=6)
with assert_raises(TypeError):
f(1,2,3,4,5,6)
17 changes: 15 additions & 2 deletions vm/src/obj/objfunction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ use crate::pyobject::{
};
use crate::scope::Scope;
use crate::slots::{SlotCall, SlotDescriptor};
use crate::vm::VirtualMachine;
use crate::VirtualMachine;
use itertools::Itertools;

pub type PyFunctionRef = PyRef<PyFunction>;

Expand Down Expand Up @@ -72,6 +73,7 @@ impl PyFunction {
) -> PyResult<()> {
let nargs = func_args.args.len();
let nexpected_args = code_object.arg_names.len();
let posonly_args = &code_object.arg_names[..code_object.posonlyarg_count];

// This parses the arguments from args and kwargs into
// the proper variables keeping into account default values
Expand Down Expand Up @@ -126,12 +128,16 @@ impl PyFunction {
bytecode::Varargs::None => None,
};

let mut posonly_passed_as_kwarg = Vec::new();
// Handle keyword arguments
for (name, value) in func_args.kwargs {
// Check if we have a parameter with this name:
if code_object.arg_names.contains(&name) || code_object.kwonlyarg_names.contains(&name)
{
if locals.contains_key(&name, vm) {
if posonly_args.contains(&name) {
posonly_passed_as_kwarg.push(name);
continue;
} else if locals.contains_key(&name, vm) {
return Err(
vm.new_type_error(format!("Got multiple values for argument '{}'", name))
);
Expand All @@ -146,6 +152,13 @@ impl PyFunction {
);
}
}
if !posonly_passed_as_kwarg.is_empty() {
return Err(vm.new_type_error(format!(
"{}() got some positional-only arguments passed as keyword arguments: '{}'",
&code_object.obj_name,
posonly_passed_as_kwarg.into_iter().format(", "),
)));
}

// Add missing positional arguments, if we have fewer positional arguments than the
// function definition calls for
Expand Down