Changeset 117 for branches/generator/URules.pas

Timestamp:

Nov 27, 2017, 1:09:38 PM (7 years ago)

Author:

chronos

Message:

• Added: Rule can be set as optional or repetitive.
• Added: Support for nested rule item sublist.

Location:

branches/generator

Files:

• . (modified) (1 prop)
• URules.pas (modified) (9 diffs)

branches/generator

@@ -2 +2 @@
 generator.lps
 lib
+heaptrclog.trc

@@ -2 +2 @@
 generator.lps
 lib
+heaptrclog.trc

branches/generator/URules.pas

@@ -12 +12 @@
   TRules = class;
   TGrammer = class;
-
-  TRuleItemType = (ritTerminal, ritNonTerminal);
+  TRuleItems = class;
+
+  TRuleItemType = (ritTerminal, ritNonTerminal, ritSubItems);
 
   { TRuleItem }
 
   TRuleItem = class
-    ParentRule: TRule;
+  private
+    FGrammer: TGrammer;
+    FParentRule: TRule;
+    procedure SetGrammer(AValue: TGrammer);
+    procedure SetParentRule(AValue: TRule);
+  public
+    Optional: Boolean;
+    Repetitive: Boolean;
     RuleItemType: TRuleItemType;
     Terminal: string;
     NonTerminalName: string;
     NonTerminal: TRule;
-    Grammer: TGrammer;
+    SubItems: TRuleItems;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
     function GetBNF: string;
+    constructor Create;
+    destructor Destroy; override;
+    property Grammer: TGrammer read FGrammer write SetGrammer;
+    property ParentRule: TRule read FParentRule write SetParentRule;
   end;
 
@@ -34 +46 @@
 
   TRuleItems = class(TFPGObjectList<TRuleItem>)
-    ParentRule: TRule;
+  private
+    FParentRule: TRule;
+    procedure SetParentRule(AValue: TRule);
+  public
     Grammer: TGrammer;
     RuleType: TRuleType;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
-    function GetBNF(RuleType: TRuleType): string;
+    procedure UpdateRuleReference;
+    function GetBNF: string;
+    property ParentRule: TRule read FParentRule write SetParentRule;
   end;
 
@@ -103 +120 @@
   RulesNode: TDOMNode;
   Rule: TRule;
-  RuleItem: TRuleItem;
 begin
   Self.FileName := FileName;
@@ -123 +139 @@
   // Update rule references
   for Rule in Rules do
-    for RuleItem in Rule.Items do
-      if RuleItem.RuleItemType = ritNonTerminal then
-        RuleItem.NonTerminal := Rules.FindName(RuleItem.NonTerminalName);
+    Rule.Items.UpdateRuleReference;
 end;
 
@@ -170 +184 @@
 
 procedure TRuleItem.SaveToXmlNode(Node: TDOMNode);
+var
+  SubItemsNode: TDOMNode;
 begin
   WriteInteger(Node, 'Type', Integer(RuleItemType));
-  if RuleItemType = ritTerminal then WriteString(Node, 'Terminal', Terminal)
-  else if RuleItemType = ritNonTerminal then WriteString(Node, 'NonTerminal', NonTerminal.Name)
+  WriteBoolean(Node, 'Optional', Optional);
+  WriteBoolean(Node, 'Repetitive', Repetitive);
+
+  case RuleItemType of
+    ritTerminal: WriteString(Node, 'Terminal', Terminal);
+    ritNonTerminal: WriteString(Node, 'NonTerminal', NonTerminal.Name);
+    ritSubItems: begin
+      SubItemsNode := Node.OwnerDocument.CreateElement('SubItems');
+      Node.AppendChild(SubItemsNode);
+      SubItems.SaveToXmlNode(SubItemsNode);
+    end;
+  end;
 end;
 
 function TRuleItem.GetBNF: string;
 begin
-  if RuleItemType = ritTerminal then Result := '"' + Terminal + '"'
-    else if RuleItemType = ritNonTerminal then Result := NonTerminal.Name;
+  case RuleItemType of
+    ritTerminal: Result := '"' + Terminal + '"';
+    ritNonTerminal: Result := NonTerminal.Name;
+    ritSubItems: Result := '(' + SubItems.GetBNF + ')';
+  end;
+  if Optional then Result := '+' + Result;
+  if Repetitive then Result := '*' + Result;
+end;
+
+constructor TRuleItem.Create;
+begin
+  SubItems := TRuleItems.Create;
+  SubItems.Grammer := Grammer;
+end;
+
+destructor TRuleItem.Destroy;
+begin
+  FreeAndNil(SubItems);
+  inherited Destroy;
+end;
+
+procedure TRuleItem.SetParentRule(AValue: TRule);
+begin
+  if FParentRule = AValue then Exit;
+  FParentRule := AValue;
+  SubItems.ParentRule := AValue;
+end;
+
+procedure TRuleItem.SetGrammer(AValue: TGrammer);
+begin
+  if FGrammer = AValue then Exit;
+  FGrammer := AValue;
+  SubItems.Grammer := AValue;
 end;
 
 procedure TRuleItem.LoadFromXmlNode(Node: TDOMNode);
+var
+  SubItemsNode: TDOMNode;
 begin
   RuleItemType := TRuleItemType(ReadInteger(Node, 'Type', Integer(ritTerminal)));
-  if RuleItemType = ritTerminal then Terminal := ReadString(Node, 'Terminal', '')
-  else if RuleItemType = ritNonTerminal then
-    NonTerminalName := ReadString(Node, 'NonTerminal', '');
+  Optional := ReadBoolean(Node, 'Optional', False);
+  Repetitive := ReadBoolean(Node, 'Repetitive', False);
+  case RuleItemType of
+    ritTerminal: Terminal := ReadString(Node, 'Terminal', '');
+    ritNonTerminal: NonTerminalName := ReadString(Node, 'NonTerminal', '');
+    ritSubItems: begin
+      SubItemsNode := Node.FindNode('SubItems');
+      if Assigned(SubItemsNode) then SubItems.LoadFromXmlNode(SubItemsNode);
+    end;
+  end;
 end;
 
@@ -206 +272 @@
 end;
 
-function TRuleItems.GetBNF(RuleType: TRuleType): string;
+procedure TRuleItems.UpdateRuleReference;
+var
+  RuleItem: TRuleItem;
+begin
+  for RuleItem in Self do
+    case RuleItem.RuleItemType of
+      ritNonTerminal: RuleItem.NonTerminal := Grammer.Rules.FindName(RuleItem.NonTerminalName);
+      ritSubItems: RuleItem.SubItems.UpdateRuleReference;
+    end;
+end;
+
+function TRuleItems.GetBNF: string;
 var
   Item: TRuleItem;
@@ -220 +297 @@
 end;
 
+procedure TRuleItems.SetParentRule(AValue: TRule);
+begin
+  if FParentRule = AValue then Exit;
+  FParentRule := AValue;
+end;
+
 procedure TRuleItems.LoadFromXmlNode(Node: TDOMNode);
 var
@@ -232 +315 @@
       RuleItem := TRuleItem.Create;
       RuleItem.Grammer := Grammer;
+      RuleItem.ParentRule := ParentRule;
       RuleItem.LoadFromXmlNode(RuleItemNode);
       Add(RuleItem);
@@ -254 +338 @@
 function TRule.GetBNF: string;
 begin
-  Result := Name + ' ::= ' + Items.GetBNF(Items.RuleType);
+  Result := Name + ' ::= ' + Items.GetBNF;
 end;
 

@@ -2 +2 @@
 generator.lps
 lib
+heaptrclog.trc