paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 19:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Force ampersand in EscaleKeyword

Browse Source
This commit is contained in:
Michaël Van Canneyt 2021-12-07 16:33:07 +01:00
parent fa9d77e67e
commit 9af13b2731
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fcl-base/src/pascodegen.pp
View File

@ -66,7 +66,7 @@ Type
Procedure Indent; Procedure Indent;
Procedure Undent; Procedure Undent;
Function IsKeyWord (Const S : String) : Boolean; Function IsKeyWord (Const S : String) : Boolean;
Function EscapeKeyWord(Const S : String) : String; Function EscapeKeyWord(Const S : String; ForceAmpersand : Boolean = false) : String;
Function MakePascalString(S: String; AddQuotes: Boolean=False): String; Function MakePascalString(S: String; AddQuotes: Boolean=False): String;
Function PrettyPrint(Const S: string): String; Function PrettyPrint(Const S: string): String;
Procedure AddLn(Const Aline: string); Procedure AddLn(Const Aline: string);
@ -126,11 +126,14 @@ begin
Result:=Pos(';'+lowercase(S)+';',KW)<>0; Result:=Pos(';'+lowercase(S)+';',KW)<>0;
end; end;
function TPascalCodeGenerator.EscapeKeyWord(const S: String): String; function TPascalCodeGenerator.EscapeKeyWord(const S: String; ForceAmpersand : Boolean = false): String;
begin begin
Result:=S; Result:=S;
if IsKeyWord(S) then if IsKeyWord(S) then
Result:=KeywordPrefix+Result+KeywordSuffix if ForceAmpersand then
Result:='&'+Result
else
Result:=KeywordPrefix+Result+KeywordSuffix
end; end;
procedure TPascalCodeGenerator.AddLn(const Aline: string); procedure TPascalCodeGenerator.AddLn(const Aline: string);