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

wrapping finished

Browse Source
This commit is contained in:
Denis Molony 2021-02-23 07:56:51 +10:00
parent 5901ea87ce
commit 903ec192e2
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,9 +25,12 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
private static final String underline = private static final String underline =
"----------------------------------------------------" "----------------------------------------------------"
+ "----------------------------------------------"; + "----------------------------------------------";
private static Pattern dimPattern = private static final Pattern dimPattern =
Pattern.compile ("[A-Z][A-Z0-9]*[$%]?\\([0-9]+(,[0-9]+)*\\)[,:]?"); Pattern.compile ("[A-Z][A-Z0-9]*[$%]?\\([0-9]+(,[0-9]+)*\\)[,:]?");
private static String NEWLINE = "\n"; private static final String NEWLINE = "\n";
private static final int LEFT_MARGIN = 5;
private static final int RIGHT_MARGIN = 33;
private final List<SourceLine> sourceLines = new ArrayList<> (); private final List<SourceLine> sourceLines = new ArrayList<> ();
private final int endPtr; private final int endPtr;
@ -55,9 +58,6 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
final String formatCall; final String formatCall;
private final int maxDigits; private final int maxDigits;
private final int lineWrapLeft = 5;
private final int lineWrapRight = 33;
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
public ApplesoftBasicProgram (String name, byte[] buffer) public ApplesoftBasicProgram (String name, byte[] buffer)
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
@ -237,11 +237,17 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
private int incrementCursor (StringBuilder currentLine, int cursor, int size) private int incrementCursor (StringBuilder currentLine, int cursor, int size)
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
{ {
if ((cursor += size) >= lineWrapRight) assert size <= 9; // longest token possible (7 plus 2 spaces)
cursor += size;
if ((cursor) >= RIGHT_MARGIN)
{ {
// seems to be a bug in the ROM - see line 1610 in KEY-CAT on UtilityCity.dsk if (cursor >= 40) // already wrapped
cursor = cursor < 40 ? lineWrapLeft : 0; cursor -= 40;
currentLine.append ("\n ".substring (0, cursor + 1)); else
cursor = LEFT_MARGIN;
currentLine.append ("\n ".substring (0, cursor + 1));
} }
return cursor; return cursor;