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

* custom variant support for integer types, first part of #39815

Browse Source
This commit is contained in:
marcoonthegit 2022-08-20 22:41:36 +02:00
parent d3d4de7818
commit c67004d929
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/rtl-objpas/src/inc/variants.pp
View File

@ -594,47 +594,79 @@ end;
function Sysvartoint (const v : Variant) : Longint;
var Handler: TCustomVariantType;
dest: TVarData;
begin
if VarType(v) = varNull then
if NullStrictConvert then
VarCastError(varNull, varInt64)
else
Result := 0
else if FindCustomVariantType(TVarData(v).vType, Handler) then
begin
VariantInit(dest);
Handler.CastTo(dest, TVarData(v), varInteger);
Result := dest.vinteger;
end
else
Result := VariantToLongInt(TVarData(V));
end;
function Sysvartoint64 (const v : Variant) : Int64;
var Handler: TCustomVariantType;
dest: TVarData;
begin
if VarType(v) = varNull then
if NullStrictConvert then
VarCastError(varNull, varInt64)
else
Result := 0
else if FindCustomVariantType(TVarData(v).vType, Handler) then
begin
VariantInit(dest);
Handler.CastTo(dest, TVarData(v), varInt64);
Result := dest.vint64;
end
else
Result := VariantToInt64(TVarData(V));
end;
function sysvartoword64 (const v : Variant) : QWord;
var Handler: TCustomVariantType;
dest: TVarData;
begin
if VarType(v) = varNull then
if NullStrictConvert then
VarCastError(varNull, varQWord)
else
Result := 0
else if FindCustomVariantType(TVarData(v).vType, Handler) then
begin
VariantInit(dest);
Handler.CastTo(dest, TVarData(v), varQWord);
Result := dest.vqword;
end
else
Result := VariantToQWord (TVarData(V));
end;
function sysvartobool (const v : Variant) : Boolean;
var Handler: TCustomVariantType;
dest: TVarData;
begin
if VarType(v) = varNull then
if NullStrictConvert then
VarCastError(varNull, varBoolean)
else
Result := False
else if FindCustomVariantType(TVarData(v).vType, Handler) then
begin
VariantInit(dest);
Handler.CastTo(dest, TVarData(v), varBoolean);
Result := dest.vboolean;
end
else
Result := VariantToBoolean(TVarData(V));
end;