fixed mem leak

git-svn-id: trunk@10452 -

components/codetools/finddeclarationtool.pas

@@ -748,6 +748,7 @@ function ExprTypeToString(const ExprType: TExpressionType): string;
 function CreateExpressionType(const Desc, SubDesc: TExpressionTypeDesc;
   const Context: TFindContext): TExpressionType;
 
+function FindContextToString(const FindContext: TFindContext): string;
 function CreateFindContext(NewTool: TFindDeclarationTool;
   NewNode: TCodeTreeNode): TFindContext;
 function CreateFindContext(Params: TFindDeclarationParams): TFindContext;
@@ -915,24 +916,10 @@ begin
 end;
 
 function ExprTypeToString(const ExprType: TExpressionType): string;
-var
-  IdentNode: TCodeTreeNode;
 begin
   Result:='Desc='+ExpressionTypeDescNames[ExprType.Desc]
-         +' SubDesc='+ExpressionTypeDescNames[ExprType.SubDesc];
-  if ExprType.Context.Node<>nil then begin
-    Result:=Result+' Node='+ExprType.Context.Node.DescAsString;
-    IdentNode:=ExprType.Context.Node;
-    while (IdentNode<>nil) do begin
-      if IdentNode.Desc in AllIdentifierDefinitions then begin
-        Result:=Result+' Ident="'+
-          ExprType.Context.Tool.ExtractIdentifier(IdentNode.StartPos)+'"';
-        break;
-      end;
-      IdentNode:=IdentNode.Parent;
-    end;
-    Result:=Result+' File="'+ExprType.Context.Tool.MainFilename+'"';
-  end;
+         +' SubDesc='+ExpressionTypeDescNames[ExprType.SubDesc]
+         +FindContextToString(ExprType.Context);
 end;
 
 function CreateExpressionType(const Desc, SubDesc: TExpressionTypeDesc;
@@ -945,6 +932,40 @@ end;
 
 { TFindContext }
 
+function FindContextToString(const FindContext: TFindContext): string;
+var
+  IdentNode: TCodeTreeNode;
+  Caret: TCodeXYPosition;
+begin
+  Result:='';
+  if FindContext.Node<>nil then begin
+    Result:=Result+'Node='+FindContext.Node.DescAsString;
+    IdentNode:=FindContext.Node;
+    while (IdentNode<>nil) do begin
+      if IdentNode.Desc in AllIdentifierDefinitions then begin
+        Result:=Result+' Ident="'+
+          FindContext.Tool.ExtractIdentifier(IdentNode.StartPos)+'"';
+        break;
+      end;
+      if IdentNode.Desc=ctnProperty then begin
+        Result:=Result+' PropName="'+
+          FindContext.Tool.ExtractPropName(IdentNode,false)+'"';
+        break;
+      end;
+      IdentNode:=IdentNode.Parent;
+    end;
+    if FindContext.Tool<>nil then begin
+      if FindContext.Tool.CleanPosToCaret(FindContext.Node.StartPos,Caret) then
+      begin
+        Result:=Result+' File='+Caret.Code.Filename
+                +'('+IntToStr(Caret.Y)+','+IntToStr(Caret.X)+')';
+      end else begin
+        Result:=Result+' File="'+FindContext.Tool.MainFilename+'"';
+      end;
+    end;
+  end;
+end;
+
 function CreateFindContext(NewTool: TFindDeclarationTool;
   NewNode: TCodeTreeNode): TFindContext;
 begin

components/codetools/lfmtrees.pas

@@ -564,7 +564,6 @@ var
 begin
   CreateChildNode(TLFMObjectNode);
   ObjectNode:=TLFMObjectNode(CurNode);
-  //DebugLn('TLFMTree.ProcessObject A ',Parser.TokenString);
   if Parser.TokenSymbolIs('OBJECT') then
     ObjectNode.IsInherited := False
   else begin
@@ -573,6 +572,7 @@ begin
   end;
   Parser.NextToken;
   Parser.CheckToken(toSymbol);
+  if not Parser.TokenSymbolIs('END') then begin
     ObjectStartLine:=Parser.SourceLine;
     ObjectNode.Name := '';
     ObjectNode.TypeName := Parser.TokenString;
@@ -611,6 +611,7 @@ begin
       end;
       ProcessObject;
     end;
+  end;
   Parser.NextToken; // Skip 'END' token
   
   CloseChildNode;

components/codetools/stdcodetools.pas

@@ -1639,15 +1639,37 @@ var
       Params.ContextNode:=ClassContext.Node;
       Params.SetIdentifier(ClassContext.Tool,PChar(Pointer(IdentName)),nil);
       try
-        //DebugLn('FindLFMIdentifier A ',
-        //  ' Ident=',
-        //  '"'+GetIdentifier(Params.Identifier)+'"',
-        //  ' Context="'+ClassContext.Node.DescAsString,'" "',StringToPascalConst(copy(ClassContext.Tool.Src,ClassContext.Node.StartPos,20))+'"',
-        //  ' File="'+ExtractFilename(ClassContext.Tool.MainFilename)+'"',
-        //  ' Flags=['+FindDeclarationFlagsAsString(Params.Flags)+']'
-        //  );
+        if CompareIdentifiers('PopupMenu',PChar(Pointer(IdentName)))=0 then
+        DebugLn('FindLFMIdentifier A ',
+          ' Ident=',
+          '"'+GetIdentifier(Params.Identifier)+'"',
+          ' Context="'+ClassContext.Node.DescAsString,'" "',StringToPascalConst(copy(ClassContext.Tool.Src,ClassContext.Node.StartPos,20))+'"',
+          ' File="'+ExtractFilename(ClassContext.Tool.MainFilename)+'"',
+          ' Flags=['+FindDeclarationFlagsAsString(Params.Flags)+']'
+          );
         if ClassContext.Tool.FindIdentifierInContext(Params) then begin
+          repeat
             IdentContext:=CreateFindContext(Params);
+        if CompareIdentifiers('PopupMenu',PChar(Pointer(IdentName)))=0 then
+          DebugLn(['FindLFMIdentifier ',FindContextToString(IdentContext)]);
+            if (IdentContext.Node<>nil)
+            and (IdentContext.Node.Desc=ctnProperty)
+            and (IdentContext.Tool.PropNodeIsTypeLess(IdentContext.Node)) then
+            begin
+              // this is a typeless property -> search further
+              DebugLn(['FindLFMIdentifier property ',FindContextToString(IdentContext),' is typeless searching further ...']);
+              Params.Flags:=[fdfSearchInAncestors,fdfExceptionOnNotFound,
+                             fdfExceptionOnPredefinedIdent,
+                             fdfIgnoreMissingParams,
+                             fdfIgnoreCurContextNode,
+                             fdfIgnoreOverloadedProcs];
+              Params.ContextNode:=IdentContext.Node;
+              Params.SetIdentifier(ClassContext.Tool,PChar(Pointer(IdentName)),nil);
+              if not IdentContext.Tool.FindIdentifierInContext(Params) then
+                break;
+            end else
+              break;
+          until false;
         end;
       except
         // ignore search/parse errors
@@ -1818,8 +1840,8 @@ var
         exit;
       end;
 
-      // check if identifier is variable
-      if (not ChildContext.Node.Desc=ctnVarDefinition) then begin
+      // check if identifier is a variable
+      if (ChildContext.Node.Desc <> ctnVarDefinition) then begin
         LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
                          LFMObjectName+' is not a variable'
                          +CreateFootNote(ChildContext),
@@ -1841,8 +1863,9 @@ var
       if LFMObject.TypeName<>'' then begin
         VariableTypeName:=ChildContext.Tool.ExtractDefinitionNodeType(
                                                                ChildContext.Node);
-        if (VariableTypeName='')
-        or (AnsiCompareText(VariableTypeName,LFMObject.TypeName)<>0) then begin
+        if (CompareIdentifiers(PChar(VariableTypeName),
+                 PChar(LFMObject.TypeName))<>0)
+        then begin
           ChildContext.Node:=DefinitionNode;
           LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
                          VariableTypeName+' expected, but '+LFMObject.TypeName+' found.'

ide/idetranslations.pas

@@ -362,6 +362,8 @@ var
 begin
   Result:=false;
   ContentChanged:=false;
+  NewContent:=nil;
+  try
     try
       e:=LineEnding;
       NewContent:=TMemoryStream.Create;
@@ -426,6 +428,9 @@ begin
       if ContentChanged then
         NewContent.SaveToFile(OutFilename);
       Result:=true;
+    finally
+      NewContent.Free;
+    end;
   except
     on E: Exception do begin
       DebugLn(['ConvertToGettextPO ',E.Message]);