From c74cb8eaf454d9243b75e3770001d8d128356b28 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Sun, 23 Jul 2017 22:58:58 -0300 Subject: Format --- dice-lang/src/bjc/dicelang/DiceLangEngine.java | 30 +++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/DiceLangEngine.java') diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java index 7736db4..0ac088e 100644 --- a/dice-lang/src/bjc/dicelang/DiceLangEngine.java +++ b/dice-lang/src/bjc/dicelang/DiceLangEngine.java @@ -33,6 +33,8 @@ import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; * @author Ben Culkin */ public class DiceLangEngine { + public boolean debug = true; + /* * The random fields that are package private instead of private-private * are for the benefit of the tweaker, so that it can mess around with @@ -52,7 +54,7 @@ public class DiceLangEngine { /* * Debug indicator. */ - private boolean debugMode; + public boolean debugMode; /* * Should we do shunting? */ @@ -91,14 +93,14 @@ public class DiceLangEngine { */ public final IMap symTable; - private final IMap stringLits; - private final IMap stringLiterals; + private final IMap stringLits; + private final IMap stringLiterals; /* * Lists of defns. */ - private final IList lineDefns; - private final IList tokenDefns; + private final IList lineDefns; + private final IList tokenDefns; /* * Are defns sorted by priority? @@ -252,7 +254,8 @@ public class DiceLangEngine { /* * Matches double-angle bracketed strings. */ - private final Pattern nonExpandPattern = Pattern.compile("<<([^\\>]*(?:\\>(?:[^\\>])*)*)>>"); + private final Pattern nonExpandPattern = + Pattern.compile("<<([^\\>]*(?:\\>(?:[^\\>])*)*)>>"); /** * Run a command to completion. @@ -394,16 +397,22 @@ public class DiceLangEngine { switch (tk.type) { case OBRACE: return new Token(CBRACE, tk.intValue); + case OPAREN: return new Token(CPAREN, tk.intValue); + case OBRACKET: return new Token(CBRACKET, tk.intValue); + case CBRACE: return new Token(OBRACE, tk.intValue); + case CPAREN: return new Token(OPAREN, tk.intValue); + case CBRACKET: return new Token(OBRACKET, tk.intValue); + default: return tk; } @@ -537,7 +546,7 @@ public class DiceLangEngine { if (debugMode) { System.out.printf("\tCommand after non-expander reinsertion: %s\n", - fullyExpandedTokens.toString()); + fullyExpandedTokens.toString()); } return fullyExpandedTokens; @@ -625,7 +634,8 @@ public class DiceLangEngine { /* * Preshunt preshunt-marked groups of tokens. */ - private boolean removePreshuntTokens(final IList lexedTokens, final IList preparedTokens) { + private boolean removePreshuntTokens(final IList lexedTokens, + final IList preparedTokens) { /* * Current nesting level of tokens. */ @@ -677,7 +687,7 @@ public class DiceLangEngine { if (debugMode) { System.out.println("\t\tPreshunted " + curBracedTokens + " into " - + preshuntTokens); + + preshuntTokens); } if (!success) return false; @@ -728,4 +738,4 @@ public class DiceLangEngine { void addStringLiteral(final int key, final String val) { stringLits.put(key, val); } -} \ No newline at end of file +} -- cgit v1.2.3