Apple-2-SW
/
bastools
mirror of https://github.com/AppleCommander/bastools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweaking logic (again) to more correctly reassign line numbers.

This commit is contained in:
Rob Greene 2018-07-13 21:21:59 -05:00
parent 442cb1cdeb
commit 486016d7d6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/src/main/java/io/github/applecommander/bastools/api/visitors/ReassignmentVisitor.java
View File

@ -53,21 +53,21 @@ public class ReassignmentVisitor implements Visitor {
*/
@Override
public Statement visit(Statement statement) {
boolean next = false;
boolean multiple = false;
boolean trigger = false;
boolean then = false; // Special case: Immediately after THEN, a number triggers reassignment.
Statement newStatement = new Statement();
for (Token t : statement.tokens) {
Token newToken = t;
if (next) {
if (trigger || then) {
if (t.type == Type.NUMBER && reassignments.containsKey(t.number.intValue())) {
newToken = Token.number(t.line, reassignments.get(t.number.intValue()).doubleValue());
}
next = multiple; // preserve next based on if we have multiple line numbers or not.
} else {
next = t.keyword == ApplesoftKeyword.GOSUB || t.keyword == ApplesoftKeyword.GOTO
|| t.keyword == ApplesoftKeyword.THEN || t.keyword == ApplesoftKeyword.RUN
|| t.keyword == ApplesoftKeyword.LIST;
multiple |= t.keyword == ApplesoftKeyword.LIST || t.keyword == ApplesoftKeyword.ON;
then = false;
}
if (!trigger) {
trigger = t.keyword == ApplesoftKeyword.GOSUB || t.keyword == ApplesoftKeyword.GOTO
|| t.keyword == ApplesoftKeyword.LIST || t.keyword == ApplesoftKeyword.RUN;
then = t.keyword == ApplesoftKeyword.THEN;
}
newStatement.tokens.add(newToken);
}