Changeset 137 for trunk/UTarget.pas

Timestamp:

Mar 5, 2022, 4:38:34 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Wrong index variable used in inc/dec merge optimization.
• Fixed: Reload output if program is reset.

File:

• trunk/UTarget.pas (modified) (4 diffs)

trunk/UTarget.pas

@@ -167 +167 @@
   SNone = 'None';
   SNormal = 'Normal';
+  SProgramIndexError = 'Old program index higher than new (old: %d, new: %d)';
+  SFirstIndexHigherThanLastIndex = 'First index higher than last index';
+  SFirstIndexOutOfRange = 'First index out of range';
+  SLastIndexOutOfRange = 'Last index out of range';
 
 const
@@ -319 +323 @@
 
 procedure TDebugSteps.UpdateTargetPos(OldProgramFrom, OldProgramTo, NewProgramFrom,
-    NewProgramTo: Integer; NewTarget: Integer = 0);
+  NewProgramTo: Integer; NewTarget: Integer = 0);
 var
   I: Integer;
@@ -329 +333 @@
   if (First <> -1) and (Last <> -1) then begin
     if First > Last then
-      raise Exception.Create('First index higher than last index');
+      raise Exception.Create(SFirstIndexHigherThanLastIndex);
     if (First < 0) or (First >= Count) then
-      raise Exception.Create('First index out of range');
+      raise Exception.Create(SFirstIndexOutOfRange);
     if (Last < 0) or (Last >= Count) then
-      raise Exception.Create('Last index out of range');
+      raise Exception.Create(SLastIndexOutOfRange);
     for I := Last downto First + 1 do Delete(I);
 
@@ -343 +347 @@
       Items[First].TargetPosition := NewTarget;
     end else
-      raise Exception.Create('Old program index higher than new');
+      raise Exception.Create(Format(SProgramIndexError, [SProgramIndexError, NewProgramTo]));
   end;
 end;