Commit f0081bd3 authored by Stefan Behnel's avatar Stefan Behnel Committed by GitHub

Merge pull request #2927 from rjtobin/pos_args

Adds positional only args support (PEP 570)
parents 1ae69ef8 185a8f39
...@@ -859,8 +859,9 @@ class CArgDeclNode(Node): ...@@ -859,8 +859,9 @@ class CArgDeclNode(Node):
# annotation ExprNode or None Py3 function arg annotation # annotation ExprNode or None Py3 function arg annotation
# is_self_arg boolean Is the "self" arg of an extension type method # is_self_arg boolean Is the "self" arg of an extension type method
# is_type_arg boolean Is the "class" arg of an extension type classmethod # is_type_arg boolean Is the "class" arg of an extension type classmethod
# is_kw_only boolean Is a keyword-only argument # kw_only boolean Is a keyword-only argument
# is_dynamic boolean Non-literal arg stored inside CyFunction # is_dynamic boolean Non-literal arg stored inside CyFunction
# pos_only boolean Is a positional-only argument
child_attrs = ["base_type", "declarator", "default", "annotation"] child_attrs = ["base_type", "declarator", "default", "annotation"]
outer_attrs = ["default", "annotation"] outer_attrs = ["default", "annotation"]
...@@ -869,6 +870,7 @@ class CArgDeclNode(Node): ...@@ -869,6 +870,7 @@ class CArgDeclNode(Node):
is_type_arg = 0 is_type_arg = 0
is_generic = 1 is_generic = 1
kw_only = 0 kw_only = 0
pos_only = 0
not_none = 0 not_none = 0
or_none = 0 or_none = 0
type = None type = None
...@@ -3653,6 +3655,7 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3653,6 +3655,7 @@ class DefNodeWrapper(FuncDefNode):
positional_args = [] positional_args = []
required_kw_only_args = [] required_kw_only_args = []
optional_kw_only_args = [] optional_kw_only_args = []
num_pos_only_args = 0
for arg in args: for arg in args:
if arg.is_generic: if arg.is_generic:
if arg.default: if arg.default:
...@@ -3666,6 +3669,9 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3666,6 +3669,9 @@ class DefNodeWrapper(FuncDefNode):
elif not arg.is_self_arg and not arg.is_type_arg: elif not arg.is_self_arg and not arg.is_type_arg:
positional_args.append(arg) positional_args.append(arg)
if arg.pos_only:
num_pos_only_args += 1
# sort required kw-only args before optional ones to avoid special # sort required kw-only args before optional ones to avoid special
# cases in the unpacking code # cases in the unpacking code
kw_only_args = required_kw_only_args + optional_kw_only_args kw_only_args = required_kw_only_args + optional_kw_only_args
...@@ -3683,10 +3689,10 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3683,10 +3689,10 @@ class DefNodeWrapper(FuncDefNode):
code.putln('{') code.putln('{')
all_args = tuple(positional_args) + tuple(kw_only_args) all_args = tuple(positional_args) + tuple(kw_only_args)
code.putln("static PyObject **%s[] = {%s,0};" % ( code.putln("static PyObject **%s[] = {%s};" % (
Naming.pykwdlist_cname, Naming.pykwdlist_cname,
','.join(['&%s' % code.intern_identifier(arg.name) ','.join(['&%s' % code.intern_identifier(arg.name)
for arg in all_args]))) for arg in all_args if not arg.pos_only] + ['0'])))
# Before being converted and assigned to the target variables, # Before being converted and assigned to the target variables,
# borrowed references to all unpacked argument values are # borrowed references to all unpacked argument values are
...@@ -3704,8 +3710,8 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3704,8 +3710,8 @@ class DefNodeWrapper(FuncDefNode):
Naming.kwds_cname)) Naming.kwds_cname))
self.generate_keyword_unpacking_code( self.generate_keyword_unpacking_code(
min_positional_args, max_positional_args, min_positional_args, max_positional_args,
has_fixed_positional_count, has_kw_only_args, num_pos_only_args, has_fixed_positional_count,
all_args, argtuple_error_label, code) has_kw_only_args, all_args, argtuple_error_label, code)
# --- optimised code when we do not receive any keyword arguments # --- optimised code when we do not receive any keyword arguments
if (self.num_required_kw_args and min_positional_args > 0) or min_positional_args == max_positional_args: if (self.num_required_kw_args and min_positional_args > 0) or min_positional_args == max_positional_args:
...@@ -3868,8 +3874,8 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3868,8 +3874,8 @@ class DefNodeWrapper(FuncDefNode):
code.putln('values[%d] = %s;' % (i, arg.type.as_pyobject(default_value))) code.putln('values[%d] = %s;' % (i, arg.type.as_pyobject(default_value)))
def generate_keyword_unpacking_code(self, min_positional_args, max_positional_args, def generate_keyword_unpacking_code(self, min_positional_args, max_positional_args,
has_fixed_positional_count, has_kw_only_args, num_pos_only_args, has_fixed_positional_count,
all_args, argtuple_error_label, code): has_kw_only_args, all_args, argtuple_error_label, code):
code.putln('Py_ssize_t kw_args;') code.putln('Py_ssize_t kw_args;')
code.putln('const Py_ssize_t pos_args = PyTuple_GET_SIZE(%s);' % Naming.args_cname) code.putln('const Py_ssize_t pos_args = PyTuple_GET_SIZE(%s);' % Naming.args_cname)
# copy the values from the args tuple and check that it's not too long # copy the values from the args tuple and check that it's not too long
...@@ -3899,9 +3905,12 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3899,9 +3905,12 @@ class DefNodeWrapper(FuncDefNode):
code.putln('kw_args = PyDict_Size(%s);' % Naming.kwds_cname) code.putln('kw_args = PyDict_Size(%s);' % Naming.kwds_cname)
if self.num_required_args or max_positional_args > 0: if self.num_required_args or max_positional_args > 0:
last_required_arg = -1 last_required_arg = -1
last_required_posonly_arg = -1
for i, arg in enumerate(all_args): for i, arg in enumerate(all_args):
if not arg.default: if not arg.default:
last_required_arg = i last_required_arg = i
if arg.pos_only and not arg.default:
last_required_posonly_arg = i
if last_required_arg < max_positional_args: if last_required_arg < max_positional_args:
last_required_arg = max_positional_args-1 last_required_arg = max_positional_args-1
if max_positional_args > 0: if max_positional_args > 0:
...@@ -3915,6 +3924,12 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3915,6 +3924,12 @@ class DefNodeWrapper(FuncDefNode):
else: else:
code.putln('case %2d:' % i) code.putln('case %2d:' % i)
pystring_cname = code.intern_identifier(arg.name) pystring_cname = code.intern_identifier(arg.name)
if arg.pos_only:
if i == last_required_posonly_arg:
code.put_goto(argtuple_error_label)
elif i == last_required_arg:
code.putln('break;')
continue
if arg.default: if arg.default:
if arg.kw_only: if arg.kw_only:
# optional kw-only args are handled separately below # optional kw-only args are handled separately below
...@@ -3969,20 +3984,45 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3969,20 +3984,45 @@ class DefNodeWrapper(FuncDefNode):
# arguments, this will always do the right thing for unpacking # arguments, this will always do the right thing for unpacking
# keyword arguments, so that we can concentrate on optimising # keyword arguments, so that we can concentrate on optimising
# common cases above. # common cases above.
#
# ParseOptionalKeywords() needs to know how many of the arguments
# that could be passed as keywords have in fact been passed as
# positional args.
if num_pos_only_args > 0:
# There are positional-only arguments which we don't want to count,
# since they cannot be keyword arguments. Subtract the number of
# pos-only arguments from the number of positional arguments we got.
# If we get a negative number then none of the keyword arguments were
# passed as positional args.
code.putln('const Py_ssize_t kwd_pos_args = (pos_args < %d) ? 0 : (pos_args - %d);' % (
num_pos_only_args, num_pos_only_args))
elif max_positional_args > 0:
code.putln('const Py_ssize_t kwd_pos_args = pos_args;')
if max_positional_args == 0: if max_positional_args == 0:
pos_arg_count = "0" pos_arg_count = "0"
elif self.star_arg: elif self.star_arg:
code.putln("const Py_ssize_t used_pos_args = (pos_args < %d) ? pos_args : %d;" % ( # If there is a *arg, the number of used positional args could be larger than
max_positional_args, max_positional_args)) # the number of possible keyword arguments. But ParseOptionalKeywords() uses the
# number of positional args as an index into the keyword argument name array,
# if this is larger than the number of kwd args we get a segfault. So round
# this down to max_positional_args - num_pos_only_args (= num possible kwd args).
code.putln("const Py_ssize_t used_pos_args = (kwd_pos_args < %d) ? kwd_pos_args : %d;" % (
max_positional_args - num_pos_only_args, max_positional_args - num_pos_only_args))
pos_arg_count = "used_pos_args" pos_arg_count = "used_pos_args"
else: else:
pos_arg_count = "pos_args" pos_arg_count = "kwd_pos_args"
if num_pos_only_args > 0 and num_pos_only_args < len(all_args):
values_array = 'values + %d' % (num_pos_only_args)
else:
values_array = 'values'
code.globalstate.use_utility_code( code.globalstate.use_utility_code(
UtilityCode.load_cached("ParseKeywords", "FunctionArguments.c")) UtilityCode.load_cached("ParseKeywords", "FunctionArguments.c"))
code.putln('if (unlikely(__Pyx_ParseOptionalKeywords(%s, %s, %s, values, %s, "%s") < 0)) %s' % ( code.putln('if (unlikely(__Pyx_ParseOptionalKeywords(%s, %s, %s, %s, %s, "%s") < 0)) %s' % (
Naming.kwds_cname, Naming.kwds_cname,
Naming.pykwdlist_cname, Naming.pykwdlist_cname,
self.starstar_arg and self.starstar_arg.entry.cname or '0', self.starstar_arg and self.starstar_arg.entry.cname or '0',
values_array,
pos_arg_count, pos_arg_count,
self.name, self.name,
code.error_goto(self.pos))) code.error_goto(self.pos)))
...@@ -3991,12 +4031,19 @@ class DefNodeWrapper(FuncDefNode): ...@@ -3991,12 +4031,19 @@ class DefNodeWrapper(FuncDefNode):
def generate_optional_kwonly_args_unpacking_code(self, all_args, code): def generate_optional_kwonly_args_unpacking_code(self, all_args, code):
optional_args = [] optional_args = []
first_optional_arg = -1 first_optional_arg = -1
num_posonly_args = 0
for i, arg in enumerate(all_args): for i, arg in enumerate(all_args):
if arg.pos_only:
num_posonly_args += 1
if not arg.kw_only or not arg.default: if not arg.kw_only or not arg.default:
continue continue
if not optional_args: if not optional_args:
first_optional_arg = i first_optional_arg = i
optional_args.append(arg.name) optional_args.append(arg.name)
if num_posonly_args > 0:
posonly_correction = '-%d' % num_posonly_args
else:
posonly_correction = ''
if optional_args: if optional_args:
if len(optional_args) > 1: if len(optional_args) > 1:
# if we receive more than the named kwargs, we either have **kwargs # if we receive more than the named kwargs, we either have **kwargs
...@@ -4012,8 +4059,8 @@ class DefNodeWrapper(FuncDefNode): ...@@ -4012,8 +4059,8 @@ class DefNodeWrapper(FuncDefNode):
else: else:
code.putln('if (kw_args == 1) {') code.putln('if (kw_args == 1) {')
code.putln('const Py_ssize_t index = %d;' % first_optional_arg) code.putln('const Py_ssize_t index = %d;' % first_optional_arg)
code.putln('PyObject* value = __Pyx_PyDict_GetItemStr(%s, *%s[index]);' % ( code.putln('PyObject* value = __Pyx_PyDict_GetItemStr(%s, *%s[index%s]);' % (
Naming.kwds_cname, Naming.pykwdlist_cname)) Naming.kwds_cname, Naming.pykwdlist_cname, posonly_correction))
code.putln('if (value) { values[index] = value; kw_args--; }') code.putln('if (value) { values[index] = value; kw_args--; }')
if len(optional_args) > 1: if len(optional_args) > 1:
code.putln('}') code.putln('}')
......
...@@ -2965,7 +2965,7 @@ def p_exception_value_clause(s): ...@@ -2965,7 +2965,7 @@ def p_exception_value_clause(s):
exc_val = p_test(s) exc_val = p_test(s)
return exc_val, exc_check return exc_val, exc_check
c_arg_list_terminators = cython.declare(set, set(['*', '**', '.', ')', ':'])) c_arg_list_terminators = cython.declare(set, set(['*', '**', '.', ')', ':', '/']))
def p_c_arg_list(s, ctx = Ctx(), in_pyfunc = 0, cmethod_flag = 0, def p_c_arg_list(s, ctx = Ctx(), in_pyfunc = 0, cmethod_flag = 0,
nonempty_declarators = 0, kw_only = 0, annotated = 1): nonempty_declarators = 0, kw_only = 0, annotated = 1):
...@@ -3424,6 +3424,20 @@ def p_varargslist(s, terminator=')', annotated=1): ...@@ -3424,6 +3424,20 @@ def p_varargslist(s, terminator=')', annotated=1):
annotated = annotated) annotated = annotated)
star_arg = None star_arg = None
starstar_arg = None starstar_arg = None
if s.sy == '/':
if len(args) == 0:
s.error("Got zero positional-only arguments despite presence of "
"positional-only specifier '/'")
s.next()
# Mark all args to the left as pos only
for arg in args:
arg.pos_only = 1
if s.sy == ',':
s.next()
args.extend(p_c_arg_list(s, in_pyfunc = 1,
nonempty_declarators = 1, annotated = annotated))
elif s.sy != terminator:
s.error("Syntax error in Python function argument list")
if s.sy == '*': if s.sy == '*':
s.next() s.next()
if s.sy == 'IDENT': if s.sy == 'IDENT':
......
# mode: error
# tag: posonly
def f(a, b = 5, /, c):
pass
def f(a = 5, b, /, c):
pass
def f(a = 5, b, /):
pass
def f(a, /, a):
pass
def f(a, /, *, a):
pass
#def f(a, b/2, c): #D
# pass
#def f(*args, /): #D
# pass
#def f(*args, a, /):
# pass
#def f(**kwargs, /):
# pass
#def f(/, a = 1): # D
# pass
#def f(/, a):
# pass
#def f(/):
# pass
#def f(*, a, /):
# pass
#def f(*, /, a):
# pass
#def f(a, /, c, /):
# pass
#def f(a, /, c, /, d):
# pass
#def f(a, /, c, /, d, *, e):
# pass
#def f(a, *, c, /, d, e):
# pass
def test_invalid_syntax_lambda(self):
lambda a, b = 5, /, c: None
lambda a = 5, b, /, c: None
lambda a = 5, b, /: None
lambda a, /, a: None
lambda a, /, *, a: None
# lambda *args, /: None
# lambda *args, a, /: None
# lambda **kwargs, /: None
# lambda /, a = 1: None
# lambda /, a: None
# lambda /: None
# lambda *, a, /: None
# lambda *, /, a: None
async def f(a, b = 5, /, c):
pass
#def test_multiple_seps(a,/,b,/):
# pass
_ERRORS = u"""
4:19: Non-default argument following default argument
7:13: Non-default argument following default argument
7:19: Non-default argument following default argument
10:13: Non-default argument following default argument
13:6: Previous declaration is here
13:12: 'a' redeclared
16:6: Previous declaration is here
16:15: 'a' redeclared
59:24: Non-default argument following default argument
60:18: Non-default argument following default argument
60:24: Non-default argument following default argument
61:18: Non-default argument following default argument
62:11: Previous declaration is here
62:17: 'a' redeclared
63:11: Previous declaration is here
63:20: 'a' redeclared
73:25: Non-default argument following default argument
"""
# mode: error
# tag: posonly
def f(a, b/2, c):
pass
_ERRORS = u"""
4:11: Syntax error in Python function argument list
"""
# mode: error
# tag: posonly
def f(*args, /):
pass
def f(*args, a, /):
pass
_ERRORS = u"""
4:13: Expected ')', found '/'
"""
# mode: error
# tag: posonly
def f(/, a = 1):
pass
_ERRORS = u"""
4:6: Got zero positional-only arguments despite presence of positional-only specifier '/'
"""
# mode: error
# tag: posonly
def test_multiple_seps(a,/,b,/):
pass
_ERRORS = u"""
4:29: Expected ')', found '/'
"""
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment