Changeset 29 for branches/Analyzátor gramatiky/UProgram.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/UProgram.pas (modified) (13 diffs)

branches/Analyzátor gramatiky/UProgram.pas

@@ -6 +6 @@
 
 uses
-  Classes, ComCtrls, SysUtils, Math, UGrammer;
+  Classes, ComCtrls, SysUtils, Math, UGrammer, fgl;
 
 type
+  TProgramItem = class;
+
+  TProgramItemList = specialize TFPGObjectList<TProgramItem>;
+
   TProgramItem = class
   public
     RuleBefore: TGrammerRule;
-    Items: TList; // of TProgramItem;
+    Items: TProgramItemList;
     ItemType: TRuleItemType;
     Rule: TGrammerRule;
@@ -87 +91 @@
   Path: TGrammerPath;
   I, II: Integer;
-  Q: Integer;
   C: Integer;
   Scope: TPossibleCharacters;
@@ -95 +98 @@
   ExpectedCharacters: string;
   Level: array of Integer;
-  LevelLength: Integer;
-  LevelIsLeft: Boolean;
-  MaxLevel: Integer;
-  Different: Boolean;
 begin
   SetLength(Path.Items, Length(Path.Items) + 1);
@@ -122 +121 @@
       // Possible character selection
       SetLength(Level, 0);
-      LevelLength := 0;
       for II := 0 to High(Scope.Items) do with Scope.Items[II] do
       begin
@@ -202 +200 @@
   I: Integer;
 begin
-  for I := 0 to Items.Count - 1 do with TProgramItem(Items[I]) do begin
+  for I := 0 to Items.Count - 1 do with Items[I] do begin
     if ItemType = itNonterminal then begin
       if Rule.Name = ARule.Name then begin
@@ -221 +219 @@
 constructor TProgramItem.Create;
 begin
-  Items := TList.Create;
+  Items := TProgramItemList.Create;
 end;
 
@@ -228 +226 @@
   I: Integer;
 begin
-  for I := 0 to Items.Count - 1 do with TProgramItem(Items[I]) do begin
+  for I := 0 to Items.Count - 1 do
+  with TProgramItem(Items[I]) do begin
     if ItemType = itNonterminal then Delete;
   end;
@@ -238 +237 @@
 begin
   I := 0;
-  while I < Items.Count do with TProgramItem(Items[I]) do begin
+  while I < Items.Count do
+  with TProgramItem(Items[I]) do begin
     if ItemType = itNonterminal then begin
       if Items.Count = 0 then begin
@@ -262 +262 @@
 begin
   I := 0;
-  while I < Items.Count do with TProgramItem(Items[I]) do begin
+  while I < Items.Count do
+  with Items[I] do begin
     if ItemType = itNonterminal then begin
       if Rule.Name = ARule.Name then begin
@@ -275 +276 @@
 
 destructor TProgramItem.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Items.Count - 1 do TProgramItem(Items[I]).Free;
-  Items.Free;
+begin
+  Items.Destroy;
   inherited;
 end;
@@ -289 +287 @@
 begin
   if (ItemType = itNonterminal) and (Rule = ARule) then begin
-    SubProgramItem := TProgramItem(Items[ItemIndex]);
+    SubProgramItem := Items[ItemIndex];
     RuleBefore := SubProgramItem.RuleBefore;
     Rule := SubProgramItem.Rule;
@@ -296 +294 @@
     Items[ItemIndex] := nil;
     for I := 0 to Items.Count - 1 do
-      if Assigned(Items[I]) then TProgramItem(Items[I]).Free;
+      if Assigned(Items[I]) then Items[I].Free;
     Items := SubProgramItem.Items;
   end;
   for I := 0 to Items.Count - 1 do
-    TProgramItem(Items[I]).Join(ARule, ItemIndex);
+    Items[I].Join(ARule, ItemIndex);
 end;
 
@@ -308 +306 @@
 begin
   Result := '';
-  for I := 0 to Items.Count - 1 do with TProgramItem(Items[I]) do begin
+  for I := 0 to Items.Count - 1 do with Items[I] do begin
     if ItemType = itTerminal then Result := Result + Value
       else Result := Result + MergeToTerminal;