MLKDynamicContext#+initialize: Fix various sources of crashes.

1 files changed, 7 insertions, 6 deletions

diff --git a/MLKPackage.m b/MLKPackage.m
index d7ac803..ec74fce 100644
--- a/MLKPackage.m
+++ b/MLKPackage.m
@@ -29,18 +29,19 @@
 static NSMutableDictionary *packages = nil;
 
 
-@implementation MLKPackage : MLKLispValue
+@implementation MLKPackage
++(void) initialize
+{
+  packages = [[NSMutableDictionary alloc] init];
+}
+
 -(MLKPackage *) initWithName:(NSString *)name
                    nicknames:(NSSet *)nicknames
 {
   int i;
   NSArray *e;
 
-  self = [self init];
-
-  // FIXME: Make this thread-safe.
-  if (!packages)
-    packages = [[NSMutableDictionary alloc] init];
+  self = [super init];
 
   [packages setObject:self forKey:name];