Context Navigation

-              r11
+              r13
       </local>
     </RunParams>
     <RequiredPackages Count="2">
+    <RequiredPackages Count="4">
       <Item1>
+        <PackageName Value="reg"/>
+        <DefaultFilename Value="Packages/fcl-registry/reg.lpk" Prefer="True"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="TemplateGenerics"/>
+        <DefaultFilename Value="Packages/TemplateGenerics/TemplateGenerics.lpk" Prefer="True"/>
+      </Item2>
+      <Item3>
         <PackageName Value="Common"/>
         <DefaultFilename Value="Packages/Common/Common.lpk" Prefer="True"/>
       </Item1>
       <Item2>
+      </Item3>
+      <Item4>
         <PackageName Value="LCL"/>
       </Item2>
+      </Item4>
     </RequiredPackages>
     <Units Count="7">

trunk/LinuxBuilder.lpr

r11	r13
9	9	Interfaces, // this includes the LCL widgetset
10	10	Forms, UFormMain, UKConfig, UFormList, UFormLog, UFormCompare, UFormSearch,
11		Common
	11	Common, TemplateGenerics
12	12	{ you can add units after this };
13	13

trunk/Packages/Common/Common.lpk

-              r11
+              r13
     </i18n>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
+    <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="TemplateGenerics"/>
+        <PackageName Value="reg"/>
       </Item1>
       <Item2>
+        <PackageName Value="TemplateGenerics"/>
+      </Item2>
+      <Item3>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
       </Item2>
+      </Item3>
     </RequiredPkgs>
     <UsageOptions>

trunk/Packages/Common/UApplicationInfo.pas

r11	r13
6	6
7	7	uses
8		SysUtils, Registry, Classes, Forms, URegistry;
	8	SysUtils, Registry2, Classes, Forms, URegistry;
9	9
10	10	type

trunk/Packages/Common/ULastOpenedList.pas

r11	r13
6	6
7	7	uses
8		Classes, SysUtils, ~~Registry, URegistry, Menu~~s;
	8	Classes, SysUtils, myregistry, URegistry, Menus, Dialogs;
9	9
10	10	type

trunk/Packages/Common/UPersistentForm.pas

r11	r13
8	8
9	9	uses
10		Classes, SysUtils, Forms, URegistry, LCLIntf, Registry;
	10	Classes, SysUtils, Forms, URegistry, LCLIntf, Registry2;
11	11
12	12	type

trunk/Packages/Common/URegistry.pas

r11	r13
6	6
7	7	uses
8		Classes, Registry;
	8	Classes, MyRegistry;
9	9
10	10	type

trunk/UFormMain.lfm

r12	r13
145	145	object MenuItemOpenRecent: TMenuItem
146	146	Caption = 'Open recent'
147		~~OnClick = MenuItemOpenRecentClick~~
148	147	end
149	148	object MenuItem7: TMenuItem

trunk/UFormMain.pas

-              r12
+              r13
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
   ActnList, ComCtrls, StdCtrls, UKConfig, ULastOpenedList, URegistry, Registry;
+  ActnList, ComCtrls, StdCtrls, UKConfig, ULastOpenedList, URegistry, Registry2;
 const
 …
     procedure LastOpenedListCompareChange(Sender: TObject);
     procedure LastOpenedListOpenChange(Sender: TObject);
-    procedure MenuItemOpenRecentClick(Sender: TObject);
     procedure TreeView1SelectionChanged(Sender: TObject);
   private
 …
 begin
   AutoOpen := True;
   LastOpenedListOpen.LoadFromRegistry(RegContext(RootKey, RootPath + '/OpenRecent'));
   LastOpenedListCompare.LoadFromRegistry(RegContext(RootKey, RootPath + '/CompareRecent'));
+  LastOpenedListOpen.LoadFromRegistry(RegContext(RootKey, RootPath + '\OpenRecent'));
+  LastOpenedListCompare.LoadFromRegistry(RegContext(RootKey, RootPath + '\CompareRecent'));
   if AutoOpen and (LastOpenedListOpen.Items.Count > 0) then
     OpenDir(LastOpenedListOpen.Items[0])
 …
   LastOpenedListOpen.LoadToMenuItem(MenuItemOpenRecent, AOpenDirExecute);
   LastOpenedListOpen.LoadToMenuItem(PopupMenuOpenRecent.Items, AOpenDirExecute);
-end;
-procedure TFormMain.MenuItemOpenRecentClick(Sender: TObject);
-begin
 end;
 …
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
   LastOpenedListOpen.SaveToRegistry(RegContext(RootKey, RootPath + '/OpenRecent'));
   LastOpenedListCompare.SaveToRegistry(RegContext(RootKey, RootPath + '/CompareRecent'));
+  LastOpenedListOpen.SaveToRegistry(RegContext(RootKey, RootPath + '\OpenRecent'));
+  LastOpenedListCompare.SaveToRegistry(RegContext(RootKey, RootPath + '\CompareRecent'));
 end;

trunk/UFormSearch.pas

-              r6
+              r13
     FormMain.Config.TopNode.Search(EditText.Text, List);
     ListView1.Items.Clear;
+    ListView1.Items.BeginUpdate;
     for I := 0 to List.Count - 1 do
     with TMenuNode(List[I]) do begin
 …
     end;
   finally
+    ListView1.Items.EndUpdate;
     List.Free;
   end;

trunk/UKConfig.pas

-              r11
+              r13
     vtComment);
+  TMenuNode = class;
   TLoadTreeOption = (toShowSystem);
   TLoadTreeOptions = set of TLoadTreeOption;
 …
     ExpOperator: TExpOperator;
     Items: TObjectList; // TList<TExpression>
+    constructor Create;
+    Parent: TExpression;
+    function Show: String; virtual;
+    procedure GetList(List: TStringList); virtual;
+    constructor Create; virtual;
     destructor Destroy; override;
   end;
+  TExpressionVar = class
+  TCompareType = (ctNone, ctEqual, ctNotEqual);
+  { TExpressionVar }
+  TExpressionVar = class(TExpression)
     Name: string;
+    Node: TMenuNode;
     Negative: Boolean;
+    Compare: TCompareType;
+    Value: string;
+    constructor Create; override;
+    procedure GetList(List: TStringList); override;
+    function Show: String; override;
   end;
 …
   TMenuNode = class
+  private
+    function GetVisible: Boolean;
+  public
     ID: string;
     Name: string;
     Depends: TStringList;
+    DependsOn: TExpression;
     Selects: TStringList;
     Description: TStringList;
 …
     function GetTopNode: TMenuNode; virtual;
     function FindNode(ID: string): TMenuNode; virtual;
+    property Visible: Boolean read GetVisible;
   end;
 …
     Arch: string;
     FOnLog: TOnLogEvent;
+    ParseFileName: string;
+    LineNumber: Integer;
     function GetTopCondition: string;
     procedure Log(Text: string);
     function IsWhiteSpace(Character: Char): Boolean;
+    function IsAlpha(Character: Char): Boolean;
+    function IsAlphaNumeric(Character: Char): Boolean;
+    function IsNumeric(Character: Char): Boolean;
+    function IsIdentifier(Name: string): Boolean;
+    function IsSpecialSymbol(Character: Char): Boolean;
+    procedure Expect(var Text: string; Token: string);
     function GetNextToken(var Text: string): string;
+    procedure ParseExpression(Node: TMenuNode; Line: string);
     procedure ParseFile(FileName: string);
     procedure ParseConfig;
     procedure ParseMakeFile;
+    function GetLog: string;
   public
     TopNode: TMenuNode;
 …
 implementation
+{ TExpressionVar }
+constructor TExpressionVar.Create;
+begin
+  inherited;
+  Compare := ctNone;
+  Value := '';
+  Negative := False;
+  Name := '';
+end;
+procedure TExpressionVar.GetList(List: TStringList);
+begin
+  inherited GetList(List);
+  List.Add(Name);
+end;
+function TExpressionVar.Show: String;
+begin
+  Result := Name;
+  if Negative then Result := '!' + Result;
+  if Compare = ctEqual then Result := Result + ' = ' + Value;
+  if Compare = ctNotEqual then Result := Result + ' != ' + Value;
+end;
 { TExpression }
+function TExpression.Show: String;
+var
+  Operand: string;
+  I: Integer;
+begin
+  Result := '';
+  if ExpOperator = eoAnd then Operand := '&&';
+  if ExpOperator = eoOr then Operand := '||';
+  for I := 0 to Items.Count - 1 do begin
+    Result := Result + TExpression(Items[I]).Show;
+    if I < (Items.Count - 1) then Result := Result + ' ' + Operand + ' ';
+  end;
+  if Assigned(Parent) then Result := '(' + Result + ')';
+end;
+procedure TExpression.GetList(List: TStringList);
+var
+  I: Integer;
+begin
+  for I := 0 to Items.Count - 1 do
+    TExpression(Items[I]).GetList(List);
+end;
 constructor TExpression.Create;
 begin
   Items := TObjectList.Create;
+  Parent := nil;
+  ExpOperator := eoAnd;
 end;
 …
 { TMenuNode }
+function TMenuNode.GetVisible: Boolean;
+var
+  I: Integer;
+begin
+  Result := True;
+  //for I := 0 to Depends.Count - 1 do
+  //if Depends[I]
+end;
 constructor TMenuNode.Create;
 …
   ID := '';
   Parent := nil;
   Depends := TStringList.Create;
+  DependsOn := TExpression.Create;
   Description := TStringList.Create;
   Selects := TStringList.Create;
 …
 destructor TMenuNode.Destroy;
 begin
+  DependsOn.Free;
   Items.Free;
-  Depends.Free;
   Description.Free;
   Selects.Free;
 …
     Add('ID: ' + ID);
     Add('Name: ' + Name);
     Add('Depends on: ' + Depends.Text);
+    Add('Depends on: ' + DependsOn.Show);
     Add('Selects: ' + Selects.Text);
     Add('Description: ' + Description.Text);
 …
   LatestNode: TMenuNode;
   CheckList: TObjectList;
+  DepList: TStringList;
 begin
   Result := False;
 …
     CheckList := TObjectList.Create;
     CheckList.OwnsObjects := False;
+    DepList := TStringList.Create;
     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);
+    DepList.Clear;
+    DependsOn.GetList(DepList);
     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
+      for J := 0 to DepList.Count - 1 do
+      if Trim(DepList[J]) <> '' then begin
+        if (DepList[J] = TMenuNode(CheckList[I]).ID) and (TMenuNode(CheckList[I]).ValueType <> vtChoice) then begin
           ChangeParent(TMenuNode(CheckList[I]));
           Result := True;
 …
     end;
   finally
+    DepList.Free;
     CheckList.Free;
   end;
 …
 end;
+function TConfigMenu.IsAlpha(Character: Char): Boolean;
+begin
+  Result := ((Character >= 'a') and (Character <= 'z'))
+    or ((Character >= 'A') and (Character <= 'Z'));
+end;
+function TConfigMenu.IsAlphaNumeric(Character: Char): Boolean;
+begin
+  Result := IsAlpha(Character) or IsNumeric(Character);
+end;
+function TConfigMenu.IsNumeric(Character: Char): Boolean;
+begin
+  Result := (Character >= '0') and (Character <= '9');
+end;
+function TConfigMenu.IsIdentifier(Name: string): Boolean;
+var
+  I: Integer;
+begin
+  Result := True;
+  for I := 1 to Length(Name) do
+    if not (IsAlphaNumeric(Name[I]) or (Name[I] = '_')) then begin
+      Result := False;
+      Break;
+    end;
+end;
+function TConfigMenu.IsSpecialSymbol(Character: Char): Boolean;
+begin
+  Result := (Character = '!') or (Character = '=') or (Character = '(') or
+    (Character = ')') or (Character = '-') or (Character = '|') or (Character = '&');
+end;
+procedure TConfigMenu.Expect(var Text: string; Token: string);
+begin
+  if GetNextToken(Text) <> Token then
+    raise Exception.Create('Expected "' + Token + '"');
+end;
 function TConfigMenu.GetNextToken(var Text: string): string;
 var
   I: Integer;
   Terminate: Boolean;
+  State: (stNormal, stWhiteSpace, stString);
+  State: (stNormal, stWhiteSpace, stString, stSpecialSymbol, stIdent,
+    stString2);
 begin
   I := 1;
 …
         State := stNormal;
         Terminate := True;
+        Inc(I);
+      end else Result := Result + Text[I];
+    end else
+    if State = stString2 then begin
+      if Text[I] = '''' then begin
+        State := stNormal;
+        Terminate := True;
+        Inc(I);
+      end else Result := Result + Text[I];
+    end else
+    if State = stSpecialSymbol then begin
+      if not IsSpecialSymbol(Text[I]) or (Result = '(') or (Result = ')') or
+        ((Result = '!') and (Text[I] <> '=')) or (Result = '||') or
+        (Result = '&&') then begin
+        State := stNormal;
+        Terminate := True;
+      end else Result := Result + Text[I];
+    end else
+    if State = stIdent then begin
+      if not (IsAlphanumeric(Text[I]) or (Text[I] = '_')) then begin
+        State := stNormal;
+        Terminate := True;
       end else Result := Result + Text[I];
     end else begin
       if IsWhiteSpace(Text[I]) then State := stWhiteSpace
       else if Text[I] = '"' then State := stString
+      else if Text[I] = '''' then State := stString2
+      else if Text[I] = '#' then begin
+        // Comment
+        Text := '';
+        Terminate := True;
+      end
+      else if IsSpecialSymbol(Text[I]) then begin
+        State := stSpecialSymbol;
+        Result := Result + Text[I];
+      end
+      else if IsAlphaNumeric(Text[I]) then begin
+        State := stIdent;
+        Result := Result + Text[I];
+      end
       else Result := Result + Text[I];
     end;
 …
   end;
   Delete(Text, 1, I - 1);
+end;
+procedure TConfigMenu.ParseExpression(Node: TMenuNode; Line: string);
+var
+  Token: string;
+  Exp: TExpression;
+  ExpVar: TExpressionVar;
+  ExpNew: TExpression;
+  Neg: Boolean;
+  Compare: TCompareType;
+begin
+  Line := Trim(Line);
+  Exp := Node.DependsOn;
+  Neg := False;
+  while Line <> '' do begin
+    Token := GetNextToken(Line);
+    if Token = '||' then begin
+      Exp.ExpOperator := eoOr;
+    end else
+    if Token = '&&' then begin
+      Exp.ExpOperator := eoAnd;
+    end else
+    if Token = '!' then begin
+      Neg := True;
+      Continue;
+    end else
+    if Token = '(' then begin
+      ExpNew := TExpression.Create;
+      ExpNew.Parent := Exp;
+      Exp.Items.Add(ExpNew);
+      Exp := ExpNew;
+      Neg := False;
+    end else
+    if Token = ')' then begin
+      if Assigned(Exp.Parent) then Exp := Exp.Parent
+        else raise Exception.Create('Cannot go to expression parent.' + GetLog);
+      Neg := False;
+    end else
+    if Token = '' then begin
+      // White space
+    end else
+    if Token = '=' then begin
+      ExpVar.Compare := ctEqual;
+      Token := GetNextToken(Line);
+      ExpVar.Value := Token;
+      Continue;
+    end else
+    if Token = '!=' then begin
+      ExpVar.Compare := ctNotEqual;
+      Token := GetNextToken(Line);
+      ExpVar.Value := Token;
+      Continue;
+    end else
+    if IsIdentifier(Token) then begin
+      ExpVar := TExpressionVar.Create;
+      ExpVar.Negative := Neg;
+      ExpVar.Name := Token;
+      ExpVar.Compare := Compare;
+      Exp.Items.Add(ExpVar);
+      Neg := False;
+    end else
+      raise Exception.Create('Unknown token "' + Token + '".' + GetLog);
+  end;
+  {// 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
+      Node.Depends.Add(Parameter);
+  end;
+  }
+end;
+function TConfigMenu.GetLog: string;
+begin
+  Result := ' ' + ParseFileName + ':' + IntToStr(LineNumber);
 end;
 …
   HelpIndent: Integer;
   LineIndent: Integer;
+function GetLog: string;
+begin
+  Result := FileName + ':' + IntToStr(I + 1) + ' ' + Content[I];
+end;
+  NewExp: TExpressionVar;
 const
   TabSize = 8;
+begin
+begin
+  ParseFileName := FileName;
   Log('FILE ' + FileName);
   try
 …
     HelpIndent := 0;
     for I := 0 to Content.Count - 1 do begin
+      LineNumber := I + 1;
       Line := MergedLines + Content[I];
       MergedLines := '';
 …
         HelpIndent := LineIndent;
         if (State = stHelpStart) and (HelpIndent = 0) then
           raise Exception.Create('Error during help parsing');
+          raise Exception.Create('Error during help parsing.' + GetLog);
       end;
       if (State = stHelpStart) and (Trim(Line) <> '') and (LineIndent < HelpIndent) then
 …
       end else
       if (Command = 'bool') or (Command = 'boolean') then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.ValueType := vtBool;
         NewItem.Name := Parameter;
       end else
       if Command = 'def_bool' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.DefaultValue := Parameter;
         NewItem.ValueType := vtBool;
       end else
       if Command = 'tristate' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Name := Parameter;
         NewItem.ValueType := vtTristate;
       end else
       if Command = 'def_tristate' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Name := Parameter;
       end else
       if Command = 'string' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Name := Parameter;
         NewItem.ValueType := vtString;
       end else
       if Command = 'int' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Name := Parameter;
         NewItem.ValueType := vtInt;
       end else
       if Command = 'hex' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Name := Parameter;
         NewItem.ValueType := vtHex;
       end else
       if Command = 'range' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.RangeMin := Parameter;
         Parameter := GetNextToken(Line);
 …
       end else
       if Command = 'prompt' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Name := Parameter;
       end else
       if Command = 'default' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.DefaultValue := Parameter;
       end else
       if Command = 'depends' then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         if Parameter = 'on' then begin
+          if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+          // 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;
+          if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
+          ParseExpression(NewItem, Line);
         end;
       end else
       if Command = 'select' then begin
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined. ' + GetLog);
+        Expect(Line, '');
+        Parameter := GetNextToken(Line);
+        if not Assigned(NewItem) then raise Exception.Create('Item not defined.' + GetLog);
         NewItem.Selects.Add(Parameter);
       end else
 …
       end else
       if Command = 'option' then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
       end else
       if (Command = 'config') or (Command = 'menuconfig') then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         State := stConfig;
 …
         NewItem.Parent := CurrentMenu;
         NewItem.ID := Parameter;
+        NewItem.Depends.AddStrings(ConditionStack);
+        for J := 0 to ConditionStack.Count - 1 do
+        if ConditionStack[J] <> '' then
+        begin
+          NewExp := TExpressionVar.Create;
+          NewExp.Name := ConditionStack[J];
+          NewItem.DependsOn.Items.Add(NewExp);
+        end;
         CurrentMenu.Items.Add(NewItem);
         if Command = 'menuconfig' then NewItem.MenuConfig := True;
       end else
       if (Command = 'comment')  then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         NewItem := TMenuNode.Create;
         NewItem.Parent := CurrentMenu;
         NewItem.Name := Parameter;
+        NewItem.Depends.AddStrings(ConditionStack);
+        for J := 0 to ConditionStack.Count - 1 do
+        if ConditionStack[J] <> '' then begin
+          NewExp := TExpressionVar.Create;
+          NewExp.Name := ConditionStack[J];
+          NewItem.DependsOn.Items.Add(NewExp);
+        end;
         NewItem.ValueType := vtComment;
         CurrentMenu.Items.Add(NewItem);
       end else
       if Command = 'source' then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         if Pos('$SRCARCH', Parameter) > 0 then
 …
         if FileExistsUTF8(Parameter) then
           ParseFile(Parameter)
           else raise Exception.Create('Source file "' + Parameter + '" not found. ' + GetLog);
+          else raise Exception.Create('Source file "' + Parameter + '" not found.' + GetLog);
       end else
       if Command = 'choice' then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         NewMenu := TMenuNode.Create;
 …
         NewMenu.Name := Parameter;
         NewMenu.Parent := CurrentMenu;
+        NewMenu.Depends.AddStrings(ConditionStack);
+        for J := 0 to ConditionStack.Count - 1 do
+        if ConditionStack[J] <> '' then begin
+          NewExp := TExpressionVar.Create;
+          NewExp.Name := ConditionStack[J];
+          NewMenu.DependsOn.Items.Add(NewExp);
+        end;
         ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
 …
           ConditionStack.Delete(ConditionStack.Count - 1);
           CurrentMenu := CurrentMenu.Parent;
         end else raise Exception.Create('Can''t change menu level up. ' + GetLog);
+        end else raise Exception.Create('Can''t change menu level up.' + GetLog);
       end else
       if Command = 'mainmenu' then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         Parameter := StringReplace(Parameter, '$ARCH', Arch, [rfReplaceAll]);
 …
       end else
       if Command = 'menu' then begin
+        Expect(Line, '');
         Parameter := GetNextToken(Line);
         Log('MENU ' + Parameter + ' IN ' + CurrentMenu.GetAbsoluteName);
 …
         NewMenu.Name := Parameter;
         NewMenu.Parent := CurrentMenu;
+        NewMenu.Depends.AddStrings(ConditionStack);
+        for J := 0 to ConditionStack.Count - 1 do
+        if ConditionStack[J] <> '' then begin
+          NewExp := TExpressionVar.Create;
+          NewExp.Name := ConditionStack[J];
+          NewMenu.DependsOn.Items.Add(NewExp);
+        end;
         ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
 …
           ConditionStack.Delete(ConditionStack.Count - 1);
           CurrentMenu := CurrentMenu.Parent;
         end else raise Exception.Create('Can''t change menu level up. ' + GetLog);
+        end else raise Exception.Create('Can''t change menu level up.' + GetLog);
       end else
       if Command = 'if' then begin
+        Expect(Line, '');
         ConditionStack.AddObject(GetNextToken(Line), NewItem);
       end else
 …
         ConditionStack.Delete(ConditionStack.Count - 1);
       end else
         raise Exception.Create('Unknown command "' + Command + '". ' + GetLog);
+        raise Exception.Create('Unknown command "' + Command + '".' + GetLog);
     end;
   finally

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 13 for trunk

Legend:

Download in other formats: