mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-20 11:09:23 +02:00
* extend RTTI tests for untyped parameters
git-svn-id: trunk@41832 -
This commit is contained in:
parent
ab35c92816
commit
2eb4955613
@ -27,6 +27,7 @@ type
|
|||||||
OutputArgs: array of TValue;
|
OutputArgs: array of TValue;
|
||||||
ResultValue: TValue;
|
ResultValue: TValue;
|
||||||
InOutMapping: array of SizeInt;
|
InOutMapping: array of SizeInt;
|
||||||
|
InputUntypedTypes: array of PTypeInfo;
|
||||||
|
|
||||||
{$ifdef fpc}
|
{$ifdef fpc}
|
||||||
procedure OnHandleInvokable(aInvokable: TRttiInvokableType; const aArgs: TValueArray; out aResult: TValue);
|
procedure OnHandleInvokable(aInvokable: TRttiInvokableType; const aArgs: TValueArray; out aResult: TValue);
|
||||||
@ -71,6 +72,7 @@ type
|
|||||||
TTestMethod18 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Extended): Extended of object;
|
TTestMethod18 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Extended): Extended of object;
|
||||||
TTestMethod19 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Comp): Comp of object;
|
TTestMethod19 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Comp): Comp of object;
|
||||||
TTestMethod20 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Currency): Currency of object;
|
TTestMethod20 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Currency): Currency of object;
|
||||||
|
TTestMethod21 = procedure(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4) of object;
|
||||||
|
|
||||||
TTestProc1 = procedure;
|
TTestProc1 = procedure;
|
||||||
TTestProc2 = function(aArg1: SizeInt): SizeInt;
|
TTestProc2 = function(aArg1: SizeInt): SizeInt;
|
||||||
@ -92,6 +94,7 @@ type
|
|||||||
TTestProc18 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Extended): Extended;
|
TTestProc18 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Extended): Extended;
|
||||||
TTestProc19 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Comp): Comp;
|
TTestProc19 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Comp): Comp;
|
||||||
TTestProc20 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Currency): Currency;
|
TTestProc20 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: Currency): Currency;
|
||||||
|
TTestProc21 = procedure(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4);
|
||||||
|
|
||||||
const
|
const
|
||||||
SingleArg1: Single = 1.23;
|
SingleArg1: Single = 1.23;
|
||||||
@ -227,6 +230,9 @@ begin
|
|||||||
SetLength(InputArgs, Length(aArgs));
|
SetLength(InputArgs, Length(aArgs));
|
||||||
for i := 0 to High(aArgs) do begin
|
for i := 0 to High(aArgs) do begin
|
||||||
Status('Arg %d: %p %p', [i, aArgs[i].GetReferenceToRawData, PPointer(aArgs[i].GetReferenceToRawData)^]);
|
Status('Arg %d: %p %p', [i, aArgs[i].GetReferenceToRawData, PPointer(aArgs[i].GetReferenceToRawData)^]);
|
||||||
|
if Assigned(InputUntypedTypes[i]) then
|
||||||
|
TValue.Make(PPointer(aArgs[i].GetReferenceToRawData)^, InputUntypedTypes[i], InputArgs[i])
|
||||||
|
else
|
||||||
InputArgs[i] := CopyValue(aArgs[i]);
|
InputArgs[i] := CopyValue(aArgs[i]);
|
||||||
end;
|
end;
|
||||||
Status('Setting output args');
|
Status('Setting output args');
|
||||||
@ -251,6 +257,7 @@ var
|
|||||||
impl: TMethodImplementation;
|
impl: TMethodImplementation;
|
||||||
mrec: TMethod;
|
mrec: TMethod;
|
||||||
name: String;
|
name: String;
|
||||||
|
params: array of TRttiParameter;
|
||||||
begin
|
begin
|
||||||
name := aTypeInfo^.Name;
|
name := aTypeInfo^.Name;
|
||||||
|
|
||||||
@ -266,12 +273,21 @@ begin
|
|||||||
CheckEquals(Length(aOutputArgs), Length(aInOutMapping), 'Invalid in/out mapping');
|
CheckEquals(Length(aOutputArgs), Length(aInOutMapping), 'Invalid in/out mapping');
|
||||||
Check(Length(aOutputArgs) <= Length(aInputArgs), 'Output args not part of input args');
|
Check(Length(aOutputArgs) <= Length(aInputArgs), 'Output args not part of input args');
|
||||||
|
|
||||||
|
params := method.GetParameters;
|
||||||
|
|
||||||
{ arguments might be modified by Invoke (Note: Copy() does not uniquify the
|
{ arguments might be modified by Invoke (Note: Copy() does not uniquify the
|
||||||
IValueData of managed types) }
|
IValueData of managed types) }
|
||||||
SetLength(input, Length(aInputArgs) + 1);
|
SetLength(input, Length(aInputArgs) + 1);
|
||||||
|
SetLength(InputUntypedTypes, Length(aInputArgs) + 1);
|
||||||
input[0] := GetPointerValue(Self);
|
input[0] := GetPointerValue(Self);
|
||||||
for i := 0 to High(aInputArgs) do
|
InputUntypedTypes[0] := Nil;
|
||||||
|
for i := 0 to High(aInputArgs) do begin
|
||||||
input[i + 1] := CopyValue(aInputArgs[i]);
|
input[i + 1] := CopyValue(aInputArgs[i]);
|
||||||
|
if not Assigned(params[i].ParamType) then
|
||||||
|
InputUntypedTypes[i + 1] := aInputArgs[i].TypeInfo
|
||||||
|
else
|
||||||
|
InputUntypedTypes[i + 1] := Nil;
|
||||||
|
end;
|
||||||
|
|
||||||
impl := method.CreateImplementation({$ifdef fpc}@{$endif}OnHandleInvokable);
|
impl := method.CreateImplementation({$ifdef fpc}@{$endif}OnHandleInvokable);
|
||||||
CheckNotNull(impl, 'Method implementation is Nil');
|
CheckNotNull(impl, 'Method implementation is Nil');
|
||||||
@ -318,6 +334,7 @@ var
|
|||||||
impl: TMethodImplementation;
|
impl: TMethodImplementation;
|
||||||
name: String;
|
name: String;
|
||||||
cp: CodePointer;
|
cp: CodePointer;
|
||||||
|
params: array of TRttiParameter;
|
||||||
begin
|
begin
|
||||||
name := aTypeInfo^.Name;
|
name := aTypeInfo^.Name;
|
||||||
|
|
||||||
@ -333,11 +350,19 @@ begin
|
|||||||
CheckEquals(Length(aOutputArgs), Length(aInOutMapping), 'Invalid in/out mapping');
|
CheckEquals(Length(aOutputArgs), Length(aInOutMapping), 'Invalid in/out mapping');
|
||||||
Check(Length(aOutputArgs) <= Length(aInputArgs), 'Output args not part of input args');
|
Check(Length(aOutputArgs) <= Length(aInputArgs), 'Output args not part of input args');
|
||||||
|
|
||||||
|
params := proc.GetParameters;
|
||||||
|
|
||||||
{ arguments might be modified by Invoke (Note: Copy() does not uniquify the
|
{ arguments might be modified by Invoke (Note: Copy() does not uniquify the
|
||||||
IValueData of managed types) }
|
IValueData of managed types) }
|
||||||
SetLength(input, Length(aInputArgs));
|
SetLength(input, Length(aInputArgs));
|
||||||
for i := 0 to High(aInputArgs) do
|
SetLength(InputUntypedTypes, Length(aInputArgs));
|
||||||
|
for i := 0 to High(aInputArgs) do begin
|
||||||
input[i] := CopyValue(aInputArgs[i]);
|
input[i] := CopyValue(aInputArgs[i]);
|
||||||
|
if not Assigned(params[i].ParamType) then
|
||||||
|
InputUntypedTypes[i] := aInputArgs[i].TypeInfo
|
||||||
|
else
|
||||||
|
InputUntypedTypes[i] := Nil;
|
||||||
|
end;
|
||||||
|
|
||||||
impl := proc.CreateImplementation({$ifdef fpc}@{$endif}OnHandleInvokable);
|
impl := proc.CreateImplementation({$ifdef fpc}@{$endif}OnHandleInvokable);
|
||||||
CheckNotNull(impl, 'Method implementation is Nil');
|
CheckNotNull(impl, 'Method implementation is Nil');
|
||||||
@ -476,6 +501,25 @@ begin
|
|||||||
GetCurrencyValue(CurrencyAddArg1), GetCurrencyValue(CurrencyAddArg2), GetCurrencyValue(CurrencyAddArg3), GetCurrencyValue(CurrencyAddArg4), GetCurrencyValue(CurrencyAddArg5),
|
GetCurrencyValue(CurrencyAddArg1), GetCurrencyValue(CurrencyAddArg2), GetCurrencyValue(CurrencyAddArg3), GetCurrencyValue(CurrencyAddArg4), GetCurrencyValue(CurrencyAddArg5),
|
||||||
GetCurrencyValue(CurrencyAddArg6), GetCurrencyValue(CurrencyAddArg7), GetCurrencyValue(CurrencyAddArg8), GetCurrencyValue(CurrencyAddArg9), GetCurrencyValue(CurrencyAddArg10)
|
GetCurrencyValue(CurrencyAddArg6), GetCurrencyValue(CurrencyAddArg7), GetCurrencyValue(CurrencyAddArg8), GetCurrencyValue(CurrencyAddArg9), GetCurrencyValue(CurrencyAddArg10)
|
||||||
], [], [], GetCurrencyValue(CurrencyAddRes));
|
], [], [], GetCurrencyValue(CurrencyAddRes));
|
||||||
|
|
||||||
|
{$ifdef fpc}specialize{$endif}GenDoMethodImpl<TTestMethod21>([
|
||||||
|
GetIntValue(1234), GetIntValue(4321), GetIntValue(0), GetIntValue(9876)
|
||||||
|
], [
|
||||||
|
GetIntValue(5678), GetIntValue(6789)
|
||||||
|
], [0, 1], TValue.Empty);
|
||||||
|
|
||||||
|
{$ifdef fpc}specialize{$endif}GenDoMethodImpl<TTestMethod21>([
|
||||||
|
GetAnsiString('Alpha'), GetAnsiString('Beta'), GetAnsiString(''), GetAnsiString('Delta')
|
||||||
|
], [
|
||||||
|
GetAnsiString('Gamma'), GetAnsiString('Epsilon')
|
||||||
|
], [0, 1], TValue.Empty);
|
||||||
|
|
||||||
|
{ for some reason this fails, though it fails in Delphi as well :/ }
|
||||||
|
{{$ifdef fpc}specialize{$endif}GenDoMethodImpl<TTestMethod21>([
|
||||||
|
GetShortString('Alpha'), GetShortString('Beta'), GetShortString(''), GetShortString('Delta')
|
||||||
|
], [
|
||||||
|
GetShortString('Gamma'), GetShortString('Epsilon')
|
||||||
|
], [0, 1], TValue.Empty);}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TTestImpl.TestProcVars;
|
procedure TTestImpl.TestProcVars;
|
||||||
@ -569,6 +613,25 @@ begin
|
|||||||
GetCurrencyValue(CurrencyAddArg1), GetCurrencyValue(CurrencyAddArg2), GetCurrencyValue(CurrencyAddArg3), GetCurrencyValue(CurrencyAddArg4), GetCurrencyValue(CurrencyAddArg5),
|
GetCurrencyValue(CurrencyAddArg1), GetCurrencyValue(CurrencyAddArg2), GetCurrencyValue(CurrencyAddArg3), GetCurrencyValue(CurrencyAddArg4), GetCurrencyValue(CurrencyAddArg5),
|
||||||
GetCurrencyValue(CurrencyAddArg6), GetCurrencyValue(CurrencyAddArg7), GetCurrencyValue(CurrencyAddArg8), GetCurrencyValue(CurrencyAddArg9), GetCurrencyValue(CurrencyAddArg10)
|
GetCurrencyValue(CurrencyAddArg6), GetCurrencyValue(CurrencyAddArg7), GetCurrencyValue(CurrencyAddArg8), GetCurrencyValue(CurrencyAddArg9), GetCurrencyValue(CurrencyAddArg10)
|
||||||
], [], [], GetCurrencyValue(CurrencyAddRes));
|
], [], [], GetCurrencyValue(CurrencyAddRes));
|
||||||
|
|
||||||
|
{$ifdef fpc}specialize{$endif}GenDoProcImpl<TTestProc21>([
|
||||||
|
GetIntValue(1234), GetIntValue(4321), GetIntValue(0), GetIntValue(9876)
|
||||||
|
], [
|
||||||
|
GetIntValue(5678), GetIntValue(6789)
|
||||||
|
], [0, 1], TValue.Empty);
|
||||||
|
|
||||||
|
{$ifdef fpc}specialize{$endif}GenDoProcImpl<TTestProc21>([
|
||||||
|
GetAnsiString('Alpha'), GetAnsiString('Beta'), GetAnsiString(''), GetAnsiString('Delta')
|
||||||
|
], [
|
||||||
|
GetAnsiString('Gamma'), GetAnsiString('Epsilon')
|
||||||
|
], [0, 1], TValue.Empty);
|
||||||
|
|
||||||
|
{ for some reason this fails, though it fails in Delphi as well :/ }
|
||||||
|
{{$ifdef fpc}specialize{$endif}GenDoProcImpl<TTestProc21>([
|
||||||
|
GetShortString('Alpha'), GetShortString('Beta'), GetShortString(''), GetShortString('Delta')
|
||||||
|
], [
|
||||||
|
GetShortString('Gamma'), GetShortString('Epsilon')
|
||||||
|
], [0, 1], TValue.Empty);}
|
||||||
end;
|
end;
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
|
@ -34,6 +34,7 @@ type
|
|||||||
procedure DoMethodInvoke(aInst: TObject; aMethod: TMethod; aTypeInfo: PTypeInfo; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
procedure DoMethodInvoke(aInst: TObject; aMethod: TMethod; aTypeInfo: PTypeInfo; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
procedure DoProcVarInvoke(aInst: TObject; aProc: CodePointer; aTypeInfo: PTypeInfo; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
procedure DoProcVarInvoke(aInst: TObject; aProc: CodePointer; aTypeInfo: PTypeInfo; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
procedure DoProcInvoke(aInst: TObject; aProc: CodePointer; aTypeInfo: PTypeInfo; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
procedure DoProcInvoke(aInst: TObject; aProc: CodePointer; aTypeInfo: PTypeInfo; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
|
procedure DoUntypedInvoke(aInst: TObject; aProc: CodePointer; aMethod: TMethod; aTypeInfo: PTypeInfo; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
{$ifndef InLazIDE}
|
{$ifndef InLazIDE}
|
||||||
{$ifdef fpc}generic{$endif} procedure GenDoMethodInvoke<T>(aInst: TObject; aMethod: T; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
{$ifdef fpc}generic{$endif} procedure GenDoMethodInvoke<T>(aInst: TObject; aMethod: T; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
{$ifdef fpc}generic{$endif} procedure GenDoProcvarInvoke<T>(aInst: TObject; aProc: T; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
{$ifdef fpc}generic{$endif} procedure GenDoProcvarInvoke<T>(aInst: TObject; aProc: T; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
@ -65,6 +66,8 @@ type
|
|||||||
|
|
||||||
procedure TestProc;
|
procedure TestProc;
|
||||||
procedure TestProcRecs;
|
procedure TestProcRecs;
|
||||||
|
|
||||||
|
procedure TestUntyped;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
@ -697,6 +700,8 @@ type
|
|||||||
function TestRecSize8(aArg1: TTestRecord8): TTestRecord8;
|
function TestRecSize8(aArg1: TTestRecord8): TTestRecord8;
|
||||||
function TestRecSize9(aArg1: TTestRecord9): TTestRecord9;
|
function TestRecSize9(aArg1: TTestRecord9): TTestRecord9;
|
||||||
function TestRecSize10(aArg1: TTestRecord10): TTestRecord10;
|
function TestRecSize10(aArg1: TTestRecord10): TTestRecord10;
|
||||||
|
|
||||||
|
procedure TestUntyped(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4);
|
||||||
end;
|
end;
|
||||||
{$M-}
|
{$M-}
|
||||||
|
|
||||||
@ -735,9 +740,13 @@ type
|
|||||||
function TestRecSize8(aArg1: TTestRecord8): TTestRecord8;
|
function TestRecSize8(aArg1: TTestRecord8): TTestRecord8;
|
||||||
function TestRecSize9(aArg1: TTestRecord9): TTestRecord9;
|
function TestRecSize9(aArg1: TTestRecord9): TTestRecord9;
|
||||||
function TestRecSize10(aArg1: TTestRecord10): TTestRecord10;
|
function TestRecSize10(aArg1: TTestRecord10): TTestRecord10;
|
||||||
|
|
||||||
|
procedure TestUntyped(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4);
|
||||||
public
|
public
|
||||||
InputArgs: array of TValue;
|
InputArgs: array of TValue;
|
||||||
OutputArgs: array of TValue;
|
OutputArgs: array of TValue;
|
||||||
|
ExpectedArgs: array of TValue;
|
||||||
|
OutArgs: array of TValue;
|
||||||
ResultValue: TValue;
|
ResultValue: TValue;
|
||||||
CalledMethod: SizeInt;
|
CalledMethod: SizeInt;
|
||||||
InOutMapping: array of SizeInt;
|
InOutMapping: array of SizeInt;
|
||||||
@ -783,6 +792,8 @@ type
|
|||||||
TMethodTestRecSize9 = function(aArg1: TTestRecord9): TTestRecord9 of object;
|
TMethodTestRecSize9 = function(aArg1: TTestRecord9): TTestRecord9 of object;
|
||||||
TMethodTestRecSize10 = function(aArg1: TTestRecord10): TTestRecord10 of object;
|
TMethodTestRecSize10 = function(aArg1: TTestRecord10): TTestRecord10 of object;
|
||||||
|
|
||||||
|
TMethodTestUntyped = procedure(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4) of object;
|
||||||
|
|
||||||
TProcVarTest1 = procedure;
|
TProcVarTest1 = procedure;
|
||||||
TProcVarTest2 = function: SizeInt;
|
TProcVarTest2 = function: SizeInt;
|
||||||
TProcVarTest3 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: SizeInt): SizeInt;
|
TProcVarTest3 = function(aArg1, aArg2, aArg3, aArg4, aArg5, aArg6, aArg7, aArg8, aArg9, aArg10: SizeInt): SizeInt;
|
||||||
@ -817,6 +828,8 @@ type
|
|||||||
TProcVarTestRecSize9 = function(aArg1: TTestRecord9): TTestRecord9;
|
TProcVarTestRecSize9 = function(aArg1: TTestRecord9): TTestRecord9;
|
||||||
TProcVarTestRecSize10 = function(aArg1: TTestRecord10): TTestRecord10;
|
TProcVarTestRecSize10 = function(aArg1: TTestRecord10): TTestRecord10;
|
||||||
|
|
||||||
|
TProcVarTestUntyped = procedure(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4);
|
||||||
|
|
||||||
procedure TTestInterfaceClass.Test1;
|
procedure TTestInterfaceClass.Test1;
|
||||||
begin
|
begin
|
||||||
SetLength(InputArgs, 0);
|
SetLength(InputArgs, 0);
|
||||||
@ -1318,10 +1331,38 @@ begin
|
|||||||
CalledMethod := 10 or RecSizeMarker;
|
CalledMethod := 10 or RecSizeMarker;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TTestInterfaceClass.TestUntyped(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4);
|
||||||
|
begin
|
||||||
|
if Length(ExpectedArgs) <> 4 then
|
||||||
|
Exit;
|
||||||
|
if Length(OutArgs) <> 2 then
|
||||||
|
Exit;
|
||||||
|
|
||||||
|
SetLength(InputArgs, 4);
|
||||||
|
TValue.Make(@aArg1, ExpectedArgs[0].TypeInfo, InputArgs[0]);
|
||||||
|
TValue.Make(@aArg2, ExpectedArgs[1].TypeInfo, InputArgs[1]);
|
||||||
|
TValue.Make(@aArg3, ExpectedArgs[2].TypeInfo, InputArgs[2]);
|
||||||
|
TValue.Make(@aArg4, ExpectedArgs[3].TypeInfo, InputArgs[3]);
|
||||||
|
|
||||||
|
Move(PPointer(OutArgs[0].GetReferenceToRawData)^, aArg1, OutArgs[0].DataSize);
|
||||||
|
Move(PPointer(OutArgs[1].GetReferenceToRawData)^, aArg2, OutArgs[1].DataSize);
|
||||||
|
|
||||||
|
SetLength(OutputArgs, 2);
|
||||||
|
TValue.Make(@aArg1, ExpectedArgs[0].TypeInfo, OutputArgs[0]);
|
||||||
|
TValue.Make(@aArg2, ExpectedArgs[1].TypeInfo, OutputArgs[1]);
|
||||||
|
SetLength(InOutMapping, 2);
|
||||||
|
InOutMapping[0] := 0;
|
||||||
|
InOutMapping[1] := 1;
|
||||||
|
|
||||||
|
CalledMethod := -1;
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TTestInterfaceClass.Reset;
|
procedure TTestInterfaceClass.Reset;
|
||||||
begin
|
begin
|
||||||
InputArgs := Nil;
|
InputArgs := Nil;
|
||||||
OutputArgs := Nil;
|
OutputArgs := Nil;
|
||||||
|
ExpectedArgs := Nil;
|
||||||
|
OutArgs := Nil;
|
||||||
InOutMapping := Nil;
|
InOutMapping := Nil;
|
||||||
ResultValue := TValue.Empty;
|
ResultValue := TValue.Empty;
|
||||||
CalledMethod := 0;
|
CalledMethod := 0;
|
||||||
@ -1487,6 +1528,11 @@ begin
|
|||||||
Result := TTestInterfaceClass.ProcVarRecInst.TestRecSize10(aArg1);
|
Result := TTestInterfaceClass.ProcVarRecInst.TestRecSize10(aArg1);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure ProcTestUntyped(var aArg1; out aArg2; const aArg3; {$ifdef fpc}constref{$else}const [ref]{$endif} aArg4);
|
||||||
|
begin
|
||||||
|
TTestInterfaceClass.ProcVarInst.TestUntyped(aArg1, aArg2, aArg3, aArg4);
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TTestInvoke.DoIntfInvoke(aIndex: SizeInt; aInputArgs,
|
procedure TTestInvoke.DoIntfInvoke(aIndex: SizeInt; aInputArgs,
|
||||||
aOutputArgs: TValueArray; aResult: TValue);
|
aOutputArgs: TValueArray; aResult: TValue);
|
||||||
var
|
var
|
||||||
@ -1718,6 +1764,89 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TTestInvoke.DoUntypedInvoke(aInst: TObject; aProc: CodePointer;
|
||||||
|
aMethod: TMethod; aTypeInfo: PTypeInfo; aInputArgs, aOutputArgs: TValueArray;
|
||||||
|
aResult: TValue);
|
||||||
|
var
|
||||||
|
cls: TTestInterfaceClass;
|
||||||
|
intf: ITestInterface;
|
||||||
|
name: String;
|
||||||
|
context: TRttiContext;
|
||||||
|
t: TRttiType;
|
||||||
|
callable, res: TValue;
|
||||||
|
proc: TRttiInvokableType;
|
||||||
|
method: TRttiMethod;
|
||||||
|
i: SizeInt;
|
||||||
|
input: array of TValue;
|
||||||
|
begin
|
||||||
|
cls := aInst as TTestInterfaceClass;
|
||||||
|
cls.Reset;
|
||||||
|
|
||||||
|
name := 'TestUntyped';
|
||||||
|
TTestInterfaceClass.ProcVarInst := cls;
|
||||||
|
|
||||||
|
context := TRttiContext.Create;
|
||||||
|
try
|
||||||
|
method := Nil;
|
||||||
|
proc := Nil;
|
||||||
|
if Assigned(aProc) then begin
|
||||||
|
TValue.Make(@aProc, aTypeInfo, callable);
|
||||||
|
|
||||||
|
t := context.GetType(aTypeInfo);
|
||||||
|
Check(t is TRttiProcedureType, 'Not a procedure variable: ' + aTypeInfo^.Name);
|
||||||
|
proc := t as TRttiProcedureType;
|
||||||
|
end else if Assigned(aMethod.Code) then begin
|
||||||
|
TValue.Make(@aMethod, aTypeInfo, callable);
|
||||||
|
|
||||||
|
t := context.GetType(aTypeInfo);
|
||||||
|
Check(t is TRttiMethodType, 'Not a method variable: ' + aTypeInfo^.Name);
|
||||||
|
proc := t as TRttiMethodType;
|
||||||
|
end else begin
|
||||||
|
intf := cls;
|
||||||
|
|
||||||
|
TValue.Make(@intf, TypeInfo(intf), callable);
|
||||||
|
|
||||||
|
t := context.GetType(TypeInfo(ITestInterface));
|
||||||
|
method := t.GetMethod(name);
|
||||||
|
Check(Assigned(method), 'Method not found: ' + name);
|
||||||
|
end;
|
||||||
|
|
||||||
|
{ arguments might be modified by Invoke (Note: Copy() does not uniquify the
|
||||||
|
IValueData of managed types) }
|
||||||
|
SetLength(input, Length(aInputArgs));
|
||||||
|
SetLength(cls.ExpectedArgs, Length(aInputArgs));
|
||||||
|
for i := 0 to High(input) do begin
|
||||||
|
input[i] := CopyValue(aInputArgs[i]);
|
||||||
|
cls.ExpectedArgs[i] := CopyValue(aInputArgs[i]);
|
||||||
|
end;
|
||||||
|
SetLength(cls.OutArgs, Length(aOutputArgs));
|
||||||
|
for i := 0 to High(cls.OutArgs) do begin
|
||||||
|
cls.OutArgs[i] := CopyValue(aOutputArgs[i]);
|
||||||
|
end;
|
||||||
|
|
||||||
|
if Assigned(proc) then
|
||||||
|
res := proc.Invoke(callable, aInputArgs)
|
||||||
|
else
|
||||||
|
res := method.Invoke(callable, aInputArgs);
|
||||||
|
|
||||||
|
CheckEquals(-1, cls.CalledMethod, 'Wrong method called for ' + name);
|
||||||
|
Check(EqualValues(cls.ResultValue, res), 'Reported result value differs from returned for ' + name);
|
||||||
|
Check(EqualValues(aResult, res), 'Expected result value differs from returned for ' + name);
|
||||||
|
CheckEquals(Length(aInputArgs), Length(cls.InputArgs), 'Count of input args differs for ' + name);
|
||||||
|
CheckEquals(Length(cls.OutputArgs), Length(cls.InOutMapping), 'Count of output args and in-out-mapping differs for ' + name);
|
||||||
|
CheckEquals(Length(aOutputArgs), Length(cls.OutputArgs), 'Count of output args differs for ' + name);
|
||||||
|
for i := 0 to High(aInputArgs) do begin
|
||||||
|
Check(EqualValues(input[i], cls.InputArgs[i]), Format('Input argument %d differs for %s', [i + 1, name]));
|
||||||
|
end;
|
||||||
|
for i := 0 to High(aOutputArgs) do begin
|
||||||
|
Check(EqualValues(aOutputArgs[i], cls.OutputArgs[i]), Format('Output argument %d differs for %s', [i + 1, name]));
|
||||||
|
Check(EqualValues(aOutputArgs[i], aInputArgs[cls.InOutMapping[i]]), Format('New output argument %d differs from expected output for %s', [i + 1, name]));
|
||||||
|
end;
|
||||||
|
finally
|
||||||
|
context.Free;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
{$ifndef InLazIDE}
|
{$ifndef InLazIDE}
|
||||||
{$ifdef fpc}generic{$endif} procedure TTestInvoke.GenDoMethodInvoke<T>(aInst: TObject; aMethod: T; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
{$ifdef fpc}generic{$endif} procedure TTestInvoke.GenDoMethodInvoke<T>(aInst: TObject; aMethod: T; aIndex: SizeInt; aInputArgs, aOutputArgs: TValueArray; aResult: TValue);
|
||||||
begin
|
begin
|
||||||
@ -2380,6 +2509,96 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TTestInvoke.TestUntyped;
|
||||||
|
var
|
||||||
|
cls: TTestInterfaceClass;
|
||||||
|
begin
|
||||||
|
cls := TTestInterfaceClass.Create;
|
||||||
|
try
|
||||||
|
cls._AddRef;
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, Nil, Default(TMethod), Nil, [
|
||||||
|
GetIntValue($1234), GetIntValue($4321), GetIntValue($8765), GetIntValue($5678)
|
||||||
|
], [
|
||||||
|
GetIntValue($4321), GetIntValue($5678)
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, Nil, Default(TMethod), Nil, [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str1'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str2'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str3'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str4')
|
||||||
|
], [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('StrVar'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('StrOut')
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, Nil, Default(TMethod), Nil, [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str1'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str2'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str3'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str4')
|
||||||
|
], [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('StrVar'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('StrOut')
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, Nil, TMethod({$ifdef fpc}@{$endif}cls.TestUntyped), TypeInfo(TMethodTestUntyped), [
|
||||||
|
GetIntValue($1234), GetIntValue($4321), GetIntValue($8765), GetIntValue($5678)
|
||||||
|
], [
|
||||||
|
GetIntValue($4321), GetIntValue($5678)
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, Nil, TMethod({$ifdef fpc}@{$endif}cls.TestUntyped), TypeInfo(TMethodTestUntyped), [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str1'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str2'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str3'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str4')
|
||||||
|
], [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('StrVar'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('StrOut')
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, Nil, TMethod({$ifdef fpc}@{$endif}cls.TestUntyped), TypeInfo(TMethodTestUntyped), [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str1'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str2'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str3'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str4')
|
||||||
|
], [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('StrVar'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('StrOut')
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, {$ifdef fpc}@{$endif}ProcTestUntyped, Default(TMethod), TypeInfo(TProcVarTestUntyped), [
|
||||||
|
GetIntValue($1234), GetIntValue($4321), GetIntValue($8765), GetIntValue($5678)
|
||||||
|
], [
|
||||||
|
GetIntValue($4321), GetIntValue($5678)
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, {$ifdef fpc}@{$endif}ProcTestUntyped, Default(TMethod), TypeInfo(TProcVarTestUntyped), [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str1'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str2'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str3'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('Str4')
|
||||||
|
], [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('StrVar'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<AnsiString>('StrOut')
|
||||||
|
], TValue.Empty);
|
||||||
|
|
||||||
|
DoUntypedInvoke(cls, {$ifdef fpc}@{$endif}ProcTestUntyped, Default(TMethod), TypeInfo(TProcVarTestUntyped), [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str1'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str2'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str3'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('Str4')
|
||||||
|
], [
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('StrVar'),
|
||||||
|
TValue.{$ifdef fpc}specialize{$endif}From<ShortString>('StrOut')
|
||||||
|
], TValue.Empty);
|
||||||
|
finally
|
||||||
|
cls._Release;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
{$ifdef fpc}
|
{$ifdef fpc}
|
||||||
RegisterTest(TTestInvoke);
|
RegisterTest(TTestInvoke);
|
||||||
|
Loading…
Reference in New Issue
Block a user