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

branches/Analyzátor gramatiky/UProgram.pas

@@ -6 +6 @@
 
 uses
-  Classes, ComCtrls, SysUtils, Math, UGrammer, fgl;
+  Classes, ComCtrls, SysUtils, UGrammer, fgl;
 
 type
@@ -62 +62 @@
 begin
   SelectedProgramItem := TopItem;
-  for I := 0 to High(Path.Items) do with Path.Items[I] do begin
+  for I := 0 to Path.Items.Count - 1 do
+  with Path.Items[I] do begin
     SelectedProgramItem.ItemType := itNonterminal;
     if not Assigned(SelectedProgramItem.Rule) then SelectedProgramItem.Rule := Rule;
@@ -99 +100 @@
   Level: array of Integer;
 begin
-  SetLength(Path.Items, Length(Path.Items) + 1);
-  with Path.Items[High(Path.Items)] do begin
+  Path := TGrammerPath.Create;
+  Scope := TPossibleCharacters.Create;
+
+  with Path.Items[Path.Items.Add(TPathItem.Create)] do begin
     Rule := Grammer.TopRule;
     ItemIndex := 0;
@@ -110 +113 @@
     if (Text[I] <> #13) and (Text[I] <> #10) then
     begin
-      UseIndex := Path.Items[High(Path.Items)].ItemIndex;
-      UseCharIndex := Path.Items[High(Path.Items)].CharIndex;
-      UseRule := Path.Items[High(Path.Items)].Rule;
-      SetLength(Path.Items, Length(Path.Items) - 1);
-      SetLength(Scope.Items, 0);
+      UseIndex := Path.Items[Path.Items.Count - 1].ItemIndex;
+      UseCharIndex := Path.Items[Path.Items.Count - 1].CharIndex;
+      UseRule := Path.Items[Path.Items.Count - 1].Rule;
+      Path.Items.Delete(Path.Items.Count - 1);
+      Scope.Items.Clear;
       Grammer.ClearProcessed;
       UseRule.GetPossibleCharacters(Path, Scope, UseIndex, UseCharIndex);
-      C := Length(Scope.Items);
+      C := Scope.Items.Count;
 
       // Possible character selection
       SetLength(Level, 0);
-      for II := 0 to High(Scope.Items) do with Scope.Items[II] do
+      for II := 0 to Scope.Items.Count - 1 do
+      with Scope.Items[II] do
       begin
         if (Character = Text[I]) then
@@ -174 +178 @@
       end;
 
-      if C < Length(Scope.Items) then begin
+      if C < Scope.Items.Count then begin
         Path.Assign(Scope.Items[C].RulePath);
-        for II := 0 to Length(Path.Items) - 1 do with Path.Items[II] do begin
+        for II := 0 to Path.Items.Count - 1 do
+        with Path.Items[II] do begin
           if Affected then Inc(CharIndex);
         end;
         Insert(Path, Scope.Items[C].Character);
-        for II := 0 to Length(Path.Items) - 1 do with Path.Items[II] do begin
+        for II := 0 to Path.Items.Count - 1 do
+        with Path.Items[II] do begin
           Affected := False;
         end;
@@ -186 +192 @@
       end else begin
         ExpectedCharacters := '';
-        for II := 0 to Length(Scope.Items) - 1 do
+        for II := 0 to Scope.Items.Count - 1 do
           ExpectedCharacters := ExpectedCharacters + Scope.Items[II].Character;
         //raise Exception.Create('Parse error. Expected "' + ExpectedCharacters + '" but found "' + Text[I] + '".');
@@ -194 +200 @@
     end;
   end;
+  Path.Destroy;
+  Scope.Destroy;
 end;