summaryrefslogtreecommitdiff
path: root/dice-lang/src/examples
diff options
context:
space:
mode:
Diffstat (limited to 'dice-lang/src/examples')
-rw-r--r--dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java14
-rw-r--r--dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java58
2 files changed, 36 insertions, 36 deletions
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
index c52445d..1198ec5 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
@@ -45,6 +45,13 @@ public class DiceASTLanguageTest {
optimizer.addPass(new ConstantCollapser());
}
+ private static String getNextCommand(Scanner inputSource,
+ int commandNumber) {
+ System.out.print("\ndice-lang-" + commandNumber + "> ");
+
+ return inputSource.nextLine();
+ }
+
private static void handleInlineAction(
FunctionalStringTokenizer tokenizer,
IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) {
@@ -182,11 +189,4 @@ public class DiceASTLanguageTest {
return condensedTree;
}
-
- private static String getNextCommand(Scanner inputSource,
- int commandNumber) {
- System.out.print("\ndice-lang-" + commandNumber + "> ");
-
- return inputSource.nextLine();
- }
}
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java
index 2a9a492..bd6270e 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java
@@ -25,35 +25,6 @@ public class DiceLanguageTest {
}
/**
- * @param ln
- * Unused parameter, kept to comply with expected type sig
- */
- private static void printEnv(String ln, DiceLanguageState stat) {
- System.out.println("Printing enviroment for debugging purposes.");
-
- stat.doWith((dep, env) -> env.forEach((key, exp) -> System.out
- .println("\tKey: " + key + "\tExp: " + exp.toString())));
- }
-
- private static void rollReference(String ln, DiceLanguageState stat) {
- String[] strangs = ln.split(" ");
-
- System.out.println("\tRolling dice expression " + strangs[1] + " "
- + strangs[2] + " times.");
-
- int nRolls = Integer.parseInt(strangs[2]);
-
- IDiceExpression dexp = stat
- .merge((dep, env) -> env.get(strangs[1]));
-
- for (int i = 1; i <= nRolls; i++) {
- int roll = dexp.roll();
-
- System.out.println("\tRolled " + roll);
- }
- }
-
- /**
* Main method
*
* @param args
@@ -93,4 +64,33 @@ public class DiceLanguageTest {
System.out.println("Bye.");
scn.close();
}
+
+ /**
+ * @param ln
+ * Unused parameter, kept to comply with expected type sig
+ */
+ private static void printEnv(String ln, DiceLanguageState stat) {
+ System.out.println("Printing enviroment for debugging purposes.");
+
+ stat.doWith((dep, env) -> env.forEach((key, exp) -> System.out
+ .println("\tKey: " + key + "\tExp: " + exp.toString())));
+ }
+
+ private static void rollReference(String ln, DiceLanguageState stat) {
+ String[] strangs = ln.split(" ");
+
+ System.out.println("\tRolling dice expression " + strangs[1] + " "
+ + strangs[2] + " times.");
+
+ int nRolls = Integer.parseInt(strangs[2]);
+
+ IDiceExpression dexp = stat
+ .merge((dep, env) -> env.get(strangs[1]));
+
+ for (int i = 1; i <= nRolls; i++) {
+ int roll = dexp.roll();
+
+ System.out.println("\tRolled " + roll);
+ }
+ }
}