Changeset 137 for trunk

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.

Location:

trunk

Files:

• Languages/LazFuck.cs.po (modified) (2 diffs)
• Languages/LazFuck.pot (modified) (2 diffs)
• Target/UTargetInterpretter.pas (modified) (1 diff)
• UBFTarget.pas (modified) (1 diff)
• UTarget.pas (modified) (4 diffs)

trunk/Languages/LazFuck.cs.po

@@ -599 +599 @@
 msgstr "Spouštěč \"%s\" nenalezen"
 
+#: utarget.sfirstindexhigherthanlastindex
+msgid "First index higher than last index"
+msgstr "První index větší neÅŸ poslední index"
+
+#: utarget.sfirstindexoutofrange
+msgid "First index out of range"
+msgstr "První index mimo rozsah"
+
+#: utarget.slastindexoutofrange
+msgid "Last index out of range"
+msgstr "Poslední index mimo rozsah"
+
 #: utarget.snone
 msgid "None"
@@ -610 +622 @@
 msgid "Paused"
 msgstr "Zastaveno"
+
+#: utarget.sprogramindexerror
+#, object-pascal-format
+msgid "Old program index higher than new (old: %d, new: %d)"
+msgstr "StarÜ programová index vyšší neş novÜ (stará: %d, novÜ: %d)"
 
 #: utarget.srunning

trunk/Languages/LazFuck.pot

@@ -589 +589 @@
 msgstr ""
 
+#: utarget.sfirstindexhigherthanlastindex
+msgid "First index higher than last index"
+msgstr ""
+
+#: utarget.sfirstindexoutofrange
+msgid "First index out of range"
+msgstr ""
+
+#: utarget.slastindexoutofrange
+msgid "Last index out of range"
+msgstr ""
+
 #: utarget.snone
 msgid "None"
@@ -599 +611 @@
 #: utarget.spaused
 msgid "Paused"
+msgstr ""
+
+#: utarget.sprogramindexerror
+#, object-pascal-format
+msgid "Old program index higher than new (old: %d, new: %d)"
 msgstr ""
 

trunk/Target/UTargetInterpretter.pas

@@ -317 +317 @@
     Memory[I] := 0;
   MemoryChanged := True;
+  OutputChanged := True;
   FStepCount := 0;
   PrepareBreakPoints;

trunk/UBFTarget.pas

@@ -267 +267 @@
           if NewProgram[NewProgram.Index - 1].Command = cmPointerInc then
             NewProgram.Operations[NewProgram.Index - 1].Parameter := NewProgram[NewProgram.Index - 1].Parameter +
-              FProgram[FProgram.Index].Parameter
+              FProgram[FProgramIndex].Parameter
           else
           if NewProgram[NewProgram.Index - 1].Command = cmPointerDec then
             NewProgram.Operations[NewProgram.Index - 1].Parameter := NewProgram[NewProgram.Index - 1].Parameter -
-              FProgram[FProgram.Index].Parameter;
+              FProgram[FProgramIndex].Parameter;
           // If value negative then change command
           if NewProgram[NewProgram.Index - 1].Parameter < 0 then begin

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;