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

pastojs: fixed compile under nodejs

Browse Source 
git-svn-id: trunk@41505 -
This commit is contained in:
Mattias Gaertner 2019-02-27 08:41:14 +00:00
parent a626ba845e
commit e41d075fda
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fcl-json/src/fpjson.pp
View File

@ -3183,7 +3183,11 @@ begin
DoError(SErrNameMustBeString,[I+1]);
Inc(I);
J:=VarRecToJSON(Elements[i],'Object');
{$IFDEF FPC_HAS_CPSTRING}
Add(UTF8Encode(AName),J);
{$ELSE}
Add(AName,J);
{$ENDIF}
Inc(I);
end;
end;

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

@ -12973,7 +12973,6 @@ begin
else if (C=TPasClassConstructor)
or (C=TPasClassDestructor) then
begin
// writeln('FFF2 TPasToJSConverter.ConvertClassType ',GetObjName(P));
AddGlobalClassMethod(AContext,TPasProcedure(P));
continue;
end;
@ -15691,7 +15690,6 @@ begin
First:=nil;
Last:=nil;
try
// writeln('FFF1 TPasToJSConverter.AddClassConstructors ',length(RootContext.GlobalClassMethods));
for i:=0 to length(RootContext.GlobalClassMethods)-1 do
begin
Proc:=RootContext.GlobalClassMethods[i];