Changeset 136 for branches/generator/Forms

Timestamp:

Dec 26, 2017, 6:59:40 PM (7 years ago)

Author:

chronos

Message:

• Added: Support for whitespaces in And rule.
• Added: Terminals can be specified as escaped strings with slash.

Location:

branches/generator/Forms

Files:

• UFormGrammer.lfm (modified) (2 diffs)
• UFormGrammer.pas (modified) (4 diffs)
• UFormMain.pas (modified) (1 diff)
• UFormRuleItem.lfm (modified) (3 diffs)
• UFormRuleItem.pas (modified) (4 diffs)
• UFormRuleItems.lfm (modified) (3 diffs)
• UFormRuleItems.pas (modified) (6 diffs)

branches/generator/Forms/UFormGrammer.lfm

@@ -7 +7 @@
   ClientHeight = 346
   ClientWidth = 548
-  DesignTimePPI = 120
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '1.8.0.4'
   object Label1: TLabel
     Left = 15
-    Height = 20
+    Height = 23
     Top = 22
-    Width = 63
+    Width = 75
     Caption = 'Start rule:'
     ParentColor = False
   end
   object ComboBoxStartRule: TComboBox
-    Left = 120
-    Height = 28
-    Top = 24
+    Left = 168
+    Height = 37
+    Top = 22
     Width = 272
-    ItemHeight = 20
+    ItemHeight = 0
     Style = csDropDownList
     TabOrder = 0
@@ -47 +46 @@
     TabOrder = 2
   end
+  object Label2: TLabel
+    Left = 16
+    Height = 23
+    Top = 80
+    Width = 130
+    Caption = 'White space rule:'
+    ParentColor = False
+  end
+  object ComboBoxWhiteSpaceRule: TComboBox
+    Left = 168
+    Height = 37
+    Top = 72
+    Width = 272
+    ItemHeight = 0
+    Style = csDropDownList
+    TabOrder = 3
+  end
 end

branches/generator/Forms/UFormGrammer.pas

@@ -17 +17 @@
     ButtonOk: TButton;
     ComboBoxStartRule: TComboBox;
+    ComboBoxWhiteSpaceRule: TComboBox;
     Label1: TLabel;
+    Label2: TLabel;
     procedure FormShow(Sender: TObject);
   private
@@ -49 +51 @@
   end;
   ComboBoxStartRule.Sorted := True;
+
+  ComboBoxWhiteSpaceRule.Items.Clear;
+  for Rule in Grammer.Rules do begin
+    ComboBoxWhiteSpaceRule.Items.AddObject(Rule.Name, Rule);
+  end;
+  ComboBoxWhiteSpaceRule.Sorted := True;
 end;
 
@@ -58 +66 @@
     ComboBoxStartRule.ItemIndex := ComboBoxStartRule.Items.IndexOfObject(Grammer.TopRule);
   end else ComboBoxStartRule.ItemIndex := -1;
+  if Assigned(Grammer.WhiteSpaceRule) then begin
+    ComboBoxWhiteSpaceRule.ItemIndex := ComboBoxWhiteSpaceRule.Items.IndexOfObject(Grammer.WhiteSpaceRule);
+  end else ComboBoxWhiteSpaceRule.ItemIndex := -1;
 end;
 
@@ -66 +77 @@
     Grammer.TopRule := TRule(ComboBoxStartRule.Items.Objects[ComboBoxStartRule.ItemIndex])
     else Grammer.TopRule := nil;
+  if ComboBoxWhiteSpaceRule.ItemIndex <> -1 then
+    Grammer.WhiteSpaceRule := TRule(ComboBoxWhiteSpaceRule.Items.Objects[ComboBoxWhiteSpaceRule.ItemIndex])
+    else Grammer.WhiteSpaceRule := nil;
 end;
 

branches/generator/Forms/UFormMain.pas

@@ -271 +271 @@
 procedure TFormMain.AProjectOpenRecentExecute(Sender: TObject);
 begin
-  if Sender is TMenuItem then ProjectOpen(TMenuItem(Sender).Caption);
+  if Sender is TMenuItem then begin
+    AProjectClose.Execute;
+    if not Assigned(Core.Grammer) then begin
+      ProjectOpen(TMenuItem(Sender).Caption);
+    end;
+  end;
 end;
 

branches/generator/Forms/UFormRuleItem.lfm

@@ -161 +161 @@
   end
   object CheckBoxRepetitive: TCheckBox
-    Left = 216
+    Left = 184
     Height = 27
     Top = 56
@@ -169 +169 @@
   end
   object CheckBoxAnyExcept: TCheckBox
-    Left = 400
+    Left = 344
     Height = 27
     Top = 56
@@ -176 +176 @@
     TabOrder = 6
   end
+  object CheckBoxEscapedString: TCheckBox
+    Left = 488
+    Height = 27
+    Top = 56
+    Width = 144
+    Caption = 'Escaped strings'
+    TabOrder = 7
+  end
 end

branches/generator/Forms/UFormRuleItem.pas

@@ -17 +17 @@
     ButtonOk: TButton;
     CheckBoxAnyExcept: TCheckBox;
+    CheckBoxEscapedString: TCheckBox;
     CheckBoxOptional: TCheckBox;
     CheckBoxRepetitive: TCheckBox;
@@ -123 +124 @@
   ListBox1.Visible := RuleItem.RuleItemType = ritNonTerminal;
   LabelNonTerminal.Visible := RuleItem.RuleItemType = ritNonTerminal;
+  CheckBoxOptional.Enabled := RuleItem.ParentRule.Items.RuleType = rtAnd;
+  CheckBoxRepetitive.Enabled := RuleItem.ParentRule.Items.RuleType = rtAnd;
+  CheckBoxEscapedString.Enabled := (RuleItem.RuleItemType = ritTerminal) or
+    (RuleItem.RuleItemType = ritTerminalRange);
 end;
 
@@ -138 +143 @@
   CheckBoxAnyExcept.Checked := RuleItem.AnyExcept;
   TFormRuleItems(FormRuleItems).LoadData(RuleItem.SubItems);
+  CheckBoxEscapedString.Checked := RuleItem.EscapedStrings;
   UpdateInterface;
 end;
@@ -155 +161 @@
   RuleItem.Repetitive := CheckBoxRepetitive.Checked;
   RuleItem.AnyExcept := CheckBoxAnyExcept.Checked;
+  RuleItem.EscapedStrings := CheckBoxEscapedString.Checked;
 end;
 

branches/generator/Forms/UFormRuleItems.lfm

@@ -7 +7 @@
   ClientHeight = 467
   ClientWidth = 636
-  DesignTimePPI = 120
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '1.8.0.4'
   object ListView1: TListView
     Left = 8
-    Height = 392
-    Top = 40
+    Height = 384
+    Top = 48
     Width = 624
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -50 +49 @@
     end
     object ToolButton2: TToolButton
-      Left = 24
+      Left = 30
       Top = 2
       Action = AModify
     end
     object ToolButton3: TToolButton
-      Left = 47
+      Left = 59
       Top = 2
       Action = ARemove
     end
     object ToolButton4: TToolButton
-      Left = 70
+      Left = 88
       Top = 2
       Action = AMoveUp
     end
     object ToolButton5: TToolButton
-      Left = 93
+      Left = 117
       Top = 2
       Action = AMoveDown
@@ -72 +71 @@
   object Label1: TLabel
     Left = 10
-    Height = 20
+    Height = 23
     Top = 10
-    Width = 63
+    Width = 75
     Caption = 'Operator:'
     ParentColor = False
   end
-  object ComboBox1: TComboBox
+  object ComboBoxOperator: TComboBox
     Left = 153
-    Height = 28
+    Height = 33
     Top = 9
     Width = 231
-    ItemHeight = 20
+    ItemHeight = 0
     Items.Strings = (
       'And'
       'Or'
     )
+    OnChange = ComboBoxOperatorChange
     Style = csDropDownList
     TabOrder = 2
+  end
+  object CheckBoxWhiteSpace: TCheckBox
+    Left = 408
+    Height = 27
+    Top = 10
+    Width = 161
+    Caption = 'With white spaces'
+    TabOrder = 3
   end
   object PopupMenu1: TPopupMenu

branches/generator/Forms/UFormRuleItems.pas

@@ -20 +20 @@
     AMoveUp: TAction;
     ARemove: TAction;
-    ComboBox1: TComboBox;
+    CheckBoxWhiteSpace: TCheckBox;
+    ComboBoxOperator: TComboBox;
     Label1: TLabel;
     ListView1: TListView;
@@ -40 +41 @@
     procedure AMoveUpExecute(Sender: TObject);
     procedure ARemoveExecute(Sender: TObject);
+    procedure ComboBoxOperatorChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -82 +84 @@
   NewRuleItem := TRuleItem.Create;
   NewRuleItem.Grammer := RuleItems.Grammer;
+  NewRuleItem.ParentRule := RuleItems.ParentRule;
   FormRuleItem := TFormRuleItem.Create(nil);
   FormRuleItem.LoadData(NewRuleItem);
@@ -141 +144 @@
 end;
 
+procedure TFormRuleItems.ComboBoxOperatorChange(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+
 procedure TFormRuleItems.FormCreate(Sender: TObject);
 begin
@@ -174 +182 @@
   AMoveUp.Enabled := Assigned(ListView1.Selected) and (ListView1.Selected.Index > 0);
   AMoveDown.Enabled := Assigned(ListView1.Selected) and (ListView1.Selected.Index < (ListView1.Items.Count - 1));
+  CheckBoxWhiteSpace.Enabled := ComboBoxOperator.ItemIndex = 0;
 end;
 
@@ -186 +195 @@
 begin
   Self.RuleItems := RuleItems;
-  ComboBox1.ItemIndex := Integer(RuleItems.RuleType);
+  ComboBoxOperator.ItemIndex := Integer(RuleItems.RuleType);
+  CheckBoxWhiteSpace.Checked := RuleItems.WithWhiteSpeaces;
 end;
 
 procedure TFormRuleItems.SaveData(RuleItems: TRuleItems);
 begin
-  RuleItems.RuleType := TRuleType(ComboBox1.ItemIndex);
+  RuleItems.RuleType := TRuleType(ComboBoxOperator.ItemIndex);
+  RuleItems.WithWhiteSpeaces := CheckBoxWhiteSpace.Checked;
 end;