Changeset 67

Timestamp:

Jul 19, 2012, 8:44:08 AM (12 years ago)

Author:

chronos

Message:

• Fixed: Memory leaks in expression analyze.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzerPascal.pas (modified) (2 diffs)
• TranspascalCompiler.lpk (modified) (1 diff)
• TranspascalCompiler.pas (modified) (1 diff)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -155 +155 @@
   try
     Expressions := TListExpression.Create;
-    Expressions.OwnsObjects := False;
     Expressions.Add(TExpression.Create);
     with SourceCode do begin
@@ -180 +179 @@
             TExpression(Expressions[I - 1]).SubItems.Last := Expressions[I];
             TExpression(Expressions[I + 1]).SubItems.First := Expressions[I];
+            Expressions.OwnsObjects := False;
+            Expressions[I] := nil;
+            Expressions.OwnsObjects := True;
             Expressions.Delete(I);
           end else Inc(I);
         end;
       end;
-      if Assigned(TExpression(Expressions.First).SubItems.Last) then
+      if Assigned(TExpression(Expressions.First).SubItems.Last) then begin
         Assign(TExpression(TExpression(Expressions.First).SubItems.Last));
+        SubItems.OwnsObjects := True;
+        TExpression(TExpression(Expressions.First).SubItems.Last).SubItems.OwnsObjects := False;
+        TExpression(Expressions.First).SubItems.Last.Free;
+      end;
       TExpression(Expressions.First).SubItems.Last := nil;
       if Expressions.Count > 1 then

trunk/Compiler/TranspascalCompiler.lpk

@@ -72 +72 @@
       </Item11>
       <Item12>
+        <Filename Value="Target\GCC\UTargetGCC.pas"/>
+        <UnitName Value="UTargetGCC"/>
+      </Item12>
+      <Item13>
         <Filename Value="Target\GCC\UProducerGCC.pas"/>
         <UnitName Value="UProducerGCC"/>
-      </Item12>
-      <Item13>
-        <Filename Value="Target\GCC\UTargetGCC.pas"/>
-        <UnitName Value="UTargetGCC"/>
       </Item13>
       <Item14>

trunk/Compiler/TranspascalCompiler.pas

@@ -10 +10 @@
   UCompiler, USourceCode, UProducer, UAnalyzer, UTarget, UExecutor, 
   UAnalyzerPascal, UTargets, UProducerDynamicc, UProducerASM8051, 
-  UTargetASM8051, UProducerGCC, UTargetGCC, UProducerPascal, UTargetDelphi, 
+  UTargetASM8051, UTargetGCC, UProducerGCC, UProducerPascal, UTargetDelphi, 
   UTargetPHP, UTargetJava, UTargetXML, UTargetInterpretter, UTargetNASM, 
   LazarusPackageIntf;