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
1a62750e
Commit
1a62750e
authored
Nov 30, 2000
by
Moshe Zadka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added .first{item,value,key}() to dictionaries.
Complete with docos and tests. OKed by Guido.
parent
827bb9fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
90 additions
and
0 deletions
+90
-0
Doc/lib/libstdtypes.tex
Doc/lib/libstdtypes.tex
+12
-0
Lib/test/test_types.py
Lib/test/test_types.py
+6
-0
Objects/dictobject.c
Objects/dictobject.c
+72
-0
No files found.
Doc/lib/libstdtypes.tex
View file @
1a62750e
...
...
@@ -783,8 +783,12 @@ arbitrary objects):
\ttindex
{
has
_
key()
}
\ttindex
{
items()
}
\ttindex
{
keys()
}
\ttindex
{
firstitem()
}
\ttindex
{
firstkey()
}
\ttindex
{
update()
}
\ttindex
{
values()
}
\ttindex
{
firstvalue()
}
\ttindex
{
setdefault()
}
\ttindex
{
get()
}}
\begin{tableiii}
{
c|l|c
}{
code
}{
Operation
}{
Result
}{
Notes
}
...
...
@@ -804,11 +808,19 @@ arbitrary objects):
\lineiii
{
\var
{
a
}
.items()
}
{
a copy of
\var
{
a
}
's list of (
\var
{
key
}
,
\var
{
value
}
) pairs
}
{
(2)
}
\lineiii
{
\var
{
a
}
.firstitem()
}
{
a (
\var
{
key
}
,
\var
{
value
}
) pair, the first one in
\var
{
a
}
.items()
}
{
(2)
}
\lineiii
{
\var
{
a
}
.keys()
}{
a copy of
\var
{
a
}
's list of keys
}{
(2)
}
\lineiii
{
\var
{
a
}
.firstkey()
}
{
the first element in
\var
{
a
}
.keys()
}
{
(2)
}
\lineiii
{
\var
{
a
}
.update(
\var
{
b
}
)
}
{
\code
{
for k in
\var
{
b
}
.keys():
\var
{
a
}
[k] =
\var
{
b
}
[k]
}}
{
(3)
}
\lineiii
{
\var
{
a
}
.values()
}{
a copy of
\var
{
a
}
's list of values
}{
(2)
}
\lineiii
{
\var
{
a
}
.firstvalue()
}
{
the first element in
\var
{
a
}
.values()
}
\lineiii
{
\var
{
a
}
.get(
\var
{
k
}
\optional
{
,
\var
{
x
}}
)
}
{
\code
{
\var
{
a
}
[
\var
{
k
}
]
}
if
\code
{
\var
{
a
}
.has
_
key(
\var
{
k
}
)
}
,
else
\var
{
x
}}
...
...
Lib/test/test_types.py
View file @
1a62750e
...
...
@@ -265,3 +265,9 @@ if d['key'][0] <> 3:
d
.
setdefault
(
'key'
,
[]).
append
(
4
)
if
len
(
d
[
'key'
])
<>
2
:
raise
TestFailed
,
'present {} setdefault, w/ 2nd arg'
if
d
.
keys
()[
0
]
!=
d
.
firstkey
():
raise
TestFailed
,
'first key is not first in keys'
if
d
.
values
()[
0
]
!=
d
.
firstvalue
():
raise
TestFailed
,
'first value is not first in values'
if
d
.
items
()[
0
]
!=
d
.
firstitem
():
raise
TestFailed
,
'first item is not first in items'
Objects/dictobject.c
View file @
1a62750e
...
...
@@ -708,6 +708,75 @@ static PyMappingMethods dict_as_mapping = {
(
objobjargproc
)
dict_ass_sub
,
/*mp_ass_subscript*/
};
static
PyObject
*
dict_firstkey
(
register
dictobject
*
mp
,
PyObject
*
args
)
{
register
int
i
;
if
(
!
PyArg_NoArgs
(
args
))
return
NULL
;
if
(
mp
->
ma_used
==
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"empty dictionary"
);
return
NULL
;
}
for
(
i
=
0
;
i
<
mp
->
ma_size
;
i
++
)
{
if
(
mp
->
ma_table
[
i
].
me_value
!=
NULL
)
{
PyObject
*
key
=
mp
->
ma_table
[
i
].
me_key
;
Py_INCREF
(
key
);
return
key
;
}
}
}
static
PyObject
*
dict_firstvalue
(
register
dictobject
*
mp
,
PyObject
*
args
)
{
register
int
i
;
if
(
!
PyArg_NoArgs
(
args
))
return
NULL
;
if
(
mp
->
ma_used
==
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"empty dictionary"
);
return
NULL
;
}
for
(
i
=
0
;
i
<
mp
->
ma_size
;
i
++
)
{
if
(
mp
->
ma_table
[
i
].
me_value
!=
NULL
)
{
PyObject
*
value
=
mp
->
ma_table
[
i
].
me_value
;
Py_INCREF
(
value
);
return
value
;
}
}
}
static
PyObject
*
dict_firstitem
(
register
dictobject
*
mp
,
PyObject
*
args
)
{
register
int
i
;
if
(
!
PyArg_NoArgs
(
args
))
return
NULL
;
if
(
mp
->
ma_used
==
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"empty dictionary"
);
return
NULL
;
}
for
(
i
=
0
;
i
<
mp
->
ma_size
;
i
++
)
{
if
(
mp
->
ma_table
[
i
].
me_value
!=
NULL
)
{
PyObject
*
key
=
mp
->
ma_table
[
i
].
me_key
;
PyObject
*
value
=
mp
->
ma_table
[
i
].
me_value
;
PyObject
*
item
=
PyTuple_New
(
2
);
if
(
item
==
NULL
)
{
return
NULL
;
}
Py_INCREF
(
key
);
PyTuple_SetItem
(
item
,
0
,
key
);
Py_INCREF
(
value
);
PyTuple_SetItem
(
item
,
1
,
value
);
return
item
;
}
}
}
static
PyObject
*
dict_keys
(
register
dictobject
*
mp
,
PyObject
*
args
)
{
...
...
@@ -1162,6 +1231,9 @@ static PyMethodDef mapp_methods[] = {
{
"keys"
,
(
PyCFunction
)
dict_keys
},
{
"items"
,
(
PyCFunction
)
dict_items
},
{
"values"
,
(
PyCFunction
)
dict_values
},
{
"firstkey"
,
(
PyCFunction
)
dict_firstkey
},
{
"firstitem"
,
(
PyCFunction
)
dict_firstitem
},
{
"firstvalue"
,
(
PyCFunction
)
dict_firstvalue
},
{
"update"
,
(
PyCFunction
)
dict_update
},
{
"clear"
,
(
PyCFunction
)
dict_clear
},
{
"copy"
,
(
PyCFunction
)
dict_copy
},
...
...
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