Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
Pyston
Commits
551d925d
Commit
551d925d
authored
Apr 17, 2015
by
Travis Hance
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support arg unpacking
parent
6ab26e7f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
9 deletions
+51
-9
src/analysis/scoping_analysis.cpp
src/analysis/scoping_analysis.cpp
+8
-1
src/codegen/irgen/hooks.cpp
src/codegen/irgen/hooks.cpp
+3
-2
src/core/cfg.cpp
src/core/cfg.cpp
+21
-0
src/core/types.h
src/core/types.h
+2
-2
test/tests/arg_unpacking.py
test/tests/arg_unpacking.py
+15
-2
test/unittests/analysis.cpp
test/unittests/analysis.cpp
+2
-2
No files found.
src/analysis/scoping_analysis.cpp
View file @
551d925d
...
...
@@ -577,8 +577,15 @@ public:
bool
visit_functiondef
(
AST_FunctionDef
*
node
)
override
{
if
(
node
==
orig_node
)
{
for
(
AST_expr
*
e
:
node
->
args
->
args
)
int
counter
=
0
;
for
(
AST_expr
*
e
:
node
->
args
->
args
)
{
if
(
e
->
type
==
AST_TYPE
::
Tuple
)
{
doWrite
(
scoping
->
getInternedStrings
().
get
(
"."
+
std
::
to_string
(
counter
)));
}
counter
++
;
e
->
accept
(
this
);
}
if
(
node
->
args
->
vararg
.
str
().
size
())
{
mangleNameInPlace
(
node
->
args
->
vararg
,
cur
->
private_name
,
scoping
->
getInternedStrings
());
doWrite
(
node
->
args
->
vararg
);
...
...
src/codegen/irgen/hooks.cpp
View file @
551d925d
...
...
@@ -45,7 +45,7 @@
namespace
pyston
{
// TODO terrible place for these!
ParamNames
::
ParamNames
(
AST
*
ast
)
:
takes_param_names
(
true
)
{
ParamNames
::
ParamNames
(
AST
*
ast
,
InternedStringPool
&
pool
)
:
takes_param_names
(
true
)
{
if
(
ast
->
type
==
AST_TYPE
::
Module
||
ast
->
type
==
AST_TYPE
::
ClassDef
||
ast
->
type
==
AST_TYPE
::
Expression
||
ast
->
type
==
AST_TYPE
::
Suite
)
{
kwarg
=
""
;
...
...
@@ -58,7 +58,8 @@ ParamNames::ParamNames(AST* ast) : takes_param_names(true) {
if
(
arg
->
type
==
AST_TYPE
::
Name
)
{
args
.
push_back
(
ast_cast
<
AST_Name
>
(
arg
)
->
id
.
str
());
}
else
{
args
.
push_back
(
"."
+
std
::
to_string
(
i
+
1
));
InternedString
dot_arg_name
=
pool
.
get
(
"."
+
std
::
to_string
(
i
));
args
.
push_back
(
dot_arg_name
.
str
());
}
}
...
...
src/core/cfg.cpp
View file @
551d925d
...
...
@@ -2502,6 +2502,27 @@ CFG* computeCFG(SourceInfo* source, std::vector<AST_stmt*> body) {
}
}
if
(
source
->
ast
->
type
==
AST_TYPE
::
FunctionDef
)
{
// Unpack tuple arguments
// Tuple arguments get assigned names ".0", ".1" etc. So this
// def f(a, (b,c), (d,e)):
// would expand to:
// def f(a, .1, .2):
// (b, c) = .1
// (d, e) = .2
AST_arguments
*
args
=
ast_cast
<
AST_FunctionDef
>
(
source
->
ast
)
->
args
;
int
counter
=
0
;
for
(
AST_expr
*
arg_expr
:
args
->
args
)
{
if
(
arg_expr
->
type
==
AST_TYPE
::
Tuple
)
{
InternedString
arg_name
=
source
->
getInternedStrings
().
get
(
"."
+
std
::
to_string
(
counter
));
AST_Name
*
arg_name_expr
=
new
AST_Name
(
arg_name
,
AST_TYPE
::
Load
,
arg_expr
->
lineno
,
arg_expr
->
col_offset
);
visitor
.
pushAssign
(
arg_expr
,
arg_name_expr
);
}
counter
++
;
}
}
for
(
int
i
=
(
skip_first
?
1
:
0
);
i
<
body
.
size
();
i
++
)
{
if
(
!
visitor
.
curblock
)
break
;
...
...
src/core/types.h
View file @
551d925d
...
...
@@ -230,7 +230,7 @@ struct ParamNames {
std
::
vector
<
llvm
::
StringRef
>
args
;
llvm
::
StringRef
vararg
,
kwarg
;
explicit
ParamNames
(
AST
*
ast
);
explicit
ParamNames
(
AST
*
ast
,
InternedStringPool
&
pool
);
ParamNames
(
const
std
::
vector
<
llvm
::
StringRef
>&
args
,
llvm
::
StringRef
vararg
,
llvm
::
StringRef
kwarg
);
static
ParamNames
empty
()
{
return
ParamNames
();
}
...
...
@@ -305,7 +305,7 @@ public:
takes_varargs
(
takes_varargs
),
takes_kwargs
(
takes_kwargs
),
source
(
std
::
move
(
source
)),
param_names
(
this
->
source
->
ast
),
param_names
(
this
->
source
->
ast
,
this
->
source
->
getInternedStrings
()
),
always_use_version
(
NULL
),
code_obj
(
NULL
)
{
assert
(
num_args
>=
num_defaults
);
...
...
test/tests/arg_unpacking.py
View file @
551d925d
# expected: fail
def
f
((
a
,
b
)):
print
a
,
b
print
sorted
(
list
(
locals
().
iteritems
()))
f
(
range
(
2
))
f
((
1
,
2
))
def
g
(
a
,
(
b
,
c
),
d
,
(
e
,
f
),
(
g
,
(
h
,
i
),
j
)):
print
a
print
b
print
c
print
d
print
e
print
f
print
g
print
h
print
i
print
j
print
sorted
(
list
(
locals
().
iteritems
()))
g
(
1
,
(
2
,
3
),
4
,
(
5
,
6
),
(
7
,
(
8
,
9
),
10
))
test/unittests/analysis.cpp
View file @
551d925d
...
...
@@ -49,7 +49,7 @@ TEST_F(AnalysisTest, augassign) {
ASSERT_TRUE
(
liveness
->
isLiveAtEnd
(
module
->
interned_strings
->
get
(
"a"
),
block
));
}
std
::
unique_ptr
<
PhiAnalysis
>
phis
=
computeRequiredPhis
(
ParamNames
(
func
),
cfg
,
liveness
.
get
(),
scope_info
);
std
::
unique_ptr
<
PhiAnalysis
>
phis
=
computeRequiredPhis
(
ParamNames
(
func
,
si
->
getInternedStrings
()
),
cfg
,
liveness
.
get
(),
scope_info
);
}
void
doOsrTest
(
bool
is_osr
,
bool
i_maybe_undefined
)
{
...
...
@@ -93,7 +93,7 @@ void doOsrTest(bool is_osr, bool i_maybe_undefined) {
entry_descriptor
->
args
[
iter_str
]
=
NULL
;
phis
=
computeRequiredPhis
(
entry_descriptor
,
liveness
.
get
(),
scope_info
);
}
else
{
phis
=
computeRequiredPhis
(
ParamNames
(
func
),
cfg
,
liveness
.
get
(),
scope_info
);
phis
=
computeRequiredPhis
(
ParamNames
(
func
,
si
->
getInternedStrings
()
),
cfg
,
liveness
.
get
(),
scope_info
);
}
// First, verify that we require phi nodes for the block we enter into.
...
...
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