Commit a990eae9 authored by Stefan Behnel's avatar Stefan Behnel

more cleanup

parent dfaa72eb
...@@ -1805,13 +1805,14 @@ class DefNode(FuncDefNode): ...@@ -1805,13 +1805,14 @@ class DefNode(FuncDefNode):
# raise an error if not all keywords were read # raise an error if not all keywords were read
code.putln('if (unlikely(kw_args > 0)) {') code.putln('if (unlikely(kw_args > 0)) {')
code.put('if (!__Pyx_CheckKeywords(%s, "%s", %s)) ' % ( # __Pyx_CheckKeywords() this does more than strictly
# necessary, but this is not performance critical at all
code.put('__Pyx_CheckKeywords(%s, "%s", %s); ' % (
Naming.kwds_cname, self.name.utf8encode(), Naming.kwdlist_cname)) Naming.kwds_cname, self.name.utf8encode(), Naming.kwdlist_cname))
code.putln(code.error_goto(self.pos)) code.putln(code.error_goto(self.pos))
code.putln('}') code.putln('}')
# convert arg values to their final type and assign them # convert arg values to their final type and assign them
default_seen = False
for i, arg in enumerate(tuple(positional_args) + tuple(kw_only_args)): for i, arg in enumerate(tuple(positional_args) + tuple(kw_only_args)):
if arg.default: if arg.default:
code.putln("if (values[%d]) {" % i) code.putln("if (values[%d]) {" % i)
...@@ -1827,7 +1828,7 @@ class DefNode(FuncDefNode): ...@@ -1827,7 +1828,7 @@ class DefNode(FuncDefNode):
required_arg = arg required_arg = arg
break break
code.putln('} else {') code.putln('} else {')
code.putln('__Pyx_RaiseKeywordRequired("%s", "%s");' % ( code.put('__Pyx_RaiseKeywordRequired("%s", "%s"); ' % (
self.name.utf8encode(), required_arg.name.utf8encode())) self.name.utf8encode(), required_arg.name.utf8encode()))
code.putln(code.error_goto(self.pos)) code.putln(code.error_goto(self.pos))
code.putln('}') code.putln('}')
......
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