Changeset 115 for trunk/UBFTarget.pas

Timestamp:

Oct 13, 2020, 8:05:14 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build with Lazarus 2.0.10.
• Modified: CoolTranslator package replaced by Translator in Common package.
• Modified: About dialog moved to Common package.

File:

• trunk/UBFTarget.pas (modified) (8 diffs)

trunk/UBFTarget.pas

@@ -19 +19 @@
     Parameter: Integer;
     RelIndex: Integer;
-    function Create(Command: TMachineCommand; Parameter, RelIndex: Integer): TMachineOperation;
+    class function Create(Command: TMachineCommand; Parameter, RelIndex: Integer): TMachineOperation; static;
   end;
 
@@ -65 +65 @@
 { TMachineOperation }
 
-function TMachineOperation.Create(Command: TMachineCommand; Parameter,
+class function TMachineOperation.Create(Command: TMachineCommand; Parameter,
   RelIndex: Integer): TMachineOperation;
 begin
@@ -150 +150 @@
   PreviousCommand: TMachineCommand;
   FirstIndex: Integer;
-  NewTextIndex: Integer;
+  NewTargetIndex: Integer;
 begin
   // Merge together cmInc, cmDec, cmSet
@@ -159 +159 @@
 
   FProgramIndex := 0;
-  NewTextIndex := 0;
+  NewTargetIndex := 0;
   while (FProgramIndex < Length(FProgram)) do begin
     FirstIndex := FProgramIndex;
@@ -272 +272 @@
     end;
     PreviousCommand := FProgram[FProgramIndex].Command;
-    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
-    Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
+    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTargetIndex);
+    Inc(NewTargetIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     Inc(FProgramIndex);
     Inc(NewProgramIndex);
@@ -297 +297 @@
   RelIndex: Integer;
   FirstIndex: Integer;
-  NewTextIndex: Integer;
+  NewTargetIndex: Integer;
 begin
   NewProgramIndex := 0;
@@ -304 +304 @@
   RelIndex := 0;
   FProgramIndex := 0;
-  NewTextIndex := 0;
+  NewTargetIndex := 0;
   while (FProgramIndex < Length(FProgram)) do begin
     FirstIndex := FProgramIndex;
@@ -338 +338 @@
       else raise Exception.Create(Format('Unsupported command %d', [FProgram[FProgramIndex].Command]));
     end;
-    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
-    Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
+    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTargetIndex);
+    Inc(NewTargetIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     Inc(FProgramIndex);
     Inc(NewProgramIndex);