Apple-2gs-SW
/
ORCA-C
mirror of https://github.com/byteworksinc/ORCA-C.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use escape sequences in format strings printed by the format checker. 

Error messages are now lined up to account for the actual printed length of any escape sequences.
This commit is contained in:
Stephen Heumann 2018-09-02 00:18:26 -05:00
parent 7493ffa76c
commit d3aff49550
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Printf.pas
View File

@ -126,7 +126,7 @@ var
}
var
i: integer;
c: char;
ch: char;
begin {Warning}
if error_count = 0 then begin
@ -136,9 +136,28 @@ var
if s <> nil then begin
Write(' > "');
for i := 1 to s^.length do begin
c := s^.str[i];
if (c = '"') or (ord(c) < $20) or (ord(c) > $7f) then c := '.';
Write(c);
ch := s^.str[i];
if ch in [' '..'~'] then begin
if ch in ['"','\','?'] then
write('\');
write(ch);
end {if}
else
case ord(ch) of
7: write('\a');
8: write('\b');
9: write('\t');
10: write('\n');
11: write('\v');
12: write('\f');
13: write('\r');
otherwise: begin
write('\');
write((ord(ch)>>6):1);
write(((ord(ch)>>3) & $0007):1);
write((ord(ch) & $0007):1);
end;
end; {case}
end; {for}
WriteLn('"');
end; {if}
@ -146,10 +165,28 @@ var
error_count := error_count + 1;
Write(' ');
if offset = 0 then
if s <> nil then
offset := s^.length + 1;
if s <> nil then begin
offset := s^.length;
write(' ');
end; {if}
if offset > 0 then begin
for i := 1 to offset do Write(' ');
if s <> nil then begin
if offset > s^.length then
offset := s^.length;
for i := 1 to offset do begin
ch := s^.str[i];
if ch in [' '..'~'] then begin
if ch in ['"','\','?'] then
write(' ');
write(' ');
end {if}
else
case ord(ch) of
7,8,9,10,11,12,13: write(' ');
otherwise: write(' ');
end; {case}
end; {for}
end; {if}
Write('^ ');
end; {if}
WriteLn(msg^);