diff options
44 files changed, 245 insertions, 106 deletions
diff --git a/.project b/.project new file mode 100644 index 0000000..f110d1c --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>dicelang-parent</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/base/.classpath b/base/.classpath new file mode 100644 index 0000000..d539cb5 --- /dev/null +++ b/base/.classpath @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/classes" path="data"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/base/.project b/base/.project new file mode 100644 index 0000000..fddbb32 --- /dev/null +++ b/base/.project @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>dicelang-base</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/base/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..714351a --- /dev/null +++ b/base/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/base/.settings/org.eclipse.m2e.core.prefs b/base/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/base/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/base/src/bjc/dicelang/CLIArgsParser.java b/base/src/bjc/dicelang/CLIArgsParser.java index 1cec55d..553692b 100644 --- a/base/src/bjc/dicelang/CLIArgsParser.java +++ b/base/src/bjc/dicelang/CLIArgsParser.java @@ -21,9 +21,9 @@ public class CLIArgsParser { * Parse the provided set of CLI arguments. * * @param args - * The CLI arguments to parse. + * The CLI arguments to parse. * @param eng - * The engine to affect with parsing. + * The engine to affect with parsing. * * @return Whether or not to continue to the DiceLang repl. */ diff --git a/base/src/bjc/dicelang/CompilerTweaker.java b/base/src/bjc/dicelang/CompilerTweaker.java index 95926f0..b11caa9 100644 --- a/base/src/bjc/dicelang/CompilerTweaker.java +++ b/base/src/bjc/dicelang/CompilerTweaker.java @@ -5,7 +5,7 @@ import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; /* * @TODO 10/09/17 Ben Culkin :CompilerTweaking * - * Expand this to allow tweaking more things about the compiler. + * Expand this to allow tweaking more things about the compiler. */ /** * Contains methods for customizing the DiceLang and SCL compilers. @@ -21,7 +21,7 @@ public class CompilerTweaker { * Create a new compiler tweaker. * * @param engine - * The engine to tweak. + * The engine to tweak. */ public CompilerTweaker(final DiceLangEngine engine) { eng = engine; @@ -33,7 +33,7 @@ public class CompilerTweaker { * Add a string literal to the compiler's internal banks. * * @param val - * The string literal to add. + * The string literal to add. * * @return The key into the string literal table for this string. */ @@ -48,7 +48,7 @@ public class CompilerTweaker { * Add a line defn to the compiler. * * @param dfn - * The defn to add. + * The defn to add. */ public void addLineDefine(final Define dfn) { eng.addLineDefine(dfn); @@ -58,7 +58,7 @@ public class CompilerTweaker { * Add a token defn to the compiler. * * @param dfn - * The defn to add. + * The defn to add. */ public void addTokenDefine(final Define dfn) { eng.addTokenDefine(dfn); @@ -68,7 +68,7 @@ public class CompilerTweaker { * Adds delimiters that are expanded from tokens. * * @param delims - * The delimiters to expand on. + * The delimiters to expand on. */ public void addDelimiter(final String... delims) { opExpander.addSimpleDelimiters(delims); @@ -78,7 +78,7 @@ public class CompilerTweaker { * Adds multi-character delimiters that are expanded from tokens. * * @param delims - * The multi-character delimiters to expand on. + * The multi-character delimiters to expand on. */ public void addMultiDelimiter(final String... delims) { opExpander.addMultiDelimiters(delims); @@ -95,7 +95,7 @@ public class CompilerTweaker { * Change the max no. of times defines are allowed to recur. * * @param times - * The number of times to allow defines to recur. + * The number of times to allow defines to recur. */ public static void setDefineRecurLimit(final int times) { Define.MAX_RECURS = times; diff --git a/base/src/bjc/dicelang/Define.java b/base/src/bjc/dicelang/Define.java index 1051957..b11e10b 100644 --- a/base/src/bjc/dicelang/Define.java +++ b/base/src/bjc/dicelang/Define.java @@ -13,7 +13,7 @@ import static bjc.dicelang.Errors.ErrorKey.*; /* * @TODO 10/09/17 Ben Culkin :DefineRefactor * - * Consider replacing this with the defines package from BJC-Utils. + * Consider replacing this with the defines package from BJC-Utils. */ /** * A regular expression based pre-processor define. @@ -63,25 +63,25 @@ public class Define implements UnaryOperator<String>, Comparable<Define> { * Create a new define. * * @param priorty - * The priority of the define. + * The priority of the define. * * @param isSub - * Whether or not this is a 'sub-define' + * Whether or not this is a 'sub-define' * * @param recur - * Whether this define is recursive or not. + * Whether this define is recursive or not. * * @param isCircular - * Whether this define is circular or not. + * Whether this define is circular or not. * * @param predicte - * The string to use as a predicate. + * The string to use as a predicate. * * @param searchr - * The string to use as a search. + * The string to use as a search. * * @param replacrs - * The source for replacement strings. + * The source for replacement strings. */ public Define(final int priorty, final boolean isSub, final boolean recur, final boolean isCircular, final String predicte, final String searchr, final Iterable<String> replacrs) { diff --git a/base/src/bjc/dicelang/DiceLangConsole.java b/base/src/bjc/dicelang/DiceLangConsole.java index d2c214d..a43c1da 100644 --- a/base/src/bjc/dicelang/DiceLangConsole.java +++ b/base/src/bjc/dicelang/DiceLangConsole.java @@ -29,7 +29,7 @@ public class DiceLangConsole { * Create a new console. * * @param args - * The CLI args for the console. + * The CLI args for the console. */ public DiceLangConsole(final String[] args) { commandNumber = 0; @@ -303,7 +303,7 @@ public class DiceLangConsole { * Main method. * * @param args - * CLI arguments. + * CLI arguments. */ public static void main(final String[] args) { final DiceLangConsole console = new DiceLangConsole(args); diff --git a/base/src/bjc/dicelang/DiceLangEngine.java b/base/src/bjc/dicelang/DiceLangEngine.java index 128e2a6..ebdb07f 100644 --- a/base/src/bjc/dicelang/DiceLangEngine.java +++ b/base/src/bjc/dicelang/DiceLangEngine.java @@ -140,7 +140,7 @@ public class DiceLangEngine { * Add a defn that's applied to lines. * * @param dfn - * The defn to add. + * The defn to add. */ public void addLineDefine(final Define dfn) { lineDefns.add(dfn); @@ -152,7 +152,7 @@ public class DiceLangEngine { * Add a defn that's applied to tokens. * * @param dfn - * The defn to add. + * The defn to add. */ public void addTokenDefine(final Define dfn) { tokenDefns.add(dfn); @@ -211,7 +211,7 @@ public class DiceLangEngine { * Run a command to completion. * * @param command - * The command to run + * The command to run * * @return Whether or not the command ran successfully */ diff --git a/base/src/bjc/dicelang/Errors.java b/base/src/bjc/dicelang/Errors.java index 2263532..2577a32 100644 --- a/base/src/bjc/dicelang/Errors.java +++ b/base/src/bjc/dicelang/Errors.java @@ -273,10 +273,10 @@ public class Errors { * Print an error. * * @param key - * The key of the error. + * The key of the error. * * @param args - * The arguments for the error. + * The arguments for the error. */ public void printError(final ErrorKey key, final String... args) { switch (mode) { diff --git a/base/src/bjc/dicelang/Evaluator.java b/base/src/bjc/dicelang/Evaluator.java index e959355..677aef4 100644 --- a/base/src/bjc/dicelang/Evaluator.java +++ b/base/src/bjc/dicelang/Evaluator.java @@ -62,7 +62,7 @@ public class Evaluator { * Create a new evaluator. * * @param en - * The engine. + * The engine. */ public Evaluator(final DiceLangEngine en) { eng = en; @@ -72,7 +72,7 @@ public class Evaluator { * Evaluate a AST. * * @param comm - * The AST to evaluate. + * The AST to evaluate. * * @return The result of the tree. */ diff --git a/base/src/bjc/dicelang/EvaluatorResult.java b/base/src/bjc/dicelang/EvaluatorResult.java index f23fc71..0d0706a 100644 --- a/base/src/bjc/dicelang/EvaluatorResult.java +++ b/base/src/bjc/dicelang/EvaluatorResult.java @@ -82,7 +82,7 @@ public class EvaluatorResult { * Create a new result. * * @param typ - * The type of the result. + * The type of the result. */ public EvaluatorResult(final EvaluatorResult.Type typ) { type = typ; @@ -92,10 +92,10 @@ public class EvaluatorResult { * Create a new result. * * @param typ - * The type of the result. + * The type of the result. * * @param orig - * The original value of the result. + * The original value of the result. */ public EvaluatorResult(final EvaluatorResult.Type typ, final ITree<Node> orig) { this(typ); @@ -107,10 +107,10 @@ public class EvaluatorResult { * Create a new result. * * @param typ - * The type of the result. + * The type of the result. * * @param orig - * The original value of the result. + * The original value of the result. */ public EvaluatorResult(final EvaluatorResult.Type typ, final Node orig) { this(typ, new Tree<>(orig)); diff --git a/base/src/bjc/dicelang/Node.java b/base/src/bjc/dicelang/Node.java index 55273e8..ff0c83d 100644 --- a/base/src/bjc/dicelang/Node.java +++ b/base/src/bjc/dicelang/Node.java @@ -5,9 +5,8 @@ import static bjc.dicelang.EvaluatorResult.Type.FAILURE; import bjc.utils.data.ITree; /* - * @TODO 10/09/17 Ben Culkin :NodeReorg - * Same thing, different class. Split into subclasses based off of the type - * values. + * @TODO 10/09/17 Ben Culkin :NodeReorg Same thing, different class. Split into + * subclasses based off of the type values. */ /** * Represents a node in the AST. diff --git a/base/src/bjc/dicelang/Parser.java b/base/src/bjc/dicelang/Parser.java index 25d23c8..76730b9 100644 --- a/base/src/bjc/dicelang/Parser.java +++ b/base/src/bjc/dicelang/Parser.java @@ -36,10 +36,10 @@ public class Parser { * Parse a series of tokens to a forest of ASTs. * * @param tokens - * The list of tokens to parse. + * The list of tokens to parse. * * @param results - * The place to set results. + * The place to set results. * * @return Whether or not the parse was successful. */ diff --git a/base/src/bjc/dicelang/Shunter.java b/base/src/bjc/dicelang/Shunter.java index ca0f6e1..01029cd 100644 --- a/base/src/bjc/dicelang/Shunter.java +++ b/base/src/bjc/dicelang/Shunter.java @@ -108,10 +108,10 @@ public class Shunter { * Shunt a set of tokens from infix to postfix. * * @param tks - * The tokens to input. + * The tokens to input. * * @param returned - * The postfix tokens. + * The postfix tokens. * * @return Whether or not the shunt succeeded. */ diff --git a/base/src/bjc/dicelang/Token.java b/base/src/bjc/dicelang/Token.java index 50e5b31..b152185 100644 --- a/base/src/bjc/dicelang/Token.java +++ b/base/src/bjc/dicelang/Token.java @@ -6,7 +6,7 @@ import bjc.utils.funcdata.IList; /* * @TODO 10/09/17 Ben Culkin :TokenReorg * - * Split the class into subclasses based off of type. + * Split the class into subclasses based off of type. */ /** * Lexer token. diff --git a/base/src/bjc/dicelang/expr/ExprREPL.java b/base/src/bjc/dicelang/expr/ExprREPL.java index 84149a0..49b9575 100644 --- a/base/src/bjc/dicelang/expr/ExprREPL.java +++ b/base/src/bjc/dicelang/expr/ExprREPL.java @@ -17,7 +17,7 @@ public class ExprREPL { * Main method. * * @param args - * Unused CLI args. + * Unused CLI args. */ public static void main(final String[] args) { /* Create our objects. */ diff --git a/base/src/bjc/dicelang/expr/Ezpr.java b/base/src/bjc/dicelang/expr/Ezpr.java index b852fd1..4919c81 100644 --- a/base/src/bjc/dicelang/expr/Ezpr.java +++ b/base/src/bjc/dicelang/expr/Ezpr.java @@ -1,6 +1,6 @@ /* - * @TODO 10/08/17 Ben Culkin :EzprFixing - * Implement these, and make sure they work correctly. + * @TODO 10/08/17 Ben Culkin :EzprFixing Implement these, and make sure they + * work correctly. */ package bjc.dicelang.expr; diff --git a/base/src/bjc/dicelang/expr/Lexer.java b/base/src/bjc/dicelang/expr/Lexer.java index 7530ba5..c7dd92f 100644 --- a/base/src/bjc/dicelang/expr/Lexer.java +++ b/base/src/bjc/dicelang/expr/Lexer.java @@ -7,10 +7,9 @@ import bjc.utils.funcdata.IList; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; /* - * @TODO 10/08/18 :IntExpressions - * Add support for integer constants, and maybe floating-point ones as well - * if you feel like. Heck, you could even go for ratio constants and things - * as well. + * @TODO 10/08/18 :IntExpressions Add support for integer constants, and maybe + * floating-point ones as well if you feel like. Heck, you could even go for + * ratio constants and things as well. */ /** * Implements the lexer for simple expression operations. @@ -35,10 +34,10 @@ public class Lexer { * Convert a string from a input command to a series of infix tokens. * * @param inp - * The input command. + * The input command. * * @param tks - * The token state. + * The token state. * * @return A series of infix tokens representing the command. */ @@ -52,7 +51,7 @@ public class Lexer { for (final String spacedToken : spacedTokens) { /* Split on operators. */ final IList<String> splitTokens = split.split(spacedToken); - + /* Convert strings to tokens. */ final IList<Token> rawTokens = splitTokens.map(tok -> { return tks.lexToken(tok, spacedToken); diff --git a/base/src/bjc/dicelang/expr/Shunter.java b/base/src/bjc/dicelang/expr/Shunter.java index a1b24cb..53c2298 100644 --- a/base/src/bjc/dicelang/expr/Shunter.java +++ b/base/src/bjc/dicelang/expr/Shunter.java @@ -16,7 +16,7 @@ public class Shunter { * Convert a infix series of tokens to a postfix series of tokens. * * @param infixTokens - * The tokens in infix order. + * The tokens in infix order. * * @return The tokens in postfix order. */ diff --git a/base/src/bjc/dicelang/expr/Token.java b/base/src/bjc/dicelang/expr/Token.java index 3c6b1da..750362d 100644 --- a/base/src/bjc/dicelang/expr/Token.java +++ b/base/src/bjc/dicelang/expr/Token.java @@ -3,9 +3,9 @@ package bjc.dicelang.expr; /* * @TODO 10/08/17 :TokenReorg * - * I am not a fan of this 'having a bunch of subclasses' in one thing I - * seem to have been doing around this project. This should be multiple - * subclasses, one for each value for TokenType. + * I am not a fan of this 'having a bunch of subclasses' in one thing I seem to + * have been doing around this project. This should be multiple subclasses, one + * for each value for TokenType. */ /** * Represents a lexical token. @@ -33,13 +33,13 @@ public class Token { * Create a new token. * * @param type - * The type of this token. + * The type of this token. * * @param raw - * The string this token came from. + * The string this token came from. * * @param toks - * The state for this token + * The state for this token */ public Token(final TokenType type, final String raw, final Tokens toks) { this.typ = type; diff --git a/base/src/bjc/dicelang/expr/Tokens.java b/base/src/bjc/dicelang/expr/Tokens.java index 92416d1..687a414 100644 --- a/base/src/bjc/dicelang/expr/Tokens.java +++ b/base/src/bjc/dicelang/expr/Tokens.java @@ -58,9 +58,9 @@ public class Tokens { * Convert the string representation of a token into a token. * * @param tok - * The string representation of the token. + * The string representation of the token. * @param raw - * The original string the token came from. + * The original string the token came from. * * @return The token the string represents. */ diff --git a/base/src/bjc/dicelang/scl/StreamControlConsole.java b/base/src/bjc/dicelang/scl/StreamControlConsole.java index cc0fac8..ca61244 100644 --- a/base/src/bjc/dicelang/scl/StreamControlConsole.java +++ b/base/src/bjc/dicelang/scl/StreamControlConsole.java @@ -19,7 +19,7 @@ public class StreamControlConsole { * Main method * * @param args - * Unused CLI args. + * Unused CLI args. */ public static void main(String[] args) { /* diff --git a/base/src/bjc/dicelang/scl/StreamControlEngine.java b/base/src/bjc/dicelang/scl/StreamControlEngine.java index e05c983..32ae8ba 100644 --- a/base/src/bjc/dicelang/scl/StreamControlEngine.java +++ b/base/src/bjc/dicelang/scl/StreamControlEngine.java @@ -17,8 +17,7 @@ import static bjc.dicelang.scl.WordSCLToken.Word.*; /* * @TODO 10/08/17 Ben Culkin :SCLReorg * - * This is a large enough class that it should maybe be split into - * subclasses. + * This is a large enough class that it should maybe be split into subclasses. */ /** * Runs a Stream Control Language (SCL) program. @@ -42,7 +41,7 @@ public class StreamControlEngine { * Create a new stream control engine. * * @param engine - * The engine to control. + * The engine to control. */ public StreamControlEngine(final StreamEngine engine) { eng = engine; @@ -55,7 +54,7 @@ public class StreamControlEngine { * Run a SCL program. * * @param tokens - * The program to run. + * The program to run. * * @return Whether the program executed successfully. */ diff --git a/base/src/bjc/dicelang/scl/StreamEngine.java b/base/src/bjc/dicelang/scl/StreamEngine.java index 8a5df09..2d931b9 100644 --- a/base/src/bjc/dicelang/scl/StreamEngine.java +++ b/base/src/bjc/dicelang/scl/StreamEngine.java @@ -43,7 +43,7 @@ public class StreamEngine { * Create a new stream engine. * * @param engine - * The dice engine we're attached to. + * The dice engine we're attached to. */ public StreamEngine(final DiceLangEngine engine) { eng = engine; @@ -66,10 +66,10 @@ public class StreamEngine { * Process a possibly interleaved set of streams. * * @param toks - * The raw token to read streams from. + * The raw token to read streams from. * * @param dest - * The list to write the final stream to. + * The list to write the final stream to. * * @return Whether or not the streams were successfully processed. */ @@ -81,10 +81,10 @@ public class StreamEngine { * Process a possibly interleaved set of streams. * * @param toks - * The raw token to read streams from. + * The raw token to read streams from. * * @param dest - * The list to write the final stream to. + * The list to write the final stream to. * * @return Whether or not the streams were successfully processed. */ diff --git a/base/src/bjc/dicelang/util/ResourceLoader.java b/base/src/bjc/dicelang/util/ResourceLoader.java index 581f4cb..085081f 100644 --- a/base/src/bjc/dicelang/util/ResourceLoader.java +++ b/base/src/bjc/dicelang/util/ResourceLoader.java @@ -22,7 +22,7 @@ public class ResourceLoader { * Loads a .help file from the data/help directory. * * @param name - * The name of the help file to load. + * The name of the help file to load. * * @return The contents of the help file, or null if it could not be opened. */ diff --git a/dice/.classpath b/dice/.classpath new file mode 100644 index 0000000..af1430b --- /dev/null +++ b/dice/.classpath @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/dice/.project b/dice/.project new file mode 100644 index 0000000..621efb6 --- /dev/null +++ b/dice/.project @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>dicelang-dice</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/dice/.settings/org.eclipse.core.resources.prefs b/dice/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/dice/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/<project>=UTF-8 diff --git a/dice/.settings/org.eclipse.jdt.core.prefs b/dice/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..714351a --- /dev/null +++ b/dice/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dice/.settings/org.eclipse.m2e.core.prefs b/dice/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/dice/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java b/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java index f7564b7..a06e3c4 100644 --- a/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java @@ -14,9 +14,9 @@ public class CompoundDie implements Die { * Create a new compound die.
*
* @param lft
- * The left die
+ * The left die
* @param rght
- * The right die
+ * The right die
*/
public CompoundDie(final Die lft, final Die rght) {
left = lft;
diff --git a/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java b/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java index 4101a39..5ddbfda 100644 --- a/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java @@ -23,9 +23,9 @@ public class CompoundingDie implements Die { * Create a new compounding die with no pattern.
*
* @param src
- * The die to compound from
+ * The die to compound from
* @param compound
- * The conditions to compound on
+ * The conditions to compound on
*/
public CompoundingDie(final Die src, final Predicate<Long> compound) {
this(src, compound, null);
@@ -35,11 +35,11 @@ public class CompoundingDie implements Die { * Create a new compounding die with a specified pattern.
*
* @param src
- * The die to compound from
+ * The die to compound from
* @param compound
- * The conditions to compound on
+ * The conditions to compound on
* @param patt
- * The string pattern the condition came from, for printing
+ * The string pattern the condition came from, for printing
*/
public CompoundingDie(final Die src, final Predicate<Long> compound, final String patt) {
source = src;
diff --git a/dice/src/main/java/bjc/dicelang/dice/DiceBox.java b/dice/src/main/java/bjc/dicelang/dice/DiceBox.java index a382196..7841079 100644 --- a/dice/src/main/java/bjc/dicelang/dice/DiceBox.java +++ b/dice/src/main/java/bjc/dicelang/dice/DiceBox.java @@ -16,7 +16,7 @@ public class DiceBox { * Parse a die expression from a string. * * @param expString - * The string to parse. + * The string to parse. * * @return The die expression from the string, or null if it wasn't one */ @@ -255,7 +255,7 @@ public class DiceBox { * Check if a given string is a valid die expression. * * @param exp - * The string to check validity of. + * The string to check validity of. * * @return Whether or not the string is a valid command. */ diff --git a/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java b/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java index c888e08..4b92c88 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java +++ b/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java @@ -26,9 +26,9 @@ public class ExplodingDice implements DieList { * Create a new exploding die.
*
* @param src
- * The source die for exploding.
+ * The source die for exploding.
* @param explode
- * The condition to explode on.
+ * The condition to explode on.
*/
public ExplodingDice(final Die src, final Predicate<Long> explode) {
this(src, explode, null, false);
@@ -38,11 +38,11 @@ public class ExplodingDice implements DieList { * Create a new exploding die that may penetrate.
*
* @param src
- * The source die for exploding.
+ * The source die for exploding.
* @param explode
- * The condition to explode on.
+ * The condition to explode on.
* @param penetrate
- * Whether or not for explosions to penetrate (-1 to exploded die).
+ * Whether or not for explosions to penetrate (-1 to exploded die).
*/
public ExplodingDice(final Die src, final Predicate<Long> explode, final boolean penetrate) {
this(src, explode, null, penetrate);
@@ -52,13 +52,13 @@ public class ExplodingDice implements DieList { * Create a new exploding die that may penetrate.
*
* @param src
- * The source die for exploding.
+ * The source die for exploding.
* @param explode
- * The condition to explode on.
+ * The condition to explode on.
* @param penetrate
- * Whether or not for explosions to penetrate (-1 to exploded die).
+ * Whether or not for explosions to penetrate (-1 to exploded die).
* @param patt
- * The string the condition came from, for printing.
+ * The string the condition came from, for printing.
*/
public ExplodingDice(final Die src, final Predicate<Long> explode, final String patt, final boolean penetrate) {
source = src;
diff --git a/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java b/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java index 630af61..4b1f281 100644 --- a/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java @@ -14,7 +14,7 @@ public class FudgeDie implements Die { * Create a new fudge die. * * @param nDice - * The number of dice to roll. + * The number of dice to roll. */ public FudgeDie(final long nDice) { numDice = new ScalarDie(nDice); @@ -24,7 +24,7 @@ public class FudgeDie implements Die { * Create a new fudge die. * * @param nDice - * The number of dice to roll. + * The number of dice to roll. */ public FudgeDie(final Die nDice) { numDice = nDice; diff --git a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java index 6fde242..f8ff588 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java +++ b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java @@ -11,7 +11,7 @@ public class ListDiceExpression implements DiceExpression { * Create a list die expression. * * @param lst - * The list value of this expression. + * The list value of this expression. */ public ListDiceExpression(final DieList lst) { list = lst; diff --git a/dice/src/main/java/bjc/dicelang/dice/MathDie.java b/dice/src/main/java/bjc/dicelang/dice/MathDie.java index 21881a2..87fdfe7 100644 --- a/dice/src/main/java/bjc/dicelang/dice/MathDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/MathDie.java @@ -53,13 +53,13 @@ public class MathDie implements Die { * Create a new math die. * * @param op - * The operator to apply. + * The operator to apply. * * @param lft - * The left operand. + * The left operand. * * @param rght - * The right operand. + * The right operand. */ public MathDie(final MathDie.MathOp op, final Die lft, final Die rght) { type = op; diff --git a/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java b/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java index f88ba98..9aae256 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java @@ -14,7 +14,7 @@ public class ScalarDie implements Die { * Create a new scalar die with a set value. * * @param vl - * The value to use. + * The value to use. */ public ScalarDie(final long vl) { val = vl; diff --git a/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java b/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java index 40dd136..f598ae5 100644 --- a/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java @@ -23,10 +23,10 @@ public class SimpleDie implements Die { * Create a new dice group. * * @param nDice - * The number of dice. + * The number of dice. * * @param size - * The size of the dice. + * The size of the dice. */ public SimpleDie(final long nDice, final long size) { this(new ScalarDie(nDice), new ScalarDie(size)); @@ -36,10 +36,10 @@ public class SimpleDie implements Die { * Create a new dice group. * * @param nDice - * The number of dice. + * The number of dice. * * @param size - * The size of the dice. + * The size of the dice. */ public SimpleDie(final Die nDice, final long size) { this(nDice, new ScalarDie(size)); @@ -49,10 +49,10 @@ public class SimpleDie implements Die { * Create a new dice group. * * @param nDice - * The number of dice. + * The number of dice. * * @param size - * The size of the dice. + * The size of the dice. */ public SimpleDie(final long nDice, final Die size) { this(new ScalarDie(nDice), size); @@ -62,10 +62,10 @@ public class SimpleDie implements Die { * Create a new dice group. * * @param nDice - * The number of dice. + * The number of dice. * * @param size - * The size of the dice. + * The size of the dice. */ public SimpleDie(final Die nDice, final Die size) { numDice = nDice; diff --git a/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java b/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java index d0728cc..3516a4f 100644 --- a/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java +++ b/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java @@ -23,10 +23,10 @@ public class SimpleDieList implements DieList { * Create a new list of dice. * * @param nDice - * The number of dice in the list. + * The number of dice in the list. * * @param sze - * The size of dice in the list. + * The size of dice in the list. */ public SimpleDieList(final Die nDice, final Die sze) { numDice = nDice; @@ -25,8 +25,9 @@ <version>1.5.0</version> <executions> + <!-- <execution> - <!-- Run ctags --> + < Run ctags > <id>source tagging</id> <phase>generate-sources</phase> @@ -42,6 +43,7 @@ </arguments> </configuration> </execution> + --> </executions> </plugin> </plugins> |