From 56f07e9a3aaa873fe385d224f088f048dbafa8f7 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 10 Apr 2017 16:49:54 -0400
Subject: Cleanup

---
 .../bjc/pratt/commands/PostCircumfixCommand.java   | 28 ++++++++++------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java')

diff --git a/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java b/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
index 6bed0ff..e7d2eea 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
@@ -9,41 +9,39 @@ import bjc.utils.parserutils.ParserException;
 
 /**
  * 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 final ParseBlock<K, V, C> innerBlock;
 
-	private Token<K, V> mark;
+	private final 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) {
+	public PostCircumfixCommand(final int precedence, final ParseBlock<K, V, C> inner, final Token<K, V> marker) {
 		super(precedence);
 
-		if (inner == null) {
-			throw new NullPointerException("Inner block must not be null");
-		}
+		if (inner == null) throw new NullPointerException("Inner block must not be null");
 
 		innerBlock = inner;
 
@@ -51,9 +49,9 @@ public class PostCircumfixCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
 	}
 
 	@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);
+	public ITree<Token<K, V>> denote(final ITree<Token<K, V>> operand, final Token<K, V> operator,
+			final ParserContext<K, V, C> ctx) throws ParserException {
+		final ITree<Token<K, V>> inside = innerBlock.parse(ctx);
 
 		return new Tree<>(mark, operand, inside);
 	}
-- 
cgit v1.2.3


From f394306a4b65a3328551f9f6b8d4abff8bfd5b27 Mon Sep 17 00:00:00 2001
From: bjculkin <bjculkin@WIT-136XG42.wvu-ad.wvu.edu>
Date: Wed, 12 Apr 2017 10:46:51 -0400
Subject: Package reorganization

---
 .../bjc/pratt/commands/PostCircumfixCommand.java   | 58 ----------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java

(limited to 'JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java')

diff --git a/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java b/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
deleted file mode 100644
index e7d2eea..0000000
--- a/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package bjc.pratt.commands;
-
-import bjc.pratt.ParseBlock;
-import bjc.pratt.ParserContext;
-import bjc.pratt.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.parserutils.ParserException;
-
-/**
- * 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 final ParseBlock<K, V, C> innerBlock;
-
-	private final 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(final int precedence, final ParseBlock<K, V, C> inner, final 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(final ITree<Token<K, V>> operand, final Token<K, V> operator,
-			final ParserContext<K, V, C> ctx) throws ParserException {
-		final ITree<Token<K, V>> inside = innerBlock.parse(ctx);
-
-		return new Tree<>(mark, operand, inside);
-	}
-}
\ No newline at end of file
-- 
cgit v1.2.3