Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
cython
Commits
fdf5beeb
Commit
fdf5beeb
authored
Aug 22, 2008
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow keyword arguments after *args in a function call (as Py3 does)
some EncodedString name fixes for function names
parent
809008a6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
23 deletions
+28
-23
Cython/Compiler/Parsing.py
Cython/Compiler/Parsing.py
+28
-23
No files found.
Cython/Compiler/Parsing.py
View file @
fdf5beeb
...
...
@@ -297,7 +297,14 @@ def p_call(s, function):
keyword_args
=
[]
star_arg
=
None
starstar_arg
=
None
while
s
.
sy
not
in
(
'*'
,
'**'
,
')'
):
while
s
.
sy
not
in
(
'**'
,
')'
):
if
s
.
sy
==
'*'
:
if
star_arg
:
s
.
error
(
"only one star-arg parameter allowed"
,
pos
=
s
.
position
())
s
.
next
()
star_arg
=
p_simple_expr
(
s
)
else
:
arg
=
p_simple_expr
(
s
)
if
s
.
sy
==
'='
:
s
.
next
()
...
...
@@ -313,16 +320,14 @@ def p_call(s, function):
if
keyword_args
:
s
.
error
(
"Non-keyword arg following keyword arg"
,
pos
=
arg
.
pos
)
if
star_arg
:
s
.
error
(
"Non-keyword arg following star-arg"
,
pos
=
arg
.
pos
)
positional_args
.
append
(
arg
)
if
s
.
sy
!=
','
:
break
s
.
next
()
if
s
.
sy
==
'*'
:
s
.
next
()
star_arg
=
p_simple_expr
(
s
)
if
s
.
sy
==
','
:
s
.
next
()
if
s
.
sy
==
'**'
:
s
.
next
()
starstar_arg
=
p_simple_expr
(
s
)
...
...
@@ -1738,7 +1743,7 @@ def p_c_declarator(s, ctx = Ctx(), empty = 0, is_type = 0, cmethod_flag = 0,
if
s
.
sy
==
'('
:
s
.
next
()
if
s
.
sy
==
')'
or
looking_at_type
(
s
):
base
=
Nodes
.
CNameDeclaratorNode
(
pos
,
name
=
""
,
cname
=
None
)
base
=
Nodes
.
CNameDeclaratorNode
(
pos
,
name
=
EncodedString
(
u""
)
,
cname
=
None
)
result
=
p_c_func_declarator
(
s
,
pos
,
ctx
,
base
,
cmethod_flag
)
else
:
result
=
p_c_declarator
(
s
,
ctx
,
empty
=
empty
,
is_type
=
is_type
,
...
...
@@ -1808,7 +1813,7 @@ def p_c_simple_declarator(s, ctx, empty, is_type, cmethod_flag,
else
:
rhs
=
None
if
s
.
sy
==
'IDENT'
:
name
=
s
.
systring
name
=
EncodedString
(
s
.
systring
)
if
is_type
:
s
.
add_type_name
(
name
)
if
empty
:
...
...
@@ -2171,7 +2176,7 @@ def p_def_statement(s, decorators=None):
# s.sy == 'def'
pos
=
s
.
position
()
s
.
next
()
name
=
p_ident
(
s
)
name
=
EncodedString
(
p_ident
(
s
)
)
#args = []
s
.
expect
(
'('
);
args
=
p_c_arg_list
(
s
,
in_pyfunc
=
1
,
nonempty_declarators
=
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment