Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-06-06 06:29:27 +00:00
Code Issues Projects Releases Wiki Activity

changed headings

Browse Source
This commit is contained in:
Denis Molony 2021-01-01 10:49:42 +10:00
parent 16c677b83d
commit bda2e3358a
3 changed files with 91 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
View File

@ -178,52 +178,14 @@ public class ApplesoftBasicProgram extends BasicProgram
else
text.append (lineText);
// Check for a wrappable PRINT statement
// Check for a wrappable PRINT or INPUT statement
// (see FROM MACHINE LANGUAGE TO BASIC on DOSToolkit2eB.dsk)
if (basicPreferences.wrapPrintAt > 0 //
if (basicPreferences.wrapPrintAt > 0
&& (subline.is (ApplesoftConstants.TOKEN_PRINT)
|| subline.is (ApplesoftConstants.TOKEN_INPUT))
&& countChars (text, Utility.ASCII_QUOTE) == 2 // just start and end quotes
&& countChars (text, Utility.ASCII_CARET) == 0) // no control characters
// && countChars (text, ASCII_SEMI_COLON) == 0)
{
if (true) // new method
{
List<String> lines = splitPrint (lineText);
if (lines != null)
{
int offset = text.indexOf ("PRINT");
if (offset < 0)
offset = text.indexOf ("INPUT");
String fmt = "%-" + offset + "." + offset + "s%s%n";
String padding = text.substring (0, offset);
for (String s : lines)
{
fullText.append (String.format (fmt, padding, s));
padding = "";
}
}
else
fullText.append (text + "\n");
}
else // old method
{
int first = text.indexOf ("\"") + 1;
int last = text.indexOf ("\"", first + 1) - 1;
if ((last - first) > basicPreferences.wrapPrintAt)
{
int ptr = first + basicPreferences.wrapPrintAt;
do
{
fullText.append (text.substring (0, ptr)
+ "\n ".substring (0, first + 1));
text.delete (0, ptr);
ptr = basicPreferences.wrapPrintAt;
} while (text.length () > basicPreferences.wrapPrintAt);
}
fullText.append (text + "\n");
}
}
wrapPrint (fullText, text, lineText);
else
fullText.append (text + "\n");
@ -265,25 +227,23 @@ public class ApplesoftBasicProgram extends BasicProgram
}
if (basicPreferences.showXref && !gosubLines.isEmpty ())
showLines (fullText, gosubLines, "GOSUB:\n");
showLines (fullText, gosubLines, " GOSUB");
if (basicPreferences.showXref && !gotoLines.isEmpty ())
showLines (fullText, gotoLines, "GOTO:\n");
showLines (fullText, gotoLines, " GOTO");
if (basicPreferences.showSymbols && !symbolLines.isEmpty ())
{
if (fullText.charAt (fullText.length () - 2) != '\n')
fullText.append ("\n");
fullText.append ("Variables:\n");
heading (fullText, "Symbol ");
int longestVarName = getLongestVarName ();
String format = longestVarName > 6 ? "%" + longestVarName + "s %s%n" : "%6s %s%n";
String format =
longestVarName > 6 ? "%-" + longestVarName + "s %s%n" : "%-6s %s%n";
for (String symbol : symbolLines.keySet ())
{
String line = symbolLines.get (symbol).toString ();
line = line.substring (1, line.length () - 2);
line = line.substring (1, line.length () - 1);
for (String s : splitXref (line, 90, ' '))
{
fullText.append (String.format (format, symbol, s));
@ -294,9 +254,6 @@ public class ApplesoftBasicProgram extends BasicProgram
if (basicPreferences.showDuplicateSymbols && !uniqueSymbols.isEmpty ())
{
if (fullText.charAt (fullText.length () - 2) != '\n')
fullText.append ("\n");
boolean headingShown = false;
for (String key : uniqueSymbols.keySet ())
{
@ -306,23 +263,21 @@ public class ApplesoftBasicProgram extends BasicProgram
if (!headingShown)
{
headingShown = true;
fullText.append ("Duplicate Variable Names:\n");
heading (fullText, "Symbol Duplicate Names");
}
fullText.append (String.format ("%6s %s%n", key, usage));
String line = usage.toString ();
line = line.substring (1, line.length () - 1);
fullText.append (String.format ("%-6s %s%n", key, line));
}
}
}
if (basicPreferences.listStrings && stringsLine.size () > 0)
{
if (fullText.charAt (fullText.length () - 2) != '\n')
fullText.append ("\n");
fullText.append ("Strings:\n");
heading (fullText, " Line Strings");
for (int i = 0; i < stringsLine.size (); i++)
{
fullText.append (
String.format (" %5s %s%n", stringsLine.get (i), stringsText.get (i)));
}
String.format (" %6s %s%n", stringsLine.get (i), stringsText.get (i)));
}
if (fullText.length () > 0)
@ -332,6 +287,36 @@ public class ApplesoftBasicProgram extends BasicProgram
return fullText.toString ();
}
// ---------------------------------------------------------------------------------//
private void heading (StringBuilder fullText, String heading)
// ---------------------------------------------------------------------------------//
{
if (fullText.charAt (fullText.length () - 2) != '\n')
fullText.append ("\n");
if (heading.length () < 10)
fullText.append (heading + " Line numbers\n");
else
fullText.append (heading + "\n");
fullText.append ("------- --------------------------------------------------"
+ "------------------------------------------\n");
}
// ---------------------------------------------------------------------------------//
private void showLines (StringBuilder fullText, Map<Integer, List<Integer>> lines,
String heading)
// ---------------------------------------------------------------------------------//
{
heading (fullText, heading);
for (Integer line : lines.keySet ())
{
String list = lines.get (line).toString ();
list = list.substring (1, list.length () - 1);
fullText.append (String.format (" %6s %s%n", line, list));
}
}
// ---------------------------------------------------------------------------------//
private int getLongestVarName ()
// ---------------------------------------------------------------------------------//
@ -344,15 +329,45 @@ public class ApplesoftBasicProgram extends BasicProgram
}
// ---------------------------------------------------------------------------------//
private void showLines (StringBuilder fullText, Map<Integer, List<Integer>> lines,
String heading)
private void wrapPrint (StringBuilder fullText, StringBuilder text, String lineText)
// ---------------------------------------------------------------------------------//
{
if (fullText.charAt (fullText.length () - 2) != '\n')
fullText.append ("\n");
fullText.append (heading);
for (Integer line : lines.keySet ())
fullText.append (String.format (" %5s %s%n", line, lines.get (line)));
if (true) // new method
{
List<String> lines = splitPrint (lineText);
if (lines != null)
{
int offset = text.indexOf ("PRINT");
if (offset < 0)
offset = text.indexOf ("INPUT");
String fmt = "%-" + offset + "." + offset + "s%s%n";
String padding = text.substring (0, offset);
for (String s : lines)
{
fullText.append (String.format (fmt, padding, s));
padding = "";
}
}
else
fullText.append (text + "\n");
}
else // old method
{
int first = text.indexOf ("\"") + 1;
int last = text.indexOf ("\"", first + 1) - 1;
if ((last - first) > basicPreferences.wrapPrintAt)
{
int ptr = first + basicPreferences.wrapPrintAt;
do
{
fullText.append (text.substring (0, ptr)
+ "\n ".substring (0, first + 1));
text.delete (0, ptr);
ptr = basicPreferences.wrapPrintAt;
} while (text.length () > basicPreferences.wrapPrintAt);
}
fullText.append (text + "\n");
}
}
// ---------------------------------------------------------------------------------//
@ -407,7 +422,6 @@ public class ApplesoftBasicProgram extends BasicProgram
int firstSpace = 0;
while (firstSpace < line.length () && line.charAt (firstSpace) != ' ')
++firstSpace;
System.out.println (line);
List<String> lines = new ArrayList<> ();
while (line.length () > wrapLength)

1
src/com/bytezone/diskbrowser/applefile/ApplesoftConstants.java
View File

@ -44,6 +44,7 @@ public interface ApplesoftConstants
static final byte TOKEN_DATA = (byte) 0x83;
static final byte TOKEN_INPUT = (byte) 0x84;
static final byte TOKEN_DIM = (byte) 0x86;
static final byte TOKEN_ONERR = (byte) 0xA5;
static final byte TOKEN_LET = (byte) 0xAA;
static final byte TOKEN_GOTO = (byte) 0xAB;
static final byte TOKEN_IF = (byte) 0xAD;

18
src/com/bytezone/diskbrowser/applefile/SubLine.java
View File

@ -148,17 +148,7 @@ public class SubLine
int max = startPtr + length - 1;
while (p < max && parent.buffer[p] != ApplesoftConstants.TOKEN_GOTO
&& parent.buffer[p] != ApplesoftConstants.TOKEN_GOSUB)
{
// if (Utility.isHighBitSet (parent.buffer[p]))
// {
// int val = parent.buffer[p] & 0x7F;
// if (val < ApplesoftConstants.tokens.length)
// onExpression += " " + ApplesoftConstants.tokens[val];
// }
// else
// onExpression += (char) (parent.buffer[p]);
p++;
}
switch (parent.buffer[p++])
{
@ -176,6 +166,14 @@ public class SubLine
System.out.println ("GOTO / GOSUB not found");
}
break;
case ApplesoftConstants.TOKEN_ONERR:
if (buffer[startPtr + 1] == ApplesoftConstants.TOKEN_GOTO)
{
targetLine = getLineNumber (parent.buffer, startPtr + 2);
addXref (targetLine, gotoLines);
}
break;
}
}