paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 14:20:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fixed guesstype of copy()

Browse Source 
git-svn-id: branches/fixes_1_8@54822 -
This commit is contained in:
mattias 2017-05-07 09:14:06 +00:00
parent c79ff882eb
commit 80e13cc0af
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/codetools/finddeclarationtool.pas
View File

@ -158,7 +158,7 @@ type
fdfExceptionOnNotFound, // raise exception if identifier not found
// predefined identifiers will not raise
fdfExceptionOnPredefinedIdent,// raise an exception even if the identifier
// is an predefined identifier
// is a predefined identifier
fdfIgnoreClassVisibility,//find inaccessible private+protected fields
@ -9130,10 +9130,11 @@ var
end;
end;
end;
// find sub identifier
// find identifier
if not IdentFound then begin
if not (ExprType.Desc in [xtContext,xtNone]) then
begin
// find special sub identifier
if (ExprType.Desc in xtAllTypeHelperTypes) then
begin
// found predefined basic type (e.g. string) without a context!
@ -9176,6 +9177,7 @@ var
end;
end else
begin
// find identifier
if ExprType.Desc=xtContext then
Context:=ExprType.Context
else
@ -10253,7 +10255,8 @@ begin
begin
if (ParamList.Count<1) or (ParamList.Count>3) or (Scanner.Values.IsDefined('VER1_0')) then
exit;
Result:=ParamList.Items[0]; // Copy sets the result based on the first parameter (can be any kind of string or array)
Result:=ParamList.Items[0]; // Copy sets the result based on the first
// parameter (can be any kind of string or array)
end
else if (CompareIdentifiers(IdentPos,'OBJCSELECTOR')=0) then
begin

3
components/codetools/keywordfunclists.pas
View File

@ -1683,6 +1683,7 @@ begin
Add('BYTEBOOL' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CHAR' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('COMP' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('COPY' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CURRENCY' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DOUBLE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('EXIT' ,{$ifdef FPC}@{$endif}AllwaysTrue);
@ -1731,6 +1732,7 @@ begin
Add('CARDINAL' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CHAR' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('COMP' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('COPY' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CONTINUE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CURRENCY' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DOUBLE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
@ -1782,6 +1784,7 @@ begin
Add('BYTEBOOL' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CHAR' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CONTINUE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('COPY' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DOUBLE' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('EXIT' ,{$ifdef FPC}@{$endif}AllwaysTrue);
Add('FALSE' ,{$ifdef FPC}@{$endif}AllwaysTrue);