Memory leak fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@16251 72102866-910b-0410-8b05-ffd578937521

Languages/Smalltalk/ChangeLog

@@ -1,3 +1,9 @@
+2003 Mar 25
+
+    * STSourceReader: added missing [super dealloc]
+    * STCompiledCode: do not retain bytecode data
+    * STCompiler: various memory leak fixes
+
 2003 Mar 23
 
     * STSourceReader: added some end of string checks

Languages/Smalltalk/STCompiledCode.m

@@ -39,11 +39,11 @@
 {
     [super init];
 
-    bytecodes = [[STBytecodes alloc] initWithData:RETAIN(data)];
+    bytecodes = [[STBytecodes alloc] initWithData:data];
     literals = RETAIN(anArray);
     tempCount = count;
     stackSize = size;
-    ASSIGN(externRefs,refs);
+    externRefs = RETAIN(refs);
 
     return self;
 }

Languages/Smalltalk/STCompiledMethod.m

@@ -26,7 +26,6 @@
 #import "STCompiledMethod.h"
 
 #import "STMessage.h"
-#import "STBytecodes.h"
 
 #import <StepTalk/STScripting.h>
 

Languages/Smalltalk/STCompiler.m

@@ -120,19 +120,16 @@ extern int STCparse(void *context);
 
 - (void)setEnvironment:(STEnvironment *)env
 {
-    if(!reader)
-    {
-        reader = [[STSourceReader alloc] init];
-    }
     ASSIGN(environment,env);
 }
 
 
 - (STCompiledScript *)compileString:(NSString *)aString
 {
-    NSString       *exceptionFmt = @"Syntax error at line %i near '%@', "
+    STCompiledScript *result;
+    NSString         *exceptionFmt = @"Syntax error at line %i near '%@', "
                                    @"reason: %@.";
-    int             parsRetval = 0;
+    int               parsRetval = 0;
 
 
     NSDebugLLog(@"STCompiler", @"Compile string", aString);
@@ -159,6 +156,9 @@ extern int STCparse(void *context);
     {
         if ([[localException name] isEqualToString: STCompilerSyntaxException])
         {
+            RELEASE(reader);
+            reader = nil;
+            
             [NSException  raise:STCompilerSyntaxException
                          format:exceptionFmt,
                                 [reader currentLine],
@@ -170,9 +170,13 @@ extern int STCparse(void *context);
     }
     NS_ENDHANDLER
 
+    RELEASE(receiverVars);
     RELEASE(reader);
+
+    result = script;
+    script = nil;
     
-    return script;
+    return AUTORELEASE(result);
 }
 
 - (void)compileMethod:(STCMethod *)method
@@ -204,8 +208,8 @@ extern int STCparse(void *context);
     tempVars = [NSMutableArray arrayWithArray:[messagePattern arguments]];
 
     code = [self compileStatements:[method statements]];
-    
-    compiledMethod = [STCompiledMethod methodWithCode:code 
+   
+    compiledMethod = [STCompiledMethod methodWithCode:AUTORELEASE(code)
                                        messagePattern:messagePattern];
                                        
     [script addMethod:compiledMethod];
@@ -217,6 +221,7 @@ extern int STCparse(void *context);
     int              count;
     int              i;
     
+    /* FIXME: create another class */
     [self initializeCompilationContext];
     
     NSDebugLLog(@"STCompiler", @"compiling statements");
@@ -256,6 +261,8 @@ extern int STCparse(void *context);
                               stackSize:stackSize
                        externReferences:externVars];
 
+    [self destroyCompilationContext];
+    
     return compiledCode;
 }
 
@@ -327,7 +334,7 @@ extern int STCparse(void *context);
 
     ref = [[STObjectReferenceLiteral alloc] initWithObjectName:varName
                                                       poolName:nil];
-    [externVars addObject:ref];
+    [externVars addObject:AUTORELEASE(ref)];
 
     return count;
 }
@@ -340,9 +347,26 @@ extern int STCparse(void *context);
 
 - (void) initializeCompilationContext
 {
-    byteCodes  = [NSMutableData  data];
-    externVars = [NSMutableArray array];
-    literals   = [NSMutableArray array];
+    RELEASE(byteCodes);
+    RELEASE(externVars);
+    RELEASE(literals);
+    byteCodes  = [[NSMutableData  alloc] init];
+    externVars = [[NSMutableArray alloc] init];
+    literals   = [[NSMutableArray alloc] init];
+    
+    stackSize = stackPos = 0;
+    tempsSize = tempsCount = 0;
+    bcpos = 0;
+}
+
+- (void) destroyCompilationContext
+{
+    RELEASE(byteCodes);
+    RELEASE(externVars);
+    RELEASE(literals);
+    byteCodes  = nil;
+    externVars = nil;
+    literals   = nil;
     
     stackSize = stackPos = 0;
     tempsSize = tempsCount = 0;

Languages/Smalltalk/STSourceReader.m

@@ -142,9 +142,8 @@ static NSString *_STNormalizeStringToken(NSString *token)
 - (void)dealloc
 {
     RELEASE(source);
+    [super dealloc];
 }
-
-
 - initWithString:(NSString *)aString
 {
     return [self initWithString:aString range:NSMakeRange(0,[aString length])];

Languages/Smalltalk/SmalltalkEngine.m

@@ -26,7 +26,6 @@
 
 #import "SmalltalkEngine.h"
 
-#import "STBytecodeInterpreter.h"
 #import "STCompiler.h"
 #import "STCompiledCode.h"
 #import "STCompiledScript.h"