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
e891c285
Commit
e891c285
authored
Aug 04, 2014
by
Kevin Modzelewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
notes
parent
9146799c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
src/asm_writing/rewriter.cpp
src/asm_writing/rewriter.cpp
+2
-1
src/core/cfg.cpp
src/core/cfg.cpp
+0
-3
src/runtime/objmodel.cpp
src/runtime/objmodel.cpp
+5
-3
No files found.
src/asm_writing/rewriter.cpp
View file @
e891c285
...
...
@@ -878,7 +878,8 @@ assembler::Register Rewriter::allocReg(Location dest) {
if
(
vars_by_location
.
count
(
reg
)
==
0
)
return
reg
;
}
return
allocReg
(
assembler
::
R15
);
// seem as fine as any
// TODO maybe should do some sort of round-robin or LRU eviction strategy?
return
allocReg
(
assembler
::
R15
);
}
else
if
(
dest
.
type
==
Location
::
Register
)
{
assembler
::
Register
reg
(
dest
.
regnum
);
...
...
src/core/cfg.cpp
View file @
e891c285
...
...
@@ -579,9 +579,6 @@ private:
AST_expr
*
remapGeneratorExp
(
AST_GeneratorExp
*
node
)
{
assert
(
node
->
generators
.
size
());
// I don't think it's easy to determine by the user, but it looks like the first generator iterator gets
// evaluated in the parent scope / frame.
AST_expr
*
first
=
remapExpr
(
node
->
generators
[
0
]
->
iter
);
AST_FunctionDef
*
func
=
new
AST_FunctionDef
();
...
...
src/runtime/objmodel.cpp
View file @
e891c285
...
...
@@ -2640,12 +2640,14 @@ extern "C" Box* getitem(Box* value, Box* slice) {
if
(
rtn
==
NULL
)
{
// different versions of python give different error messages for this:
if
(
PYTHON_VERSION_MAJOR
==
2
&&
PYTHON_VERSION_MINOR
<
7
)
{
raiseExcHelper
(
TypeError
,
"'%s' object is unsubscriptable"
,
getTypeName
(
value
)
->
c_str
());
// 2.6.6
raiseExcHelper
(
TypeError
,
"'%s' object is unsubscriptable"
,
getTypeName
(
value
)
->
c_str
());
//
tested on
2.6.6
}
else
if
(
PYTHON_VERSION_MAJOR
==
2
&&
PYTHON_VERSION_MINOR
==
7
&&
PYTHON_VERSION_MICRO
<
3
)
{
raiseExcHelper
(
TypeError
,
"'%s' object is not subscriptable"
,
getTypeName
(
value
)
->
c_str
());
// 2.7.1
raiseExcHelper
(
TypeError
,
"'%s' object is not subscriptable"
,
getTypeName
(
value
)
->
c_str
());
// tested on 2.7.1
}
else
{
// Changed to this in 2.7.3:
raiseExcHelper
(
TypeError
,
"'%s' object has no attribute '__getitem__'"
,
getTypeName
(
value
)
->
c_str
());
// 2.7.3
getTypeName
(
value
)
->
c_str
());
//
tested on
2.7.3
}
}
...
...
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