//
// Dict.cc
//
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
#pragma implementation
#endif
// Dict
//------------------------------------------------------------------------
-Dict::Dict() {
+Dict::Dict(XRef *xrefA) {
+ xref = xrefA;
entries = NULL;
size = length = 0;
ref = 1;
}
void Dict::add(char *key, Object *val) {
- if (length + 1 > size) {
- size += 8;
- entries = (DictEntry *)grealloc(entries, size * sizeof(DictEntry));
+ if (length == size) {
+ if (length == 0) {
+ size = 8;
+ } else {
+ size *= 2;
+ }
+ entries = (DictEntry *)greallocn(entries, size, sizeof(DictEntry));
}
entries[length].key = key;
entries[length].val = *val;
Object *Dict::lookup(char *key, Object *obj) {
DictEntry *e;
- return (e = find(key)) ? e->val.fetch(obj) : obj->initNull();
+ return (e = find(key)) ? e->val.fetch(xref, obj) : obj->initNull();
}
Object *Dict::lookupNF(char *key, Object *obj) {
}
Object *Dict::getVal(int i, Object *obj) {
- return entries[i].val.fetch(obj);
+ return entries[i].val.fetch(xref, obj);
}
Object *Dict::getValNF(int i, Object *obj) {