diff --git a/LICENSE b/LICENSE index b789d3d..54e369e 100644 --- a/LICENSE +++ b/LICENSE @@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - bastokenizer + bastools Copyright (C) 2018 Rob Greene This program is free software: you can redistribute it and/or modify @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - bastokenizer Copyright (C) 2018 Rob Greene + bastools Copyright (C) 2018 Rob Greene This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/api/README.md b/api/README.md index afb627c..36e942c 100644 --- a/api/README.md +++ b/api/README.md @@ -9,8 +9,8 @@ To include in a Maven project: ```xml net.sf.applecommander - bastokenizer-api - 0.2.0 + bastools-api + 0.3.0 ``` @@ -19,7 +19,7 @@ To include in a Gradle project: ``` dependencies { // ... - compile "net.sf.applecommander:bastokenizer-api:0.2.0" + compile "net.sf.applecommander:bastools-api:0.2.0" // ... } ``` diff --git a/api/build.gradle b/api/build.gradle index 8dda14c..d97a2f4 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -13,7 +13,7 @@ dependencies { jar { manifest { attributes( - 'Implementation-Title': 'B/BAS Tokenizer', + 'Implementation-Title': 'B/BAS Tools API', 'Implementation-Version': "${version} (${new Date().format('yyyy-MM-dd HH:mm')})" ) } @@ -55,11 +55,11 @@ uploadArchives { pom.project { name archivesBaseName packaging 'jar' - description 'Experiments with generating an AppleSoft B/BAS tokenized "binary".' + description 'An Applesoft BASIC tools library.' url 'https://applecommander.github.io/' scm { - url 'https://github.com/AppleCommander/bastokenizer' + url 'https://github.com/AppleCommander/bastools' } licenses { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/BasTokenizer.java b/api/src/main/java/io/github/applecommander/bastokenizer/api/BasTokenizer.java deleted file mode 100644 index 4a5826a..0000000 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/BasTokenizer.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.applecommander.bastokenizer.api; - -/** - * Since there are many pieces to bastokenizer, the version information is just a small, - * dedicated class. - */ -public class BasTokenizer { - public static final String VERSION; - static { - VERSION = BasTokenizer.class.getPackage().getImplementationVersion(); - } - - private BasTokenizer() {} -} diff --git a/api/src/main/java/io/github/applecommander/bastools/api/BasTools.java b/api/src/main/java/io/github/applecommander/bastools/api/BasTools.java new file mode 100644 index 0000000..8999b33 --- /dev/null +++ b/api/src/main/java/io/github/applecommander/bastools/api/BasTools.java @@ -0,0 +1,16 @@ +package io.github.applecommander.bastools.api; + +/** + * Since there are many pieces to bastools, the version information is just a small, + * dedicated class. + */ +public class BasTools { + public static final String VERSION; + public static final String TITLE; + static { + TITLE = BasTools.class.getPackage().getImplementationTitle(); + VERSION = BasTools.class.getPackage().getImplementationVersion(); + } + + private BasTools() {} +} diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Configuration.java b/api/src/main/java/io/github/applecommander/bastools/api/Configuration.java similarity index 96% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Configuration.java rename to api/src/main/java/io/github/applecommander/bastools/api/Configuration.java index 7333f34..621ccec 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Configuration.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Configuration.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.io.File; import java.io.IOException; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Directive.java b/api/src/main/java/io/github/applecommander/bastools/api/Directive.java similarity index 87% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Directive.java rename to api/src/main/java/io/github/applecommander/bastools/api/Directive.java index 8996ad4..53d344b 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Directive.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Directive.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.io.IOException; import java.io.OutputStream; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; -import io.github.applecommander.bastokenizer.api.utils.Converters; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; +import io.github.applecommander.bastools.api.utils.Converters; public abstract class Directive { protected Configuration config; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Directives.java b/api/src/main/java/io/github/applecommander/bastools/api/Directives.java similarity index 85% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Directives.java rename to api/src/main/java/io/github/applecommander/bastools/api/Directives.java index ff577ee..4af82e1 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Directives.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Directives.java @@ -1,12 +1,12 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.io.OutputStream; import java.lang.reflect.Constructor; import java.util.Map; import java.util.TreeMap; -import io.github.applecommander.bastokenizer.api.directives.EmbeddedBinaryDirective; -import io.github.applecommander.bastokenizer.api.directives.HexDirective; +import io.github.applecommander.bastools.api.directives.EmbeddedBinaryDirective; +import io.github.applecommander.bastools.api.directives.HexDirective; public class Directives { private Directives() { /* Prevent construction. */ } diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Optimization.java b/api/src/main/java/io/github/applecommander/bastools/api/Optimization.java similarity index 60% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Optimization.java rename to api/src/main/java/io/github/applecommander/bastools/api/Optimization.java index 4bb15e5..2c03c0e 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Optimization.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Optimization.java @@ -1,12 +1,12 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.util.function.Function; -import io.github.applecommander.bastokenizer.api.optimizations.ExtractConstantValues; -import io.github.applecommander.bastokenizer.api.optimizations.MergeLines; -import io.github.applecommander.bastokenizer.api.optimizations.RemoveEmptyStatements; -import io.github.applecommander.bastokenizer.api.optimizations.RemoveRemStatements; -import io.github.applecommander.bastokenizer.api.optimizations.Renumber; +import io.github.applecommander.bastools.api.optimizations.ExtractConstantValues; +import io.github.applecommander.bastools.api.optimizations.MergeLines; +import io.github.applecommander.bastools.api.optimizations.RemoveEmptyStatements; +import io.github.applecommander.bastools.api.optimizations.RemoveRemStatements; +import io.github.applecommander.bastools.api.optimizations.Renumber; /** * All optimization capabilities are definined here in the "best" manner of execution. diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Parser.java b/api/src/main/java/io/github/applecommander/bastools/api/Parser.java similarity index 80% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Parser.java rename to api/src/main/java/io/github/applecommander/bastools/api/Parser.java index 2cdaa5f..1b33b24 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Parser.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Parser.java @@ -1,13 +1,13 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.util.Objects; import java.util.Queue; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; /** * The Parser will read a series of Tokens and build a Program. diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/TokenReader.java b/api/src/main/java/io/github/applecommander/bastools/api/TokenReader.java similarity index 96% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/TokenReader.java rename to api/src/main/java/io/github/applecommander/bastools/api/TokenReader.java index f5bd3b0..71e8b0a 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/TokenReader.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/TokenReader.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.io.File; import java.io.FileNotFoundException; @@ -12,8 +12,8 @@ import java.util.LinkedList; import java.util.Optional; import java.util.Queue; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Token; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Token; /** * The TokenReader, given a text file, generates a series of Tokens (in the compiler sense, diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Visitor.java b/api/src/main/java/io/github/applecommander/bastools/api/Visitor.java similarity index 66% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Visitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/Visitor.java index a535145..04e30db 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Visitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Visitor.java @@ -1,9 +1,9 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; /** * The Visitor interface allows some flexibility in what can be done with the diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/Visitors.java b/api/src/main/java/io/github/applecommander/bastools/api/Visitors.java similarity index 76% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/Visitors.java rename to api/src/main/java/io/github/applecommander/bastools/api/Visitors.java index d02e4c0..fcf3d55 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/Visitors.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/Visitors.java @@ -1,17 +1,17 @@ -package io.github.applecommander.bastokenizer.api; +package io.github.applecommander.bastools.api; import java.io.PrintStream; import java.util.Map; import java.util.Objects; import java.util.function.Function; -import io.github.applecommander.bastokenizer.api.visitors.ByteVisitor; -import io.github.applecommander.bastokenizer.api.visitors.LineNumberTargetCollector; -import io.github.applecommander.bastokenizer.api.visitors.PrettyPrintVisitor; -import io.github.applecommander.bastokenizer.api.visitors.PrintVisitor; -import io.github.applecommander.bastokenizer.api.visitors.ReassignmentVisitor; -import io.github.applecommander.bastokenizer.api.visitors.VariableCollectorVisitor; -import io.github.applecommander.bastokenizer.api.visitors.VariableReportVisitor; +import io.github.applecommander.bastools.api.visitors.ByteVisitor; +import io.github.applecommander.bastools.api.visitors.LineNumberTargetCollector; +import io.github.applecommander.bastools.api.visitors.PrettyPrintVisitor; +import io.github.applecommander.bastools.api.visitors.PrintVisitor; +import io.github.applecommander.bastools.api.visitors.ReassignmentVisitor; +import io.github.applecommander.bastools.api.visitors.VariableCollectorVisitor; +import io.github.applecommander.bastools.api.visitors.VariableReportVisitor; /** * This class presents all of the common Visitor implementations via builder patterns. diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/directives/EmbeddedBinaryDirective.java b/api/src/main/java/io/github/applecommander/bastools/api/directives/EmbeddedBinaryDirective.java similarity index 89% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/directives/EmbeddedBinaryDirective.java rename to api/src/main/java/io/github/applecommander/bastools/api/directives/EmbeddedBinaryDirective.java index 4b13513..331aaeb 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/directives/EmbeddedBinaryDirective.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/directives/EmbeddedBinaryDirective.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.directives; +package io.github.applecommander.bastools.api.directives; import java.io.ByteArrayOutputStream; import java.io.File; @@ -7,10 +7,10 @@ import java.io.OutputStream; import java.nio.file.Files; import java.util.Optional; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.Directive; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Line; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.Directive; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Line; public class EmbeddedBinaryDirective extends Directive { public EmbeddedBinaryDirective(Configuration config, OutputStream outputStream) { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/directives/HexDirective.java b/api/src/main/java/io/github/applecommander/bastools/api/directives/HexDirective.java similarity index 78% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/directives/HexDirective.java rename to api/src/main/java/io/github/applecommander/bastools/api/directives/HexDirective.java index e42a497..a734ea5 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/directives/HexDirective.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/directives/HexDirective.java @@ -1,12 +1,12 @@ -package io.github.applecommander.bastokenizer.api.directives; +package io.github.applecommander.bastools.api.directives; import java.io.IOException; import java.io.OutputStream; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.Directive; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Line; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.Directive; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Line; /** * A simple directive to introduce hexidecimal capabilities. StreamTokenizer does not diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/ApplesoftKeyword.java b/api/src/main/java/io/github/applecommander/bastools/api/model/ApplesoftKeyword.java similarity index 98% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/model/ApplesoftKeyword.java rename to api/src/main/java/io/github/applecommander/bastools/api/model/ApplesoftKeyword.java index 06903d3..7199b45 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/ApplesoftKeyword.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/model/ApplesoftKeyword.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.model; +package io.github.applecommander.bastools.api.model; import java.io.IOException; import java.io.Reader; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Line.java b/api/src/main/java/io/github/applecommander/bastools/api/model/Line.java similarity index 86% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/model/Line.java rename to api/src/main/java/io/github/applecommander/bastools/api/model/Line.java index 8f03b15..0c2151a 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Line.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/model/Line.java @@ -1,11 +1,11 @@ -package io.github.applecommander.bastokenizer.api.model; +package io.github.applecommander.bastools.api.model; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; -import io.github.applecommander.bastokenizer.api.Visitor; +import io.github.applecommander.bastools.api.Visitor; /** An AppleSoft BASIC Line representation. */ public class Line { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Program.java b/api/src/main/java/io/github/applecommander/bastools/api/model/Program.java similarity index 67% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/model/Program.java rename to api/src/main/java/io/github/applecommander/bastools/api/model/Program.java index b33a949..e6976ea 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Program.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/model/Program.java @@ -1,9 +1,9 @@ -package io.github.applecommander.bastokenizer.api.model; +package io.github.applecommander.bastools.api.model; import java.util.ArrayList; import java.util.List; -import io.github.applecommander.bastokenizer.api.Visitor; +import io.github.applecommander.bastools.api.Visitor; /** A Program is a series of lines. */ public class Program { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Statement.java b/api/src/main/java/io/github/applecommander/bastools/api/model/Statement.java similarity index 68% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/model/Statement.java rename to api/src/main/java/io/github/applecommander/bastools/api/model/Statement.java index 2a5b7de..76a49ed 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Statement.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/model/Statement.java @@ -1,9 +1,9 @@ -package io.github.applecommander.bastokenizer.api.model; +package io.github.applecommander.bastools.api.model; import java.util.ArrayList; import java.util.List; -import io.github.applecommander.bastokenizer.api.Visitor; +import io.github.applecommander.bastools.api.Visitor; /** A Statement is simply a series of Tokens. */ public class Statement { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Token.java b/api/src/main/java/io/github/applecommander/bastools/api/model/Token.java similarity index 94% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/model/Token.java rename to api/src/main/java/io/github/applecommander/bastools/api/model/Token.java index 423bf3c..2962a92 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/model/Token.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/model/Token.java @@ -1,6 +1,6 @@ -package io.github.applecommander.bastokenizer.api.model; +package io.github.applecommander.bastools.api.model; -import io.github.applecommander.bastokenizer.api.Visitor; +import io.github.applecommander.bastools.api.Visitor; /** * A Token in the classic compiler sense, in that this represents a component of the application. diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/BaseVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/BaseVisitor.java similarity index 79% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/BaseVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/optimizations/BaseVisitor.java index b3e9ec3..9b26087 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/BaseVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/BaseVisitor.java @@ -1,14 +1,14 @@ -package io.github.applecommander.bastokenizer.api.optimizations; +package io.github.applecommander.bastools.api.optimizations; import java.util.HashMap; import java.util.Map; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.Visitors; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.Visitors; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; /** * Common base class for optimization visitors that allow the program tree to be rewritten. diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/ExtractConstantValues.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java similarity index 88% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/ExtractConstantValues.java rename to api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java index b9f2056..3ec78c5 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/ExtractConstantValues.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.optimizations; +package io.github.applecommander.bastools.api.optimizations; import java.util.Arrays; import java.util.HashMap; @@ -7,15 +7,15 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.Visitors; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.utils.VariableNameGenerator; -import io.github.applecommander.bastokenizer.api.visitors.VariableCollectorVisitor; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.Visitors; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.utils.VariableNameGenerator; +import io.github.applecommander.bastools.api.visitors.VariableCollectorVisitor; /** * Find constants and extract to variables in order to have the number parsed only once. diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/MergeLines.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/MergeLines.java similarity index 78% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/MergeLines.java rename to api/src/main/java/io/github/applecommander/bastools/api/optimizations/MergeLines.java index 832a447..ee2d69a 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/MergeLines.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/MergeLines.java @@ -1,18 +1,18 @@ -package io.github.applecommander.bastokenizer.api.optimizations; +package io.github.applecommander.bastools.api.optimizations; import java.io.PrintStream; import java.util.Set; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.Visitors; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; -import io.github.applecommander.bastokenizer.api.visitors.ByteVisitor; -import io.github.applecommander.bastokenizer.api.visitors.LineNumberTargetCollector; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.Visitors; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; +import io.github.applecommander.bastools.api.visitors.ByteVisitor; +import io.github.applecommander.bastools.api.visitors.LineNumberTargetCollector; public class MergeLines extends BaseVisitor { private Set targets; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/RemoveEmptyStatements.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/RemoveEmptyStatements.java similarity index 63% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/RemoveEmptyStatements.java rename to api/src/main/java/io/github/applecommander/bastools/api/optimizations/RemoveEmptyStatements.java index c09e7d9..aabff24 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/RemoveEmptyStatements.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/RemoveEmptyStatements.java @@ -1,7 +1,7 @@ -package io.github.applecommander.bastokenizer.api.optimizations; +package io.github.applecommander.bastools.api.optimizations; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.model.Statement; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.model.Statement; /** Remove any empty statements during the tree walk. Effective removes double "::"'s. */ public class RemoveEmptyStatements extends BaseVisitor { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/RemoveRemStatements.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/RemoveRemStatements.java similarity index 56% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/RemoveRemStatements.java rename to api/src/main/java/io/github/applecommander/bastools/api/optimizations/RemoveRemStatements.java index b665106..c20e258 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/RemoveRemStatements.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/RemoveRemStatements.java @@ -1,8 +1,8 @@ -package io.github.applecommander.bastokenizer.api.optimizations; +package io.github.applecommander.bastools.api.optimizations; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token.Type; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token.Type; /** Drop all REM statements as they are encountered in the tree walk. */ public class RemoveRemStatements extends BaseVisitor { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/Renumber.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/Renumber.java similarity index 74% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/Renumber.java rename to api/src/main/java/io/github/applecommander/bastools/api/optimizations/Renumber.java index 305a903..b27be9d 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/optimizations/Renumber.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/Renumber.java @@ -1,7 +1,7 @@ -package io.github.applecommander.bastokenizer.api.optimizations; +package io.github.applecommander.bastools.api.optimizations; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.model.Line; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.model.Line; /** * A simple renumbering algorithm that maps the reassignments and lets {@code BaseVisitor} diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/utils/Converters.java b/api/src/main/java/io/github/applecommander/bastools/api/utils/Converters.java similarity index 91% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/utils/Converters.java rename to api/src/main/java/io/github/applecommander/bastools/api/utils/Converters.java index bd97f7b..51b08b3 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/utils/Converters.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/utils/Converters.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.utils; +package io.github.applecommander.bastools.api.utils; public class Converters { private Converters() { /* Prevent construction */ } diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/utils/VariableNameGenerator.java b/api/src/main/java/io/github/applecommander/bastools/api/utils/VariableNameGenerator.java similarity index 92% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/utils/VariableNameGenerator.java rename to api/src/main/java/io/github/applecommander/bastools/api/utils/VariableNameGenerator.java index 056c023..321db78 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/utils/VariableNameGenerator.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/utils/VariableNameGenerator.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.utils; +package io.github.applecommander.bastools.api.utils; import java.util.Optional; import java.util.function.Supplier; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/ByteVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/ByteVisitor.java similarity index 85% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/ByteVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/ByteVisitor.java index 56bd9ae..b27a806 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/ByteVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/ByteVisitor.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,15 +7,15 @@ import java.util.Optional; import java.util.Stack; import java.util.TreeMap; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.Directive; -import io.github.applecommander.bastokenizer.api.Directives; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.Directive; +import io.github.applecommander.bastools.api.Directives; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; public class ByteVisitor implements Visitor { private Stack stack; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/LineNumberTargetCollector.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/LineNumberTargetCollector.java similarity index 74% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/LineNumberTargetCollector.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/LineNumberTargetCollector.java index 372add7..646c7f9 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/LineNumberTargetCollector.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/LineNumberTargetCollector.java @@ -1,13 +1,13 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.util.Set; import java.util.TreeSet; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; public class LineNumberTargetCollector implements Visitor { private Set targets = new TreeSet<>(); diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/PrettyPrintVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/PrettyPrintVisitor.java similarity index 76% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/PrettyPrintVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/PrettyPrintVisitor.java index add15da..557d2df 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/PrettyPrintVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/PrettyPrintVisitor.java @@ -1,12 +1,12 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.io.PrintStream; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.Visitors.PrintBuilder; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.Visitors.PrintBuilder; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; public class PrettyPrintVisitor implements Visitor { private PrintStream printStream; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/PrintVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/PrintVisitor.java similarity index 76% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/PrintVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/PrintVisitor.java index eaeb232..0a72df0 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/PrintVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/PrintVisitor.java @@ -1,12 +1,12 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.io.PrintStream; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.Visitors.PrintBuilder; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.Visitors.PrintBuilder; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; public class PrintVisitor implements Visitor { private PrintStream printStream; diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/ReassignmentVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/ReassignmentVisitor.java similarity index 79% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/ReassignmentVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/ReassignmentVisitor.java index 66629ea..044b340 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/ReassignmentVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/ReassignmentVisitor.java @@ -1,14 +1,14 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.util.Map; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.model.ApplesoftKeyword; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Statement; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.model.ApplesoftKeyword; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Statement; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; /** This is a mildly rewritable Visitor. */ public class ReassignmentVisitor implements Visitor { diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/VariableCollectorVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/VariableCollectorVisitor.java similarity index 61% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/VariableCollectorVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/VariableCollectorVisitor.java index bc8ddeb..10713a1 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/VariableCollectorVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/VariableCollectorVisitor.java @@ -1,11 +1,11 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.util.HashSet; import java.util.Set; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; public class VariableCollectorVisitor implements Visitor { private Set variableNames = new HashSet<>(); diff --git a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/VariableReportVisitor.java b/api/src/main/java/io/github/applecommander/bastools/api/visitors/VariableReportVisitor.java similarity index 76% rename from api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/VariableReportVisitor.java rename to api/src/main/java/io/github/applecommander/bastools/api/visitors/VariableReportVisitor.java index 0d961e6..72ee1e2 100644 --- a/api/src/main/java/io/github/applecommander/bastokenizer/api/visitors/VariableReportVisitor.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/visitors/VariableReportVisitor.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.visitors; +package io.github.applecommander.bastools.api.visitors; import java.util.Arrays; import java.util.HashMap; @@ -6,11 +6,11 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import io.github.applecommander.bastokenizer.api.Visitor; -import io.github.applecommander.bastokenizer.api.model.Line; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; +import io.github.applecommander.bastools.api.Visitor; +import io.github.applecommander.bastools.api.model.Line; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; public class VariableReportVisitor implements Visitor { private Map> refs = new HashMap<>(); diff --git a/api/src/test/java/io/github/applecommander/bastokenizer/api/utils/VariableNameGeneratorTest.java b/api/src/test/java/io/github/applecommander/bastools/api/utils/VariableNameGeneratorTest.java similarity index 89% rename from api/src/test/java/io/github/applecommander/bastokenizer/api/utils/VariableNameGeneratorTest.java rename to api/src/test/java/io/github/applecommander/bastools/api/utils/VariableNameGeneratorTest.java index cd9269b..97d7af9 100644 --- a/api/src/test/java/io/github/applecommander/bastokenizer/api/utils/VariableNameGeneratorTest.java +++ b/api/src/test/java/io/github/applecommander/bastools/api/utils/VariableNameGeneratorTest.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.api.utils; +package io.github.applecommander.bastools.api.utils; import static org.junit.Assert.assertEquals; @@ -7,6 +7,8 @@ import java.util.Map; import org.junit.Test; +import io.github.applecommander.bastools.api.utils.VariableNameGenerator; + public class VariableNameGeneratorTest { @Test public void testNameSequence() { diff --git a/gradle.properties b/gradle.properties index 5e5899f..fc8a875 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ -# Universal applesingle version number. Used for: +# Universal bastools version number. Used for: # - Naming JAR file. # - The build will insert this into a file that is read at run time as well. version=0.3.0 # Maven Central Repository G and A of GAV coordinate. :-) group=net.sf.applecommander -archivesBaseName=bastokenizer +archivesBaseName=bastools diff --git a/settings.gradle b/settings.gradle index 6b1328e..7fe5f6a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ include 'api' include 'tools:bt' -rootProject.name = 'bastokenizer' -project(":api").name = 'bastokenizer-api' -project(":tools").name = 'bastokenizer-tools' -project(":tools:bt").name = 'bastokenizer-tools-bt' +rootProject.name = 'bastools' +project(":api").name = 'bastools-api' +project(":tools").name = 'bastools-tools' +project(":tools:bt").name = 'bastools-tools-bt' diff --git a/tools/bt/README.md b/tools/bt/README.md index f095efd..27a94d3 100644 --- a/tools/bt/README.md +++ b/tools/bt/README.md @@ -15,11 +15,11 @@ Options: --addresses Dump line number addresses out. --applesingle Write output in AppleSingle format --debug Print debug output. - --list List structure as bastokenizer understands it. + --list List structure as bastools understands it. --max-line-length= Maximum line length for generated lines. Default: 255 - --pretty Pretty print structure as bastokenizer understands it. + --pretty Pretty print structure as bastools understands it. --stdout Send binary output to stdout. --tokens Dump token list to stdout for debugging. --variables Generate a variable report diff --git a/tools/bt/build.gradle b/tools/bt/build.gradle index afa34af..bbeefff 100644 --- a/tools/bt/build.gradle +++ b/tools/bt/build.gradle @@ -8,12 +8,12 @@ repositories { apply plugin: 'application' -mainClassName = "io.github.applecommander.bastokenizer.tools.bt.Main" +mainClassName = "io.github.applecommander.bastools.tools.bt.Main" bootJar { manifest { attributes( - 'Implementation-Title': 'bastokenizer', + 'Implementation-Title': 'BT CLI', 'Implementation-Version': "${version} (${new Date().format('yyyy-MM-dd HH:mm')})" ) } @@ -22,5 +22,5 @@ bootJar { dependencies { compile 'info.picocli:picocli:3.0.2' compile 'net.sf.applecommander:applesingle-api:1.2.1' - compile project(':bastokenizer-api') + compile project(':bastools-api') } diff --git a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/HexDumper.java b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/HexDumper.java similarity index 97% rename from tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/HexDumper.java rename to tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/HexDumper.java index d9aba0b..7e2f3cd 100644 --- a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/HexDumper.java +++ b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/HexDumper.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.tools.bt; +package io.github.applecommander.bastools.tools.bt; import java.io.PrintStream; import java.util.Arrays; diff --git a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/IntegerTypeConverter.java b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/IntegerTypeConverter.java similarity index 70% rename from tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/IntegerTypeConverter.java rename to tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/IntegerTypeConverter.java index f9dedc6..1a87af7 100644 --- a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/IntegerTypeConverter.java +++ b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/IntegerTypeConverter.java @@ -1,6 +1,6 @@ -package io.github.applecommander.bastokenizer.tools.bt; +package io.github.applecommander.bastools.tools.bt; -import io.github.applecommander.bastokenizer.api.utils.Converters; +import io.github.applecommander.bastools.api.utils.Converters; import picocli.CommandLine.ITypeConverter; /** Add support for "$801" and "0x801" instead of just decimal like 2049. */ diff --git a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/Main.java b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java similarity index 91% rename from tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/Main.java rename to tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java index 4481f85..22328a9 100644 --- a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/Main.java +++ b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java @@ -1,4 +1,4 @@ -package io.github.applecommander.bastokenizer.tools.bt; +package io.github.applecommander.bastools.tools.bt; import java.io.File; import java.io.FileNotFoundException; @@ -14,15 +14,15 @@ import java.util.Queue; import java.util.concurrent.Callable; import io.github.applecommander.applesingle.AppleSingle; -import io.github.applecommander.bastokenizer.api.Configuration; -import io.github.applecommander.bastokenizer.api.Optimization; -import io.github.applecommander.bastokenizer.api.Parser; -import io.github.applecommander.bastokenizer.api.TokenReader; -import io.github.applecommander.bastokenizer.api.Visitors; -import io.github.applecommander.bastokenizer.api.model.Program; -import io.github.applecommander.bastokenizer.api.model.Token; -import io.github.applecommander.bastokenizer.api.model.Token.Type; -import io.github.applecommander.bastokenizer.api.visitors.ByteVisitor; +import io.github.applecommander.bastools.api.Configuration; +import io.github.applecommander.bastools.api.Optimization; +import io.github.applecommander.bastools.api.Parser; +import io.github.applecommander.bastools.api.TokenReader; +import io.github.applecommander.bastools.api.Visitors; +import io.github.applecommander.bastools.api.model.Program; +import io.github.applecommander.bastools.api.model.Token; +import io.github.applecommander.bastools.api.model.Token.Type; +import io.github.applecommander.bastools.api.visitors.ByteVisitor; import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Help.Visibility; @@ -60,10 +60,10 @@ public class Main implements Callable { @Option(names = "--applesingle", description = "Write output in AppleSingle format") private boolean applesingleFlag; - @Option(names = "--pretty", description = "Pretty print structure as bastokenizer understands it.") + @Option(names = "--pretty", description = "Pretty print structure as bastools understands it.") private boolean prettyPrint; - @Option(names = "--list", description = "List structure as bastokenizer understands it.") + @Option(names = "--list", description = "List structure as bastools understands it.") private boolean listPrint; @Option(names = "--tokens", description = "Dump token list to stdout for debugging.") diff --git a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/OptimizationTypeConverter.java b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/OptimizationTypeConverter.java similarity index 81% rename from tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/OptimizationTypeConverter.java rename to tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/OptimizationTypeConverter.java index 28854f5..a627ccf 100644 --- a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/OptimizationTypeConverter.java +++ b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/OptimizationTypeConverter.java @@ -1,6 +1,6 @@ -package io.github.applecommander.bastokenizer.tools.bt; +package io.github.applecommander.bastools.tools.bt; -import io.github.applecommander.bastokenizer.api.Optimization; +import io.github.applecommander.bastools.api.Optimization; import picocli.CommandLine.ITypeConverter; /** Add support for lower-case Optimization flags. */ diff --git a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/VersionProvider.java b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/VersionProvider.java similarity index 55% rename from tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/VersionProvider.java rename to tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/VersionProvider.java index 9db3ba3..a24bded 100644 --- a/tools/bt/src/main/java/io/github/applecommander/bastokenizer/tools/bt/VersionProvider.java +++ b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/VersionProvider.java @@ -1,15 +1,16 @@ -package io.github.applecommander.bastokenizer.tools.bt; +package io.github.applecommander.bastools.tools.bt; import io.github.applecommander.applesingle.AppleSingle; -import io.github.applecommander.bastokenizer.api.BasTokenizer; +import io.github.applecommander.bastools.api.BasTools; import picocli.CommandLine.IVersionProvider; /** Display version information. Note that this is dependent on Gradle configuration. */ public class VersionProvider implements IVersionProvider { public String[] getVersion() { return new String[] { - String.format("BT CLI: %s", Main.class.getPackage().getImplementationVersion()), - String.format("BT API: %s", BasTokenizer.VERSION), + String.format("%s: %s", Main.class.getPackage().getImplementationTitle(), + Main.class.getPackage().getImplementationVersion()), + String.format("%s: %s", BasTools.TITLE, BasTools.VERSION), String.format("AppleSingle API: %s", AppleSingle.VERSION) }; }