Reorganize

21 files changed, 0 insertions, 1170 deletions

diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/AbstractInitialCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/AbstractInitialCommand.java
deleted file mode 100644
index 3c3a89b..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/AbstractInitialCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * Abstract base for initial commands.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public abstract class AbstractInitialCommand<K, V, C> implements InitialCommand<K, V, C> {
-	@Override
-	public ITree<Token<K, V>> denote(Token<K, V> operator, ParserContext<K, V, C> ctx) throws ParserException {
-		return intNullDenotation(operator, ctx);
-	}
-
-	protected abstract ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException;
-
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryCommand.java
deleted file mode 100644
index 781309c..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A binary operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public abstract class BinaryCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
-	/**
-	 * Create a new binary operator with the specified precedence.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 */
-	public BinaryCommand(int precedence) {
-		super(precedence);
-	}
-
-	protected abstract int rightBinding();
-
-	@Override
-	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> opr = ctx.parse.parseExpression(rightBinding(), ctx.tokens, ctx.state, false);
-
-		return new Tree<>(operator, operand, opr);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryPostCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryPostCommand.java
deleted file mode 100644
index 806f2f3..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryPostCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-
-/**
- * A operator with fixed precedence.
- * 
- * @author bjculkin
- * 
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public abstract class BinaryPostCommand<K, V, C> extends NonInitialCommand<K, V, C> {
-	private final int leftPower;
-
-	/**
-	 * Create a new operator with fixed precedence.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 */
-	public BinaryPostCommand(int precedence) {
-		if (precedence < 0) {
-			throw new IllegalArgumentException("Precedence must be non-negative");
-		}
-
-		leftPower = precedence;
-	}
-
-	@Override
-	public int leftBinding() {
-		return leftPower;
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ChainCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ChainCommand.java
deleted file mode 100644
index 1324586..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ChainCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-import java.util.Set;
-
-/**
- * Create a new chained operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class ChainCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
-	private Set<K> chainWith;
-
-	private Token<K, V> chain;
-
-	/**
-	 * Create a new chained operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of this operator.
-	 * 
-	 * @param chainSet
-	 *                The operators to chain with.
-	 * 
-	 * @param chainMarker
-	 *                The token to use as the node in the AST.
-	 */
-	public ChainCommand(int precedence, Set<K> chainSet, Token<K, V> chainMarker) {
-		super(precedence);
-
-		chainWith = chainSet;
-		chain = chainMarker;
-	}
-
-	@Override
-	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> tree = ctx.parse.parseExpression(1 + leftBinding(), ctx.tokens, ctx.state, false);
-
-		ITree<Token<K, V>> res = new Tree<>(operator, operand, tree);
-
-		if (chainWith.contains(ctx.tokens.current().getKey())) {
-			Token<K, V> tok = ctx.tokens.current();
-			ctx.tokens.next();
-
-			ITree<Token<K, V>> other = denote(tree, tok,
-					new ParserContext<>(ctx.tokens, ctx.parse, ctx.state));
-
-			return new Tree<>(chain, res, other);
-		} else {
-			return res;
-		}
-	}
-
-	@Override
-	public int nextBinding() {
-		return leftBinding() - 1;
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ConstantCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ConstantCommand.java
deleted file mode 100644
index 10ff184..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ConstantCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A command that represents a specific tree.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class ConstantCommand<K, V, C> implements InitialCommand<K, V, C> {
-	private ITree<Token<K, V>> val;
-
-	/**
-	 * Create a new constant.
-	 * 
-	 * @param con
-	 *                The tree this constant represents.
-	 */
-	public ConstantCommand(ITree<Token<K, V>> con) {
-		val = con;
-	}
-
-	@Override
-	public ITree<Token<K, V>> denote(Token<K, V> operator, ParserContext<K, V, C> ctx) throws ParserException {
-		return val;
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultInitialCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultInitialCommand.java
deleted file mode 100644
index 7409755..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultInitialCommand.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * Default implementation of an initial command.
- * 
- * @author EVE
- *
- * @param <K>
- *                The key type of the token.
- * 
- * @param <V>
- *                The value type of the token.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class DefaultInitialCommand<K, V, C> implements InitialCommand<K, V, C> {
-	@Override
-	public ITree<Token<K, V>> denote(Token<K, V> operator, ParserContext<K, V, C> ctx) throws ParserException {
-		throw new ParserException("Unexpected token " + operator);
-	}
-}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultNonInitialCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultNonInitialCommand.java
deleted file mode 100644
index 887dd25..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultNonInitialCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * Default implementation of a non-initial command.
- * 
- * @author EVE
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class DefaultNonInitialCommand<K, V, C> extends NonInitialCommand<K, V, C> {
-	@Override
-	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx) {
-		throw new UnsupportedOperationException("Default command has no left denotation");
-	}
-
-	@Override
-	public int leftBinding() {
-		return -1;
-	}
-}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DenestingCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DenestingCommand.java
deleted file mode 100644
index 567e608..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DenestingCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A command that denests a input tree.
- * 
- * Useful for processing the result of passing a complex parse group to a
- * command.
- * 
- * @author bjculkin
- * 
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- *
- */
-public class DenestingCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private InitialCommand<K, V, C> wrapped;
-
-	/**
-	 * Create a new transforming initial command.
-	 * 
-	 * @param internal
-	 *                The initial command to delegate to.
-	 */
-	public DenestingCommand(InitialCommand<K, V, C> internal) {
-		wrapped = internal;
-	}
-
-	@Override
-	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		return wrapped.denote(operator, ctx).getChild(0);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java
deleted file mode 100644
index 37cc6ee..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A grouping operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class GroupingCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private ParseBlock<K, V, C> innerBlock;
-
-	private Token<K, V> mark;
-
-	/**
-	 * Create a new grouping command.
-	 * 
-	 * @param inner
-	 *                The inner block.
-	 * 
-	 * @param marker
-	 *                The token to use as the node in the AST.
-	 */
-	public GroupingCommand(ParseBlock<K, V, C> inner, Token<K, V> marker) {
-		innerBlock = inner;
-
-		mark = marker;
-	}
-
-	@Override
-	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> opr = innerBlock.parse(ctx);
-
-		return new Tree<>(mark, opr);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/InitialCommands.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/InitialCommands.java
deleted file mode 100644
index eac357a..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/InitialCommands.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.Token;
-
-import java.util.function.UnaryOperator;
-
-import static bjc.utils.parserutils.pratt.blocks.ParseBlocks.*;
-
-/**
- * * Contains factory methods for producing common implementations of
- * {@link InitialCommand}
- * 
- * @author EVE
- *
- */
-public class InitialCommands {
-	/**
-	 * Create a new unary operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> unary(int precedence) {
-		return new UnaryCommand<>(precedence);
-	}
-
-	/**
-	 * Create a new grouping operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the expression in the operator.
-	 * 
-	 * @param term
-	 *                The type that closes the group.
-	 * 
-	 * @param mark
-	 *                The token for the AST node of the group.
-	 * 
-	 * @return A command implementing the operator.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> grouping(int precedence, K term, Token<K, V> mark) {
-		ParseBlock<K, V, C> innerBlock = simple(precedence, term, null);
-
-		return new GroupingCommand<>(innerBlock, mark);
-	}
-
-	/**
-	 * Create a new leaf operator.
-	 * 
-	 * @return A command implementing the operator.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> leaf() {
-		return new LeafCommand<>();
-	}
-
-	/**
-	 * Create a new pre-ternary operator, like an if-then-else statement.
-	 * 
-	 * @param cond1
-	 *                The priority of the first block.
-	 * 
-	 * @param block1
-	 *                The priority of the second block.
-	 * 
-	 * @param block2
-	 *                The priority of the third block.
-	 * 
-	 * @param mark1
-	 *                The marker that ends the first block.
-	 * 
-	 * @param mark2
-	 *                The marker that ends the second block.
-	 * 
-	 * @param term
-	 *                The token for the AST node of the group.
-	 * 
-	 * @return A command implementing the operator.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> preTernary(int cond1, int block1, int block2, K mark1, K mark2,
-			Token<K, V> term) {
-		ParseBlock<K, V, C> condBlock = simple(cond1, mark1, null);
-		ParseBlock<K, V, C> opblock1 = simple(block1, mark2, null);
-		ParseBlock<K, V, C> opblock2 = simple(block2, null, null);
-
-		return new PreTernaryCommand<>(condBlock, opblock1, opblock2, term);
-	}
-
-	/**
-	 * Create a new named constant.
-	 * 
-	 * @param val
-	 *                The value of the constant.
-	 * 
-	 * @return A command implementing the constant.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> constant(ITree<Token<K, V>> val) {
-		return new ConstantCommand<>(val);
-	}
-
-	/**
-	 * Create a new delimited command. This is for block-like constructs.
-	 * 
-	 * @param inner
-	 *                The precedence of the inner blocks.
-	 * 
-	 * @param delim
-	 *                The marker between sub-blocks.
-	 * 
-	 * @param mark
-	 *                The block terminator.
-	 * 
-	 * @param term
-	 *                The token for the AST node of the group.
-	 * 
-	 * @param onEnter
-	 *                The function to apply to the state on entering the
-	 *                block.
-	 * 
-	 * @param onDelim
-	 *                The function to apply to the state on finishing a
-	 *                sub-block.
-	 * 
-	 * @param onExit
-	 *                The function to apply to the state on exiting the
-	 *                block.
-	 * 
-	 * @param statement
-	 *                Whether or not the sub-blocks are statements or
-	 *                expressions.
-	 * 
-	 * @return A command implementing the operator.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> delimited(int inner, K delim, K mark, Token<K, V> term,
-			UnaryOperator<C> onEnter, UnaryOperator<C> onDelim, UnaryOperator<C> onExit,
-			boolean statement) {
-		ParseBlock<K, V, C> innerBlock = simple(inner, null, null);
-		ParseBlock<K, V, C> delimsBlock = repeating(innerBlock, delim, mark, term, onDelim);
-		ParseBlock<K, V, C> scopedBlock = trigger(delimsBlock, onEnter, onExit);
-
-		GroupingCommand<K, V, C> command = new GroupingCommand<>(scopedBlock, term);
-
-		/*
-		 * Remove the wrapper layer from grouping-command on top of
-		 * RepeatingParseBlock.
-		 */
-		return denest(command);
-	}
-
-	/**
-	 * Create a new denesting command.
-	 * 
-	 * This removes one tree-level, and is useful when combining complex
-	 * parse blocks with commands.
-	 * 
-	 * @param comm
-	 *                The command to denest.
-	 * 
-	 * @return A command that denests the result of the provided command.
-	 */
-	public static <K, V, C> InitialCommand<K, V, C> denest(InitialCommand<K, V, C> comm) {
-		return new DenestingCommand<>(comm);
-	}
-}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeafCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeafCommand.java
deleted file mode 100644
index 3937f5f..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeafCommand.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A operator that stands for itself.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class LeafCommand<K, V, C> implements InitialCommand<K, V, C> {
-	@Override
-	public ITree<Token<K, V>> denote(Token<K, V> operator, ParserContext<K, V, C> ctx) throws ParserException {
-		return new Tree<>(operator);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeftBinaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeftBinaryCommand.java
deleted file mode 100644
index 58d7261..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeftBinaryCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-/**
- * A left-associative operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class LeftBinaryCommand<K, V, C> extends BinaryCommand<K, V, C> {
-	/**
-	 * Create a new left-associative operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 */
-	public LeftBinaryCommand(int precedence) {
-		super(precedence);
-	}
-
-	@Override
-	protected int rightBinding() {
-		return 1 + leftBinding();
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonBinaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonBinaryCommand.java
deleted file mode 100644
index d32a1a7..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonBinaryCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-/**
- * A non-associative operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class NonBinaryCommand<K, V, C> extends BinaryCommand<K, V, C> {
-	/**
-	 * Create a new non-associative operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 */
-	public NonBinaryCommand(int precedence) {
-		super(precedence);
-	}
-
-	@Override
-	protected int rightBinding() {
-		return 1 + leftBinding();
-	}
-
-	@Override
-	public int nextBinding() {
-		return leftBinding() - 1;
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonInitialCommands.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonInitialCommands.java
deleted file mode 100644
index 45bdc51..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonInitialCommands.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.blocks.SimpleParseBlock;
-
-import java.util.Set;
-
-/**
- * Contains factory methods for producing common implementations of
- * {@link NonInitialCommand}
- * 
- * @author EVE
- *
- */
-public class NonInitialCommands {
-	/**
-	 * Create a left-associative infix operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> infixLeft(int precedence) {
-		return new LeftBinaryCommand<>(precedence);
-	}
-
-	/**
-	 * Create a right-associative infix operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> infixRight(int precedence) {
-		return new RightBinaryCommand<>(precedence);
-	}
-
-	/**
-	 * Create a non-associative infix operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> infixNon(int precedence) {
-		return new NonBinaryCommand<>(precedence);
-	}
-
-	/**
-	 * Create a chained operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @param chainSet
-	 *                The operators it forms a chain with.
-	 * 
-	 * @param marker
-	 *                The token to use as the AST node for the chained
-	 *                operators.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> chain(int precedence, Set<K> chainSet, Token<K, V> marker) {
-		return new ChainCommand<>(precedence, chainSet, marker);
-	}
-
-	/**
-	 * Create a postfix operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> postfix(int precedence) {
-		return new PostfixCommand<>(precedence);
-	}
-
-	/**
-	 * Create a post-circumfix operator.
-	 * 
-	 * This is an operator in form similar to array indexing.
-	 * 
-	 * @param precedence
-	 *                The precedence of this operator
-	 * 
-	 * @param insidePrecedence
-	 *                The precedence of the expression inside the operator
-	 * 
-	 * @param closer
-	 *                The token that closes the circumfix.
-	 * 
-	 * @param marker
-	 *                The token to use as the AST node for the operator.
-	 * 
-	 * @return A command implementing that operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> postCircumfix(int precedence, int insidePrecedence, K closer,
-			Token<K, V> marker) {
-		ParseBlock<K, V, C> innerBlock = new SimpleParseBlock<>(insidePrecedence, closer, null);
-
-		return new PostCircumfixCommand<>(precedence, innerBlock, marker);
-	}
-
-	/**
-	 * Create a ternary operator.
-	 * 
-	 * This is like C's ?: operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @param insidePrecedence
-	 *                The precedence of the inner section of the operator.
-	 * 
-	 * @param closer
-	 *                The token that marks the end of the inner section.
-	 * 
-	 * @param marker
-	 *                The token to use as the AST node for the operator.
-	 * 
-	 * @param nonassoc
-	 *                True if the command is non-associative, false
-	 *                otherwise.
-	 * 
-	 * @return A command implementing this operator.
-	 */
-	public static <K, V, C> NonInitialCommand<K, V, C> ternary(int precedence, int insidePrecedence, K closer,
-			Token<K, V> marker, boolean nonassoc) {
-		ParseBlock<K, V, C> innerBlock = new SimpleParseBlock<>(insidePrecedence, closer, null);
-
-		return new TernaryCommand<>(precedence, innerBlock, marker, nonassoc);
-	}
-}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostCircumfixCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostCircumfixCommand.java
deleted file mode 100644
index 90fca00..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostCircumfixCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A post-circumfix operator, like array indexing.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class PostCircumfixCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
-	private ParseBlock<K, V, C> innerBlock;
-
-	private Token<K, V> mark;
-
-	/**
-	 * Create a new post-circumfix operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 * 
-	 * @param inner
-	 *                The block inside the expression.
-	 * 
-	 * @param marker
-	 *                The token to use as the node for the AST.
-	 */
-	public PostCircumfixCommand(int precedence, ParseBlock<K, V, C> inner, Token<K, V> marker) {
-		super(precedence);
-
-		if (inner == null) {
-			throw new NullPointerException("Inner block must not be null");
-		}
-
-		innerBlock = inner;
-
-		mark = marker;
-	}
-
-	@Override
-	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> inside = innerBlock.parse(ctx);
-
-		return new Tree<>(mark, operand, inside);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostfixCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostfixCommand.java
deleted file mode 100644
index bab3de4..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostfixCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A postfix operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class PostfixCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
-	/**
-	 * Create a new postfix operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 */
-	public PostfixCommand(int precedence) {
-		super(precedence);
-	}
-
-	@Override
-	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		return new Tree<>(operator, operand);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PreTernaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PreTernaryCommand.java
deleted file mode 100644
index 42d1a6e..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PreTernaryCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A prefix ternary operator, like an if/then/else group.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class PreTernaryCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private Token<K, V> term;
-
-	private ParseBlock<K, V, C> condBlock;
-
-	private ParseBlock<K, V, C>	opblock1;
-	private ParseBlock<K, V, C>	opblock2;
-
-	/**
-	 * Create a new ternary statement.
-	 * 
-	 * @param cond
-	 *                The block for handling the condition.
-	 * 
-	 * @param op1
-	 *                The block for handling the first operator.
-	 * 
-	 * @param op2
-	 *                The block for handling the second operator.
-	 * 
-	 * @param term
-	 *                The token to use as the node for the AST.
-	 */
-	public PreTernaryCommand(ParseBlock<K, V, C> cond, ParseBlock<K, V, C> op1, ParseBlock<K, V, C> op2,
-			Token<K, V> term) {
-		super();
-
-		if (cond == null)
-			throw new NullPointerException("Cond block must not be null");
-		else if (op1 == null)
-			throw new NullPointerException("Op block #1 must not be null");
-		else if (op2 == null) throw new NullPointerException("Op block #2 must not be null");
-
-		this.condBlock = cond;
-		this.opblock1 = op1;
-		this.opblock2 = op2;
-
-		this.term = term;
-	}
-
-	@Override
-	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> cond = condBlock.parse(ctx);
-
-		ITree<Token<K, V>> op1 = opblock1.parse(ctx);
-
-		ITree<Token<K, V>> op2 = opblock2.parse(ctx);
-
-		return new Tree<>(term, cond, op1, op2);
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/RightBinaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/RightBinaryCommand.java
deleted file mode 100644
index 5f3d9f2..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/RightBinaryCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-/**
- * A right-associative binary operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * @param <V>
- *                The value type of the tokens.
- * @param <C>
- *                The state type of the parser.
- */
-public class RightBinaryCommand<K, V, C> extends BinaryCommand<K, V, C> {
-	/**
-	 * Create a new right-associative operator.
-	 * 
-	 * @param precedence
-	 *                The precedence of the operator.
-	 */
-	public RightBinaryCommand(int precedence) {
-		super(precedence);
-	}
-
-	@Override
-	protected int rightBinding() {
-		return leftBinding();
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TernaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TernaryCommand.java
deleted file mode 100644
index 8f04368..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TernaryCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A ternary command, like C's ?:
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class TernaryCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
-	private ParseBlock<K, V, C> innerBlck;
-
-	private Token<K, V> mark;
-
-	private boolean nonassoc;
-
-	/**
-	 * Create a new ternary command.
-	 * 
-	 * @param precedence
-	 *                The precedence of this operator.
-	 * 
-	 * @param innerBlock
-	 *                The representation of the inner block of the
-	 *                expression.
-	 * 
-	 * @param marker
-	 *                The token to use as the root of the AST node.
-	 * 
-	 * @param isNonassoc
-	 *                Whether or not the conditional is associative.
-	 */
-	public TernaryCommand(int precedence, ParseBlock<K, V, C> innerBlock, Token<K, V> marker, boolean isNonassoc) {
-		super(precedence);
-
-		if (innerBlock == null)
-			throw new NullPointerException("Inner block must not be null");
-		else if (marker == null) throw new NullPointerException("Marker must not be null");
-
-		innerBlck = innerBlock;
-		mark = marker;
-		nonassoc = isNonassoc;
-	}
-
-	@Override
-	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> inner = innerBlck.parse(ctx);
-
-		ITree<Token<K, V>> outer = ctx.parse.parseExpression(1 + leftBinding(), ctx.tokens, ctx.state, false);
-
-		return new Tree<>(mark, inner, operand, outer);
-	}
-
-	@Override
-	public int nextBinding() {
-		if (nonassoc) {
-			return leftBinding() - 1;
-		} else {
-			return leftBinding();
-		}
-	}
-}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TransformingInitialCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TransformingInitialCommand.java
deleted file mode 100644
index 88803df..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TransformingInitialCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import java.util.function.UnaryOperator;
-
-import bjc.utils.data.ITree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * An initial command that transforms the result of another command.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class TransformingInitialCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private InitialCommand<K, V, C> internal;
-
-	private UnaryOperator<ITree<Token<K, V>>> transform;
-
-	/**
-	 * Create a new transforming initial command.
-	 * 
-	 * @param internal
-	 *                The initial command to delegate to.
-	 * 
-	 * @param transform
-	 *                The transform to apply to the returned tree.
-	 */
-	public TransformingInitialCommand(InitialCommand<K, V, C> internal,
-			UnaryOperator<ITree<Token<K, V>>> transform) {
-		super();
-		this.internal = internal;
-		this.transform = transform;
-	}
-
-	@Override
-	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		return transform.apply(internal.denote(operator, ctx));
-	}
-
-}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/UnaryCommand.java b/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/UnaryCommand.java
deleted file mode 100644
index c608362..0000000
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/UnaryCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package bjc.utils.parserutils.pratt.commands;
-
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-
-/**
- * A unary operator.
- * 
- * @author bjculkin
- *
- * @param <K>
- *                The key type of the tokens.
- * 
- * @param <V>
- *                The value type of the tokens.
- * 
- * @param <C>
- *                The state type of the parser.
- */
-public class UnaryCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private final int nullPwer;
-
-	/**
-	 * Create a new unary command.
-	 * 
-	 * @param precedence
-	 *                The precedence of this operator.
-	 */
-	public UnaryCommand(int precedence) {
-		if(precedence < 0) {
-			throw new IllegalArgumentException("Precedence must be non-negative");
-		}
-		
-		nullPwer = precedence;
-	}
-
-	@Override
-	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
-			throws ParserException {
-		ITree<Token<K, V>> opr = ctx.parse.parseExpression(nullPwer, ctx.tokens, ctx.state, false);
-
-		return new Tree<>(operator, opr);
-	}
-}
\ No newline at end of file