summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dice-lang/src/bjc/dicelang/ComplexDice.java2
-rw-r--r--dice-lang/src/bjc/dicelang/DiceExpressionParser.java2
-rw-r--r--dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java2
-rw-r--r--dice-lang/src/bjc/dicelang/ast/DiceASTParser.java2
-rw-r--r--dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java2
-rw-r--r--dice-lang/src/bjc/dicelang/v2/Define.java2
-rw-r--r--dice-lang/src/bjc/dicelang/v2/DiceBox.java2
-rw-r--r--dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java7
-rw-r--r--dice-lang/src/bjc/dicelang/v2/Errors.java2
-rw-r--r--dice-lang/src/bjc/dicelang/v2/Evaluator.java2
-rw-r--r--dice-lang/src/bjc/dicelang/v2/Shunter.java2
11 files changed, 7 insertions, 20 deletions
diff --git a/dice-lang/src/bjc/dicelang/ComplexDice.java b/dice-lang/src/bjc/dicelang/ComplexDice.java
index a21900a..81699ae 100644
--- a/dice-lang/src/bjc/dicelang/ComplexDice.java
+++ b/dice-lang/src/bjc/dicelang/ComplexDice.java
@@ -31,7 +31,7 @@ public class ComplexDice implements IDiceExpression {
return new ComplexDice(
new ScalarDie(Integer.parseInt(strangs[0])),
new Die(Integer.parseInt(strangs[1])));
- } catch (@SuppressWarnings("unused") NumberFormatException nfex) {
+ } catch (NumberFormatException nfex) {
// We don't care about details
// Tell the user the expression is invalid
diff --git a/dice-lang/src/bjc/dicelang/DiceExpressionParser.java b/dice-lang/src/bjc/dicelang/DiceExpressionParser.java
index 6e15e63..c58bccd 100644
--- a/dice-lang/src/bjc/dicelang/DiceExpressionParser.java
+++ b/dice-lang/src/bjc/dicelang/DiceExpressionParser.java
@@ -83,7 +83,7 @@ public class DiceExpressionParser {
*/
expressions.push(new ScalarDie(
Integer.parseInt(expressionPart)));
- } catch (@SuppressWarnings("unused") NumberFormatException nfex) {
+ } catch (NumberFormatException nfex) {
// We don't care about details, just that it failed
if (expressions.size() >= 2) {
/*
diff --git a/dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java b/dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java
index 7d3c5c2..2c4d300 100644
--- a/dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java
+++ b/dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java
@@ -31,7 +31,7 @@ public class ReferenceDiceExpression implements IDiceExpression {
*/
public ReferenceDiceExpression(String nme,
Map<String, IDiceExpression> env) {
- this.name = name;
+ this.name = nme;
this.enviroment = env;
}
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTParser.java b/dice-lang/src/bjc/dicelang/ast/DiceASTParser.java
index 259b855..dc35d37 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTParser.java
+++ b/dice-lang/src/bjc/dicelang/ast/DiceASTParser.java
@@ -132,7 +132,7 @@ public class DiceASTParser {
try {
OperatorDiceNode.fromString(token);
return true;
- } catch (@SuppressWarnings("unused") IllegalArgumentException iaex) {
+ } catch (IllegalArgumentException iaex) {
// We don't care about details
return false;
}
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java b/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java
index e37b6da..8be14fb 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java
@@ -32,7 +32,7 @@ public interface ILiteralDiceNode extends IDiceASTNode {
try {
Integer.parseInt(tok);
return DiceLiteralType.INTEGER;
- } catch (@SuppressWarnings("unused") NumberFormatException nfex) {
+ } catch (NumberFormatException nfex) {
// We don't care about details
// This probably shouldn't return null, but I believe it does so
// because where its called checks that. @FIXME
diff --git a/dice-lang/src/bjc/dicelang/v2/Define.java b/dice-lang/src/bjc/dicelang/v2/Define.java
index 3ee2f37..f87bab6 100644
--- a/dice-lang/src/bjc/dicelang/v2/Define.java
+++ b/dice-lang/src/bjc/dicelang/v2/Define.java
@@ -119,7 +119,7 @@ public class Define implements UnaryOperator<String> {
} else {
String replac = replacers.next();
- searcherMatcher.appendReplacement(sb, replacers.next());
+ searcherMatcher.appendReplacement(sb, replac);
}
}
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceBox.java b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
index 8297e24..2a32f47 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceBox.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
@@ -7,8 +7,6 @@ import java.util.Random;
import java.util.function.Predicate;
import java.util.regex.Pattern;
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
public class DiceBox {
private static final Random rng = new Random();
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
index 220fd3f..ad56cc1 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
@@ -3,7 +3,6 @@ package bjc.dicelang.v2;
import bjc.utils.data.IPair;
import bjc.utils.data.ITree;
import bjc.utils.data.Pair;
-import bjc.utils.data.Tree;
import bjc.utils.funcdata.FunctionalList;
import bjc.utils.funcdata.FunctionalMap;
import bjc.utils.funcdata.FunctionalStringTokenizer;
@@ -12,7 +11,6 @@ import bjc.utils.funcdata.IMap;
import bjc.utils.funcutils.ListUtils;
import bjc.utils.funcutils.StringUtils;
-import java.util.Arrays;
import java.util.Comparator;
import java.util.Deque;
import java.util.Iterator;
@@ -66,10 +64,6 @@ public class DiceLangEngine {
// Stream engine for processing streams
private StreamEngine streamEng;
- private final int MATH_PREC = 20;
- private final int DICE_PREC = 10;
- private final int EXPR_PREC = 0;
-
public DiceLangEngine() {
lineDefns = new FunctionalList<>();
tokenDefns = new FunctionalList<>();
@@ -576,7 +570,6 @@ public class DiceLangEngine {
for(IPair<String, String> op : deaffixTokens) {
Deque<String> newWorking = new LinkedList<>();
- String opName = op.getLeft();
String opRegex = op.getRight();
Pattern opRegexPattern = Pattern.compile(opRegex);
diff --git a/dice-lang/src/bjc/dicelang/v2/Errors.java b/dice-lang/src/bjc/dicelang/v2/Errors.java
index 4ba0aca..a533438 100644
--- a/dice-lang/src/bjc/dicelang/v2/Errors.java
+++ b/dice-lang/src/bjc/dicelang/v2/Errors.java
@@ -1,7 +1,5 @@
package bjc.dicelang.v2;
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
public class Errors {
public static enum ErrorKey {
// Define Errors
diff --git a/dice-lang/src/bjc/dicelang/v2/Evaluator.java b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
index 969b2d5..c13e42d 100644
--- a/dice-lang/src/bjc/dicelang/v2/Evaluator.java
+++ b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
@@ -191,7 +191,7 @@ public class Evaluator {
case COERCE:
if(ast.getChildrenCount() != 1) {
Errors.inst.printError(EK_EVAL_NOTUNARY, ast.getChildrenCount());
- return new Tree<>(FAIL(AST));
+ return new Tree<>(FAIL(ast));
}
break;
default:
diff --git a/dice-lang/src/bjc/dicelang/v2/Shunter.java b/dice-lang/src/bjc/dicelang/v2/Shunter.java
index 37da14c..e95b642 100644
--- a/dice-lang/src/bjc/dicelang/v2/Shunter.java
+++ b/dice-lang/src/bjc/dicelang/v2/Shunter.java
@@ -86,8 +86,6 @@ public class Shunter {
Deque<Token> currReturned = new LinkedList<>();
for(Token tk : tks.toIterable()) {
- Token.Type tkType = tk.type;
-
if(unaryMode) {
if(isUnary(tk)) {
unaryOps.add(tk);
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-10 06:41:19 +0000