From 251419e1f0ab8eb04d21287b708b06a552f4c58a Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 10 Apr 2017 16:49:31 -0400
Subject: Warning resolution

---
 JPratt/src/main/java/bjc/pratt/ParserContext.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/JPratt/src/main/java/bjc/pratt/ParserContext.java b/JPratt/src/main/java/bjc/pratt/ParserContext.java
index f5e22ba..1697a12 100644
--- a/JPratt/src/main/java/bjc/pratt/ParserContext.java
+++ b/JPratt/src/main/java/bjc/pratt/ParserContext.java
@@ -30,18 +30,18 @@ public class ParserContext<K, V, C> {
 	/**
 	 * Create a new parser context.
 	 * 
-	 * @param tokens
+	 * @param tokns
 	 *                The source of tokens.
 	 * 
-	 * @param parse
+	 * @param prse
 	 *                The parser to call for sub expressions.
 	 * 
-	 * @param state
+	 * @param stte
 	 *                Any state needing to be kept during parsing.
 	 */
-	public ParserContext(TokenStream<K, V> tokens, PrattParser<K, V, C> parse, C state) {
-		this.tokens = tokens;
-		this.parse = parse;
-		this.state = state;
+	public ParserContext(TokenStream<K, V> tokns, PrattParser<K, V, C> prse, C stte) {
+		this.tokens = tokns;
+		this.parse = prse;
+		this.state = stte;
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3


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

---
 JPratt/src/main/java/bjc/pratt/ParserContext.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/JPratt/src/main/java/bjc/pratt/ParserContext.java b/JPratt/src/main/java/bjc/pratt/ParserContext.java
index 1697a12..162c5cf 100644
--- a/JPratt/src/main/java/bjc/pratt/ParserContext.java
+++ b/JPratt/src/main/java/bjc/pratt/ParserContext.java
@@ -2,14 +2,14 @@ package bjc.pratt;
 
 /**
  * Represents the contextual state passed to a command.
- * 
+ *
  * @author EVE
  *
  * @param <K>
  *                The key type of the tokens.
  * @param <V>
  *                The value type of the tokens.
- * 
+ *
  * @param <C>
  *                The state type of the parser.
  */
@@ -29,17 +29,17 @@ public class ParserContext<K, V, C> {
 
 	/**
 	 * Create a new parser context.
-	 * 
+	 *
 	 * @param tokns
 	 *                The source of tokens.
-	 * 
+	 *
 	 * @param prse
 	 *                The parser to call for sub expressions.
-	 * 
+	 *
 	 * @param stte
 	 *                Any state needing to be kept during parsing.
 	 */
-	public ParserContext(TokenStream<K, V> tokns, PrattParser<K, V, C> prse, C stte) {
+	public ParserContext(final TokenStream<K, V> tokns, final PrattParser<K, V, C> prse, final C stte) {
 		this.tokens = tokns;
 		this.parse = prse;
 		this.state = stte;
-- 
cgit v1.2.3


From 694bed833470393ee00eae0a85bff0c6c90e692a Mon Sep 17 00:00:00 2001
From: bjculkin <bjculkin@WIT-136XG42.wvu-ad.wvu.edu>
Date: Wed, 12 Apr 2017 10:45:46 -0400
Subject: Add support for meta-commands

Meta-commands allow you to implement meta-operators, whose behavior
changes based off of tokens that follow.
---
 JPratt/src/main/java/bjc/pratt/ParserContext.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

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

diff --git a/JPratt/src/main/java/bjc/pratt/ParserContext.java b/JPratt/src/main/java/bjc/pratt/ParserContext.java
index 162c5cf..9007f79 100644
--- a/JPratt/src/main/java/bjc/pratt/ParserContext.java
+++ b/JPratt/src/main/java/bjc/pratt/ParserContext.java
@@ -17,15 +17,22 @@ public class ParserContext<K, V, C> {
 	/**
 	 * The source of tokens.
 	 */
-	public TokenStream<K, V>	tokens;
+	public TokenStream<K, V> tokens;
+
 	/**
 	 * The parser for sub-expressions.
 	 */
-	public PrattParser<K, V, C>	parse;
+	public PrattParser<K, V, C> parse;
+
 	/**
 	 * The state of the parser.
 	 */
-	public C			state;
+	public C state;
+
+	/**
+	 * The initial command for the current expression.
+	 */
+	public K initial;
 
 	/**
 	 * Create a new parser context.
@@ -40,8 +47,8 @@ public class ParserContext<K, V, C> {
 	 *                Any state needing to be kept during parsing.
 	 */
 	public ParserContext(final TokenStream<K, V> tokns, final PrattParser<K, V, C> prse, final C stte) {
-		this.tokens = tokns;
-		this.parse = prse;
-		this.state = stte;
+		tokens = tokns;
+		parse = prse;
+		state = stte;
 	}
 }
\ No newline at end of file
-- 
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

---
 JPratt/src/main/java/bjc/pratt/ParserContext.java | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/JPratt/src/main/java/bjc/pratt/ParserContext.java b/JPratt/src/main/java/bjc/pratt/ParserContext.java
index 9007f79..1e0b054 100644
--- a/JPratt/src/main/java/bjc/pratt/ParserContext.java
+++ b/JPratt/src/main/java/bjc/pratt/ParserContext.java
@@ -1,5 +1,7 @@
 package bjc.pratt;
 
+import bjc.pratt.tokens.TokenStream;
+
 /**
  * Represents the contextual state passed to a command.
  *
-- 
cgit v1.2.3