update

2 files changed, 11 insertions, 13 deletions

diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java
index 3ffb4b2..8c6fd7d 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java
@@ -202,7 +202,7 @@ public class RGrammar {
 		body = body.replaceAll("([)\\]])\\s+([)\\]])", "$1$2");
 
 		/* Handle inter-word punctuation. */
-		body = body.replaceAll(" ([,:.])", "$1 ");
+		body = body.replaceAll(" ([,:.!])", "$1 ");
 
 		/* Handle intra-word punctuation. */
 		body = body.replaceAll("\\s?([-/])\\s?", "$1");
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
index 3d2c921..cf33967 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
@@ -368,19 +368,17 @@ public class RGrammarParser {
 				String ctxDelim = String.format(TMPL_TOPLEVEL_BLOCK_DELIM, level + 1);
 
 				try (BlockReader bodyReader = new SimpleBlockReader(ctxDelim, ctxReader)) {
-
+					Block whereBody = whereReader.next();
+
+					/**
+					 * @TODO 10/11/17 Ben Culkin :WhereBlocks
+					 * 	Implement where blocks. 
+					 *
+					 * 	A where block has the context evaluated
+					 * 	in a new context, and the body executed
+					 * 	in that context.
+					 */
 				}
-
-				Block whereBody = whereReader.next();
-
-				/**
-				 * @TODO 10/11/17 Ben Culkin :WhereBlocks
-				 * 	Implement where blocks. 
-				 *
-				 * 	A where block has the context evaluated
-				 * 	in a new context, and the body executed
-				 * 	in that context.
-				 */
 			} catch (GrammarException gex) {
 				throw new GrammarException(String.format("Error in where block (%s)",
 				                           whereReader.getBlock()), gex);