mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-18 17:19:32 +02:00
pas2js: function await(atype; p:TJSPromise):atype
git-svn-id: trunk@45443 -
This commit is contained in:
Mattias Gaertner
parent
b92ffac29a
commit
18fdc0675e
@ -1753,7 +1753,7 @@ type
|
||||
function CheckBuiltInMinParamCount(Proc: TResElDataBuiltInProc; Expr: TPasExpr;
|
||||
MinCount: integer; RaiseOnError: boolean): boolean;
|
||||
function CheckBuiltInMaxParamCount(Proc: TResElDataBuiltInProc; Params: TParamsExpr;
|
||||
MaxCount: integer; RaiseOnError: boolean): integer;
|
||||
MaxCount: integer; RaiseOnError: boolean; Signature: string = ''): integer;
|
||||
function CheckRaiseTypeArgNo(id: TMaxPrecInt; ArgNo: integer; Param: TPasExpr;
|
||||
const ParamResolved: TPasResolverResult; Expected: string; RaiseOnError: boolean): integer;
|
||||
function FindUsedUnitInSection(const aName: string; Section: TPasSection): TPasModule;
|
||||
@ -14705,13 +14705,17 @@ begin
|
||||
end;
|
||||
|
||||
function TPasResolver.CheckBuiltInMaxParamCount(Proc: TResElDataBuiltInProc;
|
||||
Params: TParamsExpr; MaxCount: integer; RaiseOnError: boolean): integer;
|
||||
Params: TParamsExpr; MaxCount: integer; RaiseOnError: boolean;
|
||||
Signature: string): integer;
|
||||
begin
|
||||
if length(Params.Params)>MaxCount then
|
||||
begin
|
||||
if RaiseOnError then
|
||||
begin
|
||||
if Signature='' then Signature:=Proc.Signature;
|
||||
RaiseMsg(20170329154348,nWrongNumberOfParametersForCallTo,
|
||||
sWrongNumberOfParametersForCallTo,[Proc.Signature],Params.Params[MaxCount]);
|
||||
sWrongNumberOfParametersForCallTo,[Signature],Params.Params[MaxCount]);
|
||||
end;
|
||||
exit(cIncompatible);
|
||||
end;
|
||||
|
||||
|
||||
@ -406,6 +406,7 @@ Works:
|
||||
- generics
|
||||
- async procedure modifier
|
||||
- function await(const expr: T): T
|
||||
- function await(T; p: TJSPromise): T
|
||||
|
||||
ToDos:
|
||||
- range check:
|
||||
@ -486,7 +487,7 @@ const
|
||||
nVirtualMethodNameMustMatchExternal = 4013;
|
||||
nPublishedNameMustMatchExternal = 4014;
|
||||
nInvalidVariableModifier = 4015;
|
||||
// was nExternalObjectConstructorMustBeNamedNew = 4016;
|
||||
nAWaitOnlyInAsyncProcedure = 4016;
|
||||
nNewInstanceFunctionMustBeVirtual = 4017;
|
||||
nNewInstanceFunctionMustHaveTwoParameters = 4018;
|
||||
nNewInstanceFunctionMustNotHaveOverloadAtX = 4019;
|
||||
@ -502,7 +503,6 @@ const
|
||||
nDuplicateMessageIdXAtY = 4029;
|
||||
nDispatchRequiresX = 4030;
|
||||
nConstRefNotForXAsConst = 4031;
|
||||
nAWaitOnlyInAsyncProcedure = 3144;
|
||||
// resourcestring patterns of messages
|
||||
resourcestring
|
||||
sPasElementNotSupported = 'Pascal element not supported: %s';
|
||||
@ -520,7 +520,7 @@ resourcestring
|
||||
sVirtualMethodNameMustMatchExternal = 'Virtual method name must match external';
|
||||
sInvalidVariableModifier = 'Invalid variable modifier "%s"';
|
||||
sPublishedNameMustMatchExternal = 'Published name must match external';
|
||||
// was sExternalObjectConstructorMustBeNamedNew = 'external object constructor must be named "new"';
|
||||
sAWaitOnlyInAsyncProcedure = 'await only available in async procedure';
|
||||
sNewInstanceFunctionMustBeVirtual = 'NewInstance function must be virtual';
|
||||
sNewInstanceFunctionMustHaveTwoParameters = 'NewInstance function must have two parameters';
|
||||
sNewInstanceFunctionMustNotHaveOverloadAtX = 'NewInstance function must not have overload at %s';
|
||||
@ -536,7 +536,6 @@ resourcestring
|
||||
sDuplicateMessageIdXAtY = 'Duplicate message id "%s" at %s';
|
||||
sDispatchRequiresX = 'Dispatch requires %s';
|
||||
sConstRefNotForXAsConst = 'ConstRef not yet implemented for %s. Treating as Const';
|
||||
sAWaitOnlyInAsyncProcedure = 'await only available in async procedure';
|
||||
|
||||
const
|
||||
ExtClassBracketAccessor = '[]'; // external name '[]' marks the array param getter/setter
|
||||
@ -5213,11 +5212,14 @@ end;
|
||||
function TPas2JSResolver.BI_AWait_OnGetCallCompatibility(
|
||||
Proc: TResElDataBuiltInProc; Expr: TPasExpr; RaiseOnError: boolean): integer;
|
||||
// function await(const Expr: T): T
|
||||
const
|
||||
Signature2 = 'function await(aType,TJSPromise):aType';
|
||||
var
|
||||
Params: TParamsExpr;
|
||||
Param: TPasExpr;
|
||||
ParamResolved: TPasResolverResult;
|
||||
ParentProc: TPasProcedure;
|
||||
TypeEl: TPasType;
|
||||
begin
|
||||
Result:=cIncompatible;
|
||||
|
||||
@ -5235,24 +5237,60 @@ begin
|
||||
Params:=TParamsExpr(Expr);
|
||||
Param:=Params.Params[0];
|
||||
ComputeElement(Param,ParamResolved,[]);
|
||||
if not (rrfReadable in ParamResolved.Flags) then
|
||||
exit(CheckRaiseTypeArgNo(20200519151816,1,Param,ParamResolved,'jsvalue',RaiseOnError));
|
||||
if (rrfReadable in ParamResolved.Flags) then
|
||||
begin
|
||||
// function await(value)
|
||||
// must be the only parameter
|
||||
Result:=CheckBuiltInMaxParamCount(Proc,Params,1,RaiseOnError);
|
||||
end
|
||||
else
|
||||
begin
|
||||
TypeEl:=ParamResolved.LoTypeEl;
|
||||
if (TypeEl is TPasUnresolvedSymbolRef)
|
||||
and (TypeEl.CustomData is TResElDataBaseType) then
|
||||
// base type
|
||||
else if (TypeEl<>nil) and (ParamResolved.IdentEl is TPasType) then
|
||||
// custom type
|
||||
else
|
||||
exit(CheckRaiseTypeArgNo(20200519151816,1,Param,ParamResolved,'jsvalue',RaiseOnError));
|
||||
|
||||
Result:=CheckBuiltInMaxParamCount(Proc,Params,1,RaiseOnError);
|
||||
if Proc=nil then ;
|
||||
// function await(type,...)
|
||||
if length(Params.Params)<2 then
|
||||
begin
|
||||
if RaiseOnError then
|
||||
RaiseMsg(20200520090749,nWrongNumberOfParametersForCallTo,
|
||||
sWrongNumberOfParametersForCallTo,[Signature2],Params);
|
||||
exit(cIncompatible);
|
||||
end;
|
||||
|
||||
// check second param TJSPromise
|
||||
Param:=Params.Params[1];
|
||||
ComputeElement(Param,ParamResolved,[]);
|
||||
if not (rrfReadable in ParamResolved.Flags) then
|
||||
exit(CheckRaiseTypeArgNo(20200520091707,2,Param,ParamResolved,
|
||||
'instance of TJSPromise',RaiseOnError));
|
||||
|
||||
if (ParamResolved.BaseType<>btContext)
|
||||
or not (ParamResolved.LoTypeEl is TPasClassType)
|
||||
or not IsExternalClass_Name(TPasClassType(ParamResolved.LoTypeEl),'Promise') then
|
||||
exit(CheckRaiseTypeArgNo(20200520091707,2,Param,ParamResolved,
|
||||
'TJSPromise',RaiseOnError));
|
||||
|
||||
Result:=CheckBuiltInMaxParamCount(Proc,Params,2,RaiseOnError,Signature2);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TPas2JSResolver.BI_AWait_OnGetCallResult(Proc: TResElDataBuiltInProc;
|
||||
Params: TParamsExpr; out ResolvedEl: TPasResolverResult);
|
||||
// function await(const Expr: T): T
|
||||
// function await(T; p: TJSPromise): T
|
||||
var
|
||||
Param: TPasExpr;
|
||||
begin
|
||||
if length(Params.Params)<>1 then
|
||||
RaiseMsg(20200519233144,nWrongNumberOfParametersForCallTo,
|
||||
sWrongNumberOfParametersForCallTo,[Proc.Signature],Params);
|
||||
Param:=Params.Params[0];
|
||||
ComputeElement(Param,ResolvedEl,[]);
|
||||
Include(ResolvedEl.Flags,rrfReadable);
|
||||
if Proc=nil then ;
|
||||
end;
|
||||
|
||||
procedure TPas2JSResolver.BI_AWait_OnEval(Proc: TResElDataBuiltInProc;
|
||||
@ -5263,11 +5301,12 @@ var
|
||||
begin
|
||||
Evaluated:=nil;
|
||||
if length(Params.Params)<>1 then
|
||||
RaiseMsg(20200519233220,nWrongNumberOfParametersForCallTo,
|
||||
sWrongNumberOfParametersForCallTo,[Proc.Signature],Params);
|
||||
exit;
|
||||
|
||||
Param:=Params.Params[0];
|
||||
ComputeElement(Param,ParamResolved,[]);
|
||||
Evaluated:=Eval(Param,Flags);
|
||||
if Proc=nil then ;
|
||||
end;
|
||||
|
||||
constructor TPas2JSResolver.Create;
|
||||
@ -13217,9 +13256,12 @@ var
|
||||
JS: TJSElement;
|
||||
AWaitJS: TJSAwaitExpression;
|
||||
begin
|
||||
if length(El.Params)<>1 then
|
||||
if length(El.Params)=1 then
|
||||
Param:=El.Params[0]
|
||||
else if length(El.Params)=2 then
|
||||
Param:=El.Params[1]
|
||||
else
|
||||
RaiseNotSupported(El,AContext,20200519233919);
|
||||
Param:=El.Params[0];
|
||||
JS:=ConvertExpression(Param,AContext);
|
||||
AWaitJS:=TJSAwaitExpression(CreateElement(TJSAwaitExpression,El));
|
||||
AWaitJS.A:=JS;
|
||||
|
||||
@ -343,6 +343,7 @@ type
|
||||
Procedure TestProc_Async;
|
||||
Procedure TestProc_AWaitOutsideAsyncFail;
|
||||
Procedure TestProc_AWait;
|
||||
Procedure TestProc_AWaitExternalClassPromise;
|
||||
|
||||
// anonymous functions
|
||||
Procedure TestAnonymousProc_Assign_ObjFPC;
|
||||
@ -4686,6 +4687,37 @@ begin
|
||||
]));
|
||||
end;
|
||||
|
||||
procedure TTestModule.TestProc_AWaitExternalClassPromise;
|
||||
begin
|
||||
StartProgram(false);
|
||||
Add([
|
||||
'{$modeswitch externalclass}',
|
||||
'type',
|
||||
' TJSPromise = class external name ''Promise''',
|
||||
' end;',
|
||||
'function Run(d: double): word; async;',
|
||||
'var',
|
||||
' p: TJSPromise;',
|
||||
'begin',
|
||||
' Result:=await(word,p);',
|
||||
'end;',
|
||||
'begin',
|
||||
' Run(1);']);
|
||||
ConvertProgram;
|
||||
CheckSource('TestProc_AWaitExternalClassPromise',
|
||||
LinesToStr([ // statements
|
||||
'this.Run = async function (d) {',
|
||||
' var Result = 0;',
|
||||
' var p = null;',
|
||||
' Result = await p;',
|
||||
' return Result;',
|
||||
'};',
|
||||
'']),
|
||||
LinesToStr([
|
||||
'$mod.Run(1);'
|
||||
]));
|
||||
end;
|
||||
|
||||
procedure TTestModule.TestAnonymousProc_Assign_ObjFPC;
|
||||
begin
|
||||
StartProgram(false);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user