mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add marshalling for dictionaries.

Browse source
This commit is contained in:
Guido van Rossum 1991-06-07 13:58:22 +00:00
parent 65481401b1
commit 64b4552069
1 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Python/marshal.c
View file

@ -125,6 +125,22 @@ wr_object(v, fp)
wr_object(getlistitem(v, (int)i), fp); wr_object(getlistitem(v, (int)i), fp);
} }
} }
else if (is_dictobject(v)) {
wr_byte(TYPE_DICT, fp);
/* This one is NULL object terminated! */
n = getdictsize(v);
for (i = 0; i < n; i++) {
object *key, *val;
extern object *getdict2key();
key = getdict2key(v, (int)i);
if (key != NULL) {
val = dictlookup(v, getstringvalue(key));
wr_object(key, fp);
wr_object(val, fp);
}
}
wr_object((object *)NULL, fp);
}
else if (is_codeobject(v)) { else if (is_codeobject(v)) {
codeobject *co = (codeobject *)v; codeobject *co = (codeobject *)v;
wr_byte(TYPE_CODE, fp); wr_byte(TYPE_CODE, fp);
@ -261,6 +277,22 @@ rd_object(fp)
setlistitem(v, (int)i, rd_object(fp)); setlistitem(v, (int)i, rd_object(fp));
return v; return v;
case TYPE_DICT:
v = newdictobject();
if (v == NULL)
return NULL;
for (;;) {
object *key, *val;
key = rd_object(fp);
if (key == NULL)
break;
val = rd_object(fp);
dict2insert(v, key, val);
DECREF(key);
XDECREF(val);
}
return v;
case TYPE_CODE: case TYPE_CODE:
{ {
object *code = rd_object(fp); object *code = rd_object(fp);
@ -288,7 +320,7 @@ rd_object(fp)
} }
} }
/* The rest is meant to test only... */ /* And an interface for Python programs... */
static object * static object *
dump(self, args) dump(self, args)