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

pastojs: fixed compile with pas2js

Browse Source
This commit is contained in:
mattias 2024-01-05 16:18:40 +01:00
parent 3423fa9a82
commit f6de2c5756
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19080,15 +19080,6 @@ function TPasToJSConverter.CreateArrayInit(ArrayType: TPasArrayType;
var var
NextArrType: TPasArrayType; NextArrType: TPasArrayType;
NextRgIndex: integer; NextRgIndex: integer;
IsLastRange: boolean;
function ConvertSubExpr(SubExpr: TPasExpr): TJSElement;
begin
if IsLastRange then
Result:=ConvertExpression(SubExpr,AContext)
else
Result:=ConvertArrayExpr(NextArrType,NextRgIndex,SubExpr);
end;
function ConvertSubValues(ExprArray: TPasExprArray): TJSArrayLiteral; function ConvertSubValues(ExprArray: TPasExprArray): TJSArrayLiteral;
var var
@ -19123,7 +19114,6 @@ function TPasToJSConverter.CreateArrayInit(ArrayType: TPasArrayType;
aResolver: TPas2JSResolver; aResolver: TPas2JSResolver;
begin begin
Result:=nil; Result:=nil;
IsLastRange:=false;
NextArrType:=CurArrType; NextArrType:=CurArrType;
NextRgIndex:=RgIndex+1; NextRgIndex:=RgIndex+1;
if RgIndex>=length(CurArrType.Ranges)-1 then if RgIndex>=length(CurArrType.Ranges)-1 then
@ -19137,7 +19127,7 @@ function TPasToJSConverter.CreateArrayInit(ArrayType: TPasArrayType;
NextRgIndex:=0; NextRgIndex:=0;
end end
else else
IsLastRange:=true; ; //IsLastRange:=true;
end; end;
if CurExpr.ClassType=TArrayValues then if CurExpr.ClassType=TArrayValues then
begin begin

8
packages/pastojs/src/pas2jsfileutils.pp
View File

@ -84,7 +84,7 @@ function GetEnvironmentVariableCountPJ: Integer;
function GetEnvironmentStringPJ(Index: Integer): string; function GetEnvironmentStringPJ(Index: Integer): string;
function GetEnvironmentVariablePJ(const EnvVar: string): String; function GetEnvironmentVariablePJ(const EnvVar: string): String;
function GetNextDelimitedItem(const List: string; Delimiter: AnsiChar; function GetNextDelimitedItem(const List: string; Delimiter: Char;
var Position: integer): string; var Position: integer): string;
type TChangeStamp = SizeInt; type TChangeStamp = SizeInt;
@ -434,7 +434,7 @@ end;
end; end;
var SrcPos, DestPos, Len, DirStart: integer; var SrcPos, DestPos, Len, DirStart: integer;
c: AnsiChar; c: Char;
MacroPos: LongInt; MacroPos: LongInt;
begin begin
Len:=length(AFilename); Len:=length(AFilename);
@ -636,7 +636,7 @@ end;
function GetForcedPathDelims(const FileName: string): String; function GetForcedPathDelims(const FileName: string): String;
var var
i: Integer; i: Integer;
c: AnsiChar; c: Char;
begin begin
Result:=Filename; Result:=Filename;
{$IFDEF Pas2js} {$IFDEF Pas2js}
@ -804,7 +804,7 @@ begin
end; end;
{$ENDIF} {$ENDIF}
function GetNextDelimitedItem(const List: string; Delimiter: AnsiChar; function GetNextDelimitedItem(const List: string; Delimiter: Char;
var Position: integer): string; var Position: integer): string;
var var
StartPos: Integer; StartPos: Integer;

4
packages/pastojs/src/pas2jsfileutilsnodejs.inc
View File

@ -189,10 +189,12 @@ begin
Result:=GetEnvironmentVariable(EnvVar); Result:=GetEnvironmentVariable(EnvVar);
end; end;
{$IFDEF FPC_HAS_CPSTRING}
function GetConsoleTextEncoding: string; function GetConsoleTextEncoding: string;
begin begin
Result:=GetDefaultTextEncoding; Result:=GetDefaultTextEncoding;
end; end;
{$ENDIF}
end; end.

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

@ -51,7 +51,7 @@ uses
Node.FS, Node.FS,
{$ENDIF} {$ENDIF}
{$IFDEF HASFILESYSTEM} {$IFDEF HASFILESYSTEM}
pas2jsfileutils, Pas2jsFileUtils,
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
pas2jsutils, pas2jsutils,

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

@ -637,7 +637,7 @@ begin
end; end;
{$ENDIF UNIX} {$ENDIF UNIX}
{$IF NOT DEFINED(UNIX) AND NOT DEFINED(WINDOWS)} {$IF NOT DEFINED(UNIX) AND NOT DEFINED(WINDOWS) and defined(FPC_HAS_CPSTRING)}
function UTF8ToSystemCP(const s: Ansistring): Ansistring; function UTF8ToSystemCP(const s: Ansistring): Ansistring;
begin begin
if NonUTF8System and not IsASCII(s) then if NonUTF8System and not IsASCII(s) then

1
utils/pas2js/nodepas2js.pp
View File

@ -83,3 +83,4 @@ begin
Application.Run; Application.Run;
Application.Free; Application.Free;
end. end.