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

Timestamp:

Nov 11, 2009, 12:56:32 PM (15 years ago)

Author:

george

Message:

• Opraveno: Inicializace a uvolnění třídy, které byly přepsány ze struktury record.

File:

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

branches/Analyzátor gramatiky/UGrammer.pas

@@ -20 +20 @@
   end;
 
+  TPathItemList = specialize TFPGObjectList<TPathItem>;
+
   TGrammerPath = class
-    Items: array of TPathItem;
+    Items: TPathItemList;
     procedure Assign(Source: TGrammerPath);
     procedure Next;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -32 +36 @@
   end;
 
+  TPossibleCharacterList = specialize TFPGObjectList<TPossibleCharacter>;
+
+  { TPossibleCharacters }
+
   TPossibleCharacters = class
-    Items: array of TPossibleCharacter;
+    Items: TPossibleCharacterList;
     procedure Assign(Source: TPossibleCharacters);
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -135 +145 @@
   I: Integer;
 begin
-  for I := 0 to Items.Count - 1 do with TGrammerItem(Items[I]) do begin
+  for I := 0 to Items.Count - 1 do
+  with Items[I] do begin
     Processed := False;
   end;
@@ -160 +171 @@
   TempPath: TGrammerPath;
 begin
-  SetLength(Path.Items, Length(Path.Items) + 1);
-  with Path.Items[High(Path.Items)] do begin
+  TempPath := TGrammerPath.Create;
+  with Path.Items[Path.Items.Add(TPathItem.Create)] do begin
     Rule := Self;
     ItemIndex := UseIndex;
@@ -172 +183 @@
       if UseIndex > 0 then begin
         // Forward generation to upper item
-        SetLength(Path.Items, Length(Path.Items) - 1);
-        with Path.Items[High(Path.Items)] do begin
+       with Path.Items[Path.Items.Add(TPathItem.Create)] do begin
           NextItemIndex := ItemIndex;
           NextCharIndex := CharIndex;
           NextRule := Rule;
         end;
-        SetLength(Path.Items, Length(Path.Items) - 1);
+        Path.Items.Delete(Path.Items.Count - 1);
         NextRule.GetPossibleCharacters(Path, Characters, NextItemIndex + 1, NextCharIndex);
       end else begin
         // Generate alternatives
         for I := 0 to Items.Count - 1 do begin
-          Path.Items[High(Path.Items)].ItemIndex := I;
+          Path.Items[Path.Items.Count - 1].ItemIndex := I;
           //Inc(Path.Items[High(Path.Items)].CharIndex);
           Items[I].GetPossibleCharacters(Path, Characters);
@@ -193 +203 @@
       if UseIndex >= Items.Count then begin
         // Forward generation to upper item
-        SetLength(Path.Items, Length(Path.Items) - 1);
-        with Path.Items[High(Path.Items)] do begin
+        Path.Items.Delete(Path.Items.Count - 1);
+        with Path.Items[Path.Items.Count - 1] do begin
           NextItemIndex := ItemIndex;
           NextCharIndex := CharIndex;
           NextRule := Rule;
         end;
-        SetLength(Path.Items, Length(Path.Items) - 1);
+        Path.Items.Delete(Path.Items.Count - 1);
         NextRule.GetPossibleCharacters(Path, Characters, NextItemIndex + 1, NextCharIndex);
       end else begin
-        Path.Items[High(Path.Items)].ItemIndex := UseIndex;
+        Path.Items[Path.Items.Count - 1].ItemIndex := UseIndex;
         Items[UseIndex].GetPossibleCharacters(Path, Characters);
       end;
@@ -208 +218 @@
       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;
+          TempPath.Items[TempPath.Items.Count - 1].ItemIndex := UseIndex - 1;
           Items[UseIndex - 1].GetPossibleCharacters(TempPath, Characters);
         end;
     end;
   end;
+  TempPath.Destroy;
 end;
 
@@ -225 +236 @@
   I: Integer;
 begin
-  for I := 0 to Rules.Count - 1 do with Rules[I] do begin
+  for I := 0 to Rules.Count - 1 do
+  with Rules[I] do begin
     ClearProcessed;
   end;
@@ -278 +290 @@
   case ItemType of
     itTerminal: begin
-      SetLength(Characters.Items, Length(Characters.Items) + 1);
-      Characters.Items[High(Characters.Items)].Character := Character;
-      Characters.Items[High(Characters.Items)].RulePath.Assign(Path);
-      with Characters.Items[High(Characters.Items)].RulePath do begin
-        Inc(Items[High(Items)].ItemIndex);
+      Characters.Items.Add(TPossibleCharacter.Create);
+      Characters.Items[Characters.Items.Count - 1].Character := Character;
+      Characters.Items[Characters.Items.Count - 1].RulePath.Assign(Path);
+      with Characters.Items[Characters.Items.Count - 1].RulePath do begin
+        Inc(Items[Items.Count - 1].ItemIndex);
       end;
     end;
@@ -292 +304 @@
         // Forward generation to upper item
         //SetLength(Path.Items, Length(Path.Items) - 1);
-        with Path.Items[High(Path.Items)] do begin
+        with Path.Items[Path.Items.Count - 1] do begin
           NextItemIndex := ItemIndex;
           NextCharIndex := CharIndex;
           NextRule := Rule;
         end;
-        SetLength(Path.Items, Length(Path.Items) - 1);
+        Path.Items.Count := Path.Items.Count - 1;
         NextRule.GetPossibleCharacters(Path, Characters, NextItemIndex + 1, NextCharIndex);
   end;
@@ -308 +320 @@
   I: Integer;
 begin
-  SetLength(Items, Length(Source.Items));
-  for I := 0 to High(Items) do Items[I].Assign(Source.Items[I]);
+  for I := 0 to Items.Count - 1 do
+    Items[I].Destroy;
+  Items.Count := Source.Items.Count;
+  for I := 0 to Items.Count - 1 do begin
+    Items[I] := TPathItem.Create;
+    Items[I].Assign(Source.Items[I]);
+  end;
 end;
 
@@ -318 +335 @@
 begin
   Success := False;
-  Index := High(Items);
+  Index := Items.Count - 1;
   while not Success and (Index >= 0) do begin
     with Items[Index] do if Rule.Items[ItemIndex].Repetition then begin
@@ -331 +348 @@
     end;
   end;
-  SetLength(Items, Index + 1);
+  Items.Count := Index + 1;
+end;
+
+constructor TGrammerPath.Create;
+begin
+  Items := TPathItemList.Create;
+end;
+
+destructor TGrammerPath.Destroy;
+begin
+  Items.Destroy;
+  inherited Destroy;
 end;
 
@@ -358 +386 @@
   I: Integer;
 begin
-  SetLength(Items, Length(Source.Items));
-  for I := 0 to High(Items) do Items[I].Assign(Source.Items[I]);
+  Items.Count := Source.Items.Count;
+  for I := 0 to Items.Count - 1 do
+    Items[I].Assign(Source.Items[I]);
+end;
+
+constructor TPossibleCharacters.Create;
+begin
+  Items := TPossibleCharacterList.Create;
+end;
+
+destructor TPossibleCharacters.Destroy;
+begin
+  Items.Destroy;
+  inherited Destroy;
 end;