From 1aaee043a37a6b7f4642b6fce7cc1e830920fc28 Mon Sep 17 00:00:00 2001
From: Denis Molony <dmolony@users.noreply.github.com>
Date: Sun, 21 Feb 2021 06:50:18 +1000
Subject: [PATCH] removed CALL target from integer list

---
 .../diskbrowser/applefile/SubLine.java        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/com/bytezone/diskbrowser/applefile/SubLine.java b/src/com/bytezone/diskbrowser/applefile/SubLine.java
index 2bc0523..ca34bab 100644
--- a/src/com/bytezone/diskbrowser/applefile/SubLine.java
+++ b/src/com/bytezone/diskbrowser/applefile/SubLine.java
@@ -55,7 +55,11 @@ public class SubLine implements ApplesoftConstants
       doToken (firstByte);
       if (is (TOKEN_REM) || is (TOKEN_DATA))      // no further processing
         return;
-      ptr = startPtr + 1;
+
+      if (is (TOKEN_CALL))
+        ptr = startPtr + callTarget.length ();
+      else
+        ptr = startPtr + 1;
     }
     else
     {
@@ -66,8 +70,8 @@ public class SubLine implements ApplesoftConstants
         return;
       }
       else if (Utility.isLetter (firstByte))     // variable assignment
-        recordEqualsPosition ();
-      else if (firstByte == Utility.ASCII_COLON || firstByte == 0)  // empty subline
+        setEqualsPosition ();
+      else if (isEndOfLine (firstByte))          // empty subline
         return;
       else                                       // probably Beagle Bros 0D or 0A
         System.out.printf ("Unexpected bytes at %5d: %s%n", parent.lineNumber,
@@ -82,7 +86,7 @@ public class SubLine implements ApplesoftConstants
     int stringPtr = 0;
 
     int max = startPtr + length - 1;
-    if (buffer[max] == 0 || buffer[max] == Utility.ASCII_COLON)
+    if (isEndOfLine (buffer[max]))
       --max;
 
     while (ptr <= max)
@@ -162,6 +166,13 @@ public class SubLine implements ApplesoftConstants
       checkVar (var, (byte) 0);       // unprocessed variable or number
   }
 
+  // ---------------------------------------------------------------------------------//
+  private boolean isEndOfLine (byte b)
+  // ---------------------------------------------------------------------------------//
+  {
+    return b == 0 || b == Utility.ASCII_COLON;
+  }
+
   // ---------------------------------------------------------------------------------//
   private void addString (int stringPtr, int ptr)
   // ---------------------------------------------------------------------------------//
@@ -285,7 +296,7 @@ public class SubLine implements ApplesoftConstants
         break;
 
       case TOKEN_LET:
-        recordEqualsPosition ();
+        setEqualsPosition ();
         break;
 
       case TOKEN_GOTO:
@@ -484,7 +495,7 @@ public class SubLine implements ApplesoftConstants
 
   // Record the position of the equals sign so it can be aligned with adjacent lines.
   // ---------------------------------------------------------------------------------//
-  private void recordEqualsPosition ()
+  private void setEqualsPosition ()
   // ---------------------------------------------------------------------------------//
   {
     int p = startPtr + 1;