Merge pull request #15 from ksherlock/debugger_strings

refine debugger string types
This commit is contained in:
MikeW50 2018-03-25 15:19:39 -06:00 committed by GitHub
commit 0548a011a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -986,22 +986,34 @@ var
count: unsigned; {# of subscripts} count: unsigned; {# of subscripts}
lmin, lmax: addrrange; {index range} lmin, lmax: addrrange; {index range}
tp2: stp; {used to trace array type list} tp2: stp; {used to trace array type list}
tp3: stp;
begin {WriteArrays} begin {WriteArrays}
count := 0; {count the subscripts} count := 0; {count the subscripts}
tp2 := tp; tp2 := tp;
tp3 := nil;
while tp2^.form = arrays do begin while tp2^.form = arrays do begin
count := count+1; count := count+1;
tp3 := tp2;
tp2 := tp2^.aeltype; tp2 := tp2^.aeltype;
end; {while} end; {while}
if tp2^.form = scalar then {write the type code}
if GetType(tp2, tp^.isPacked) in [cgByte,cgUByte] then begin if tp2^.form = scalar then begin {write the type code}
count := count-1; { cstring = packed array[1..x] of char }
CnOut(6); { pstring = packed array[0..x] of char }
CnOut2(count); if (boolean(tp2^.isPacked)) and (tp2 = charptr) then begin
GetBounds(tp3^.inxtype, lmin, lmax);
if (lmin = 0) or (lmin = 1) then begin
count := count-1;
{ 6 = cstring, 7 = pstring }
CnOut(7 - ord(lmin));
CnOut2(count);
end {if}
else WriteScalarType(tp2, 0, count);
end {if} end {if}
else else
WriteScalarType(tp2, 0, count) WriteScalarType(tp2, 0, count);
end {if}
else if tp2^.form = subrange then else if tp2^.form = subrange then
WriteScalarType(tp2^.rangetype, 0, count) WriteScalarType(tp2^.rangetype, 0, count)
else if tp2^.form = pointerStruct then else if tp2^.form = pointerStruct then