Misc Updates

4 files changed, 126 insertions, 1 deletions

diff --git a/base/src/examples/java/bjc/utils/examples/cli/package-info.java b/base/src/examples/java/bjc/utils/examples/cli/package-info.java
new file mode 100644
index 0000000..29ca4a4
--- /dev/null
+++ b/base/src/examples/java/bjc/utils/examples/cli/package-info.java
@@ -0,0 +1 @@
+package bjc.utils.examples.cli;
\ No newline at end of file
diff --git a/base/src/main/java/bjc/utils/graph/AlgGraph.java b/base/src/main/java/bjc/utils/graph/AlgGraph.java
index 7c9d38d..96a984f 100644
--- a/base/src/main/java/bjc/utils/graph/AlgGraph.java
+++ b/base/src/main/java/bjc/utils/graph/AlgGraph.java
@@ -1,6 +1,6 @@
 package bjc.utils.graph;
 
-import bjc.functypes.Container;
+import bjc.typeclasses.Container;
 
 /**
  * A directed algebraic graph
diff --git a/base/src/main/java/bjc/utils/ioutils/blocks/MLPromptBlockReader.java b/base/src/main/java/bjc/utils/ioutils/blocks/MLPromptBlockReader.java
new file mode 100644
index 0000000..981c5aa
--- /dev/null
+++ b/base/src/main/java/bjc/utils/ioutils/blocks/MLPromptBlockReader.java
@@ -0,0 +1,102 @@
+package bjc.utils.ioutils.blocks;
+
+import java.io.*;
+import java.util.Scanner;
+
+/**
+ * A block reader that uses bash-style multi-line prompts to read blocks.
+ * 
+ * The format of the blocks returned by this is indented blocks <code> x y z a b
+ * 
+ * c -- block split here d <code>
+ * 
+ * @author bjcul
+ *
+ */
+public class MLPromptBlockReader implements BlockReader {
+	private String firstPrompt;
+	private String secondPrompt;
+
+	private Scanner input;
+	private Writer output;
+
+	private Block currBlock;
+	
+	/* Info about the current block. */
+	private int blockNo = 0;
+	private int lineNo  = 1;
+	
+	private String nextInitLine;
+	/**
+	 * Create a new multi-line prompt block reader.
+	 * 
+	 * @param firstPrompt  The initial prompt. Is treated as a format string, with
+	 *                     %1 being the block number and %2 being the line number
+	 * @param secondPrompt The secondary prompt. Is also treated as a format string
+	 *                     with %1 and %2 as firstPrompt, and %3 as the continuation line
+	 *                     number
+	 * 
+	 * @param input        The input source
+	 * @param output       The output destination
+	 */
+	public MLPromptBlockReader(String firstPrompt, String secondPrompt, Reader input, Writer output) {
+		this.firstPrompt = firstPrompt;
+		this.secondPrompt = secondPrompt;
+		this.input = new Scanner(input);
+		this.output = output;
+	}
+
+	@Override
+	public boolean hasNextBlock() {
+		return input.hasNextLine();
+	}
+
+	@Override
+	public Block getBlock() {
+		return currBlock;
+	}
+
+	@Override
+	public boolean nextBlock() {
+		StringBuilder blockContents = new StringBuilder();
+		
+		String currLn;
+		if (nextInitLine == null) {
+			try {
+				output.write(String.format(firstPrompt, blockNo, lineNo));
+			} catch (IOException ioex) {
+				throw new RuntimeException(ioex);
+			}
+			currLn = input.nextLine();
+		} else {
+			currLn = nextInitLine;
+		}
+		
+		blockContents.append(currLn);
+		
+		int startLn = lineNo;
+		int endLn = lineNo++;
+		
+		boolean inBlock = true;
+		while(input.hasNextLine() && inBlock) {
+			currLn = input.nextLine();
+			
+			int initCh = currLn.codePointAt(0);
+			inBlock = Character.isSpaceChar(initCh);
+		}
+		
+		currBlock = new Block(blockNo++, blockContents.toString(), startLn, endLn);
+		return true;
+	}
+
+	@Override
+	public int getBlockCount() {
+		return blockNo;
+	}
+
+	@Override
+	public void close() throws IOException {
+		input.close();
+	}
+
+}
diff --git a/base/src/test/java/bjc/utils/test/ioutils/blocks/MLPromptBlockReaderTest.java b/base/src/test/java/bjc/utils/test/ioutils/blocks/MLPromptBlockReaderTest.java
new file mode 100644
index 0000000..599d5a4
--- /dev/null
+++ b/base/src/test/java/bjc/utils/test/ioutils/blocks/MLPromptBlockReaderTest.java
@@ -0,0 +1,22 @@
+package bjc.utils.test.ioutils.blocks;
+
+import static org.junit.Assert.*;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import org.junit.Test;
+
+import bjc.utils.ioutils.blocks.MLPromptBlockReader;
+
+public class MLPromptBlockReaderTest {
+
+	@Test
+	public void test() {
+		StringReader reader = new StringReader("");
+		StringWriter writer = new StringWriter();
+		
+		MLPromptBlockReader blocker = new MLPromptBlockReader("%1:%2> ", "%3... ", reader, writer);
+	}
+
+}