Update Pratt parser

1 files changed, 31 insertions, 22 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/PrattParser.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/PrattParser.java
index a2cefda..a8c273d 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/PrattParser.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/PrattParser.java
@@ -13,66 +13,75 @@ import java.util.Map;
  * @author EVE
  * 
  * @param <K>
- *                The key type for the tokens.
+ *            The key type for the tokens.
  * 
  * @param <V>
- *                The value type for the tokens.
+ *            The value type for the tokens.
  * 
  * @param <C>
- *                The state type of the parser.
+ *            The state type of the parser.
  * 
  *
  */
 public class PrattParser<K, V, C> {
-	private final LeftCommand<K, V, C>	DEFAULT_LEFT_COMMAND	= new DefaultLeftCommand<>();
-	private final NullCommand<K, V, C>	DEFAULT_NULL_COMMAND	= new DefaultNullCommand<>();
+	private final LeftCommand<K, V, C> DEFAULT_LEFT_COMMAND = new DefaultLeftCommand<>();
+	private final NullCommand<K, V, C> DEFAULT_NULL_COMMAND = new DefaultNullCommand<>();
 
-	private Map<K, LeftCommand<K, V, C>>	leftCommands;
-	private Map<K, NullCommand<K, V, C>>	nullCommands;
+	private Map<K, LeftCommand<K, V, C>> leftCommands;
+	private Map<K, NullCommand<K, V, C>> nullCommands;
+	private Map<K, NullCommand<K, V, C>> statementCommands;
 
 	/**
 	 * Create a new Pratt parser.
 	 * 
 	 * @param terminal
-	 *                The terminal symbol.
+	 *            The terminal symbol.
 	 */
 	public PrattParser() {
 		leftCommands = new HashMap<>();
 		nullCommands = new HashMap<>();
+		statementCommands = new HashMap<>();
 	}
 
 	/**
 	 * Parse an expression.
 	 * 
 	 * @param precedence
-	 *                The initial precedence for the expression.
+	 *            The initial precedence for the expression.
 	 * 
 	 * @param tokens
-	 *                The tokens for the expression.
+	 *            The tokens for the expression.
 	 * 
 	 * @param state
-	 *                The state of the parser.
+	 *            The state of the parser.
 	 * 
 	 * @return The expression as an AST.
 	 * 
 	 * @throws ParserException
-	 *                 If something goes wrong during parsing.
+	 *             If something goes wrong during parsing.
 	 */
-	public ITree<Token<K, V>> parseExpression(int precedence, TokenStream<K, V> tokens, C state)
+	public ITree<Token<K, V>> parseExpression(int precedence, TokenStream<K, V> tokens, C state, boolean isStatement)
 			throws ParserException {
-		if(precedence < 0) {
+		if (precedence < 0) {
 			throw new IllegalArgumentException("Precedence must be greater than zero");
 		}
 
 		Token<K, V> initToken = tokens.current();
 		tokens.next();
 
-		ITree<Token<K, V>> ast = nullCommands.getOrDefault(initToken.getKey(), DEFAULT_NULL_COMMAND)
-				.nullDenotation(initToken, new ParserContext<>(tokens, this, state));
+		ITree<Token<K, V>> ast;
+
+		if (isStatement && statementCommands.containsKey(initToken.getKey())) {
+			ast = statementCommands.getOrDefault(initToken.getKey(), DEFAULT_NULL_COMMAND).nullDenotation(initToken,
+					new ParserContext<>(tokens, this, state));
+		} else {
+			ast = nullCommands.getOrDefault(initToken.getKey(), DEFAULT_NULL_COMMAND).nullDenotation(initToken,
+					new ParserContext<>(tokens, this, state));
+		}
 
 		int rightPrec = Integer.MAX_VALUE;
 
-		while(true) {
+		while (true) {
 			Token<K, V> tok = tokens.current();
 
 			K key = tok.getKey();
@@ -80,7 +89,7 @@ public class PrattParser<K, V, C> {
 			LeftCommand<K, V, C> command = leftCommands.getOrDefault(key, DEFAULT_LEFT_COMMAND);
 			int leftBind = command.leftBinding();
 
-			if(NumberUtils.between(precedence, rightPrec, leftBind)) {
+			if (NumberUtils.between(precedence, rightPrec, leftBind)) {
 				tokens.next();
 
 				ast = command.leftDenote(ast, tok, new ParserContext<>(tokens, this, state));
@@ -97,10 +106,10 @@ public class PrattParser<K, V, C> {
 	 * Add a non-initial command to this parser.
 	 * 
 	 * @param marker
-	 *                The key that marks the command.
+	 *            The key that marks the command.
 	 * 
 	 * @param comm
-	 *                The command.
+	 *            The command.
 	 */
 	public void addNonInitialCommand(K marker, LeftCommand<K, V, C> comm) {
 		leftCommands.put(marker, comm);
@@ -110,10 +119,10 @@ public class PrattParser<K, V, C> {
 	 * Add a initial command to this parser.
 	 * 
 	 * @param marker
-	 *                The key that marks the command.
+	 *            The key that marks the command.
 	 * 
 	 * @param comm
-	 *                The command.
+	 *            The command.
 	 */
 	public void addInitialCommand(K marker, NullCommand<K, V, C> comm) {
 		nullCommands.put(marker, comm);