Changeset 122 for branches/generator/Forms/UFormRuleItem.pas

Timestamp:

Nov 29, 2017, 2:03:17 PM (7 years ago)

Author:

chronos

Message:

• Added: New rule item type "Terminal range" to hold interval of characters.
• Fixed: Removel of selected items in a list was not working correctly.

File:

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

branches/generator/Forms/UFormRuleItem.pas

@@ -18 +18 @@
     CheckBoxOptional: TCheckBox;
     CheckBoxRepetitive: TCheckBox;
-    ComboBoxNonTerminal: TComboBox;
     ComboBoxType: TComboBox;
-    EditName: TEdit;
+    EditTerminal: TEdit;
+    EditTerminalFrom: TEdit;
+    EditTerminalTo: TEdit;
     Label2: TLabel;
     LabelNonTerminal: TLabel;
     LabelTerminal: TLabel;
+    LabelTerminal1: TLabel;
+    LabelTerminal2: TLabel;
+    ListBox1: TListBox;
     PageControl1: TPageControl;
+    TabSheetTerminalRange: TTabSheet;
     TabSheetTerminal: TTabSheet;
     TabSheetNonTerminal: TTabSheet;
     TabSheetSubItems: TTabSheet;
     procedure ComboBoxTypeChange(Sender: TObject);
+    procedure EditTerminalKeyPress(Sender: TObject; var Key: char);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -62 +68 @@
 end;
 
+procedure TFormRuleItem.EditTerminalKeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = #13 then ButtonOk.Click;
+end;
+
 procedure TFormRuleItem.FormClose(Sender: TObject; var CloseAction: TCloseAction
   );
@@ -84 +95 @@
 begin
   Core.PersistentForm1.Load(Self);
+  case RuleItem.RuleItemType of
+    ritTerminal: EditTerminal.SetFocus;
+    ritNonTerminal: ListBox1.SetFocus;
+    ritSubItems: TFormRuleItems(FormRuleItems).ListView1.SetFocus;
+  end;
 end;
+
 
 procedure TFormRuleItem.ReloadNonTerminals(Grammer: TGrammer);
@@ -90 +107 @@
   Rule: TRule;
 begin
-  ComboBoxNonTerminal.Items.Clear;
+  ListBox1.Items.Clear;
   for Rule in Grammer.Rules do begin
-    ComboBoxNonTerminal.Items.AddObject(Rule.Name, Rule);
+    ListBox1.Items.AddObject(Rule.Name, Rule);
   end;
-  ComboBoxNonTerminal.Sorted := True;
+  ListBox1.Sorted := True;
 end;
 
@@ -100 +117 @@
 begin
   PageControl1.PageIndex := Integer(RuleItem.RuleItemType);
-  EditName.Visible := RuleItem.RuleItemType = ritTerminal;
+  EditTerminal.Visible := RuleItem.RuleItemType = ritTerminal;
   LabelTerminal.Visible := RuleItem.RuleItemType = ritTerminal;
-  ComboBoxNonTerminal.Visible := RuleItem.RuleItemType = ritNonTerminal;
+  ListBox1.Visible := RuleItem.RuleItemType = ritNonTerminal;
   LabelNonTerminal.Visible := RuleItem.RuleItemType = ritNonTerminal;
 end;
@@ -111 +128 @@
   ReloadNonTerminals(RuleItem.Grammer);
   ComboBoxType.ItemIndex := Integer(RuleItem.RuleItemType);
-  ComboBoxNonTerminal.ItemIndex := ComboBoxNonTerminal.Items.IndexOfObject(RuleItem.NonTerminal);
-  EditName.Text := RuleItem.Terminal;
+  ListBox1.ItemIndex := ListBox1.Items.IndexOfObject(RuleItem.NonTerminal);
+  EditTerminal.Text := RuleItem.Terminal;
+  EditTerminalFrom.Text := RuleItem.TerminalFrom;
+  EditTerminalTo.Text := RuleItem.TerminalTo;
   CheckBoxOptional.Checked := RuleItem.Optional;
   CheckBoxRepetitive.Checked := RuleItem.Repetitive;
@@ -123 +142 @@
   TFormRuleItems(FormRuleItems).SaveData(RuleItem.SubItems);
   RuleItem.RuleItemType := TRuleItemType(ComboBoxType.ItemIndex);
-  if RuleItem.RuleItemType = ritTerminal then RuleItem.Terminal := EditName.Text
-  else if RuleItem.RuleItemType = ritNonTerminal then
-    RuleItem.NonTerminal := TRule(ComboBoxNonTerminal.Items.Objects[ComboBoxNonTerminal.ItemIndex]);
+  RuleItem.Terminal := EditTerminal.Text;
+  RuleItem.TerminalFrom := EditTerminalFrom.Text;
+  RuleItem.TerminalTo := EditTerminalTo.Text;
+  if ListBox1.ItemIndex <> -1 then
+    RuleItem.NonTerminal := TRule(ListBox1.Items.Objects[ListBox1.ItemIndex])
+    else RuleItem.NonTerminal := nil;
   RuleItem.Optional := CheckBoxOptional.Checked;
   RuleItem.Repetitive := CheckBoxRepetitive.Checked;