Implement py.DeleteAttr, py.NewStringDictSized and DELETE_ATTR, BUILD_MAP, STORE_MAP opcodes

Author: ncw

py/dict.go

@@ -24,6 +24,11 @@ func NewStringDict() StringDict{
 returnmake(StringDict)
 }
 
+// Make a new dictionary with reservation for n entries
+funcNewStringDictSized(nint) StringDict{
+returnmake(StringDict, n)
+}
+
 // Copy a dictionary
 func (dStringDict) Copy() StringDict{
 e:=make(StringDict, len(d))

py/internal.go

@@ -240,6 +240,53 @@ func SetAttr(self Object, keyObj Object, value Object) Object{
 panic(ExceptionNewf(TypeError, "attribute name must be string, not '%s'", self.Type().Name))
 }
 
+// DeleteAttrString
+funcDeleteAttrString(selfObject, keystring){
+// First look in type's dictionary etc for a property that could
+// be set - do this before looking in the instance dictionary
+deleter:=self.Type().NativeGetAttrOrNil(key)
+ifdeleter!=nil{
+// Call __set__ which writes properties etc
+ifI, ok:=deleter.(I__delete__); ok{
+I.M__delete__(self)
+return
+ }
+ }
+
+// If we have __delattr__ then use that
+ifI, ok:=self.(I__delattr__); ok{
+I.M__delattr__(key)
+return
+ } elseif_, ok:=TypeCall1(self, "__delattr__", String(key)); ok{
+return
+ }
+
+// Otherwise delete the attribute from the instance dictionary
+// if possible
+ifI, ok:=self.(IGetDict); ok{
+dict:=I.GetDict()
+ifdict==nil{
+panic(ExceptionNewf(SystemError, "nil Dict in %s", self.Type().Name))
+ }
+if_, ok:=dict[key]; ok{
+delete(dict, key)
+return
+ }
+ }
+
+// If not blow up
+panic(ExceptionNewf(AttributeError, "'%s' object has no attribute '%s'", self.Type().Name, key))
+}
+
+// DeleteAttr
+funcDeleteAttr(selfObject, keyObjObject){
+ifkey, ok:=keyObj.(String); ok{
+DeleteAttrString(self, string(key))
+return
+ }
+panic(ExceptionNewf(TypeError, "attribute name must be string, not '%s'", self.Type().Name))
+}
+
 // Call __next__ for the python object
 funcNext(selfObject) Object{
 ifI, ok:=self.(I__next__); ok{

vm/eval.go

@@ -727,7 +727,7 @@ func do_STORE_ATTR(vm *Vm, namei int32){
 // Implements del TOS.name, using namei as index into co_names.
 funcdo_DELETE_ATTR(vm*Vm, nameiint32){
 defervm.CheckException()
-vm.NotImplemented("DELETE_ATTR", namei)
+py.DeleteAttrString(vm.POP(), vm.frame.Code.Names[namei])
 }
 
 // Works as STORE_NAME, but stores the name as a global.
@@ -786,7 +786,7 @@ func do_BUILD_LIST(vm *Vm, count int32){
 // pre-sized to hold count entries.
 funcdo_BUILD_MAP(vm*Vm, countint32){
 defervm.CheckException()
-vm.NotImplemented("BUILD_MAP", count)
+vm.PUSH(py.NewStringDictSized(int(count)))
 }
 
 // Replaces TOS with getattr(TOS, co_names[namei]).
@@ -988,7 +988,12 @@ func do_SETUP_FINALLY(vm *Vm, delta int32){
 // while leaving the dictionary on the stack.
 funcdo_STORE_MAP(vm*Vm, argint32){
 defervm.CheckException()
-vm.NotImplemented("STORE_MAP", arg)
+key:=string(vm.TOP().(py.String)) // FIXME
+value:=vm.SECOND()
+dictObj:=vm.THIRD()
+vm.DROPN(2)
+dict:=dictObj.(py.StringDict)
+dict[key] =value
 }
 
 // Pushes a reference to the local co_varnames[var_num] onto the stack.