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

pastojs: typeinfo(classof)

Browse Source 
git-svn-id: trunk@35862 -
This commit is contained in:
Mattias Gaertner 2017-04-20 15:28:39 +00:00
parent 869f395a31
commit 13bc0cfdd6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/pastojs/src/fppas2js.pp
View File

@ -6761,12 +6761,14 @@ begin
Result:=CreateTypeInfoRef(TPasType(ParamResolved.IdentEl),AContext,Param) Result:=CreateTypeInfoRef(TPasType(ParamResolved.IdentEl),AContext,Param)
else if ParamResolved.TypeEl<>nil then else if ParamResolved.TypeEl<>nil then
begin begin
if (ParamResolved.TypeEl.ClassType=TPasClassType) if (rrfReadable in ParamResolved.Flags)
and (rrfReadable in ParamResolved.Flags) and ((ParamResolved.TypeEl.ClassType=TPasClassType)
or (ParamResolved.TypeEl.ClassType=TPasClassOfType))
and ((ParamResolved.IdentEl is TPasVariable) and ((ParamResolved.IdentEl is TPasVariable)
or (ParamResolved.IdentEl.ClassType=TPasArgument)) then or (ParamResolved.IdentEl.ClassType=TPasArgument)) then
begin begin
// typeinfo(classinstance) -> classinstance.$rtti // typeinfo(classinstance) -> classinstance.$rtti
// typeinfo(classof) -> classof.$rtti
Result:=ConvertElement(Param,AContext); Result:=ConvertElement(Param,AContext);
Result:=CreateDotExpression(El,Result,CreateBuiltInIdentifierExpr(FBuiltInNames[pbivnRTTI])); Result:=CreateDotExpression(El,Result,CreateBuiltInIdentifierExpr(FBuiltInNames[pbivnRTTI]));
end end

2
packages/pastojs/tests/tcmodules.pas
View File

@ -12556,7 +12556,7 @@ begin
'$mod.tiRecord = $mod.$rtti["TRec"];', '$mod.tiRecord = $mod.$rtti["TRec"];',
'$mod.tiClass = $mod.Obj.$rtti;', '$mod.tiClass = $mod.Obj.$rtti;',
'$mod.tiClass = $mod.$rtti["TObject"];', '$mod.tiClass = $mod.$rtti["TObject"];',
'$mod.tiClassRef = $mod.$rtti["TClass"];', '$mod.tiClassRef = $mod.aClass.$rtti;',
'$mod.tiClassRef = $mod.$rtti["TClass"];', '$mod.tiClassRef = $mod.$rtti["TClass"];',
''])); '']));
end; end;