paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-02 20:26:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug ID #37537: External constant support

Browse Source 
git-svn-id: trunk@46361 -
This commit is contained in:
michael 2020-08-11 11:44:23 +00:00
parent b50734c037
commit cbb395fa0c
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/fcl-passrc/src/paswrite.pp
View File

@ -720,8 +720,9 @@ procedure TPasWriter.WriteConst(AConst: TPasConst);
Const
Seps : Array[Boolean] of Char = ('=',':');
Var
Decl : String;
Vart,Decl : String;
begin
PrepareDeclSection('const');
@ -731,15 +732,35 @@ begin
If Assigned(VarType) then
begin
If VarType.Name='' then
Decl:=VarType.GetDeclaration(False)
Vart:=VarType.GetDeclaration(False)
else
Decl:=VarType.SafeName;
Decl:=Decl+Modifiers;
Vart:=VarType.SafeName;
Decl:=Vart+Modifiers;
Vart:=LowerCase(Vart);
if (Value<>'') then
Decl:=Decl+' = '+Value;
Decl:=Decl+' = '+Value
else if ExportName<>Nil then // external name
case VarT of
'integer',
'byte',
'word',
'smallint',
'int64',
'nativeint',
'shortint',
'longint' : Decl:=Decl+' = 0';
'double',
'single',
'extended' : Decl:=Decl+' = 0.0';
'string' : Decl:=Decl+' = ''''';
else
if Pos('array',Vart)>0 then
Decl:=Decl+' = []';
end;
end
else
Decl:=Value;
Decl:=SafeName+' '+Seps[Assigned(VarType)]+' '+Decl;
if NotOption(woSkipHints) then
Decl:=Decl+HintsString;