Changeset 116 for branches/generator/URules.pas

Timestamp:

Nov 27, 2017, 10:04:52 AM (7 years ago)

Author:

chronos

Message:

• Modified: Rule items interface moved to separate unit UFormRuleItems.

File:

• branches/generator/URules.pas (modified) (8 diffs)

branches/generator/URules.pas

@@ -34 +34 @@
 
   TRuleItems = class(TFPGObjectList<TRuleItem>)
+    ParentRule: TRule;
     Grammer: TGrammer;
+    RuleType: TRuleType;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
     function GetBNF(RuleType: TRuleType): string;
+  end;
+
+  TRuleLinkType = (ltRequire);
+
+  TRuleLink = class
+    LinkType: TRuleLinkType;
+    Rule: TRule;
+  end;
+
+  TRuleLinks = class(TFPGObjectList<TRuleLink>)
+
   end;
 
@@ -49 +62 @@
     Name: string;
     Items: TRuleItems;
-    RuleType: TRuleType;
+    Links: TRuleLinks;
     property Grammer: TGrammer read GetGrammer write SetGrammer;
     constructor Create;
@@ -184 +197 @@
   RuleItemNode: TDOMNode;
 begin
+  WriteInteger(Node, 'Type', Integer(RuleType));
+
   for RuleItem in Self do begin
     RuleItemNode := Node.OwnerDocument.CreateElement('RuleItem');
@@ -210 +225 @@
   RuleItem: TRuleItem;
 begin
+  RuleType := TRuleType(ReadInteger(Node, 'Type', Integer(rtAnd)));
+
   RuleItemNode := Node.FirstChild;
   while Assigned(RuleItemNode) do begin
@@ -229 +246 @@
 begin
   WriteString(Node, 'Name', Name);
-  WriteInteger(Node, 'Type', Integer(RuleType));
 
   RuleItemsNode := Node.OwnerDocument.CreateElement('RuleItems');
@@ -238 +254 @@
 function TRule.GetBNF: string;
 begin
-  Result := Name + ' ::= ' + Items.GetBNF(RuleType);
+  Result := Name + ' ::= ' + Items.GetBNF(Items.RuleType);
 end;
 
@@ -254 +270 @@
 begin
   Items := TRuleItems.Create;
+  Items.ParentRule := Self;
+  Links := TRuleLinks.Create;
 end;
 
 destructor TRule.Destroy;
 begin
+  FreeAndNil(Links);
   FreeAndNil(Items);
   inherited Destroy;
@@ -267 +286 @@
 begin
   Name := ReadString(Node, 'Name', '');
-  RuleType := TRuleType(ReadInteger(Node, 'Type', Integer(rtAnd)));
 
   ItemsNode := Node.FindNode('RuleItems');