Changeset 122 for branches/generator/URules.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/URules.pas (modified) (6 diffs)

branches/generator/URules.pas

@@ -14 +14 @@
   TRuleItems = class;
 
-  TRuleItemType = (ritTerminal, ritNonTerminal, ritSubItems);
+  TRuleItemType = (ritTerminal, ritNonTerminal, ritSubItems, ritTerminalRange);
 
   { TRuleItem }
@@ -29 +29 @@
     RuleItemType: TRuleItemType;
     Terminal: string;
+    TerminalFrom: string;
+    TerminalTo: string;
     NonTerminalName: string;
     NonTerminal: TRule;
@@ -342 +344 @@
       SubItems.SaveToXmlNode(SubItemsNode);
     end;
+    ritTerminalRange: begin
+      WriteString(Node, 'TerminalFrom', TerminalFrom);
+      WriteString(Node, 'TerminalTo', TerminalTo);
+    end;
   end;
 end;
@@ -351 +357 @@
     ritNonTerminal: Result := NonTerminal.Name;
     ritSubItems: Result := '(' + SubItems.GetString + ')';
+    ritTerminalRange: Result := '(' + TerminalFrom + ' .. ' + TerminalTo + ')';
   end;
   if Optional then Result := '+' + Result;
@@ -381 +388 @@
     ritNonTerminal: Result := Length(NonTerminal.Name);
     ritSubItems: Result := SubItems.GetCharLength;
+    ritTerminalRange: Result := Max(Length(TerminalFrom), Length(TerminalTo))
   end;
 end;
@@ -405 +413 @@
       if Assigned(SubItemsNode) then SubItems.LoadFromXmlNode(SubItemsNode);
     end;
+    ritTerminalRange: begin
+      TerminalFrom := ReadString(Node, 'TerminalFrom', '');
+      TerminalTo := ReadString(Node, 'TerminalTo', '');
+    end;
   end;
 end;