Fix Delphi Linux StrToFloat build - #299
Open
MaxLogic wants to merge 1 commit into
Open
MaxLogic wants to merge 1 commit into
MaxLogic wants to merge 1 commit into
Conversation
Copy link
Copy Markdown
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
you can use DELPHI_LINUX condition like {$IFNDEF DELPHI_LINUX}
var
i: longint;
{$ENDIF}
begin
{$IFDEF DELPHI_LINUX}
Result := SysUtils.StrToFloat(string(s), TFormatSettings.Invariant);
{$ELSE}
Val(string(s), Result, i);
if i <> 0 then raise Exception.Create(RPS_InvalidFloat);
{$ENDIF}
end;
|
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This fixes a Delphi Linux build failure in uPSUtils.StrToFloat.
On Delphi/Linux, the current implementation calls:
where Result is Extended. That fails to compile because Delphi Linux does not support Extended as a distinct floating-point target in this context.
The patch keeps the existing Val implementation for Windows and FPC, and uses SysUtils.StrToFloat with invariant format settings only for Delphi/Linux. That preserves PascalScript's dot-decimal parsing behavior without changing the existing non-Linux path.
Verification
Verified in a downstream Delphi 12 project where the current upstream uPSUtils.pas failed during a Linux64 build with:
After this change, the same downstream execute Linux64 Release build completes successfully.