compiler: remove dummy ado_none from tarraydefoption. It is probably a leftover from time when tarraydefoptions was not present, comment options

ppudump: simplify readarraydefoptions

git-svn-id: trunk@24456 -
This commit is contained in:
paul 2013-05-07 06:51:32 +00:00
parent f1861a71d6
commit d38bd1b9bd
2 changed files with 22 additions and 27 deletions

View File

@ -440,14 +440,14 @@ type
); );
tobjectoptions=set of tobjectoption; tobjectoptions=set of tobjectoption;
tarraydefoption=(ado_none, tarraydefoption=(
ado_IsConvertedPointer, ado_IsConvertedPointer, // array created from pointer (e.g. PInteger(Ptr)[1])
ado_IsDynamicArray, ado_IsDynamicArray, // dynamic array
ado_IsVariant, ado_IsVariant, //
ado_IsConstructor, ado_IsConstructor, // array constructor (e.g. something = [1,2,3])
ado_IsArrayOfConst, ado_IsArrayOfConst, // array of const
ado_IsConstString, ado_IsConstString, // string constant
ado_IsBitPacked ado_IsBitPacked // bitpacked array
); );
tarraydefoptions=set of tarraydefoption; tarraydefoptions=set of tarraydefoption;

View File

@ -1891,39 +1891,34 @@ end;
procedure readarraydefoptions(ArrayDef: TPpuArrayDef); procedure readarraydefoptions(ArrayDef: TPpuArrayDef);
{ type tarraydefoption is in unit symconst } { type tarraydefoption is in unit symconst }
type
tsymopt=record
mask : tarraydefoption;
str : string[30];
end;
const const
symopt : array[1..ord(high(tarraydefoption))] of tsymopt=( symopt : array[tarraydefoption] of string = (
(mask:ado_IsConvertedPointer;str:'ConvertedPointer'), { ado_IsConvertedPointer } 'ConvertedPointer',
(mask:ado_IsDynamicArray; str:'IsDynamicArray'), { ado_IsDynamicArray } 'IsDynamicArray',
(mask:ado_IsVariant; str:'IsVariant'), { ado_IsVariant } 'IsVariant',
(mask:ado_IsConstructor; str:'IsConstructor'), { ado_IsConstructor } 'IsConstructor',
(mask:ado_IsArrayOfConst; str:'ArrayOfConst'), { ado_IsArrayOfConst } 'ArrayOfConst',
(mask:ado_IsConstString; str:'ConstString'), { ado_IsConstString } 'ConstString',
(mask:ado_IsBitPacked; str:'BitPacked') { ado_IsBitPacked } 'BitPacked'
); );
var var
symoptions : tarraydefoptions; symoptions: tarraydefoptions;
i : longint; i: tarraydefoption;
first : boolean; first: boolean;
begin begin
ppufile.getsmallset(symoptions); ppufile.getsmallset(symoptions);
if symoptions<>[] then if symoptions<>[] then
begin begin
if ado_IsDynamicArray in symoptions then Include(ArrayDef.Options, aoDynamic); if ado_IsDynamicArray in symoptions then Include(ArrayDef.Options, aoDynamic);
first:=true; first:=true;
for i:=1 to high(symopt) do for i:=Low(symopt) to high(symopt) do
if (symopt[i].mask in symoptions) then if (i in symoptions) then
begin begin
if first then if first then
first:=false first:=false
else else
write(', '); write(', ');
write(symopt[i].str); write(symopt[i]);
end; end;
end; end;
writeln; writeln;