paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 04:40:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: ParseFPCParameters: alias params

Browse Source 
git-svn-id: trunk@53181 -
This commit is contained in:
mattias 2016-10-20 16:57:52 +00:00
parent 3610fd18b2
commit de0adccd6e
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/codetools/fileprocs.pas
View File

@ -1473,7 +1473,7 @@ procedure ParseFPCParameter(const CmdLineParam: string;
const
AlphaNum = ['a'..'z','A'..'Z','0'..'9'];
procedure Add(const aName, aValue: string; aKind: TFPCParamKind; aFlags: TFPCParamFlags = []);
procedure Add(aName, aValue: string; aKind: TFPCParamKind; aFlags: TFPCParamFlags = []);
var
i: Integer;
Param: TFPCParamValue;
@ -1481,6 +1481,12 @@ const
{$IFDEF VerboseParseFPCParameter}
debugln(['ParseFPCParameter.Add Name="',aName,'" Value="',aValue,'" Kind=',dbgs(aKind),' Flags=',dbgs(aFlags)]);
{$ENDIF}
if (aName='O1') or (aName='O2') or (aName='O3') or (aName='O4') then begin
aValue:=aName[2];
aName:='O';
aKind:=fpkValue;
end;
if not (aKind in [fpkUnknown,fpkConfig,fpkNonOption,fpkMultiValue]) then
// check for duplicates
for i:=0 to ParsedParams.Count-1 do begin
@ -1489,8 +1495,10 @@ const
if (aKind=fpkDefine) <> (Param.Kind=fpkDefine) then continue;
// was already set
Include(Param.Flags,fpfSetTwice);
if (aValue<>Param.Value) or ((fpfUnset in aFlags)<>(fpfUnset in Param.Flags)) then
if (aValue<>Param.Value) or ((fpfUnset in aFlags)<>(fpfUnset in Param.Flags))
or (aKind<>Param.Kind) then
Include(Param.Flags,fpfValueChanged);
Param.Kind:=aKind;
Param.Value:=aValue;
if fpfUnset in aFlags then
Include(Param.Flags,fpfUnset)
@ -1499,6 +1507,16 @@ const
exit;
end;
ParsedParams.Add(TFPCParamValue.Create(aName, aValue, aKind, aFlags));
// alias
if aName='S2' then
Add('M','objfpc',fpkValue,aFlags)
else if aName='Sd' then
Add('M','delphi',fpkValue,aFlags)
else if aName='So' then
Add('M','tp',fpkValue,aFlags)
else if aName='?' then
Add('h',aValue,aKind,aFlags);
end;
procedure AddBooleanFlag(var p: PChar; Len: integer; Prefix: string = '');
@ -1688,7 +1706,7 @@ begin
end;
until false;
end;
'i': ReadSequence(p,'S* T*');
'i': ReadSequence(p,'SO SP TO TP');
'I': Add(p^,PChar(@p[1]),fpkMultiValue);
'k': Add(p^,PChar(@p[1]),fpkMultiValue);
'M': Add(p^,PChar(@p[1]),fpkValue);
@ -1697,7 +1715,7 @@ begin
case p[1] of
'-': DisableAllFlags('O');
else
ReadSequence(p,'a= o* p: W:');
ReadSequence(p,'a= o* p: W: w:');
end;
'P': ; // ToDo
'R': Add(p^,PChar(@p[1]),fpkValue);

7
components/codetools/tests/testbasiccodetools.pas
View File

@ -495,7 +495,12 @@ begin
t('-Mdelphi','M','delphi',fpkValue,[]);
t('-n-','n','',fpkBoolean,[fpfUnset]);
t('-opath','o','path',fpkValue,[]);
t('-O2','O2',FPCParamEnabled,fpkBoolean,[]);
t('-O1','O','1',fpkValue,[]);
t('-O2','O','2',fpkValue,[]);
t('-O3','O','3',fpkValue,[]);
t('-O4','O','4',fpkValue,[]);
t('-O1 -O-','O','',fpkValue,[fpfUnset,fpfSetTwice,fpfValueChanged]);
t('-O1 -O2','O','2',fpkValue,[fpfSetTwice,fpfValueChanged]);
t('-Oab=c','Oab','c',fpkValue,[]);
t('-pg','pg',FPCParamEnabled,fpkBoolean,[]);
t('-Rfoo','R','foo',fpkValue,[]);