Apple-2-SW/bastools
1
0
Fork 0
mirror of https://github.com/AppleCommander/bastools.git synced 2026-04-19 16:16:37 +00:00
Code Issues Projects Releases Wiki Activity

Restructured optimization selection a bit.

Browse Source
This commit is contained in:
Rob Greene
2025-11-10 10:32:57 -06:00
parent 7a4a4ce7c9
commit aa2a57287c
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/bt/src/main/java/org/applecommander/bastools/tools/bt/Main.java
+24 -21
View File
@@ -93,25 +93,13 @@ public class Main implements Callable<Integer> {
private boolean wrapProgram;
@ArgGroup(heading = "%nTokenizer Selection:%n")
private TokenizerSelection tokenizer = new TokenizerSelection();
private final TokenizerSelection tokenizer = new TokenizerSelection();
@Option(names = "--checkit", description = "Apply Nibble Checkit (ca 1988) to code")
private boolean showCheckitValues;
@Option(names = "-f", converter = OptimizationTypeConverter.class, split = ",", description = {
"Enable specific optimizations.",
"* @|green remove-empty-statements|@ - Strip out all '::'-like statements.",
"* @|green remove-rem-statements|@ - Remove all REM statements.",
"* @|green shorten-variable-names|@ - Ensure all variables are 1 or 2 characters long.",
"* @|green extract-constant-values|@ - Assign all constant values first.",
"* @|green merge-lines|@ - Merge lines.",
"* @|green renumber|@ - Renumber program.",
"* @|green shorten-numbers|@ - Shorten numbers."
})
private List<Optimization> optimizations = new ArrayList<>();
@Option(names = { "-O", "--optimize" }, description = "Apply all optimizations.")
private boolean allOptimizations;
@ArgGroup(heading = "%nOptimization:%n")
private final OptimizationSelection optimizations = new OptimizationSelection();
@Option(names = "--debug", description = "Print debug output.")
private static boolean debugFlag;
@@ -194,12 +182,8 @@ public class Main implements Callable<Integer> {
/** A basic test to ensure parameters are somewhat sane. */
public boolean checkParameters() {
if (allOptimizations) {
optimizations.clear();
optimizations.addAll(Arrays.asList(Optimization.values()));
}
// Special handling for the "shorten numbers" optimization to be applied
if (optimizations.contains(Optimization.SHORTEN_NUMBERS)) {
if (optimizations.selected.contains(Optimization.SHORTEN_NUMBERS)) {
tokenizer.preserveNumbers = true;
}
boolean hasTextOutput = hexFormat || copyFormat || prettyPrint || listPrint || showTokens || showVariableReport
@@ -223,7 +207,7 @@ public class Main implements Callable<Integer> {
Parser parser = new Parser(tokens);
Program program = parser.parse();
for (Optimization optimization : optimizations) {
for (Optimization optimization : optimizations.selected) {
debug.printf("Optimization: %s\n", optimization.name());
program = program.accept(optimization.create(config));
}
@@ -342,4 +326,23 @@ public class Main implements Callable<Integer> {
}
}
}
public static class OptimizationSelection {
@Option(names = "-f", converter = OptimizationTypeConverter.class, split = ",", description = {
"Enable specific optimizations.",
"* @|green remove-empty-statements|@ - Strip out all '::'-like statements.",
"* @|green remove-rem-statements|@ - Remove all REM statements.",
"* @|green shorten-variable-names|@ - Ensure all variables are 1 or 2 characters long.",
"* @|green extract-constant-values|@ - Assign all constant values first.",
"* @|green merge-lines|@ - Merge lines.",
"* @|green renumber|@ - Renumber program.",
"* @|green shorten-numbers|@ - Shorten numbers."
})
private List<Optimization> selected = new ArrayList<>();
@Option(names = { "-O", "--optimize" }, description = "Apply all optimizations.")
public void selectAllOptimizations(boolean flag) {
selected.addAll(List.of(Optimization.values()));
}
}
}