More work on parse blocks

1 files changed, 4 insertions, 11 deletions

diff --git a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
index db94034..0fb5097 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
@@ -34,16 +34,14 @@ public class SimpleParseBlock<K, V, C> implements ParseBlock<K, V, C> {
 	 *
 	 * @param precedence
 	 *                The precedence of this block.
-	 *
+	 * @param validator
+	 *                The predicate to apply to blocks.
 	 * @param terminator
 	 *                The token type that terminates the block. If this is
 	 *                null, don't check for a terminator.
-	 *
-	 * @param validator
-	 *                The predicate to apply to blocks.
 	 */
-	public SimpleParseBlock(final int precedence, final K terminator,
-			final Predicate<ITree<Token<K, V>>> validator) {
+	public SimpleParseBlock(final int precedence, final Predicate<ITree<Token<K, V>>> validator,
+			final K terminator) {
 		if (precedence < 0) throw new IllegalArgumentException("Precedence must be non-negative");
 
 		pow = precedence;
@@ -92,9 +90,4 @@ public class SimpleParseBlock<K, V, C> implements ParseBlock<K, V, C> {
 
 		return true;
 	}
-
-	@Override
-	public String toString() {
-		return String.format("ParseBlock [pow=%s, term='%s']", pow, term);
-	}
 }
\ No newline at end of file