Skip to content

Restore Delphi 7 compatibility #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TetzkatLipHoka wants to merge 1 commit into
base: master
Choose a base branch
from
+72 −13
Open

Restore Delphi 7 compatibility #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions Source/uPSCompiler.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1945,7 +1945,7 @@ function BlockWriteVariant(BlockInfo: TPSBlockInfo; p: PIfRVariant{$IFNDEF PS_NO
if ExecIs64Bit then begin
{$IFNDEF CPU64}
{ On 64-bit Exec, Extended is an alias for Double, so write a Double instead }
TempDouble := tbtDouble(p^.textended);
TempDouble := p^.textended; { conversion; a tbtDouble() cast fails on Delphi 7 }
BlockWriteData(BlockInfo, TempDouble, sizeof(tbtDouble));
{$ELSE}
BlockWriteData(BlockInfo, p^.textended, sizeof(tbtExtended));
Expand Down Expand Up @@ -10214,9 +10214,9 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
TPSValueData(Result).Data^.ts64 := High(tbtS64);
btU64:
if Backwards then
TPSValueData(Result).Data^.tu64 := Low(tbtU64)
else
TPSValueData(Result).Data^.tu64 := High(tbtU64);
TPSValueData(Result).Data^.tu64 := 0
else // all-ones = High(tbtU64); D7 cannot evaluate that as a constant
TPSValueData(Result).Data^.tu64 := not tbtU64(0);
{$ENDIF}
else
begin
Expand All @@ -10232,14 +10232,20 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
Does not free finVal. See also EmitForExitCheck. }
begin
if not (PreWriteOutRec(VariableVar, nil) and PreWriteOutRec(finVal, nil)) then
Exit(False);
begin
Result := False;
Exit;
end;
BlockWriteByte(BlockInfo, CM_CO);
if Backwards then
BlockWriteByte(BlockInfo, 0) { >= }
else
BlockWriteByte(BlockInfo, 1); { <= }
if not (WriteOutRec(TempBool, False) and WriteOutRec(VariableVar, True) and WriteOutRec(finVal, True)) then
Exit(False);
begin
Result := False;
Exit;
end;
AfterWriteOutRec(finVal);
AfterWriteOutRec(VariableVar);
BlockWriteByte(BlockInfo, Cm_CNG);
Expand All @@ -10260,18 +10266,23 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
BoundaryValue := CreateForBoundaryValue;
ExitCheckEmitted := BoundaryValue <> nil;
if BoundaryValue = nil then
Exit(True);
begin
Result := True;
Exit;
end;
if not (PreWriteOutRec(VariableVar, nil) and PreWriteOutRec(BoundaryValue, nil)) then
begin
BoundaryValue.Free;
Exit(False);
Result := False;
Exit;
end;
BlockWriteByte(BlockInfo, CM_CO);
BlockWriteByte(BlockInfo, 5); { = }
if not (WriteOutRec(TempBool, False) and WriteOutRec(VariableVar, True) and WriteOutRec(BoundaryValue, True)) then
begin
BoundaryValue.Free;
Exit(False);
Result := False;
Exit;
end;
AfterWriteOutRec(BoundaryValue);
AfterWriteOutRec(VariableVar);
Expand Down Expand Up @@ -12001,7 +12012,7 @@ function TPSPascalCompiler.Compile(const s: tbtString): Boolean;
if FExecIs64Bit then begin
{$IFNDEF CPU64}
{ On 64-bit Exec, Extended is an alias for Double, so write a Double instead }
TempDouble := tbtDouble(p^.textended);
TempDouble := p^.textended; { conversion; a tbtDouble() cast fails on Delphi 7 }
WriteData(TempDouble, sizeof(tbtDouble));
{$ELSE}
WriteData(p^.textended, sizeof(tbtExtended));
Expand Down
6 changes: 3 additions & 3 deletions Source/uPSRuntime.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9752,10 +9752,10 @@ function DefProc(Caller: TPSExec; p: TPSExternalProcRec; Global, Stack: TPSStack
40: Stack.SetAnsiString(-1, tbtstring(SysUtils.IntToStr(Stack.GetInt64(-2))));// Int64ToStr
41: Stack.SetInt64(-1, StrToInt64Def(string(Stack.GetAnsiString(-2)), Stack.GetInt64(-3))); // StrToInt64Def
45: Stack.SetUInt64(-1, StrToUInt64(string(Stack.GetAnsiString(-2)))); // StrToUInt64
46: Stack.SetAnsiString(-1, tbtstring(SysUtils.UIntToStr(Stack.GetUInt64(-2))));// UInt64ToStr
46: Stack.SetAnsiString(-1, tbtstring(UIntToStr(Stack.GetUInt64(-2))));// UInt64ToStr
47: Stack.SetUInt64(-1, StrToUInt64Def(string(Stack.GetAnsiString(-2)), Stack.GetUInt64(-3))); // StrToUInt64Def
{$ENDIF}
48: Stack.SetAnsiString(-1, tbtstring(SysUtils.UIntToStr({$IFNDEF PS_NOINT64}Stack.GetUInt64(-2){$ELSE}Stack.GetUInt(-2){$ENDIF}))); // UIntToStr
48: Stack.SetAnsiString(-1, tbtstring(UIntToStr({$IFNDEF PS_NOINT64}Stack.GetUInt64(-2){$ELSE}Stack.GetUInt(-2){$ENDIF}))); // UIntToStr
42: // sizeof
begin
temp := NewTPSVariantIFC(Stack[Stack.Count -2], False);
Expand Down Expand Up @@ -10026,7 +10026,7 @@ function High_(Caller: TPSExec; p: TPSExternalProcRec; Global, Stack: TPSStack):
btS32 : Stack.SetInt(-1,High(Integer)); //Integer/LongInt: 2147483647
{$IFNDEF PS_NOINT64}
btS64 : Stack.SetInt64(-1,High(Int64)); //Int64: 9223372036854775807
btU64 : Stack.SetUInt64(-1,High(UInt64)); //UInt64: 18446744073709551615
btU64 : Stack.SetUInt64(-1,not UInt64(0)); //UInt64: 18446744073709551615 (High(UInt64); D7 cannot evaluate that as a constant)
{$ENDIF}
else Result:=false;
end;
Expand Down
48 changes: 48 additions & 0 deletions Source/uPSUtils.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,27 @@ function GRLW(var s: TbtString): TbtString;
function WideUpperCase(const S: WideString): WideString;
function WideLowerCase(const S: WideString): WideString;
{$ENDIF}

{ SysUtils fallbacks for compilers that lack the UInt64 conversion helpers
(the StrToUInt64 family appeared in XE4, UIntToStr in 2009). Note that
pre-2010 compilers treat UInt64 as a signed alias, so values above
High(Int64) are formatted with a sign there - an inherent limit of those
RTLs. }
{$IFNDEF PS_NOINT64}
{$IF NOT DECLARED(StrToUInt64)}
{$DEFINE PS_NEED_STRTOUINT64}
{$IFEND}
{$IF NOT DECLARED(UIntToStr)}
{$DEFINE PS_NEED_UINTTOSTR}
{$IFEND}
{$ENDIF}
{$IFDEF PS_NEED_STRTOUINT64}
function StrToUInt64(const S: string): UInt64;
function StrToUInt64Def(const S: string; const Default: UInt64): UInt64;
{$ENDIF}
{$IFDEF PS_NEED_UINTTOSTR}
function UIntToStr(Value: UInt64): string;
{$ENDIF}
implementation

{$IFDEF DELPHI3UP }
Expand Down Expand Up @@ -1753,6 +1774,33 @@ procedure TPSUnit.SetUnitName(const Value: TbtString);
fUnitName := FastUpperCase(Value);
end;

{$IFDEF PS_NEED_STRTOUINT64}
function StrToUInt64(const S: string): UInt64;
var
Err: Integer;
begin
Val(S, Result, Err);
if Err <> 0 then
raise EConvertError.CreateFmt('''%s'' is not a valid UInt64 value', [S]);
end;

function StrToUInt64Def(const S: string; const Default: UInt64): UInt64;
var
Err: Integer;
begin
Val(S, Result, Err);
if Err <> 0 then
Result := Default;
end;
{$ENDIF}

{$IFDEF PS_NEED_UINTTOSTR}
function UIntToStr(Value: UInt64): string;
begin
Str(Value, Result);
end;
{$ENDIF}


end.

Expand Down