pastojs: fixed compile with pas2js

packages/pastojs/src/fppas2js.pp

@@ -19080,15 +19080,6 @@ function TPasToJSConverter.CreateArrayInit(ArrayType: TPasArrayType;
   var
     NextArrType: TPasArrayType;
     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;
     var
@@ -19123,7 +19114,6 @@ function TPasToJSConverter.CreateArrayInit(ArrayType: TPasArrayType;
     aResolver: TPas2JSResolver;
   begin
     Result:=nil;
-    IsLastRange:=false;
     NextArrType:=CurArrType;
     NextRgIndex:=RgIndex+1;
     if RgIndex>=length(CurArrType.Ranges)-1 then
@@ -19137,7 +19127,7 @@ function TPasToJSConverter.CreateArrayInit(ArrayType: TPasArrayType;
         NextRgIndex:=0;
         end
       else
-        IsLastRange:=true;
+        ; //IsLastRange:=true;
       end;
     if CurExpr.ClassType=TArrayValues then
       begin

packages/pastojs/src/pas2jsfileutils.pp

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

packages/pastojs/src/pas2jsfileutilsnodejs.inc

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

packages/pastojs/src/pas2jslogger.pp

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

packages/pastojs/src/pas2jsutils.pp

@@ -637,7 +637,7 @@ begin
 end;
 {$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;
 begin
   if NonUTF8System and not IsASCII(s) then

utils/pas2js/nodepas2js.pp

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