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

indent split REM correctly

Browse Source
This commit is contained in:
Denis Molony 2020-12-25 14:30:26 +10:00
parent f84e0b0ce7
commit f0244793a7
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,21 +163,22 @@ public class ApplesoftBasicProgram extends BasicProgram
// Check for a wrappable REM statement
// (see SEA BATTLE on DISK283.DSK)
int inset = Math.max (text.length (), getIndent (fullText)) + 1;
if (subline.is (TOKEN_REM) && lineText.length () > basicPreferences.wrapRemAt)
{
List<String> lines = splitLine (lineText, basicPreferences.wrapRemAt, ' ');
addSplitLines (lines, text);
addSplitLines (lines, text, inset);
}
else if (subline.is (TOKEN_DATA)
&& lineText.length () > basicPreferences.wrapDataAt)
{
List<String> lines = splitLine (lineText, basicPreferences.wrapDataAt, ',');
addSplitLines (lines, text);
addSplitLines (lines, text, inset);
}
else if (subline.is (TOKEN_DIM) && basicPreferences.splitDim)
{
List<String> lines = splitDim (lineText);
addSplitLines (lines, text);
addSplitLines (lines, text, inset);
}
else
text.append (lineText);
@ -377,9 +378,8 @@ public class ApplesoftBasicProgram extends BasicProgram
// ---------------------------------------------------------------------------------//
{
List<String> lines = new ArrayList<> ();
System.out.println (line);
Pattern p = Pattern.compile ("[A-Z][A-Z0-9]*[$%]?\\([0-9,]*\\),?");
Pattern p = Pattern.compile ("[A-Z][A-Z0-9]*[$%]?\\([0-9,]*\\)[,:]?");
Matcher m = p.matcher (line);
while (m.find ())
@ -392,10 +392,9 @@ public class ApplesoftBasicProgram extends BasicProgram
}
// ---------------------------------------------------------------------------------//
private void addSplitLines (List<String> lines, StringBuilder text)
private void addSplitLines (List<String> lines, StringBuilder text, int indent)
// ---------------------------------------------------------------------------------//
{
int inset = text.length () + 1;
boolean first = true;
for (String line : lines)
@ -406,10 +405,25 @@ public class ApplesoftBasicProgram extends BasicProgram
text.append (line);
}
else
text.append ("\n ".substring (0, inset) + line);
text.append (
"\n ".substring (0, indent) + line);
}
}
// ---------------------------------------------------------------------------------//
private int getIndent (StringBuilder fullText)
// ---------------------------------------------------------------------------------//
{
int ptr = fullText.length () - 1;
int indent = 0;
while (ptr >= 0 && fullText.charAt (ptr) != '\n')
{
--ptr;
++indent;
}
return indent;
}
// ---------------------------------------------------------------------------------//
private int countChars (StringBuilder text, byte ch)
// ---------------------------------------------------------------------------------//