Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
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
Kirill Smelkov
cpython
Commits
85065935
Commit
85065935
authored
Feb 17, 2006
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove size constraints in SLICE opcodes.
parent
76845ede
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
19 deletions
+14
-19
Objects/classobject.c
Objects/classobject.c
+3
-3
Python/ceval.c
Python/ceval.c
+11
-16
No files found.
Objects/classobject.c
View file @
85065935
...
...
@@ -1170,7 +1170,7 @@ instance_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j)
return
NULL
;
arg
=
Py_BuildValue
(
"(N)"
,
sliceobj_from_intint
(
i
,
j
));
}
else
arg
=
Py_BuildValue
(
"(
ii
)"
,
i
,
j
);
arg
=
Py_BuildValue
(
"(
nn
)"
,
i
,
j
);
if
(
arg
==
NULL
)
{
Py_DECREF
(
func
);
...
...
@@ -1241,7 +1241,7 @@ instance_ass_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j, PyObject
arg
=
Py_BuildValue
(
"(N)"
,
sliceobj_from_intint
(
i
,
j
));
}
else
arg
=
Py_BuildValue
(
"(
ii
)"
,
i
,
j
);
arg
=
Py_BuildValue
(
"(
nn
)"
,
i
,
j
);
}
else
{
if
(
setslicestr
==
NULL
)
...
...
@@ -1262,7 +1262,7 @@ instance_ass_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j, PyObject
arg
=
Py_BuildValue
(
"(NO)"
,
sliceobj_from_intint
(
i
,
j
),
value
);
}
else
arg
=
Py_BuildValue
(
"(
ii
O)"
,
i
,
j
,
value
);
arg
=
Py_BuildValue
(
"(
nn
O)"
,
i
,
j
,
value
);
}
if
(
arg
==
NULL
)
{
Py_DECREF
(
func
);
...
...
Python/ceval.c
View file @
85065935
...
...
@@ -3851,8 +3851,9 @@ ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk)
}
/* Extract a slice index from a PyInt or PyLong, and store in *pi.
Silently reduce values larger than INT_MAX to INT_MAX, and silently
boost values less than -INT_MAX to 0. Return 0 on error, 1 on success.
Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX,
and silently boost values less than -PY_SSIZE_T_MAX to 0.
Return 0 on error, 1 on success.
*/
/* Note: If v is NULL, return success without storing into *pi. This
is because_PyEval_SliceIndex() is called by apply_slice(), which can be
...
...
@@ -3862,11 +3863,11 @@ int
_PyEval_SliceIndex
(
PyObject
*
v
,
Py_ssize_t
*
pi
)
{
if
(
v
!=
NULL
)
{
long
x
;
Py_ssize_t
x
;
if
(
PyInt_Check
(
v
))
{
x
=
PyInt_AsLong
(
v
);
}
else
if
(
PyLong_Check
(
v
))
{
x
=
Py
Long_AsLong
(
v
);
x
=
Py
Int_AsSsize_t
(
v
);
if
(
x
==-
1
&&
PyErr_Occurred
())
{
PyObject
*
long_zero
;
int
cmp
;
...
...
@@ -3883,8 +3884,8 @@ _PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi)
/* It's an overflow error, so we need to
check the sign of the long integer,
set the value to
INT_MAX or -INT_MAX,
and clear the error. */
set the value to
PY_SSIZE_T_MAX or
-PY_SSIZE_T_MAX,
and clear the error. */
/* Create a long integer with a value of 0 */
long_zero
=
PyLong_FromLong
(
0L
);
...
...
@@ -3898,21 +3899,15 @@ _PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi)
if
(
cmp
<
0
)
return
0
;
else
if
(
cmp
)
x
=
IN
T_MAX
;
x
=
PY_SSIZE_
T_MAX
;
else
x
=
-
IN
T_MAX
;
x
=
-
PY_SSIZE_
T_MAX
;
}
}
else
{
PyErr_SetString
(
PyExc_TypeError
,
"slice indices must be integers"
);
return
0
;
}
/* Truncate -- very long indices are truncated anyway */
/* XXX truncate by ssize maximum */
if
(
x
>
INT_MAX
)
x
=
INT_MAX
;
else
if
(
x
<
-
INT_MAX
)
x
=
-
INT_MAX
;
*
pi
=
x
;
}
return
1
;
...
...
@@ -3928,7 +3923,7 @@ apply_slice(PyObject *u, PyObject *v, PyObject *w) /* return u[v:w] */
PySequenceMethods
*
sq
=
tp
->
tp_as_sequence
;
if
(
sq
&&
sq
->
sq_slice
&&
ISINT
(
v
)
&&
ISINT
(
w
))
{
Py_ssize_t
ilow
=
0
,
ihigh
=
IN
T_MAX
;
Py_ssize_t
ilow
=
0
,
ihigh
=
PY_SSIZE_
T_MAX
;
if
(
!
_PyEval_SliceIndex
(
v
,
&
ilow
))
return
NULL
;
if
(
!
_PyEval_SliceIndex
(
w
,
&
ihigh
))
...
...
@@ -3955,7 +3950,7 @@ assign_slice(PyObject *u, PyObject *v, PyObject *w, PyObject *x)
PySequenceMethods
*
sq
=
tp
->
tp_as_sequence
;
if
(
sq
&&
sq
->
sq_slice
&&
ISINT
(
v
)
&&
ISINT
(
w
))
{
Py_ssize_t
ilow
=
0
,
ihigh
=
IN
T_MAX
;
Py_ssize_t
ilow
=
0
,
ihigh
=
PY_SSIZE_
T_MAX
;
if
(
!
_PyEval_SliceIndex
(
v
,
&
ilow
))
return
-
1
;
if
(
!
_PyEval_SliceIndex
(
w
,
&
ihigh
))
...
...
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