diff options
Diffstat (limited to 'dice-lang/src/bjc/dicelang/v1/examples')
6 files changed, 40 insertions, 40 deletions
diff --git a/dice-lang/src/bjc/dicelang/v1/examples/DiceASTLanguageTest.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTLanguageTest.java index f20e276..205d986 100644 --- a/dice-lang/src/bjc/dicelang/v1/examples/DiceASTLanguageTest.java +++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTLanguageTest.java @@ -1,8 +1,5 @@ package bjc.dicelang.v1.examples; -import java.util.InputMismatchException; -import java.util.Scanner; - import bjc.dicelang.v1.ast.DiceASTEvaluator; import bjc.dicelang.v1.ast.DiceASTInliner; import bjc.dicelang.v1.ast.DiceASTOptimizer; @@ -18,9 +15,12 @@ import bjc.utils.funcdata.FunctionalStringTokenizer; import bjc.utils.funcdata.IList; import bjc.utils.funcdata.IMap; +import java.util.InputMismatchException; +import java.util.Scanner; + /** * Test interface for AST-based dice language - * + * * @author ben * */ @@ -66,7 +66,7 @@ public class DiceASTLanguageTest { // Get the pragma arguments IList<String> pragmaArgs = tokenizer.toList(); - if (pragmaArgs.getSize() < 3) { + if(pragmaArgs.getSize() < 3) { // Complain about pragma arguments not being valid System.err.println("ERROR: Inline requires at least 3 parameters. They are:" + "\n\t1. The name of the expression to inline." @@ -91,7 +91,7 @@ public class DiceASTLanguageTest { /** * Main method of class - * + * * @param args * Unused CLI args */ @@ -107,12 +107,12 @@ public class DiceASTLanguageTest { IMap<String, ITree<IDiceASTNode>> enviroment = new FunctionalMap<>(); // Handle commands - while (!currentLine.equalsIgnoreCase("quit")) { + while(!currentLine.equalsIgnoreCase("quit")) { // Get the name of a possible action String possibleActionName = currentLine.split(" ")[0]; // Check and see if we're executing an action - if (actions.containsKey(possibleActionName)) { + if(actions.containsKey(possibleActionName)) { // Execute action FunctionalStringTokenizer tokenizer = new FunctionalStringTokenizer(currentLine); @@ -146,7 +146,7 @@ public class DiceASTLanguageTest { System.out.println("Command parsed in " + (double) (System.nanoTime() - time) / 1000000000 + " s"); - } catch (InputMismatchException | IllegalStateException | UnsupportedOperationException ex) { + } catch(InputMismatchException | IllegalStateException | UnsupportedOperationException ex) { // Tell the user there was an error in parsing System.out.println("PARSING ERROR: " + ex.getLocalizedMessage()); @@ -187,7 +187,7 @@ public class DiceASTLanguageTest { // Update the 'last' meta-variable enviroment.put("last", transformedAST); - } catch (UnsupportedOperationException usex) { + } catch(UnsupportedOperationException usex) { // Tell the user there was an error in // evaluation System.out.println("EVALUATION ERROR: " + usex.getLocalizedMessage()); diff --git a/dice-lang/src/bjc/dicelang/v1/examples/DiceASTPragma.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTPragma.java index a29b8b5..502dafd 100644 --- a/dice-lang/src/bjc/dicelang/v1/examples/DiceASTPragma.java +++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTPragma.java @@ -1,18 +1,18 @@ package bjc.dicelang.v1.examples; -import java.util.function.BiConsumer; - import bjc.dicelang.v1.ast.nodes.IDiceASTNode; import bjc.utils.data.ITree; import bjc.utils.funcdata.FunctionalStringTokenizer; import bjc.utils.funcdata.IMap; +import java.util.function.BiConsumer; + /** * Alias for the type of a 'pragma' or special language command - * + * * To explain it, a pragma is a function that takes a tokenizer with the rest of * the line, and an enviroment that contains variable bindings - * + * * @author ben * */ diff --git a/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionParserTest.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionParserTest.java index adffc69..9d51c28 100644 --- a/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionParserTest.java +++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionParserTest.java @@ -1,21 +1,21 @@ package bjc.dicelang.v1.examples; -import java.util.HashMap; -import java.util.Scanner; - import bjc.dicelang.v1.DiceExpressionParser; import bjc.dicelang.v1.IDiceExpression; +import java.util.HashMap; +import java.util.Scanner; + /** * Driver class for testing expression parser - * + * * @author ben * */ public class DiceExpressionParserTest { /** * Run the parser test - * + * * @param args * Unused CLI arguments */ @@ -44,7 +44,7 @@ public class DiceExpressionParserTest { /* * Roll the dice a specified amount of times */ - for (int i = 1; i <= nTimes; i++) { + for(int i = 1; i <= nTimes; i++) { int roll = dexp.roll(); System.out.println("Rolled " + roll); diff --git a/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionPreparer.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionPreparer.java index 121847c..5f38374 100644 --- a/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionPreparer.java +++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionPreparer.java @@ -1,8 +1,5 @@ package bjc.dicelang.v1.examples; -import java.util.Deque; -import java.util.LinkedList; - import bjc.utils.data.IPair; import bjc.utils.data.Pair; import bjc.utils.funcdata.FunctionalStringTokenizer; @@ -10,9 +7,12 @@ import bjc.utils.funcdata.IList; import bjc.utils.funcutils.ListUtils; import bjc.utils.parserutils.ShuntingYard; +import java.util.Deque; +import java.util.LinkedList; + /** * Prepare a dice expression to be parsed - * + * * @author ben * */ @@ -22,9 +22,9 @@ public class DiceExpressionPreparer { */ private static ShuntingYard<String> yard; - private static final int MATH_PREC = 20; - private static final int DICE_PREC = 10; - private static final int EXPR_PREC = 0; + private static final int MATH_PREC = 20; + private static final int DICE_PREC = 10; + private static final int EXPR_PREC = 0; // Do initialization for all parsers static { @@ -54,7 +54,7 @@ public class DiceExpressionPreparer { /** * Prepare a command, turning raw tokens into input for the tree builder - * + * * @param currentLine * The command to prepare * @return A stream of tokens representing the command diff --git a/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageState.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageState.java index e2a71b4..17c147c 100644 --- a/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageState.java +++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageState.java @@ -1,14 +1,14 @@ package bjc.dicelang.v1.examples; -import java.util.Map; - import bjc.dicelang.v1.DiceExpressionParser; import bjc.dicelang.v1.IDiceExpression; import bjc.utils.data.Pair; +import java.util.Map; + /** * Internal state of dice language - * + * * @author ben * */ @@ -22,7 +22,7 @@ public class DiceLanguageState extends Pair<DiceExpressionParser, Map<String, ID /** * Create a new state with the desired parameters - * + * * @param left * The parser to use * @param right diff --git a/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageTest.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageTest.java index 2d90318..9a13b78 100644 --- a/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageTest.java +++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageTest.java @@ -1,16 +1,16 @@ package bjc.dicelang.v1.examples; +import bjc.dicelang.v1.DiceExpressionParser; +import bjc.dicelang.v1.IDiceExpression; + import java.util.HashMap; import java.util.Map; import java.util.Scanner; import java.util.function.BiConsumer; -import bjc.dicelang.v1.DiceExpressionParser; -import bjc.dicelang.v1.IDiceExpression; - /** * Test of dice language - * + * * @author ben * */ @@ -26,7 +26,7 @@ public class DiceLanguageTest { /** * Main method - * + * * @param args * Unused CLI args */ @@ -41,10 +41,10 @@ public class DiceLanguageTest { Map<String, IDiceExpression> env = new HashMap<>(); DiceLanguageState state = new DiceLanguageState(dep, env); - while (!ln.equalsIgnoreCase("quit")) { + while(!ln.equalsIgnoreCase("quit")) { String header = ln.split(" ")[0]; - if (acts.containsKey(header)) { + if(acts.containsKey(header)) { acts.get(header).accept(ln, state); } else { IDiceExpression exp = DiceExpressionParser.parse(ln, env); @@ -86,7 +86,7 @@ public class DiceLanguageTest { IDiceExpression dexp = stat.merge((dep, env) -> env.get(strangs[1])); - for (int i = 1; i <= nRolls; i++) { + for(int i = 1; i <= nRolls; i++) { int roll = dexp.roll(); System.out.println("\tRolled " + roll); |