Skip to content

Adding iterator method to Dict #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 3, 2019
Merged

Adding iterator method to Dict #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
93a9f40
Adding iterator method to Dict
kellrott May 17, 2019
abedc25
Fixing formatting
kellrott May 17, 2019
30a14d7
Adding test for dict iterator
kellrott May 17, 2019
f85056c
Adding some docs
kellrott May 24, 2019
7d9728d
Changing docs
kellrott May 28, 2019
6b49912
Fixing error in test
kellrott May 28, 2019
3604157
Extending dict __iter__ tests
kellrott May 28, 2019
a39291e
Adding items method to dict
kellrott Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions py/dict.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ var (
expectingDict = ExceptionNewf(TypeError, "a dict is required")
)

func init() {
StringDictType.Dict["items"] = MustNewMethod("items", func(self Object, args Tuple) (Object, error) {
sMap := self.(StringDict)
o := make([]Object, 0, len(sMap))
for k, v := range sMap {
o = append(o, Tuple{String(k), v})
}
return NewIterator(o), nil
}, 0, "items() -> list of D's (key, value) pairs, as 2-tuples")
}

// String to object dictionary
//
// Used for variables etc where the keys can only be strings
Expand Down Expand Up @@ -100,6 +111,15 @@ func (a StringDict) M__repr__() (Object, error) {
return String(out.String()), nil
}

// Returns a list of keys from the dict
func (d StringDict) M__iter__() (Object, error) {
o := make([]Object, 0, len(d))
for k := range d {
o = append(o, String(k))
}
return NewIterator(o), nil
}

func (d StringDict) M__getitem__(key Object) (Object, error) {
str, ok := key.(String)
if ok {
Expand Down
16 changes: 16 additions & 0 deletions py/tests/dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,20 @@
a = repr({"a":"b","c":5.5})
assert a == "{'a': 'b', 'c': 5.5}" or a == "{'c': 5.5, 'a': 'b'}"

doc="check __iter__"
a = {"a":"b","c":5.5}
l = list(iter(a))
assert "a" in l
assert "c" in l
assert len(l) == 2

doc="check items"
a = {"a":"b","c":5.5}
for k, v in a.items():
assert k in ["a", "c"]
if k == "a":
assert v == "b"
if k == "c":
assert v == 5.5

doc="finished"