Changeset 29 for branches/Analyzátor gramatiky/UGrammer.pas

Timestamp:

Nov 11, 2009, 11:11:13 AM (15 years ago)

Author:

george

Message:

• Upraveno: Seznamy objektů přepsány na TFPGObjectList a použití generických typů.

File:

• branches/Analyzátor gramatiky/UGrammer.pas (modified) (10 diffs)

branches/Analyzátor gramatiky/UGrammer.pas

@@ -6 +6 @@
 
 uses
-  Classes, ComCtrls, SysUtils, Math, UGrammerRules;
+  Classes, ComCtrls, SysUtils, Math, UGrammerRules, fgl;
 
 type
@@ -55 +55 @@
   end;
 
+  TGrammerItemList = specialize TFPGObjectList<TGrammerItem>;
+
   TGrammerRule = class
   private
   public
-    Ownership: TGrammerRule;
+    Token: Boolean;
+    Parent: TGrammerRule;
     Name: string;
     RuleType: TRuleType;
-    Items: TList; // of TGrammerItem;
+    Items: TGrammerItemList;
     procedure ClearProcessed;
     function Add: TGrammerItem;
@@ -74 +77 @@
   end;
 
+  TGrammerRuleList = specialize TFPGObjectList<TGrammerRule>;
+
   TGrammer = class
   public
-    Rules: TList; // of TGrammerRule;
+    Rules: TGrammerRuleList;
     TopRule: TGrammerRule;
     constructor Create;
@@ -137 +142 @@
 constructor TGrammerRule.Create;
 begin
-  Ownership := nil;
-  Items := TList.Create;
+  Parent := nil;
+  Items := TGrammerItemList.Create;
 end;
 
 destructor TGrammerRule.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Items.Count - 1 do
-    TGrammerItem(Items[I]).Free;
-  Items.Free;    
+begin
+  Items.Destroy;
   inherited;
 end;
@@ -184 +185 @@
           Path.Items[High(Path.Items)].ItemIndex := I;
           //Inc(Path.Items[High(Path.Items)].CharIndex);
-          TGrammerItem(Items[I]).GetPossibleCharacters(Path, Characters);
+          Items[I].GetPossibleCharacters(Path, Characters);
         end;
       end;
@@ -202 +203 @@
       end else begin
         Path.Items[High(Path.Items)].ItemIndex := UseIndex;
-        TGrammerItem(Items[UseIndex]).GetPossibleCharacters(Path, Characters);
+        Items[UseIndex].GetPossibleCharacters(Path, Characters);
       end;
       // Check repetition
-      if (UseIndex > 0) and not TGrammerItem(Items[UseIndex - 1]).Processed then
-        if TGrammerItem(Items[UseIndex - 1]).Repetition then begin
+      if (UseIndex > 0) and not Items[UseIndex - 1].Processed then
+        if Items[UseIndex - 1].Repetition then begin
           TempPath.Items[High(TempPath.Items)].ItemIndex := UseIndex - 1;
-          TGrammerItem(Items[UseIndex - 1]).GetPossibleCharacters(TempPath, Characters);
+          Items[UseIndex - 1].GetPossibleCharacters(TempPath, Characters);
         end;
     end;
@@ -224 +225 @@
   I: Integer;
 begin
-  for I := 0 to Rules.Count - 1 do with TGrammerRule(Rules[I]) do begin
+  for I := 0 to Rules.Count - 1 do with Rules[I] do begin
     ClearProcessed;
   end;
@@ -235 +236 @@
   J: Integer;
 begin
-  for I := 0 to Rules.Count - 1 do with TGrammerRule(Rules[I]) do begin
-    for II := 0 to Items.Count - 1 do with TGrammerItem(Items[II]) do begin
+  for I := 0 to Rules.Count - 1 do with Rules[I] do begin
+    for II := 0 to Items.Count - 1 do with Items[II] do begin
       if (ItemType = itNonterminal) and (Rule = nil) then begin
         J := 0;
-        while (J < Rules.Count) and (TGrammerRule(Rules[J]).Name <> RuleName)  do Inc(J);
+        while (J < Rules.Count) and (Rules[J].Name <> RuleName)  do Inc(J);
         if J < Rules.Count then Rule := Rules[J] else
           raise Exception.Create('Rule link correction failed on rule ' +
@@ -250 +251 @@
 constructor TGrammer.Create;
 begin
-  Rules := TList.Create;
+  Rules := TGrammerRuleList.Create;
 end;
 
 destructor TGrammer.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Rules.Count - 1 do TGrammerRule(Rules[I]).Free;
-  Rules.Free;
+begin
+  Rules.Destroy;
   inherited;
 end;
@@ -322 +320 @@
   Index := High(Items);
   while not Success and (Index >= 0) do begin
-    with Items[Index] do if TGrammerItem(Rule.Items[ItemIndex]).Repetition then begin
+    with Items[Index] do if Rule.Items[ItemIndex].Repetition then begin
       Success := True;
       //Inc(CharIndex);