From 0b9e3dcde4c40986a242debfdfd0b8d721f2339d Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sat, 25 Jan 2014 19:05:40 +0000
Subject: [PATCH] IDE: In all compiler options, allow one char options combined
 like -Criot.

git-svn-id: trunk@43804 -
---
 ide/compiler.pp | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/ide/compiler.pp b/ide/compiler.pp
index 63456c4c2f..bf5d2dc950 100644
--- a/ide/compiler.pp
+++ b/ide/compiler.pp
@@ -135,6 +135,7 @@ type
   private
     // List of options belonging to this group.
     fCompilerOpts: TCompilerOptList;
+    function OneCharOptions(aOptAndValue: string): TCompilerOpt;
   protected
     procedure ParseEditKind; override;
   public
@@ -630,10 +631,28 @@ begin
   Result := FindOptionSub(Self);
 end;
 
+function TCompilerOptGroup.OneCharOptions(aOptAndValue: string): TCompilerOpt;
+// Split and select option characters like in -Criot.
+// Returns reference to the last option object if all characters were valid opts.
+var
+  i: Integer;
+  OptBase: String;
+begin
+  OptBase := Copy(aOptAndValue, 1, 2);
+  for i := 3 to Length(aOptAndValue) do
+  begin
+    Result := FindOption(OptBase + aOptAndValue[i]);
+    if Assigned(Result) then
+      Result.Value := 'True'
+    else
+      Exit(Nil);
+  end;
+end;
+
 function TCompilerOptGroup.SelectOption(aOptAndValue: string): Boolean;
 var
   Opt: TCompilerOpt;
-  OptStr, Param: string;
+  Param: string;
   OptLen, ParamLen: integer;
 begin
   Opt := FindOption(aOptAndValue);
@@ -648,19 +667,22 @@ begin
       OptLen := 2
     else
       OptLen := 3;
-    OptStr := Copy(aOptAndValue, 1, OptLen);
     ParamLen := Length(aOptAndValue) - OptLen;
-    if (ParamLen > 0)
+    Opt := Nil;
+    if (ParamLen > 1)
     and (aOptAndValue[OptLen+1] in ['''', '"'])
     and (aOptAndValue[Length(aOptAndValue)] in ['''', '"']) then
-    begin
-      Inc(OptLen);                // Strip quotes
-      Dec(ParamLen, 2);
+      Param := Copy(aOptAndValue, OptLen+2, ParamLen-2) // Strip quotes
+    else begin
+      Param := Copy(aOptAndValue, OptLen+1, ParamLen);
+      if OptLen = 3 then // Can contain one char options like -Criot. Can be combined.
+        Opt := OneCharOptions(aOptAndValue);
+    end;
+    if Opt = Nil then begin
+      Opt := FindOption(Copy(aOptAndValue, 1, OptLen));
+      if Assigned(Opt) then
+        Opt.Value := Param;
     end;
-    Param := Copy(aOptAndValue, OptLen+1, ParamLen);
-    Opt := FindOption(OptStr);
-    if Assigned(Opt) then
-      Opt.Value := Param;
   end;
   Result := Assigned(Opt);
 end;
@@ -717,7 +739,7 @@ begin
     Opt := TCompilerOpt(fCompilerOpts[i]);
     if Opt.Value <> '' then
       case Opt.EditKind of
-        oeSetElem: s := s + Opt.Option;
+        oeSetElem  : s := s + Opt.Option;
         oeSetNumber: s := s + Opt.Value;
       end;
   end;