2 files changed, 142 insertions, 0 deletions
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/SimpleToken.java b/JPratt/src/main/java/bjc/pratt/tokens/SimpleToken.java
new file mode 100644
index 0000000..18e2e5a
--- /dev/null
+++ b/JPratt/src/main/java/bjc/pratt/tokens/SimpleToken.java
@@ -0,0 +1,60 @@
+package bjc.pratt.tokens;
+
+import java.util.Objects;
+
+/**
+ * Simple token implementation
+ * 
+ * @author bjcul
+ * 
+ * @param <K> The key type
+ * @param <V> The value type
+ *
+ */
+public class SimpleToken<K, V> implements Token<K, V> {
+	private K key;
+	private V value;
+	
+	/**
+	 * Create a new token
+	 * @param key The key
+	 * @param value The value
+	 */
+	public SimpleToken(K key, V value) {
+		super();
+		this.key = key;
+		this.value = value;
+	}
+
+	@Override
+	public K getKey() {
+		return key;
+	}
+
+	@Override
+	public V getValue() {
+		return value;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(key, value);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SimpleToken<?, ?> other = (SimpleToken<?, ?>) obj;
+		return Objects.equals(key, other.key) && Objects.equals(value, other.value);
+	}
+
+	@Override
+	public String toString() {
+		return "SimpleToken [key=" + key + ", value=" + value + "]";
+	}
+}
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/SimpleTokenStream.java b/JPratt/src/main/java/bjc/pratt/tokens/SimpleTokenStream.java
new file mode 100644
index 0000000..fba38bb
--- /dev/null
+++ b/JPratt/src/main/java/bjc/pratt/tokens/SimpleTokenStream.java
@@ -0,0 +1,82 @@
+package bjc.pratt.tokens;
+
+import java.util.Iterator;
+
+import bjc.data.MarkListIterator;
+
+/**
+ * Simple token stream implementation
+ * @author bjcul
+ *
+ * @param <K> The key type
+ * @param <V> The value type
+ */
+public class SimpleTokenStream<K, V> extends TokenStream<K, V> {
+	private final MarkListIterator<Token<K, V>> iter;
+
+	private Token<K, V> curr;
+
+	private Token<K, V> terminal;
+	/**
+	 * Create a new token stream from a iterator.
+	 *
+	 * @param itr The iterator to use.
+	 * @param terminal The terminal token to use for end-of-stream
+	 *
+	 */
+	public SimpleTokenStream(final Iterator<Token<K, V>> itr, Token<K, V> terminal) {
+		this.iter = new MarkListIterator<>(itr);
+		this.terminal = terminal;
+	}
+
+	@Override
+	public Token<K, V> current() {
+		// Prime stream if necessary
+		if (curr == null)
+			return next();
+		return curr;
+	}
+
+	@Override
+	public Token<K, V> next() {
+		if (iter.hasNext()) {
+			curr = iter.next();
+		} else {
+			curr = terminal;
+		}
+
+		return curr;
+	}
+
+	@Override
+	public boolean hasNext() {
+		return iter.hasNext();
+	}
+
+	@Override
+	public void mark() {
+		iter.mark();
+	}
+
+	@Override
+	public void commit() {
+		iter.commit();
+
+		if (!iter.hasMark()) {
+			// No marks outstanding; we can release the previous state
+			iter.reset();
+		}
+	}
+
+	@Override
+	public void rollback() {
+		iter.rollback();
+
+		curr = iter.current();
+	}
+
+	@Override
+	public boolean hasMark() {
+		return iter.hasMark();
+	}
+}