vm: stop dict literals or dict comp panicing with non string keys

Author: ncw

notes.txt

@@ -30,7 +30,6 @@ FIXME recursive types for __repr__ in list, dict, tuple
 Limitations & Missing parts
 ===========================
   * string keys only in dictionaries
-    * intermediate fix - stop it panicing!
   * line numbers missing in SyntaxErrors
   * \N{...} escapes not implemented
   * lots of builtins still to implement

py/dict.go

@@ -20,6 +20,7 @@ dict(**kwargs) -> new dictionary initialized with the name=value pairs
 var (
 	StringDictType = NewType("dict", dictDoc)
 	DictType       = NewType("dict", dictDoc)
+	expectingDict  = ExceptionNewf(TypeError, "Expecting dict")
 )
 
 // String to object dictionary
@@ -42,6 +43,15 @@ func NewStringDictSized(n int) StringDict {
 	return make(StringDict, n)
 }
 
+// Checks that obj is exactly a dictionary and returns an error if not
+func DictCheckExact(obj Object) (StringDict, error) {
+	dict, ok := obj.(StringDict)
+	if !ok {
+		return nil, expectingDict
+	}
+	return dict, nil
+}
+
 // Copy a dictionary
 func (d StringDict) Copy() StringDict {
 	e := make(StringDict, len(d))

vm/eval.go

@@ -574,14 +574,13 @@ func do_MAP_ADD(vm *Vm, i int32) error {
 	key := vm.TOP()
 	value := vm.SECOND()
 	vm.DROPN(2)
-	dict := vm.PEEK(int(i))
-	// FIXME assert(PyDict_CheckExact(dict));
-	// err = PyDict_SetItem(map, key, value);  /* v[w] = u */
-	_, err := py.SetItem(dict, key, value)
+	dictObj := vm.PEEK(int(i))
+	dict, err := py.DictCheckExact(dictObj)
 	if err != nil {
 		return err
 	}
-	return nil
+	_, err = dict.M__setitem__(key, value)
+	return err
 }
 
 // Returns with TOS to the caller of the function.
@@ -1233,13 +1232,16 @@ func do_SETUP_FINALLY(vm *Vm, delta int32) error {
 // Store a key and value pair in a dictionary. Pops the key and value
 // while leaving the dictionary on the stack.
 func do_STORE_MAP(vm *Vm, arg int32) error {
-	key := string(vm.TOP().(py.String)) // FIXME
+	key := vm.TOP()
 	value := vm.SECOND()
 	dictObj := vm.THIRD()
 	vm.DROPN(2)
-	dict := dictObj.(py.StringDict)
-	dict[key] = value
-	return nil
+	dict, err := py.DictCheckExact(dictObj)
+	if err != nil {
+		return err
+	}
+	_, err = dict.M__setitem__(key, value)
+	return err
 }
 
 // Pushes a reference to the local co_varnames[var_num] onto the stack.