tidying

src/com/bytezone/diskbrowser/applefile/AssemblerConstants.java

@@ -61,7 +61,7 @@ public interface AssemblerConstants
         "(Zero page, X)", "(Zero page), Y", "(Zero page)", "Relative" };
 
   byte[] chip65c02 =
-							{ 0x04, 0x0C, 0x12, 0x14, 0x1A, 0x1C, 0x32, 0x34, 0x3A, 0x3C, 0x52, 0x5A, 0x64, 0x72,
+      { 0x04, 0x0C, 0x12, 0x14, 0x1A, 0x1C, 0x32, 0x34, 0x3A, 0x3C, 0x52, 0x5A, 0x64,
-									0x74, 0x7A, 0x7C, (byte) 0x80, (byte) 0x89, (byte) 0x92, (byte) 0x9C,
+        0x72, 0x74, 0x7A, 0x7C, (byte) 0x80, (byte) 0x89, (byte) 0x92, (byte) 0x9C,
         (byte) 0x9E, (byte) 0xB2, (byte) 0xD2, (byte) 0xDA, (byte) 0xF2, (byte) 0xFA, };
 }

src/com/bytezone/diskbrowser/applefile/equates.txt

@@ -116,27 +116,40 @@ F48A  RIGHT EQU
 F4D5  UP EQU
 F504  DOWN EQU
 F6B9  HFNS
+
+F800  PLOT
+F819  HLINE
+F828  VLINE
+F864  SETCOL
+F871  SCRN
+
 F940  PRINTYX
 F941  PRINTAX - print a hex number
+
 FAA6  reboot DOS
 FAFF  0 = Autostart ROM, 1 = Old Monitor
+
 FB1E  PREAD - read game paddle
 FB2F  initialise text screen
 FB39  text mode - SETTXT
+FB40  SETGR
 FB5B  TABV - monitor tab routine
-FC66  CURSDWN - move cursor down
-FBF4  CURSRIT - move cursor right
-FC10  CURSLFT - move cursor left
-FC1A  CURSUP - move cursor up
 FB6F  set powerup checksum
 FBC1  BASCALC - calculate video address
 FBDD  BEEP
+FBF4  CURSRIT - move cursor right
+
+FC10  CURSLFT - move cursor left
+FC1A  CURSUP - move cursor up
 FC22  VTAB
 FC42  CLREOP - clear to end of page
 FC58  HOME - clear screen
 FC62  CR
+FC66  CURSDWN - move cursor down
 FC9C  CLREOL
 FCA8  WAIT 1/2(26+27A+5A^2) microseconds
+FCFA  RD2BIT
+
 FD0C  RDKEY - Blink cursor
 FD1B  KEYIN - Increment RNDL,H while polling keyboard
 FD35  RDCHAR - Call RDKEY
@@ -147,9 +160,16 @@ FDDA  PRBYTE - print A in hex
 FDED  COUT - output a character
 FDF0  COUT1 - output a character to screen
 FD8E  CROUT - generate a return
+
 FE2C  move a block of memory
 FE89  disconnect DOS from I/O links
+FE8B  INPORT
 FE93  disconnect DOS from I/O links
+FE95  OUTPORT
+FECD  WRITE
+FEFD  READ
+
+FF02  READ2
 FF3A  BELL
 FF3F  SAVE
 FF4A  RESTORE

src/com/bytezone/diskbrowser/visicalc/VisicalcCell.java

@@ -34,6 +34,13 @@ class VisicalcCell implements Comparable<VisicalcCell>
       case '/':
         if (command.charAt (1) == 'F')                // format cell
         {
+          //  /FG - general
+          //  /FD - default
+          //  /FI - integer
+          //  /F$ - dollars and cents
+          //  /FL - left justified
+          //  /FR - right justified
+          //  /F* - graph
           format = command.charAt (2);
           if (command.length () > 3 && command.charAt (3) == '"')
             label = command.substring (4);
@@ -73,6 +80,9 @@ class VisicalcCell implements Comparable<VisicalcCell>
     double result = 0.0;
     double interim = 0.0;
 
+    if (formula.startsWith ("@LOOKUP("))
+      return result;
+
     Matcher m = cellContents.matcher (formula);
     while (m.find ())
     {
@@ -88,7 +98,7 @@ class VisicalcCell implements Comparable<VisicalcCell>
         }
         catch (NumberFormatException e)
         {
-          System.out.printf ("NFE: %s%n", m.group (4));
+          System.out.printf ("NFE: %s [%s]%n", m.group (4), formula);
         }
       else
         interim = parent.evaluateFunction (m.group (5));         // function

src/com/bytezone/diskbrowser/visicalc/VisicalcSpreadsheet.java

@@ -196,11 +196,11 @@ public class VisicalcSpreadsheet implements Iterable<VisicalcCell>
       char subCommand = command.charAt (1);
       switch (subCommand)
       {
-        case 'W':
+        case 'W':           // Window control
           //          System.out.println ("  Window command: " + data);
           break;
 
-        case 'G':
+        case 'G':           // Global command
           //          System.out.println ("  Global command: " + data);
           try
           {
@@ -224,7 +224,7 @@ public class VisicalcSpreadsheet implements Iterable<VisicalcCell>
           }
           break;
 
-        case 'T':
+        case 'T':             // Set title area
           //          System.out.println ("  Title command: " + data);
           break;
 
@@ -268,6 +268,10 @@ public class VisicalcSpreadsheet implements Iterable<VisicalcCell>
     {
       return result;
     }
+    if (function.startsWith ("@LOOKUP("))
+    {
+      return result;
+    }
 
     Range range = getRange (function);
     if (range == null)
@@ -305,6 +309,11 @@ public class VisicalcSpreadsheet implements Iterable<VisicalcCell>
           max = getValue (address);
       result = max;
     }
+    else if (function.startsWith ("@LOOKUP"))
+    {
+      System.out.println ("Unfinished: " + function);
+      result = 0;
+    }
     else
       System.out.println ("Unimplemented function: " + function);
     // http://www.bricklin.com/history/refcard1.htm
@@ -339,6 +348,7 @@ public class VisicalcSpreadsheet implements Iterable<VisicalcCell>
   private Range getRange (String text)
   {
     Range range = null;
+    System.out.printf ("Range: [%s]%n", text);
     Matcher m = functionPattern.matcher (text);
     while (m.find ())
     {