Skip to content
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

[WIP] Implement dict to receive Object as key #119

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] Implement dict to receive Object as key #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
185 changes: 185 additions & 0 deletions py/dict.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,81 @@
}
return nil, ExceptionNewf(KeyError, "%v", args[0])
}, 0, "gets(key, default) -> If there is a val corresponding to key, return val, otherwise default")

DictType.Dict["items"] = MustNewMethod("items", func(self Object, args Tuple) (Object, error) {
dict := self.(Dict)
o := make([]Object, 0, len(dict.keys))
for _, item := range dict.items {
if item[0] != nil {
o = append(o, Tuple{item[0], item[1]})

Check warning on line 69 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L65-L69 

Added lines #L65 - L69 were not covered by tests
}
}
return NewIterator(o), nil

Check warning on line 72 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L72 

Added line #L72 was not covered by tests
}, 0, "items() -> list of D's (key, value) pairs, as 2-tuples")

DictType.Dict["get"] = MustNewMethod("get", func(self Object, args Tuple) (Object, error) {
var length = len(args)
switch {
case length == 0:
return nil, ExceptionNewf(TypeError, "%s expected at least 1 arguments, got %d", "items()", length)
case length > 2:
return nil, ExceptionNewf(TypeError, "%s expected at most 2 arguments, got %d", "items()", length)

Check warning on line 81 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L76-L81 

Added lines #L76 - L81 were not covered by tests
}
dict := self.(Dict)
if res, ok := dict.keys[args[0]]; ok {
return dict.items[res][1], nil

Check warning on line 85 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L83-L85 

Added lines #L83 - L85 were not covered by tests
}

if length == 2 {
return args[1], nil

Check warning on line 89 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L88-L89 

Added lines #L88 - L89 were not covered by tests
}
return None, nil

Check warning on line 91 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L91 

Added line #L91 was not covered by tests
}, 0, "gets(key, default) -> If there is a val corresponding to key, return val, otherwise default")
}

// String to object dictionary
//
// Used for variables etc where the keys can only be strings
type StringDict map[string]Object

type Dict struct {
keys map[Object]int
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is the right representation alas...

Putting the Object as the key means that you are relying on how Go compares interfaces. It does this with a shallow compare. An interface is basically

  • pointer to type
  • pointer to data

so comparing two interfaces just compares the pointer to type and pointer to data - it doesn't compare the data.

This means that you could insert two objects eg py.String("hello") and py.String("hello") and these would both get inserted into the dictionary.

I think what we want as the key is

  • python type
  • hash of object

And the values need to be a []Object (because different objects can have the same hash).

Copy link
Contributor Author

@HyeockJinKim HyeockJinKim Oct 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no hash implementation, so I've got Object as key now.

We only receive hash values as key values. so I'm going to get int as the key.
What do you think about this way?

type Dict struct {
	keys  map[int]int  // int key

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think maybe we should try the really simple version first, then we can make it more efficient later

type dictEntry struct {
    key Object
    value Object
}
type Dict struct {
    entries []dictEntry 
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ncw, to be nit-picky, the way py.String is currently implemented, I believe this would work.
see:
https://play.golang.org/p/bDvOEmkim6r

(ie: py.String just contains values and no pointers.)

but ok with going with the KISS version first.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed! The problem comes when the py.Object interface is satisfied with a pointer: https://play.golang.org/p/vf4dGmh0Gb4

items [][2]Object // key-value pair
}

// Type of this StringDict object
func (o StringDict) Type() *Type {
return StringDictType
}

// Type of this Dict object
func (o Dict) Type() *Type {
return DictType

Check warning on line 112 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L111-L112 

Added lines #L111 - L112 were not covered by tests
}

// Make a new dictionary
func NewStringDict() StringDict {
return make(StringDict)
}

// Make a new dictionary
func NewDict() *Dict {
return &Dict{}

Check warning on line 122 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L121-L122 

Added lines #L121 - L122 were not covered by tests
}

// Make a new dictionary with reservation for n entries
func NewStringDictSized(n int) StringDict {
return make(StringDict, n)
}

// Make a new dictionary with reservation for n entries
func NewDictSized(n int) *Dict {
return &Dict{
keys: make(map[Object]int, n),
items: make([][2]Object, n),

Check warning on line 134 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L131-L134 

Added lines #L131 - L134 were not covered by tests
}
}

// Checks that obj is exactly a dictionary and returns an error if not
func DictCheckExact(obj Object) (StringDict, error) {
dict, ok := obj.(StringDict)
Expand All @@ -91,12 +144,27 @@
return dict, nil
}

// Checks that obj is exactly a dictionary and returns an error if not
func _DictCheckExact(obj Object) (*Dict, error) {
dict, ok := obj.(Dict)
if !ok {
return nil, expectingDict

Check warning on line 151 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L148-L151 

Added lines #L148 - L151 were not covered by tests
}
return &dict, nil

Check warning on line 153 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L153 

Added line #L153 was not covered by tests
}

// Checks that obj is exactly a dictionary and returns an error if not
func DictCheck(obj Object) (StringDict, error) {
// FIXME should be checking subclasses
return DictCheckExact(obj)
}

// Checks that obj is exactly a dictionary and returns an error if not
func _DictCheck(obj Object) (*Dict, error) {

Check warning on line 163 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L163 

Added line #L163 was not covered by tests
// FIXME should be checking subclasses
return _DictCheckExact(obj)

Check warning on line 165 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L165 

Added line #L165 was not covered by tests
}

// Copy a dictionary
func (d StringDict) Copy() StringDict {
e := make(StringDict, len(d))
Expand All @@ -106,10 +174,26 @@
return e
}

// Copy a dictionary
func (d Dict) Copy() *Dict {
e := NewDictSized(len(d.keys))
for k, v := range d.keys {
e.keys[k] = v
e.items[v][0] = d.items[v][0]
e.items[v][1] = d.items[v][1]

Check warning on line 183 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L178-L183 

Added lines #L178 - L183 were not covered by tests
}
return e

Check warning on line 185 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L185 

Added line #L185 was not covered by tests
}

func (a StringDict) M__str__() (Object, error) {
return a.M__repr__()
}


func (a Dict) M__str__() (Object, error) {
return a.M__repr__()

Check warning on line 194 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L193-L194 

Added lines #L193 - L194 were not covered by tests
}

func (a StringDict) M__repr__() (Object, error) {
var out bytes.Buffer
out.WriteRune('{')
Expand All @@ -135,6 +219,33 @@
return String(out.String()), nil
}

func (a Dict) M__repr__() (Object, error) {
var out bytes.Buffer
out.WriteRune('{')
spacer := false
for _, item := range a.items {
if item[0] != nil {
if spacer {
out.WriteString(", ")

Check warning on line 229 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L222-L229 

Added lines #L222 - L229 were not covered by tests
}
keyStr, err := ReprAsString(item[0])
if err != nil {
return nil, err

Check warning on line 233 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L231-L233 

Added lines #L231 - L233 were not covered by tests
}
valueStr, err := ReprAsString(item[1])
if err != nil {
return nil, err

Check warning on line 237 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L235-L237 

Added lines #L235 - L237 were not covered by tests
}
out.WriteString(keyStr)
out.WriteString(": ")
out.WriteString(valueStr)
spacer = true

Check warning on line 242 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L239-L242 

Added lines #L239 - L242 were not covered by tests
}
}
out.WriteRune('}')
return String(out.String()), nil

Check warning on line 246 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L245-L246 

Added lines #L245 - L246 were not covered by tests
}

// Returns a list of keys from the dict
func (d StringDict) M__iter__() (Object, error) {
o := make([]Object, 0, len(d))
Expand All @@ -144,6 +255,17 @@
return NewIterator(o), nil
}

// Returns a list of keys from the dict
func (d Dict) M__iter__() (Object, error) {
o := make([]Object, 0, len(d.keys))
for _, item := range d.items {
if item[0] != nil {
o = append(o, item[0])

Check warning on line 263 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L259-L263 

Added lines #L259 - L263 were not covered by tests
}
}
return NewIterator(o), nil

Check warning on line 266 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L266 

Added line #L266 was not covered by tests
}

func (d StringDict) M__getitem__(key Object) (Object, error) {
str, ok := key.(String)
if ok {
Expand All @@ -155,6 +277,15 @@
return nil, ExceptionNewf(KeyError, "%v", key)
}

func (d Dict) M__getitem__(key Object) (Object, error) {

Check warning on line 280 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L280 

Added line #L280 was not covered by tests
// FIXME should be checking hash of Object
res, ok := d.keys[key]
if ok {
return d.items[res][1], nil

Check warning on line 284 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L282-L284 

Added lines #L282 - L284 were not covered by tests
}
return nil, ExceptionNewf(KeyError, "%v", key)

Check warning on line 286 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L286 

Added line #L286 was not covered by tests
}

func (d StringDict) M__setitem__(key, value Object) (Object, error) {
str, ok := key.(String)
if !ok {
Expand All @@ -164,6 +295,13 @@
return None, nil
}

func (d Dict) M__setitem__(key, value Object) (Object, error) {

Check warning on line 298 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L298 

Added line #L298 was not covered by tests
// FIXME should be checking hash of Object
d.keys[key] = len(d.items)
d.items = append(d.items, [2]Object{key, value})
return None, nil

Check warning on line 302 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L300-L302 

Added lines #L300 - L302 were not covered by tests
}

func (a StringDict) M__eq__(other Object) (Object, error) {
b, ok := other.(StringDict)
if !ok {
Expand All @@ -188,6 +326,41 @@
return True, nil
}

func (a Dict) M__eq__(other Object) (Object, error) {
b, ok := other.(Dict)
if !ok {
return NotImplemented, nil

Check warning on line 332 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L329-L332 

Added lines #L329 - L332 were not covered by tests
}
if len(a.keys) != len(b.keys) {
return False, nil

Check warning on line 335 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L334-L335 

Added lines #L334 - L335 were not covered by tests
}
for k, ai := range a.keys {

Check warning on line 337 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L337 

Added line #L337 was not covered by tests
// FIXME should be checking hash of Object
bi, ok := b.keys[k]
if !ok || len(a.keys) < ai || len(b.keys) < bi {
return False, nil

Check warning on line 341 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L339-L341 

Added lines #L339 - L341 were not covered by tests
}
aitem := a.items[ai]
bitem := b.items[bi]

Check warning on line 344 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L343-L344 

Added lines #L343 - L344 were not covered by tests

res, err := Eq(aitem[0], bitem[0])
if err != nil {
return nil, err

Check warning on line 348 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L346-L348 

Added lines #L346 - L348 were not covered by tests
}
if res == False {
return False, nil

Check warning on line 351 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L350-L351 

Added lines #L350 - L351 were not covered by tests
}
res, err = Eq(aitem[1], bitem[1])
if err != nil {
return nil, err

Check warning on line 355 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L353-L355 

Added lines #L353 - L355 were not covered by tests
}
if res == False {
return False, nil

Check warning on line 358 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L357-L358 

Added lines #L357 - L358 were not covered by tests
}
}
return True, nil

Check warning on line 361 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L361 

Added line #L361 was not covered by tests
}

func (a StringDict) M__ne__(other Object) (Object, error) {
res, err := a.M__eq__(other)
if err != nil {
Expand All @@ -202,6 +375,10 @@
return True, nil
}

func (a Dict) M__ne__(other Object) (Object, error) {
return notEq(a.M__eq__(other))

Check warning on line 379 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L378-L379 

Added lines #L378 - L379 were not covered by tests
}

func (a StringDict) M__contains__(other Object) (Object, error) {
key, ok := other.(String)
if !ok {
Expand All @@ -213,3 +390,11 @@
}
return False, nil
}

func (a Dict) M__contains__(other Object) (Object, error) {

Check warning on line 394 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L394 

Added line #L394 was not covered by tests
// FIXME should be checking hash of Object
if i, ok := a.keys[other]; ok {
return Eq(other, a.items[i][0])

Check warning on line 397 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L396-L397 

Added lines #L396 - L397 were not covered by tests
}
return False, nil

Check warning on line 399 in py/dict.go

View check run for this annotation

Codecov / codecov/patch

py/dict.go#L399 

Added line #L399 was not covered by tests
}