Merge pull request #218 from peterdell/way2js4

Way2js4 - Minimize differences to origin

Author: tebe6502

origin/Common.pas

@@ -1,12 +1,12 @@
-Unit Diagnostic;
+unit Diagnostic;
 
 interface
 
 {$i define.inc}
 
 // ----------------------------------------------------------------------------
 
-	procedure Diagnostics;
+procedure Diagnostics;
 
 // ----------------------------------------------------------------------------
 
@@ -18,11 +18,12 @@ implementation
 
 
 procedure Diagnostics;
-var i, CharIndex, ChildIndex: Integer;
-    DiagFile: textfile;
+var
+  i, CharIndex, ChildIndex: Integer;
+  DiagFile: textfile;
 begin
 
-  AssignFile(DiagFile, ChangeFileExt( UnitName[1].Name, '.txt') );
+  AssignFile(DiagFile, ChangeFileExt(UnitName[1].Name, '.txt'));
   Rewrite(DiagFile);
 
   WriteLn(DiagFile);
@@ -32,52 +33,58 @@ procedure Diagnostics;
   WriteLn(DiagFile);
 
   for i := 1 to NumTok do
-    begin
+  begin
     Write(DiagFile, i: 6, UnitName[Tok[i].UnitIndex].Name: 30, Tok[i].Line: 6, GetSpelling(i): 30);
     if Tok[i].Kind = INTNUMBERTOK then
       WriteLn(DiagFile, ' = ', Tok[i].Value)
     else if Tok[i].Kind = FRACNUMBERTOK then
-      WriteLn(DiagFile, ' = ', Tok[i].FracValue: 8: 4)
-    else if Tok[i].Kind = IDENTTOK then
-      WriteLn(DiagFile, ' = ', Tok[i].Name^)
-    else if Tok[i].Kind = CHARLITERALTOK then
-      WriteLn(DiagFile, ' = ', Chr(Tok[i].Value))
-    else if Tok[i].Kind = STRINGLITERALTOK then
-      begin
-      Write(DiagFile, ' = ');
-      for CharIndex := 1 to Tok[i].StrLength do
-	Write(DiagFile, StaticStringData[Tok[i].StrAddress - CODEORIGIN + (CharIndex - 1)]);
-      WriteLn(DiagFile);
-      end
-    else
-      WriteLn(DiagFile);
-    end;// for
+        WriteLn(DiagFile, ' = ', Tok[i].FracValue: 8: 4)
+      else if Tok[i].Kind = IDENTTOK then
+          WriteLn(DiagFile, ' = ', Tok[i].Name^)
+        else if Tok[i].Kind = CHARLITERALTOK then
+            WriteLn(DiagFile, ' = ', Chr(Tok[i].Value))
+          else if Tok[i].Kind = STRINGLITERALTOK then
+            begin
+              Write(DiagFile, ' = ');
+              for CharIndex := 1 to Tok[i].StrLength do
+                Write(DiagFile, StaticStringData[Tok[i].StrAddress - CODEORIGIN + (CharIndex - 1)]);
+              WriteLn(DiagFile);
+            end
+            else
+              WriteLn(DiagFile);
+  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, '#': 6, 'Block': 6, 'Name': 30, 'Kind': 15, 'Type': 15, 'Items/Params': 15,
+    'Value/Addr': 15, 'Dead': 5);
   WriteLn(DiagFile);
 
   for i := 1 to NumIdent do
-    begin
+  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);
+    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);
-    end;
+    if (Ident[i].Kind in [PROCEDURETOK, FUNCTIONTOK, CONSTRUCTORTOK, DESTRUCTORTOK]) and not Ident[i].IsNotDead then
+      WriteLn(DiagFile, 'Yes': 5)
+    else
+      WriteLn(DiagFile, '': 5);
+  end;
 
   WriteLn(DiagFile);
   WriteLn(DiagFile, 'Call graph: ');
   WriteLn(DiagFile);
 
   for i := 1 to NumBlocks do
-    begin
+  begin
     Write(DiagFile, i: 6, '  ---> ');
     for ChildIndex := 1 to CallGraph[i].NumChildren do
       Write(DiagFile, CallGraph[i].ChildBlock[ChildIndex]: 5);
     WriteLn(DiagFile);
-    end;
+  end;
 
   WriteLn(DiagFile);
   CloseFile(DiagFile);