paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-25 11:37:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: write procedure declaration

Browse Source 
git-svn-id: trunk@38187 -
This commit is contained in:
Mattias Gaertner 2018-02-10 12:08:56 +00:00
parent c8fe0d342f
commit 84d93e50a2
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-passrc/src/pasresolver.pp
View File

@ -1833,7 +1833,7 @@ begin
else if C=TPasTypeAliasType then
Result:='type alias'
else if C=TPasClassOfType then
Result:='class-of'
Result:='class of'
else if C=TPasSpecializeType then
Result:='specialize'
else if C=TInlineSpecializeExpr then

42
packages/pastojs/src/pas2jsfiler.pp
View File

@ -604,6 +604,7 @@ type
procedure WriteProperty(Obj: TJSONObject; El: TPasProperty; aContext: TPJUWriterContext); virtual;
procedure WriteProcedureModifiers(Obj: TJSONObject; const Value, DefaultValue: TProcedureModifiers); virtual;
procedure WriteProcedure(Obj: TJSONObject; El: TPasProcedure; aContext: TPJUWriterContext); virtual;
procedure WriteOperator(Obj: TJSONObject; El: TPasOperator; aContext: TPJUWriterContext); virtual;
procedure WriteExternalReferences(ParentJSON: TJSONObject); virtual;
public
constructor Create; override;
@ -1922,12 +1923,40 @@ begin
Obj.Add('Type','Property');
WriteProperty(Obj,TPasProperty(El),aContext);
end
else if C=TPasProcedure then
else if C.InheritsFrom(TPasProcedure) then
begin
ProcScope:=El.CustomData as TPasProcedureScope;
if ProcScope.DeclarationProc<>nil then
exit;
Obj.Add('Type','Procedure');
if C.InheritsFrom(TPasOperator) then
begin
if C=TPasOperator then
Obj.Add('Type','Operator')
else if C=TPasClassOperator then
Obj.Add('Type','ClassOperator')
else
RaiseMsg(20180210130142,El);
WriteOperator(Obj,TPasOperator(El),aContext);
exit;
end;
if C=TPasProcedure then
Obj.Add('Type','Procedure')
else if C=TPasCLassProcedure then
Obj.Add('Type','ClassProcedure')
else if C=TPasFunction then
Obj.Add('Type','Function')
else if C=TPasClassFunction then
Obj.Add('Type','ClassFunction')
else if C=TPasConstructor then
Obj.Add('Type','Constructor')
else if C=TPasClassConstructor then
Obj.Add('Type','ClassConstructor')
else if C=TPasDestructor then
Obj.Add('Type','Destructor')
else if C=TPasClassDestructor then
Obj.Add('Type','Class Destructor')
else
RaiseMsg(20180210130202,El);
WriteProcedure(Obj,TPasProcedure(El),aContext);
end
else
@ -2370,6 +2399,15 @@ begin
WritePasElement(Obj,El,aContext);
end;
procedure TPJUWriter.WriteOperator(Obj: TJSONObject; El: TPasOperator;
aContext: TPJUWriterContext);
begin
Obj.Add('Operator',PJUOperatorTypeNames[El.OperatorType]);
if El.TokenBased then
Obj.Add('TokenBased',El.TokenBased);
WriteProcedure(Obj,El,aContext);
end;
procedure TPJUWriter.WriteExternalReferences(ParentJSON: TJSONObject);
var
Node: TAVLTreeNode;