Changeset 111 for branches/generator/Forms/UFormRule.pas

Timestamp:

Aug 9, 2017, 12:09:47 AM (7 years ago)

Author:

chronos

Message:

• Added: RuleItem can be selected as terminal or non-terminal node.

File:

• branches/generator/Forms/UFormRule.pas (modified) (7 diffs)

branches/generator/Forms/UFormRule.pas

@@ -20 +20 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    ComboBox1: TComboBox;
     EditName: TEdit;
     Label1: TLabel;
+    Label2: TLabel;
     ListView: TListView;
     MenuItem1: TMenuItem;
@@ -39 +41 @@
     { private declarations }
   public
-    RuleItems: TRuleItems;
+    Rule: TRule;
     procedure UpdateInterface;
     procedure ReloadList;
@@ -68 +70 @@
 procedure TFormRule.ListViewData(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < RuleItems.Count) then begin
-    Item.Caption := RuleItems[Item.Index].Name;
-    Item.Data := RuleItems[Item.Index];
+  if (Item.Index >= 0) and (Item.Index < Rule.Items.Count) then begin
+    Item.Caption := Rule.Items[Item.Index].GetBNF;
+    Item.Data := Rule.Items[Item.Index];
   end;
 end;
@@ -95 +97 @@
 begin
   NewRuleItem := TRuleItem.Create;
+  NewRuleItem.Grammer := Rule.Grammer;
   FormRuleItem.LoadData(NewRuleItem);
   if FormRuleItem.ShowModal = mrOk then begin
     FormRuleItem.SaveData(NewRuleItem);
-    RuleItems.Add(NewRuleItem);
+    NewRuleItem.ParentRule := Rule;
+    Rule.Items.Add(NewRuleItem);
     ReloadList;
   end else FreeAndNil(NewRuleItem);
@@ -121 +125 @@
   for Item in ListView.Items do
   if Item.Selected then
-    RuleItems.Remove(TRuleItem(Item.Data));
+    Rule.Items.Remove(TRuleItem(Item.Data));
   ReloadList;
 end;
@@ -133 +137 @@
 procedure TFormRule.ReloadList;
 begin
-  ListView.Items.Count := RuleItems.Count;
+  ListView.Items.Count := Rule.Items.Count;
   ListView.Refresh;
 end;
@@ -139 +143 @@
 procedure TFormRule.LoadData(Rule: TRule);
 begin
+  Self.Rule := Rule;
+  ComboBox1.ItemIndex := Integer(Rule.RuleType);
   EditName.Text := Rule.Name;
-  RuleItems := Rule.Items;
+  Rule.Items := Rule.Items;
 end;
 
 procedure TFormRule.SaveData(Rule: TRule);
 begin
+  Rule.RuleType := TRuleType(ComboBox1.ItemIndex);
   Rule.Name := EditName.Text;
 end;