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

Timestamp:

Nov 11, 2009, 1:43:47 PM (15 years ago)

Author:

george

Message:

• Opraveno: Chyby v inicializaci objektů.

File:

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

branches/Analyzátor gramatiky/UGrammer.pas

@@ -30 +30 @@
   end;
 
+  { TPossibleCharacter }
+
   TPossibleCharacter = class
     Character: Char;
     RulePath: TGrammerPath;
     procedure Assign(Source: TPossibleCharacter);
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -138 +142 @@
   I: Integer;
 begin
-  for I := 1 to Length(Text) do AddTerminal(Text[I], False, False);
+  for I := 1 to Length(Text) do
+    AddTerminal(Text[I], False, False);
 end;
 
@@ -146 +151 @@
 begin
   for I := 0 to Items.Count - 1 do
-  with Items[I] do begin
-    Processed := False;
-  end;
+    Items[I].Processed := False;
 end;
 
@@ -183 +186 @@
       if UseIndex > 0 then begin
         // Forward generation to upper item
-       with Path.Items[Path.Items.Add(TPathItem.Create)] do begin
+        Path.Items.Delete(Path.Items.Count - 1);
+        with Path.Items[Path.Items.Count - 1] do begin
           NextItemIndex := ItemIndex;
           NextCharIndex := CharIndex;
@@ -237 +241 @@
 begin
   for I := 0 to Rules.Count - 1 do
-  with Rules[I] do begin
-    ClearProcessed;
-  end;
+    Rules[I].ClearProcessed;
 end;
 
@@ -250 +252 @@
   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
+      if (ItemType = itNonterminal) and (not Assigned(Rule)) then begin
         J := 0;
-        while (J < Rules.Count) and (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 ' +
@@ -309 +311 @@
           NextRule := Rule;
         end;
-        Path.Items.Count := Path.Items.Count - 1;
+        Path.Items.Delete(Path.Items.Count - 1);
         NextRule.GetPossibleCharacters(Path, Characters, NextItemIndex + 1, NextCharIndex);
   end;
@@ -380 +382 @@
 end;
 
+constructor TPossibleCharacter.Create;
+begin
+  RulePath := TGrammerPath.Create;
+end;
+
+destructor TPossibleCharacter.Destroy;
+begin
+  RulePath.Destroy;
+  inherited Destroy;
+end;
+
 { TPossibleCharacters }