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];
+         +' SubDesc='+ExpressionTypeDescNames[ExprType.SubDesc]
-  if ExprType.Context.Node<>nil then begin
+         +FindContextToString(ExprType.Context);
-    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;
 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,43 +572,45 @@ begin
   end;
   Parser.NextToken;
   Parser.CheckToken(toSymbol);
-  ObjectStartLine:=Parser.SourceLine;
+  if not Parser.TokenSymbolIs('END') then begin
-  ObjectNode.Name := '';
+    ObjectStartLine:=Parser.SourceLine;
-  ObjectNode.TypeName := Parser.TokenString;
+    ObjectNode.Name := '';
-  ObjectNode.TypeNamePosition:=Parser.SourcePos+1;
-  ObjectNode.ChildPos := -1;
-  Parser.NextToken;
-  if Parser.Token = ':' then begin
-    Parser.NextToken;
-    Parser.CheckToken(toSymbol);
-    ObjectNode.Name := ObjectNode.TypeName;
-    ObjectNode.NamePosition:=ObjectNode.TypeNamePosition;
     ObjectNode.TypeName := Parser.TokenString;
     ObjectNode.TypeNamePosition:=Parser.SourcePos+1;
+    ObjectNode.ChildPos := -1;
     Parser.NextToken;
-    if parser.Token = '[' then begin
+    if Parser.Token = ':' then begin
-      parser.NextToken;
+      Parser.NextToken;
-      ObjectNode.ChildPos := parser.TokenInt;
+      Parser.CheckToken(toSymbol);
-      parser.NextToken;
+      ObjectNode.Name := ObjectNode.TypeName;
-      parser.CheckToken(']');
+      ObjectNode.NamePosition:=ObjectNode.TypeNamePosition;
-      parser.NextToken;
+      ObjectNode.TypeName := Parser.TokenString;
+      ObjectNode.TypeNamePosition:=Parser.SourcePos+1;
+      Parser.NextToken;
+      if parser.Token = '[' then begin
+        parser.NextToken;
+        ObjectNode.ChildPos := parser.TokenInt;
+        parser.NextToken;
+        parser.CheckToken(']');
+        parser.NextToken;
+      end;
     end;
-  end;
 
-  // read property list
+    // read property list
-  while not (Parser.TokenSymbolIs('END')
+    while not (Parser.TokenSymbolIs('END')
-  or Parser.TokenSymbolIs('OBJECT')
+    or Parser.TokenSymbolIs('OBJECT')
-  or Parser.TokenSymbolIs('INHERITED')) do
+    or Parser.TokenSymbolIs('INHERITED')) do
-    ProcessProperty;
+      ProcessProperty;
 
-  // read child objects
+    // read child objects
-  while not Parser.TokenSymbolIs('END') do begin
+    while not Parser.TokenSymbolIs('END') do begin
-    if Parser.Token=toEOF then begin
+      if Parser.Token=toEOF then begin
-      Parser.Error('END not found for'
+        Parser.Error('END not found for'
-        +' object='+ObjectNode.Name+':'+ObjectNode.TypeName
+          +' object='+ObjectNode.Name+':'+ObjectNode.TypeName
-        +' starting at line '+IntToStr(ObjectStartLine));
+          +' starting at line '+IntToStr(ObjectStartLine));
+      end;
+      ProcessObject;
     end;
-    ProcessObject;
   end;
   Parser.NextToken; // Skip 'END' token
   

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 ',
+        if CompareIdentifiers('PopupMenu',PChar(Pointer(IdentName)))=0 then
-        //  ' Ident=',
+        DebugLn('FindLFMIdentifier A ',
-        //  '"'+GetIdentifier(Params.Identifier)+'"',
+          ' Ident=',
-        //  ' Context="'+ClassContext.Node.DescAsString,'" "',StringToPascalConst(copy(ClassContext.Tool.Src,ClassContext.Node.StartPos,20))+'"',
+          '"'+GetIdentifier(Params.Identifier)+'"',
-        //  ' File="'+ExtractFilename(ClassContext.Tool.MainFilename)+'"',
+          ' Context="'+ClassContext.Node.DescAsString,'" "',StringToPascalConst(copy(ClassContext.Tool.Src,ClassContext.Node.StartPos,20))+'"',
-        //  ' Flags=['+FindDeclarationFlagsAsString(Params.Flags)+']'
+          ' File="'+ExtractFilename(ClassContext.Tool.MainFilename)+'"',
-        //  );
+          ' Flags=['+FindDeclarationFlagsAsString(Params.Flags)+']'
+          );
         if ClassContext.Tool.FindIdentifierInContext(Params) then begin
-          IdentContext:=CreateFindContext(Params);
+          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
+      // check if identifier is a variable
-      if (not ChildContext.Node.Desc=ctnVarDefinition) then begin
+      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='')
+        if (CompareIdentifiers(PChar(VariableTypeName),
-        or (AnsiCompareText(VariableTypeName,LFMObject.TypeName)<>0) then begin
+                 PChar(LFMObject.TypeName))<>0)
+        then begin
           ChildContext.Node:=DefinitionNode;
           LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
                          VariableTypeName+' expected, but '+LFMObject.TypeName+' found.'

ide/idetranslations.pas

@@ -362,70 +362,75 @@ var
 begin
   Result:=false;
   ContentChanged:=false;
+  NewContent:=nil;
   try
-    e:=LineEnding;
+    try
-    NewContent:=TMemoryStream.Create;
+      e:=LineEnding;
+      NewContent:=TMemoryStream.Create;
 
-    // write header - needed by editors like poedit so they know what encoding
+      // write header - needed by editors like poedit so they know what encoding
-    //                to create
+      //                to create
-    WriteLine('msgid ""');
+      WriteLine('msgid ""');
-    WriteLine('msgstr ""');
+      WriteLine('msgstr ""');
-    WriteLine('"MIME-Version: 1.0\n"');
+      WriteLine('"MIME-Version: 1.0\n"');
-    WriteLine('"Content-Type: text/plain; charset=UTF-8\n"');
+      WriteLine('"Content-Type: text/plain; charset=UTF-8\n"');
-    WriteLine('"Content-Transfer-Encoding: 8bit\n"');
+      WriteLine('"Content-Transfer-Encoding: 8bit\n"');
-    WriteStr(e);
+      WriteStr(e);
 
-    Node:=TreeOfConstItems.FindLowest;
+      Node:=TreeOfConstItems.FindLowest;
-    while Node<>nil do begin
+      while Node<>nil do begin
-      item := TConstItem(Node.Data);
+        item := TConstItem(Node.Data);
 
-      // Convert string to C-style syntax
+        // Convert string to C-style syntax
-      s := '';
+        s := '';
-      for j := 1 to Length(item.Value) do begin
+        for j := 1 to Length(item.Value) do begin
-        c := item.Value[j];
+          c := item.Value[j];
-        case c of
+          case c of
-          #9:  s := s + '\t';
+            #9:  s := s + '\t';
-          #10: s := s + '\n';
+            #10: s := s + '\n';
-          #0..#8,#11..#31,#128..#255:
+            #0..#8,#11..#31,#128..#255:
-            s := s + '\' +
+              s := s + '\' +
-              Chr(Ord(c) shr 6 + 48) +
+                Chr(Ord(c) shr 6 + 48) +
-              Chr((Ord(c) shr 3) and 7 + 48) +
+                Chr((Ord(c) shr 3) and 7 + 48) +
-              Chr(Ord(c) and 7 + 48);
+                Chr(Ord(c) and 7 + 48);
-          '\': s := s + '\\';
+            '\': s := s + '\\';
-          '"': s := s + '\"';
+            '"': s := s + '\"';
-        else s := s + c;
+          else s := s + c;
+          end;
         end;
+
+        // Write msg entry
+        WriteStr('#: ');
+        WriteStr(item.ModuleName);
+        WriteStr(':');
+        WriteStr(item.ConstName);
+        WriteStr(e);
+        WriteStr('msgid "');
+        WriteStr(s);
+        WriteStr('"');
+        WriteStr(e);
+        WriteStr('msgstr ""');
+        WriteStr(e);
+        WriteStr(e);
+
+        Node:=TreeOfConstItems.FindSuccessor(Node);
       end;
 
-      // Write msg entry
+      NewContent.Position:=0;
-      WriteStr('#: ');
+      if CheckContentChange and FileExists(OutFilename) then begin
-      WriteStr(item.ModuleName);
+        OldContent:=TMemoryStream.Create;
-      WriteStr(':');
+        OldContent.LoadFromFile(OutFilename);
-      WriteStr(item.ConstName);
+        ContentChanged:=CompareMemStreamText(NewContent,OldContent);
-      WriteStr(e);
+        OldContent.Free;
-      WriteStr('msgid "');
+      end else begin
-      WriteStr(s);
+        ContentChanged:=true;
-      WriteStr('"');
+      end;
-      WriteStr(e);
+      if ContentChanged then
-      WriteStr('msgstr ""');
+        NewContent.SaveToFile(OutFilename);
-      WriteStr(e);
+      Result:=true;
-      WriteStr(e);
+    finally
-
+      NewContent.Free;
-      Node:=TreeOfConstItems.FindSuccessor(Node);
     end;
-
-    NewContent.Position:=0;
-    if CheckContentChange and FileExists(OutFilename) then begin
-      OldContent:=TMemoryStream.Create;
-      OldContent.LoadFromFile(OutFilename);
-      ContentChanged:=CompareMemStreamText(NewContent,OldContent);
-      OldContent.Free;
-    end else begin
-      ContentChanged:=true;
-    end;
-    if ContentChanged then
-      NewContent.SaveToFile(OutFilename);
-    Result:=true;
   except
     on E: Exception do begin
       DebugLn(['ConvertToGettextPO ',E.Message]);