Apple-2-SW/bastools
1
0
Fork 0
mirror of https://github.com/AppleCommander/bastools.git synced 2024-05-29 10:41:32 +00:00
Code Issues Projects Releases Wiki Activity

Adding renumber (which takes advantage of reassignment). Closes #12.

Browse Source
This commit is contained in:
Rob Greene 2018-05-15 22:04:35 -05:00
parent bf5c9f8e10
commit 3f4c47551a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/io/github/applecommander/bastokenizer/Main.java
View File

@ -58,7 +58,8 @@ public class Main implements Callable<Void> {
@Option(names = "-f", converter = Optimization.TypeConverter.class, split = ",", description = {
"Enable specific optimizations.",
"* @|green remove-empty-statements|@ - Strip out all '::'-like statements.",
"* @|yellow remove-rem-statements|@ - Remove all REM statements."
"* @|green remove-rem-statements|@ - Remove all REM statements.",
"* @|green renumber|@ - Renumber program."
})
private List<Optimization> optimizations = new ArrayList<>();

13
src/main/java/io/github/applecommander/bastokenizer/Optimization.java
View File

@ -25,6 +25,17 @@ public enum Optimization {
public Statement visit(Statement statement) {
return statement.tokens.get(0).type == Type.COMMENT ? null : statement;
}
}),
RENUMBER(new BaseVisitor() {
protected int lineNumber = 0;
@Override
public Line visit(Line line) {
Line newLine = new Line(lineNumber++);
newLine.statements.addAll(line.statements);
// Track what went where so lines can get renumbered automatically
reassignments.put(line.lineNumber, newLine.lineNumber);
return newLine;
}
})
;
@ -53,10 +64,10 @@ public enum Optimization {
}
/** Common base class for optimization visitors that allow the program tree to be rewritten. */
private static class BaseVisitor implements Visitor {
protected Map<Integer,Integer> reassignments = new HashMap<>();
@Override
public Program visit(Program program) {
final Program newProgram = new Program();
Map<Integer,Integer> reassignments = new HashMap<>();
program.lines.forEach(l -> {
Line line = l.accept(this);
boolean lineKept = line != null && !line.statements.isEmpty();