Changeset 9 for trunk

Timestamp:

May 2, 2014, 3:39:44 PM (11 years ago)

Author:

chronos

Message:

• Modified: Different "depends on" evalution.

File:

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

trunk/UKConfig.pas

@@ -23 +23 @@
   TObjectMoves = array of TObjectMove;
 
+  TExpOperator = (eoAnd, eoOr);
+
+  { TExpression }
+
+  TExpression = class
+    ExpOperator: TExpOperator;
+    Items: TObjectList; // TList<TExpression>
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  TExpressionVar = class
+    Name: string;
+    Negative: Boolean;
+  end;
+
   { TMenuNode }
 
   TMenuNode = class
+    Index: Integer;
     ID: string;
     Name: string;
@@ -66 +83 @@
     Arch: string;
     FOnLog: TOnLogEvent;
+    IndexCounter: Integer;
     function GetTopCondition: string;
     procedure Log(Text: string);
@@ -89 +107 @@
 implementation
 
+{ TExpression }
+
+constructor TExpression.Create;
+begin
+  Items := TObjectList.Create;
+end;
+
+destructor TExpression.Destroy;
+begin
+  Items.Free;
+  inherited Destroy;
+end;
+
 { TMenuNode }
 
@@ -150 +181 @@
   with List do begin
     Clear;
+    Add('Index: ' + IntToStr(Index));
     Add('ID: ' + ID);
     Add('Name: ' + Name);
@@ -199 +231 @@
   Index: Integer;
   P: TMenuNode;
-begin
-  if ID = 'EXT4_FS' then
+  LatestNode: TMenuNode;
+begin
+  if ID = 'PARAVIRT_DEBUG' then
     Name := Name + '$';
   NewParent := Parent;
@@ -212 +245 @@
     end;
   end;}
-  if Depends.Count > 0 then begin
-    Index := Lookup.IndexOf(Depends[0]);
+  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)) then begin
-      NewParent := Node;
+    if Assigned(Node) and (NewParent <> Node) and (Node.HaveUpperNode(NewParent)) and
+      (Node.Index > LatestNode.Index) then begin
+      LatestNode := Node;
     end;
-  end;
+    Inc(I);
+  end;
+  NewParent := LatestNode;
+
   if NewParent <> Parent then begin
     NewMove.Source := Self;
@@ -436 +475 @@
         Parameter := GetNextToken(Line);
         if Parameter = 'on' then begin
-          Parameter := GetNextToken(Line);
-          if Copy(Parameter, 1, 1) = '!' then Delete(Parameter, 1, 1);
           if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
-          NewItem.Depends.Add(Parameter);
+          // Just try to load symbol list. Do not parse expression
+          while Trim(Line) <> '' do begin
+            Parameter := GetNextToken(Line);
+            if Copy(Parameter, 1, 1) = '!' then Delete(Parameter, 1, 1);
+            if Copy(Parameter, 1, 1) = '(' then Delete(Parameter, 1, 1);
+            if Copy(Parameter, Length(Parameter), 1) = ')' then Delete(Parameter, Length(Parameter), 1);
+            Parameter := Trim(Parameter);
+            if (Parameter <> '&&') and (Parameter <> '||') then
+              NewItem.Depends.Add(Parameter);
+          end;
         end;
       end else
@@ -470 +516 @@
         NewItem.ID := Parameter;
         NewItem.Condition := GetTopCondition;
+        NewItem.Index := IndexCounter;
+        Inc(IndexCounter);
         CurrentMenu.Items.Add(NewItem);
         if Command = 'menuconfig' then NewItem.MenuConfig := True;
@@ -479 +527 @@
         NewItem.Name := Parameter;
         NewItem.Condition := GetTopCondition;
+        NewItem.Index := IndexCounter;
+        Inc(IndexCounter);
         NewItem.ValueType := vtComment;
         CurrentMenu.Items.Add(NewItem);
@@ -498 +548 @@
         NewMenu.Parent := CurrentMenu;
         NewMenu.Condition := GetTopCondition;
+        NewMenu.Index := IndexCounter;
+        Inc(IndexCounter);
         ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
@@ -563 +615 @@
   TopNode.Name := 'Root';
   CurrentMenu := TopNode;
+  IndexCounter := 1;
   ParseFile(BaseDir + DirectorySeparator + 'Kconfig');
 end;