diff options
| author | Ben Culkin <scorpress@gmail.com> | 2020-11-21 23:11:50 -0500 |
|---|---|---|
| committer | Ben Culkin <scorpress@gmail.com> | 2020-11-21 23:11:50 -0500 |
| commit | f82c6b52caf044dd896c03757d1696f296233a48 (patch) | |
| tree | 99f90110abab536a1685e560058688ff32737ad1 /base | |
| parent | eda9a86d8d48758e9982cfffd470c3b38a0a4b0b (diff) | |
Minor updates
Diffstat (limited to 'base')
| -rw-r--r-- | base/src/bjc/dicelang/DiceLangEngine.java | 4 | ||||
| -rw-r--r-- | base/src/bjc/dicelang/Shunter.java | 4 | ||||
| -rw-r--r-- | base/src/bjc/dicelang/Tokenizer.java | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/base/src/bjc/dicelang/DiceLangEngine.java b/base/src/bjc/dicelang/DiceLangEngine.java index b19ce77..549faf6 100644 --- a/base/src/bjc/dicelang/DiceLangEngine.java +++ b/base/src/bjc/dicelang/DiceLangEngine.java @@ -531,7 +531,7 @@ public class DiceLangEngine { /* Reinsert non-expanded tokens */ fullyExpandedTokens = fullyExpandedTokens.map(tk -> { if (tk.startsWith("nonExpandToken")) - return nonExpandedTokens.get(tk); + return nonExpandedTokens.get(tk).get(); return tk; }); @@ -715,7 +715,7 @@ public class DiceLangEngine { * */ public String getStringLiteral(final int key) { - return stringLits.get(key); + return stringLits.get(key).get(); } /* Add a string literal to the string literal table. */ diff --git a/base/src/bjc/dicelang/Shunter.java b/base/src/bjc/dicelang/Shunter.java index 9d250d8..0e3cf1d 100644 --- a/base/src/bjc/dicelang/Shunter.java +++ b/base/src/bjc/dicelang/Shunter.java @@ -319,13 +319,13 @@ public class Shunter { if(rght.type == TAGOPR) { rightPrecedence = (int) rght.intValue; } else { - rightPrecedence = ops.get(right); + rightPrecedence = ops.get(right).get(); } if(lft.type == TAGOPR) { leftPrecedence = (int) lft.intValue; } else { - leftPrecedence = ops.get(left); + leftPrecedence = ops.get(left).get(); } if(rightAssoc.contains(left)) { diff --git a/base/src/bjc/dicelang/Tokenizer.java b/base/src/bjc/dicelang/Tokenizer.java index 6b94e4e..d0e0539 100644 --- a/base/src/bjc/dicelang/Tokenizer.java +++ b/base/src/bjc/dicelang/Tokenizer.java @@ -75,7 +75,7 @@ public class Tokenizer { Token tk = Token.NIL_TOKEN; if (litTokens.containsKey(token)) { - tk = new Token(litTokens.get(token)); + tk = new Token(litTokens.get(token).get()); } else { switch (token.charAt(0)) { case '(': @@ -175,7 +175,7 @@ public class Tokenizer { if (stringLit.matches()) { final int litNum = Integer.parseInt(stringLit.group(1)); - eng.addStringLiteral(litNum, stringLts.get(token)); + eng.addStringLiteral(litNum, stringLts.get(token).get()); tk = new Token(STRING_LIT, litNum); } else { /* Everything else is a symbol */ |