Browse Source

pas2js: fixed compile under nodejs

git-svn-id: trunk@45296 -
Mattias Gaertner 5 years ago
parent
commit
728a60c155

+ 1 - 1
packages/fcl-js/src/jssrcmap.pas

@@ -38,7 +38,7 @@ uses
   {$ifdef pas2js}
   {$ifdef pas2js}
   JS,
   JS,
     {$ifdef nodejs}
     {$ifdef nodejs}
-    NodeJSFS,
+    Node.FS,
     {$endif}
     {$endif}
   {$else}
   {$else}
   contnrs,
   contnrs,

+ 1 - 1
packages/fcl-passrc/src/pasresolver.pp

@@ -324,7 +324,7 @@ uses
   {$ifdef pas2js}
   {$ifdef pas2js}
   js,
   js,
   {$IFDEF NODEJS}
   {$IFDEF NODEJS}
-  NodeJSFS,
+  Node.FS,
   {$ENDIF}
   {$ENDIF}
   {$endif}
   {$endif}
   Classes, SysUtils, Math, Types, contnrs,
   Classes, SysUtils, Math, Types, contnrs,

+ 1 - 1
packages/fcl-passrc/src/pparser.pp

@@ -38,7 +38,7 @@ interface
 
 
 uses
 uses
   {$ifdef NODEJS}
   {$ifdef NODEJS}
-  NodeJSFS,
+  Node.FS,
   {$endif}
   {$endif}
   SysUtils, Classes, Types, PasTree, PScanner;
   SysUtils, Classes, Types, PasTree, PScanner;
 
 

+ 1 - 1
packages/fcl-passrc/src/pscanner.pp

@@ -39,7 +39,7 @@ uses
   {$ifdef pas2js}
   {$ifdef pas2js}
   js,
   js,
   {$IFDEF NODEJS}
   {$IFDEF NODEJS}
-  NodeJSFS,
+  Node.FS,
   {$ENDIF}
   {$ENDIF}
   Types,
   Types,
   {$endif}
   {$endif}

+ 2 - 2
packages/pastojs/src/pas2jscompiler.pp

@@ -4889,13 +4889,13 @@ var
   begin
   begin
     if s='' then exit;
     if s='' then exit;
     if Flags='' then
     if Flags='' then
-      Flags:=Space(Log.Indent)
+      Flags:=StringOfChar(' ',Log.Indent)
     else
     else
       Flags:=Flags+',';
       Flags:=Flags+',';
     if length(Flags)+length(s)>Log.LineLen then
     if length(Flags)+length(s)>Log.LineLen then
     begin
     begin
       Log.LogPlain(Flags);
       Log.LogPlain(Flags);
-      Flags:=Space(Log.Indent);
+      Flags:=StringOfChar(' ',Log.Indent);
     end;
     end;
     Flags:=Flags+s;
     Flags:=Flags+s;
   end;
   end;

+ 3 - 3
packages/pastojs/src/pas2jsfilecache.pp

@@ -925,7 +925,7 @@ begin
       Filename:=ChompPathDelim(ResolveDots(Filename));
       Filename:=ChompPathDelim(ResolveDots(Filename));
       if not FilenameIsAbsolute(Filename) then
       if not FilenameIsAbsolute(Filename) then
         Filename:=WorkingDirectory+Filename;
         Filename:=WorkingDirectory+Filename;
-      Result:={$IFDEF pas2js}NodeJSFS{$ELSE}SysUtils{$ENDIF}.DirectoryExists(Filename);
+      Result:={$IFDEF pas2js}Node.FS{$ELSE}SysUtils{$ENDIF}.DirectoryExists(Filename);
       end;
       end;
     end;
     end;
 end;
 end;
@@ -939,7 +939,7 @@ begin
   if Info.Dir<>nil then
   if Info.Dir<>nil then
     Result:=Info.Dir.IndexOfFile(Info.ShortFilename)>=0
     Result:=Info.Dir.IndexOfFile(Info.ShortFilename)>=0
   else
   else
-    Result:={$IFDEF pas2js}NodeJSFS{$ELSE}SysUtils{$ENDIF}.FileExists(Info.Filename);
+    Result:={$IFDEF pas2js}Node.FS{$ELSE}SysUtils{$ENDIF}.FileExists(Info.Filename);
 end;
 end;
 
 
 function TPas2jsCachedDirectories.FileExistsI(var Filename: string): integer;
 function TPas2jsCachedDirectories.FileExistsI(var Filename: string): integer;
@@ -952,7 +952,7 @@ begin
   if not GetFileInfo(Info) then exit;
   if not GetFileInfo(Info) then exit;
   if Info.Dir=nil then
   if Info.Dir=nil then
   begin
   begin
-    if {$IFDEF pas2js}NodeJSFS{$ELSE}SysUtils{$ENDIF}.FileExists(Info.Filename) then
+    if {$IFDEF pas2js}Node.FS{$ELSE}SysUtils{$ENDIF}.FileExists(Info.Filename) then
       Result:=1;
       Result:=1;
   end
   end
   else
   else

+ 1 - 1
packages/pastojs/src/pas2jsfileutils.pp

@@ -29,7 +29,7 @@ uses
   BaseUnix,
   BaseUnix,
   {$ENDIF}
   {$ENDIF}
   {$IFDEF Pas2JS}
   {$IFDEF Pas2JS}
-  JS, NodeJS, NodeJSFS,
+  JS, NodeJS, Node.FS,
   {$ENDIF}
   {$ENDIF}
   SysUtils, Classes;
   SysUtils, Classes;
 
 

+ 1 - 1
packages/pastojs/src/pas2jslogger.pp

@@ -30,7 +30,7 @@ uses
   {$IFDEF Pas2JS}
   {$IFDEF Pas2JS}
   JS,
   JS,
   {$IFDEF NodeJS}
   {$IFDEF NodeJS}
-  NodeJSFS,
+  Node.FS,
   {$ENDIF}
   {$ENDIF}
   {$ENDIF}
   {$ENDIF}
   pas2jsutils,
   pas2jsutils,