Changeset 10

Timestamp:

May 2, 2014, 8:06:58 PM (11 years ago)

Author:

chronos

Message:

• Modified: Improved help text parsing.
• Modified: Reworked menu structure rearranging according "Depends on" items. Now it better corresponds to kernel config tools.

File:

• trunk/UKConfig.pas (modified) (25 diffs)

trunk/UKConfig.pas

@@ -42 +42 @@
 
   TMenuNode = class
-    Index: Integer;
     ID: string;
     Name: string;
-    Condition: string;
     Depends: TStringList;
     Selects: TStringList;
@@ -51 +49 @@
     Items: TObjectList; // TList<TMenuNode>
     Parent: TMenuNode;
-    NewParent: TMenuNode;
+    //NewParent: TMenuNode;
     DefaultValue: string;
     ValueType: TValueType;
@@ -59 +57 @@
     constructor Create; virtual;
     destructor Destroy; override;
-    function HaveUpperNode(Node: TMenuNode): Boolean;
+    procedure ChangeParent(NewParent: TMenuNode);
+    procedure AddLastToList(List: TObjectList);
     function GetName: string; virtual;
     function GetAbsoluteName: string; virtual;
@@ -67 +66 @@
     procedure Search(Text: string; List: TObjectList); virtual;
     procedure SaveToList(List: TStrings); virtual;
-    procedure PrepareMoveList(Lookup: TStringList; var List: TObjectMoves); virtual;
+    function PrepareMoveList(Lookup: TStringList; var List: TObjectMoves): Boolean; virtual;
     function GetCount: Integer; virtual;
     function GetTopNode: TMenuNode; virtual;
@@ -83 +82 @@
     Arch: string;
     FOnLog: TOnLogEvent;
-    IndexCounter: Integer;
     function GetTopCondition: string;
     procedure Log(Text: string);
@@ -143 +141 @@
 end;
 
-function TMenuNode.HaveUpperNode(Node: TMenuNode): Boolean;
-begin
-  Result := False;
-  if NewParent = Node then Result := True
-    else if Assigned(NewParent) then Result := NewParent.HaveUpperNode(Node);
+procedure TMenuNode.ChangeParent(NewParent: TMenuNode);
+var
+  LastOwnState: Boolean;
+begin
+  try
+    LastOwnState := Parent.Items.OwnsObjects;
+    Parent.Items.OwnsObjects := False;
+    Parent.Items.Remove(Self);
+  finally
+    Parent.Items.OwnsObjects := LastOwnState;
+  end;
+  Parent := NewParent;
+  NewParent.Items.Add(Self);
+end;
+
+procedure TMenuNode.AddLastToList(List: TObjectList);
+begin
+  List.Add(Self);
+  if Items.Count > 0 then begin
+    TMenuNode(Items.Last).AddLastToList(List);
+  end;
 end;
 
@@ -181 +195 @@
   with List do begin
     Clear;
-    Add('Index: ' + IntToStr(Index));
     Add('ID: ' + ID);
     Add('Name: ' + Name);
@@ -187 +200 @@
     Add('Selects: ' + Selects.Text);
     Add('Description: ' + Description.Text);
-    Add('Condition: ' + Condition);
     Add('Value type: ' + IntToStr(Integer(ValueType)));
     Add('Default value: ' + DefaultValue);
+    Add('Path: ' + GetAbsoluteName);
   end;
 end;
@@ -224 +237 @@
 end;
 
-procedure TMenuNode.PrepareMoveList(Lookup: TStringList; var List: TObjectMoves);
-var
-  I: Integer;
-  Node: TMenuNode;
+function TMenuNode.PrepareMoveList(Lookup: TStringList; var List: TObjectMoves): Boolean;
+var
+  I: Integer;
+  J: Integer;
   NewMove: TObjectMove;
   Index: Integer;
-  P: TMenuNode;
   LatestNode: TMenuNode;
-begin
-  if ID = 'PARAVIRT_DEBUG' then
-    Name := Name + '$';
-  NewParent := Parent;
-  P := Parent;
-{  if Condition <> '' then begin
-    Index := Lookup.IndexOf(Condition);
-    if Index <> -1 then Node := TMenuNode(Lookup.Objects[Index])
-      else Node := nil;
-    if Assigned(Node) and (NewParent <> Node) and Node.MenuConfig then begin
-      NewParent := Node;
+  CheckList: TObjectList;
+begin
+  Result := False;
+  try
+    CheckList := TObjectList.Create;
+    CheckList.OwnsObjects := False;
+    if Assigned(Parent) then begin
+    Index := Parent.Items.IndexOf(Self);
+    if Index = -1 then raise Exception.Create('Node not found in parent');
+    if Index >= 1 then TMenuNode(Parent.Items[Index - 1]).AddLastToList(CheckList);
+    for I := CheckList.Count - 1 downto 0 do begin
+      for J := 0 to Depends.Count - 1 do
+      if Trim(Depends[J]) <> '' then begin
+        if (Depends[J] = TMenuNode(CheckList[I]).ID) and (TMenuNode(CheckList[I]).ValueType <> vtChoice) then begin
+          ChangeParent(TMenuNode(CheckList[I]));
+          Result := True;
+          Break;
+        end;
+      end;
+      if Result then Break;
     end;
-  end;}
-  I := 0;
-  LatestNode := NewParent;
-  while I < Depends.Count do begin
-    Index := Lookup.IndexOf(Depends[I]);
-    if Index <> -1 then Node := TMenuNode(Lookup.Objects[Index])
-      else Node := nil;
-    if Assigned(Node) and (NewParent <> Node) and (Node.HaveUpperNode(NewParent)) and
-      (Node.Index > LatestNode.Index) then begin
-      LatestNode := Node;
     end;
-    Inc(I);
-  end;
-  NewParent := LatestNode;
-
-  if NewParent <> Parent then begin
-    NewMove.Source := Self;
-    NewMove.NewParent := NewParent;
-    SetLength(List, Length(List) + 1);
-    List[Length(List) - 1] := NewMove;
+  finally
+    CheckList.Free;
   end;
 
@@ -269 +273 @@
   while I < Items.Count do
   with TMenuNode(Items[I]) do begin
-    PrepareMoveList(Lookup, List);
-    Inc(I);
+    if not PrepareMoveList(Lookup, List) then Inc(I);
   end;
 end;
@@ -323 +326 @@
 function TConfigMenu.IsWhiteSpace(Character: Char): Boolean;
 begin
-  Result := (Character = ' ') or (Character = #9);
+  Result := (Character >= #0) and (Character <= ' ');
 end;
 
@@ -362 +365 @@
   Content: TStringList;
   I: Integer;
+  J: Integer;
   Command: string;
   Parameter: string;
   Line: string;
-  State: (stNormal, stConfig, stHelp);
+  State: (stNormal, stConfig, stHelp, stHelpStart);
   NewItem: TMenuNode;
   NewMenu: TMenuNode;
@@ -376 +380 @@
   Result := FileName + ':' + IntToStr(I + 1) + ' ' + Content[I];
 end;
+
+const
+  TabSize = 8;
 
 begin
@@ -389 +396 @@
       Line := MergedLines + Content[I];
       MergedLines := '';
-      LineIndent := 1;
-      while (LineIndent <= Length(Line)) and IsWhiteSpace(Line[LineIndent]) do Inc(LineIndent);
-      if (State = stHelp) and (Trim(Line) <> '') and (LineIndent = 1) then
+      LineIndent := 0;
+      J := 1;
+      while (J <= Length(Line)) and IsWhiteSpace(Line[J]) do begin
+        if Line[J] = #9 then LineIndent := (Trunc(LineIndent / TabSize) + 1) * TabSize
+          else Inc(LineIndent);
+        Inc(J);
+      end;
+      if (State = stHelp) and (Trim(Line) <> '') then begin
+        State := stHelpStart;
+        if LineIndent = 0 then State := stNormal;
+        HelpIndent := LineIndent;
+        if (State = stHelpStart) and (HelpIndent = 0) then
+          raise Exception.Create('Error during help parsing');
+      end;
+      if (State = stHelpStart) and (Trim(Line) <> '') and (LineIndent < HelpIndent) then
         State := stNormal;
 
@@ -411 +430 @@
       end;
       Command := GetNextToken(Line);
-      if State = stHelp then begin
+      if (State = stHelp) or (State = stHelpStart) then begin
         NewItem.Description.Add(Trim(Content[I]));
       end else
@@ -496 +515 @@
         Command := GetNextToken(Line);
         if Command = 'help' then begin
-          Parameter := GetNextToken(Line);
           State := stHelp;
           HelpIndent := LineIndent;
@@ -502 +520 @@
       end else
       if (Command = 'help') or (Command = '---help---') then begin
-        Parameter := GetNextToken(Line);
         State := stHelp;
         HelpIndent := LineIndent;
@@ -515 +532 @@
         NewItem.Parent := CurrentMenu;
         NewItem.ID := Parameter;
-        NewItem.Condition := GetTopCondition;
-        NewItem.Index := IndexCounter;
-        Inc(IndexCounter);
+        NewItem.Depends.AddStrings(ConditionStack);
         CurrentMenu.Items.Add(NewItem);
         if Command = 'menuconfig' then NewItem.MenuConfig := True;
@@ -526 +541 @@
         NewItem.Parent := CurrentMenu;
         NewItem.Name := Parameter;
-        NewItem.Condition := GetTopCondition;
-        NewItem.Index := IndexCounter;
-        Inc(IndexCounter);
+        NewItem.Depends.AddStrings(ConditionStack);
         NewItem.ValueType := vtComment;
         CurrentMenu.Items.Add(NewItem);
@@ -547 +560 @@
         NewMenu.Name := Parameter;
         NewMenu.Parent := CurrentMenu;
-        NewMenu.Condition := GetTopCondition;
-        NewMenu.Index := IndexCounter;
-        Inc(IndexCounter);
+        NewMenu.Depends.AddStrings(ConditionStack);
         ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
@@ -573 +584 @@
         NewMenu.Name := Parameter;
         NewMenu.Parent := CurrentMenu;
-        NewMenu.Condition := GetTopCondition;
+        NewMenu.Depends.AddStrings(ConditionStack);
         ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
@@ -588 +599 @@
       if Command = 'if' then begin
         ConditionStack.AddObject(GetNextToken(Line), NewItem);
-        if Assigned(NewItem) and NewItem.MenuConfig then begin
-          CurrentMenu := NewItem;
-        end;
       end else
       if Command = 'visible' then begin
@@ -596 +604 @@
       end else
       if Command = 'endif' then begin
-        if Assigned(ConditionStack.Objects[ConditionStack.Count - 1]) then
-          if TMenuNode(ConditionStack.Objects[ConditionStack.Count - 1]).MenuConfig then
-            CurrentMenu := CurrentMenu.Parent;
         ConditionStack.Delete(ConditionStack.Count - 1);
       end else
@@ -615 +620 @@
   TopNode.Name := 'Root';
   CurrentMenu := TopNode;
-  IndexCounter := 1;
   ParseFile(BaseDir + DirectorySeparator + 'Kconfig');
 end;
@@ -664 +668 @@
     Node := TopNode.FindNode(List[I]);
     if Assigned(Node) then
-      List[I] := Node.GetAbsoluteName + ' (' + List[I] + ')';
+      List[I] := '"' + Node.GetAbsoluteName + '";' + List[I];
   end;
 end;