Format pass

11 files changed, 84 insertions, 93 deletions

diff --git a/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java b/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java
index e045222..31966d7 100644
--- a/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java
+++ b/base/src/main/java/bjc/utils/parserutils/DoubleMatcher.java
@@ -14,34 +14,33 @@ class DoubleMatcher {
 	/*
 	 * Unit pieces.
 	 */
-	private static final String	rDecDigits	= getRegex("fpDigits");
-	private static final String	rHexDigits	= getRegex("fpHexDigits");
-	private static final String	rExponent	= applyFormat("fpExponent", getRegex("fpExponent"), rDecDigits);
+	private static final String rDecDigits = getRegex("fpDigits");
+	private static final String rHexDigits = getRegex("fpHexDigits");
+	private static final String rExponent = applyFormat("fpExponent", getRegex("fpExponent"), rDecDigits);
 
 	/*
 	 * Decimal floating point numbers.
 	 */
-	private static final String	rSimpleDec	= applyFormat("fpDecimalDecimal", rDecDigits, rExponent);
-	private static final String	rSimpleIntDec	= applyFormat("fpDecimalInteger", rDecDigits, rExponent);
+	private static final String rSimpleDec = applyFormat("fpDecimalDecimal", rDecDigits, rExponent);
+	private static final String rSimpleIntDec = applyFormat("fpDecimalInteger", rDecDigits, rExponent);
 
 	/*
 	 * Hex floating point numbers.
 	 */
-	private static final String	rHexInt		= applyFormat("fpHexInteger", rHexDigits);
-	private static final String	rHexDec		= applyFormat("fpHexDecimal", rHexDigits);
-	private static final String	rHexLead	= applyFormat("fpHexLeader", rHexInt, rHexDec);
-	private static final String	rHexString	= applyFormat("fpHexString", rHexLead, rDecDigits);
+	private static final String rHexInt = applyFormat("fpHexInteger", rHexDigits);
+	private static final String rHexDec = applyFormat("fpHexDecimal", rHexDigits);
+	private static final String rHexLead = applyFormat("fpHexLeader", rHexInt, rHexDec);
+	private static final String rHexString = applyFormat("fpHexString", rHexLead, rDecDigits);
 
 	/*
 	 * Floating point components.
 	 */
-	private static final String	rFPLeader	= getRegex("fpLeader");
-	private static final String	rFPNum		= applyFormat("fpNumber", rSimpleIntDec, rSimpleDec,
-			rHexString);
+	private static final String rFPLeader = getRegex("fpLeader");
+	private static final String rFPNum = applyFormat("fpNumber", rSimpleIntDec, rSimpleDec, rHexString);
 
 	/*
 	 * Full double.
 	 */
-	private static final String	rDouble		= applyFormat("fpDouble", rFPLeader, rFPNum);
-	public static final Pattern	doubleLiteral	= Pattern.compile("\\A" + rDouble + "\\Z");
+	private static final String rDouble = applyFormat("fpDouble", rFPLeader, rFPNum);
+	public static final Pattern doubleLiteral = Pattern.compile("\\A" + rDouble + "\\Z");
 }
diff --git a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
index 352ad04..7a78a6e 100644
--- a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
+++ b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
@@ -61,9 +61,9 @@ public class ShuntingYard<TokenType> {
 	 * Function that shunts tokens.
 	 */
 	private final class TokenShunter implements Consumer<String> {
-		private final IList<TokenType>			output;
-		private final Deque<String>			stack;
-		private final Function<String, TokenType>	transformer;
+		private final IList<TokenType> output;
+		private final Deque<String> stack;
+		private final Function<String, TokenType> transformer;
 
 		public TokenShunter(final IList<TokenType> outpt, final Deque<String> stack,
 				final Function<String, TokenType> transformer) {
@@ -181,8 +181,7 @@ public class ShuntingYard<TokenType> {
 		 */
 		if(operator == null)
 			throw new NullPointerException("Operator must not be null");
-		else if (precedence == null)
-			throw new NullPointerException("Precedence must not be null");
+		else if(precedence == null) throw new NullPointerException("Precedence must not be null");
 
 		/*
 		 * Add the operator to the ones we handle
@@ -231,8 +230,7 @@ public class ShuntingYard<TokenType> {
 		 */
 		if(input == null)
 			throw new NullPointerException("Input must not be null");
-		else if (transformer == null)
-			throw new NullPointerException("Transformer must not be null");
+		else if(transformer == null) throw new NullPointerException("Transformer must not be null");
 
 		/*
 		 * Here's what we're handing back
diff --git a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java
index c995396..fb6fe8f 100644
--- a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java
+++ b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java
@@ -23,19 +23,19 @@ public class StringDescaper {
 	/*
 	 * Patterns and pattern parts.
 	 */
-	private static String	rPossibleEscapeString	= getRegex("possibleStringEscape");
-	private static Pattern	possibleEscapePatt	= Pattern.compile(rPossibleEscapeString);
+	private static String rPossibleEscapeString = getRegex("possibleStringEscape");
+	private static Pattern possibleEscapePatt = Pattern.compile(rPossibleEscapeString);
 
-	private static String	rShortEscape	= getRegex("shortFormStringEscape");
-	private static String	rOctalEscape	= getRegex("octalStringEscape");
-	private static String	rUnicodeEscape	= getRegex("unicodeStringEscape");
+	private static String rShortEscape = getRegex("shortFormStringEscape");
+	private static String rOctalEscape = getRegex("octalStringEscape");
+	private static String rUnicodeEscape = getRegex("unicodeStringEscape");
 
-	private String	rEscapeString;
-	private Pattern	escapePatt;
+	private String rEscapeString;
+	private Pattern escapePatt;
 
-	private Map<String, String>                 literalEscapes;
+	private Map<String, String> literalEscapes;
 	private Map<Pattern, UnaryOperator<String>> specialEscapes;
-	
+
 	/**
 	 * Create a new customizable string escape remover.
 	 */
@@ -45,18 +45,17 @@ public class StringDescaper {
 		specialEscapes = new HashMap<>();
 
 		/* Set up the hard-coded escapes. */
-		rEscapeString = String.format("\\\\(%1$s|%2$s|%3$s)",
-				rShortEscape, rOctalEscape, rUnicodeEscape);
-		escapePatt    = Pattern.compile(rEscapeString);
+		rEscapeString = String.format("\\\\(%1$s|%2$s|%3$s)", rShortEscape, rOctalEscape, rUnicodeEscape);
+		escapePatt = Pattern.compile(rEscapeString);
 	}
 
 	/**
 	 * Add a new literal escape.
 	 *
 	 * @param escape
-	 * 	The custom escape to add.
+	 *        The custom escape to add.
 	 * @param val
-	 * 	The value for the escape.
+	 *        The value for the escape.
 	 */
 	public void addLiteralEscape(String escape, String val) {
 		if(literalEscapes.containsKey(escape)) {
@@ -142,13 +141,13 @@ public class StringDescaper {
 		/*
 		 * Prepare the buffer and escape finder.
 		 */
-		final StringBuffer work            = new StringBuffer();
+		final StringBuffer work = new StringBuffer();
 		final Matcher possibleEscapeFinder = possibleEscapePatt.matcher(inp);
-		final Matcher escapeFinder         = escapePatt.matcher(inp);
+		final Matcher escapeFinder = escapePatt.matcher(inp);
 
 		/* Go through each escape. */
-		while (possibleEscapeFinder.find()) {
-			if (!escapeFinder.find()) {
+		while(possibleEscapeFinder.find()) {
+			if(!escapeFinder.find()) {
 				/*
 				 * Found a possible escape that isn't actually
 				 * an escape.
@@ -195,7 +194,7 @@ public class StringDescaper {
 				escapeRep = "\\";
 				break;
 			default:
-				if (escapeSeq.startsWith("u")) {
+				if(escapeSeq.startsWith("u")) {
 					/* Handle a unicode escape. */
 					escapeRep = handleUnicodeEscape(escapeSeq.substring(1));
 				} else if(escapeSeq.startsWith("O")) {
diff --git a/base/src/main/java/bjc/utils/parserutils/TokenTransformer.java b/base/src/main/java/bjc/utils/parserutils/TokenTransformer.java
index 5a37596..72913db 100644
--- a/base/src/main/java/bjc/utils/parserutils/TokenTransformer.java
+++ b/base/src/main/java/bjc/utils/parserutils/TokenTransformer.java
@@ -90,8 +90,8 @@ final class TokenTransformer<TokenType> implements Consumer<TokenType> {
 
 	private final Predicate<TokenType> operatorPredicate;
 
-	private final Predicate<TokenType>				isSpecialOperator;
-	private final Function<TokenType, QueueFlattener<TokenType>>	handleSpecialOperator;
+	private final Predicate<TokenType> isSpecialOperator;
+	private final Function<TokenType, QueueFlattener<TokenType>> handleSpecialOperator;
 
 	/*
 	 * Create a new transformer
diff --git a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
index 2a6c0fd..dba9b74 100644
--- a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
+++ b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
@@ -41,9 +41,9 @@ public class TokenUtils {
 
 	private static Pattern possibleEscapePatt = Pattern.compile(rPossibleEscapeString);
 
-	private static String	rShortEscape	= getRegex("shortFormStringEscape");
-	private static String	rOctalEscape	= getRegex("octalStringEscape");
-	private static String	rUnicodeEscape	= getRegex("unicodeStringEscape");
+	private static String rShortEscape = getRegex("shortFormStringEscape");
+	private static String rOctalEscape = getRegex("octalStringEscape");
+	private static String rUnicodeEscape = getRegex("unicodeStringEscape");
 
 	private static String rEscapeString = applyFormat("stringEscape", rShortEscape, rOctalEscape, rUnicodeEscape);
 
diff --git a/base/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java b/base/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java
index 6d1ed64..3d279d8 100644
--- a/base/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java
+++ b/base/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java
@@ -27,7 +27,7 @@ public class IteratedDefine implements UnaryOperator<String> {
 	 *        Whether or not to loop through the list of replacers, or just
 	 *        repeat the last one.
 	 * @param replacers
-	 * 	The set of replacement strings to use.
+	 *        The set of replacement strings to use.
 	 */
 	public IteratedDefine(Pattern pattern, boolean circular, String... replacers) {
 		patt = pattern;
diff --git a/base/src/main/java/bjc/utils/parserutils/defines/SimpleDefine.java b/base/src/main/java/bjc/utils/parserutils/defines/SimpleDefine.java
index c3496a8..032c33e 100644
--- a/base/src/main/java/bjc/utils/parserutils/defines/SimpleDefine.java
+++ b/base/src/main/java/bjc/utils/parserutils/defines/SimpleDefine.java
@@ -10,16 +10,16 @@ import java.util.regex.Pattern;
  * @author Ben Culkin
  */
 public class SimpleDefine implements UnaryOperator<String> {
-	private Pattern	patt;
-	private String	repl;
+	private Pattern patt;
+	private String repl;
 
 	/**
 	 * Create a new simple define.
 	 *
 	 * @param pattern
-	 * 	The pattern to match against.
+	 *        The pattern to match against.
 	 * @param replace
-	 * 	The text to use as a replacement.
+	 *        The text to use as a replacement.
 	 */
 	public SimpleDefine(Pattern pattern, String replace) {
 		patt = pattern;
diff --git a/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java b/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java
index 0fe998d..e89ba08 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java
@@ -47,8 +47,8 @@ public class DelimiterGroup<T> {
 		/*
 		 * The token that opened the group, and any opening parameters.
 		 */
-		private final T		opener;
-		private final T[]	params;
+		private final T opener;
+		private final T[] params;
 
 		/**
 		 * Create a new instance of a delimiter group.
@@ -148,8 +148,8 @@ public class DelimiterGroup<T> {
 			final ITree<T> res = new Tree<>(chars.contents);
 
 			/*
-			 * Add either the contents of the current group,
-			 * or subgroups if they're there.
+			 * Add either the contents of the current group, or
+			 * subgroups if they're there.
 			 */
 			if(contents.isEmpty()) {
 				currentGroup.forEach(res::addChild);
@@ -261,14 +261,12 @@ public class DelimiterGroup<T> {
 		 *         open one.
 		 */
 		public IPair<T, T[]> doesOpen(final T marker) {
-			if (openDelimiters.containsKey(marker))
-				return new Pair<>(openDelimiters.get(marker), null);
+			if(openDelimiters.containsKey(marker)) return new Pair<>(openDelimiters.get(marker), null);
 
 			for(final Function<T, IPair<T, T[]>> pred : predOpeners) {
 				final IPair<T, T[]> par = pred.apply(marker);
 
-				if (par.getLeft() != null) 
-					return par;
+				if(par.getLeft() != null) return par;
 			}
 
 			return new Pair<>(null, null);
@@ -329,20 +327,19 @@ public class DelimiterGroup<T> {
 	 *        The name of the delimiter group
 	 */
 	public DelimiterGroup(final T name) {
-		if (name == null)
-			throw new NullPointerException("Group name must not be null");
+		if(name == null) throw new NullPointerException("Group name must not be null");
 
 		groupName = name;
 
-		openDelimiters       = new HashMap<>();
+		openDelimiters = new HashMap<>();
 		nestedOpenDelimiters = new HashMap<>();
 
 		closingDelimiters = new HashSet<>();
 
 		topLevelExclusions = new HashSet<>();
-		groupExclusions    = new HashSet<>();
+		groupExclusions = new HashSet<>();
 
-		subgroups        = new HashMap<>();
+		subgroups = new HashMap<>();
 		impliedSubgroups = new HashMap<>();
 
 		predOpeners = new LinkedList<>();
@@ -359,10 +356,10 @@ public class DelimiterGroup<T> {
 	public final void addClosing(final T... closers) {
 		final List<T> closerList = Arrays.asList(closers);
 
-		for (final T closer : closerList) {
-			if (closer == null) {
+		for(final T closer : closerList) {
+			if(closer == null) {
 				throw new NullPointerException("Closing delimiter must not be null");
-			} else if (closer.equals("")) {
+			} else if(closer.equals("")) {
 				/*
 				 * We can do this because equals works on
 				 * arbitrary objects, not just those of the same
@@ -384,10 +381,10 @@ public class DelimiterGroup<T> {
 	 */
 	@SafeVarargs
 	public final void addTopLevelForbid(final T... exclusions) {
-		for (final T exclusion : exclusions) {
-			if (exclusion == null) {
+		for(final T exclusion : exclusions) {
+			if(exclusion == null) {
 				throw new NullPointerException("Exclusion must not be null");
-			} else if (exclusion.equals("")) {
+			} else if(exclusion.equals("")) {
 				/*
 				 * We can do this because equals works on
 				 * arbitrary objects, not just those of the same
@@ -408,10 +405,10 @@ public class DelimiterGroup<T> {
 	 */
 	@SafeVarargs
 	public final void addGroupForbid(final T... exclusions) {
-		for (final T exclusion : exclusions) {
-			if (exclusion == null) {
+		for(final T exclusion : exclusions) {
+			if(exclusion == null) {
 				throw new NullPointerException("Exclusion must not be null");
-			} else if (exclusion.equals("")) {
+			} else if(exclusion.equals("")) {
 				/*
 				 * We can do this because equals works on
 				 * arbitrary objects, not just those of the same
@@ -434,8 +431,7 @@ public class DelimiterGroup<T> {
 	 *        The priority of this sub-group.
 	 */
 	public void addSubgroup(final T subgroup, final int priority) {
-		if (subgroup == null)
-			throw new NullPointerException("Subgroup marker must not be null");
+		if(subgroup == null) throw new NullPointerException("Subgroup marker must not be null");
 
 		subgroups.put(subgroup, priority);
 	}
@@ -450,10 +446,9 @@ public class DelimiterGroup<T> {
 	 *        The group opened by the marker.
 	 */
 	public void addOpener(final T opener, final T group) {
-		if (opener == null)
+		if(opener == null)
 			throw new NullPointerException("Opener must not be null");
-		else if (group == null)
-			throw new NullPointerException("Group to open must not be null");
+		else if(group == null) throw new NullPointerException("Group to open must not be null");
 
 		openDelimiters.put(opener, group);
 	}
@@ -468,9 +463,9 @@ public class DelimiterGroup<T> {
 	 *        The group opened by the marker.
 	 */
 	public void addNestedOpener(final T opener, final T group) {
-		if (opener == null) {
+		if(opener == null) {
 			throw new NullPointerException("Opener must not be null");
-		} else if (group == null) {
+		} else if(group == null) {
 			throw new NullPointerException("Group to open must not be null");
 		}
 
@@ -487,13 +482,13 @@ public class DelimiterGroup<T> {
 	 *        The subgroup to imply.
 	 */
 	public void implySubgroup(final T closer, final T subgroup) {
-		if (closer == null) {
+		if(closer == null) {
 			throw new NullPointerException("Closer must not be null");
-		} else if (subgroup == null) {
+		} else if(subgroup == null) {
 			throw new NullPointerException("Subgroup must not be null");
-		} else if (!closingDelimiters.contains(closer)) {
+		} else if(!closingDelimiters.contains(closer)) {
 			throw new IllegalArgumentException(String.format("No closing delimiter '%s' defined", closer));
-		} else if (!subgroups.containsKey(subgroup)) {
+		} else if(!subgroups.containsKey(subgroup)) {
 			throw new IllegalArgumentException(String.format("No subgroup '%s' defined", subgroup));
 		}
 
diff --git a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
index 6aa3cc9..ff4b348 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
@@ -87,9 +87,9 @@ public class SequenceDelimiter<T> {
 	 */
 	public ITree<T> delimitSequence(final SequenceCharacteristics<T> chars,
 			@SuppressWarnings("unchecked") final T... seq) throws DelimiterException {
-		if (initialGroup == null) {
+		if(initialGroup == null) {
 			throw new NullPointerException("Initial group must be specified.");
-		} else if (chars == null) {
+		} else if(chars == null) {
 			throw new NullPointerException("Sequence characteristics must not be null");
 		}
 
@@ -110,10 +110,10 @@ public class SequenceDelimiter<T> {
 		/* Map of who forbid what for debugging purposes. */
 		final IMap<T, T> whoForbid = new PushdownMap<>();
 
-		/* 
+		/*
 		 * Process each member of the sequence.
 		 */
-		for (int i = 0; i < seq.length; i++) {
+		for(int i = 0; i < seq.length; i++) {
 			final T tok = seq[i];
 
 			/* Check if this token could open a group. */
@@ -233,8 +233,8 @@ public class SequenceDelimiter<T> {
 		if(groupStack.size() > 1) {
 			final DelimiterGroup<T>.OpenGroup group = groupStack.top();
 
-			final String closingDelims = StringUtils.toEnglishList(
-					group.getNestingExclusions().toArray(), false);
+			final String closingDelims = StringUtils.toEnglishList(group.getNestingExclusions().toArray(),
+					false);
 
 			final String ctxList = StringUtils.toEnglishList(groupStack.toArray(), "then");
 
@@ -270,7 +270,7 @@ public class SequenceDelimiter<T> {
 	 *        The delimiter group.
 	 */
 	public void addGroup(final DelimiterGroup<T> group) {
-		if (group == null) {
+		if(group == null) {
 			throw new NullPointerException("Group must not be null");
 		}
 
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
index 0a46edb..cc69221 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
@@ -30,9 +30,9 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 		super(null, keepDelims);
 
 		/* Use linked hash-sets to keep items in insertion order. */
-		simpleDelimiters   = new LinkedHashSet<>();
+		simpleDelimiters = new LinkedHashSet<>();
 		multipleDelimiters = new LinkedHashSet<>();
-		rRawDelimiters     = new LinkedHashSet<>();
+		rRawDelimiters = new LinkedHashSet<>();
 	}
 
 	/**
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
index b38a5c3..3e58629 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
@@ -14,7 +14,7 @@ import bjc.utils.funcdata.IList;
  *
  */
 public class ExcludingTokenSplitter implements TokenSplitter {
-	private final Set<String>              literalExclusions;
+	private final Set<String> literalExclusions;
 	private final IList<Predicate<String>> predExclusions;
 
 	private final TokenSplitter spliter;