paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-11 13:08:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: allow comparing (equal) pointer = number.

Browse Source
This commit is contained in:
Martin 2024-08-02 22:43:29 +02:00
parent 8af587ec77
commit 68d14314b2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpdebug/fpdbginfo.pas
View File

@ -1455,7 +1455,9 @@ end;
function TFpValueConstNumber.GetAsInteger: Int64;
begin
{$push}{$R-}{$Q-}
Result := Int64(FValue);
{$pop}
end;
function TFpValueConstNumber.GetAsFloat: Extended;

10
components/fpdebug/fppascalparser.pas
View File

@ -4146,7 +4146,7 @@ begin
if FStartChar^ in ['0'..'9'] then
Result := TFpValueConstNumber.Create(i, False)
else
Result := TFpValueConstNumber.Create(Int64(i), True); // hex,oct,bin values default to signed
Result := TFpValueConstNumber.Create(i, True); // hex,oct,bin values default to signed
{$IFDEF WITH_REFCOUNT_DEBUG}Result.DbgRenameReference(nil, 'DoGetResultValue'){$ENDIF};
end;
@ -6855,6 +6855,8 @@ function TFpPascalExpressionPartOperatorCompare.DoGetResultValue: TFpValue;
skInteger: Result := TFpValueConstBool.Create((AIntVal.AsInteger = AOtherVal.AsInteger) xor AReverse);
skCardinal: Result := TFpValueConstBool.Create((AIntVal.AsInteger = AOtherVal.AsCardinal) xor AReverse);
skFloat: Result := TFpValueConstBool.Create((AIntVal.AsInteger = AOtherVal.AsFloat) xor AReverse);
skPointer, skAddress:
Result := TFpValueConstBool.Create((AIntVal.AsCardinal = AOtherVal.AsCardinal) xor AReverse)
else SetError('= not supported');
end;
end;
@ -6865,6 +6867,8 @@ function TFpPascalExpressionPartOperatorCompare.DoGetResultValue: TFpValue;
skInteger: Result := TFpValueConstBool.Create((ACardinalVal.AsCardinal = AOtherVal.AsInteger) xor AReverse);
skCardinal: Result := TFpValueConstBool.Create((ACardinalVal.AsCardinal = AOtherVal.AsCardinal) xor AReverse);
skFloat: Result := TFpValueConstBool.Create((ACardinalVal.AsCardinal = AOtherVal.AsFloat) xor AReverse);
skPointer, skAddress:
Result := TFpValueConstBool.Create((ACardinalVal.AsCardinal = AOtherVal.AsCardinal) xor AReverse)
else SetError('= not supported');
end;
end;
@ -6881,7 +6885,9 @@ function TFpPascalExpressionPartOperatorCompare.DoGetResultValue: TFpValue;
function AddressPtrEqualToValue(AIntVal, AOtherVal: TFpValue; AReverse: Boolean = False): TFpValue;
begin
Result := nil;
if AOtherVal.Kind in [skClass,skInterface,skAddress,skPointer] then
if (AOtherVal.Kind in [skClass,skInterface,skAddress,skPointer]) or
((AIntVal.Kind in [skPointer, skAddress]) and (AOtherVal.Kind in [skInteger,skCardinal]))
then
Result := TFpValueConstBool.Create((AIntVal.AsCardinal = AOtherVal.AsCardinal) xor AReverse)
else
SetError('= not supported');