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

branches/Analyzátor gramatiky/UProgram.pas

@@ -72 +72 @@
         if not Assigned(SelectedProgramItem.Items[CharIndex]) then
           SelectedProgramItem.Items[CharIndex] := TProgramItem.Create;
-        SelectedProgramItem := TProgramItem(SelectedProgramItem.Items[CharIndex]);
+        SelectedProgramItem := SelectedProgramItem.Items[CharIndex];
 (*      end else begin
         SelectedProgramItem.Items.Count := SelectedProgramItem.Items.Count + 1;
@@ -109 +109 @@
   end;
 
-  for I := 1 to Length(Text) do
-  begin
-    if (Text[I] <> #13) and (Text[I] <> #10) then
-    begin
+  for I := 1 to Length(Text) do begin
+    if (Text[I] <> #13) and (Text[I] <> #10) then begin
       UseIndex := Path.Items[Path.Items.Count - 1].ItemIndex;
       UseCharIndex := Path.Items[Path.Items.Count - 1].CharIndex;
@@ -208 +206 @@
   I: Integer;
 begin
-  for I := 0 to Items.Count - 1 do with 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
@@ -235 +234 @@
 begin
   for I := 0 to Items.Count - 1 do
-  with TProgramItem(Items[I]) do begin
+  with Items[I] do begin
     if ItemType = itNonterminal then Delete;
   end;
@@ -246 +245 @@
   I := 0;
   while I < Items.Count do
-  with TProgramItem(Items[I]) do begin
+  with Items[I] do begin
     if ItemType = itNonterminal then begin
       if Items.Count = 0 then begin
@@ -260 +259 @@
 procedure TProgramItem.DeleteItem(Index: Integer);
 begin
-  if TProgramItem(Items[Index]).ItemType = itNonterminal then
-    TProgramItem(Items[Index]).Delete;
+  if Items[Index].ItemType = itNonterminal then
+    Items[Index].Delete;
   Items.Delete(Index);
 end;
@@ -314 +313 @@
 begin
   Result := '';
-  for I := 0 to Items.Count - 1 do with 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;