Merge pull request #171 from peterdell/way2js4

Adapt remaining I/O to use IFile

Author: tebe6502

src/Common.pas

@@ -365,8 +365,8 @@ interface
 
   );
 
-  TString = string [MAXSTRLENGTH];
-  TName   = string [MAXNAMELENGTH];
+  TString = string;
+  TName   = string;
 
   TDefinesParam = array [1..MAXPARAMS] of TString;
 
@@ -581,7 +581,7 @@   TIdentifier = record
 
   FastMul: Integer = -1;
 
-  OutFile: TextFile;
+  OutFile: ITextFile;
 
   //AsmLabels: array of integer;
 
@@ -616,7 +616,7 @@   TIdentifier = record
 
 {$IFDEF USEOPTFILE}
 
-  OptFile: TextFile;
+  OptFile: ITextFile;
 
 {$ENDIF}
 

src/Console.pas

@@ -28,16 +28,23 @@ procedure NormVideo;
 
 implementation
 
+{$IFNDEF PAS2JS}
 uses Crt;
+{$ENDIF}
+
 
 procedure TextColor(color: Byte);
 begin
+ {$IFNDEF PAS2JS}
  Crt.TextColor(color);
+ {$ENDIF}
 end;
 
 procedure NormVideo();
 begin
+ {$IFNDEF PAS2JS}
  Crt.Normvideo;
+ {$ENDIF}
 end;
 
 

src/Diagnostic.pas

@@ -19,68 +19,75 @@ implementation
 
 procedure Diagnostics;
 var i, CharIndex, ChildIndex: Integer;
-    DiagFile: textfile;
+    DiagFile: ITextFile;
 begin
 
-  AssignFile(DiagFile, ChangeFileExt( UnitName[1].Name, '.txt') );
-  Rewrite(DiagFile);
+  DiagFile:=TFileSystem.CreateTextFile;
+  DiagFile.Assign(ChangeFileExt( UnitName[1].Name, '.txt') );
+  DiagFile.Rewrite;
 
-  WriteLn(DiagFile);
-  WriteLn(DiagFile, 'Token list: ');
-  WriteLn(DiagFile);
-  WriteLn(DiagFile, '#': 6, 'Unit': 30, 'Line': 6, 'Token': 30);
-  WriteLn(DiagFile);
+  DiagFile.WriteLn;
+  DiagFile.WriteLn('Token list: ');
+  DiagFile.WriteLn;
+  // DiagFile.WriteLn('#' : 6, 'Unit': 30, 'Line': 6, 'Token': 30);
+  DiagFile.Write('# ',6).Write( 'Unit',30).Write( 'Line',6).Write('Token',30).WriteLn;
+
+  DiagFile.WriteLn;
 
   for i := 1 to NumTok do
     begin
-    Write(DiagFile, i: 6, UnitName[Tok[i].UnitIndex].Name: 30, Tok[i].Line: 6, GetSpelling(i): 30);
+    // DiagFile.Write(i: 6, UnitName[Tok[i].UnitIndex].Name: 30, Tok[i].Line: 6, GetSpelling(i): 30);
+    DiagFile.Write(i,6).Write( UnitName[Tok[i].UnitIndex].Name, 30).Write(Tok[i].Line, 6).Write(GetSpelling(i), 30).WriteLn;
     if Tok[i].Kind = INTNUMBERTOK then
-      WriteLn(DiagFile, ' = ', Tok[i].Value)
+      DiagFile.WriteLn(' = ', IntToStr(Tok[i].Value))
     else if Tok[i].Kind = FRACNUMBERTOK then
-      WriteLn(DiagFile, ' = ', Tok[i].FracValue: 8: 4)
+//    DiagFile.WriteLn(' = ', Tok[i].FracValue: 8: 4)
+      DiagFile.WriteLn(' = ', FloatToStr(Tok[i].FracValue))
     else if Tok[i].Kind = IDENTTOK then
-      WriteLn(DiagFile, ' = ', Tok[i].Name)
+      DiagFile.WriteLn(' = ', Tok[i].Name)
     else if Tok[i].Kind = CHARLITERALTOK then
-      WriteLn(DiagFile, ' = ', Chr(Tok[i].Value))
+      DiagFile.WriteLn(' = ', Chr(Tok[i].Value))
     else if Tok[i].Kind = STRINGLITERALTOK then
       begin
-      Write(DiagFile, ' = ');
+      DiagFile.Write(' = ');
       for CharIndex := 1 to Tok[i].StrLength do
-	Write(DiagFile, StaticStringData[Tok[i].StrAddress - CODEORIGIN + (CharIndex - 1)]);
-      WriteLn(DiagFile);
+	DiagFile.Write( StaticStringData[Tok[i].StrAddress - CODEORIGIN + (CharIndex - 1)],-1);
+      DiagFile.WriteLn;
       end
     else
-      WriteLn(DiagFile);
+      DiagFile.WriteLn;
     end;// for
 
-  WriteLn(DiagFile);
-  WriteLn(DiagFile, 'Identifier list: ');
-  WriteLn(DiagFile);
-  WriteLn(DiagFile, '#': 6, 'Block': 6, 'Name': 30, 'Kind': 15, 'Type': 15, 'Items/Params': 15, 'Value/Addr': 15, 'Dead': 5);
-  WriteLn(DiagFile);
+  DiagFile.WriteLn;
+  DiagFile.WriteLn( 'Identifier list: ');
+  DiagFile.WriteLn;
+  DiagFile.Write( '#',6).Write('Block',6).Write( 'Name',30).Write('Kind',15).Write( 'Type', 15).Write( 'Items/Params', 15).Write( 'Value/Addr', 15).Write( 'Dead',5).WriteLn;
+  DiagFile.WriteLn;
 
   for i := 1 to NumIdent do
     begin
-    Write(DiagFile, i: 6, Ident[i].Block: 6, Ident[i].Name: 30, Spelling[Ident[i].Kind]: 15);
-    if Ident[i].DataType <> 0 then Write(DiagFile, Spelling[Ident[i].DataType]: 15) else Write(DiagFile, 'N/A': 15);
-    Write(DiagFile, Ident[i].NumAllocElements: 15, IntToHex(Ident[i].Value, 8): 15);
-    if (Ident[i].Kind in [PROCEDURETOK, FUNCTIONTOK, CONSTRUCTORTOK, DESTRUCTORTOK]) and not Ident[i].IsNotDead then WriteLn(DiagFile, 'Yes': 5) else WriteLn(DiagFile, '': 5);
+    DiagFile.Write( i, 6).Write( Ident[i].Block, 6).Write( Ident[i].Name, 30).Write( Spelling[Ident[i].Kind], 15);
+    if Ident[i].DataType <> 0 then DiagFile.Write( Spelling[Ident[i].DataType], 15) else DiagFile.Write( 'N/A', 15);
+    DiagFile.Write( Ident[i].NumAllocElements, 15).Write( IntToHex(Ident[i].Value, 8), 15);
+    if (Ident[i].Kind in [PROCEDURETOK, FUNCTIONTOK, CONSTRUCTORTOK, DESTRUCTORTOK]) and not Ident[i].IsNotDead
+    then DiagFile.Write( 'Yes', 5) else DiagFile.Write('', 5);
     end;
 
-  WriteLn(DiagFile);
-  WriteLn(DiagFile, 'Call graph: ');
-  WriteLn(DiagFile);
+  DiagFile.WriteLn;
+  DiagFile.WriteLn;
+  DiagFile.WriteLn( 'Call graph: ');
+  DiagFile.WriteLn;
 
   for i := 1 to NumBlocks do
     begin
-    Write(DiagFile, i: 6, '  ---> ');
+    DiagFile.Write( i, 6).Write('  ---> ');
     for ChildIndex := 1 to CallGraph[i].NumChildren do
-      Write(DiagFile, CallGraph[i].ChildBlock[ChildIndex]: 5);
-    WriteLn(DiagFile);
+      DiagFile.Write( CallGraph[i].ChildBlock[ChildIndex], 5);
+    DiagFile.WriteLn;
     end;
 
-  WriteLn(DiagFile);
-  CloseFile(DiagFile);
+  DiagFile.WriteLn;
+  DiagFile.Close;
 
 end;