Source cleanup

1 files changed, 12 insertions, 13 deletions

diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarTest.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarTest.java
index 97440f6..cdbba09 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarTest.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarTest.java
@@ -10,21 +10,20 @@ import java.nio.file.Paths;
  * Test for new grammar syntax.
  *
  * @author EVE
- *
  */
 public class RGrammarTest {
 	/**
 	 * Main method.
 	 *
 	 * @param args
-	 *                Unused CLI args.
+	 * 	Unused CLI args.
 	 */
 	public static void main(String[] args) {
 		URL rsc = RGrammarTest.class.getResource("/server-config-sample.cfg");
 
 		try {
 			/* Load a grammar set. */
-			Path cfgPath        = Paths.get(rsc.toURI());
+			Path        cfgPath = Paths.get(rsc.toURI());
 			RGrammarSet gramSet = RGrammarSet.fromConfigFile(cfgPath);
 
 			/* Generate rule suggestions for all the grammars in the set. */
@@ -34,24 +33,25 @@ public class RGrammarTest {
 
 			/* Generate for each exported rule. */
 			for (String exportName : gramSet.getExportedRules()) {
-				RGrammar grammar = gramSet.getExportSource(exportName);
+				/* Where we loaded the rule from. */
+				String loadSrc = gramSet.loadedFrom(gramSet.exportedFrom(exportName));
 
-				for (int i = 0; i < 10; i++) {
+				System.out.println();
+				System.out.printf("Generating for exported rule '%s' from file '%s'\n", exportName, loadSrc);
+
+				RGrammar grammar = gramSet.getExportSource(exportName);
+				for (int i = 0; i < 100; i++) {
 					try {
-						System.out.printf("Generating for exported rule '%s'\n", exportName);
 						String res = grammar.generate(exportName);
+						if(exportName.contains("+")) res = res.replaceAll("\\s+", "");
+
 						System.out.printf("\tContents: %s\n", res);
 					} catch (GrammarException gex) {
-						/* 
-						 * Print out errors with generation.
-						 */
+						/* Print out errors with generation. */
 						String fmt     = "Error in exported rule '%s' (loaded from '%s')\n";
-						String loadSrc = gramSet.loadedFrom(gramSet.exportedFrom(exportName));
 						
 						System.out.printf(fmt, exportName, loadSrc);
-
 						System.out.println();
-
 						gex.printStackTrace();
 
 						System.out.println();
@@ -59,7 +59,6 @@ public class RGrammarTest {
 					}
 				}
 			}
-
 		} catch (IOException ioex) {
 			ioex.printStackTrace();
 		} catch (URISyntaxException urisex) {