From 96351c90e992cdbba7fbcce52fbb12eb9b28e147 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Tue, 29 Sep 2015 16:18:25 -0400
Subject: Update to new version of BJC-Utils.

---
 RGens/pom.xml                                         |  4 ++--
 RGens/src/main/java/bjc/RGens/ZadronsPouch.java       | 15 +++++----------
 RGens/src/main/java/bjc/RGens/text/GrammarReader.java |  6 ++----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/RGens/pom.xml b/RGens/pom.xml
index c81ba67..d04a3a4 100644
--- a/RGens/pom.xml
+++ b/RGens/pom.xml
@@ -23,8 +23,8 @@
     </dependency>
     <dependency>
     	<groupId>bjc</groupId>
-    	<artifactId>BJC-Utils</artifactId>
-    	<version>0.0.2-SNAPSHOT</version>
+    	<artifactId>BJC-Utils2</artifactId>
+    	<version>0.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/RGens/src/main/java/bjc/RGens/ZadronsPouch.java b/RGens/src/main/java/bjc/RGens/ZadronsPouch.java
index 1076599..fd2b65c 100644
--- a/RGens/src/main/java/bjc/RGens/ZadronsPouch.java
+++ b/RGens/src/main/java/bjc/RGens/ZadronsPouch.java
@@ -1,9 +1,7 @@
 package bjc.RGens;
 
-import java.util.StringTokenizer;
-
-import bjc.utils.FunctionalStringTokenizer;
-import bjc.utils.data.FunctionalList;
+import bjc.utils.funcdata.FunctionalStringTokenizer;
+import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.gen.RandomGrammar;
 
 public class ZadronsPouch {
@@ -155,12 +153,9 @@ public class ZadronsPouch {
 	private void addRule(String rule, String... cases) {
 		FunctionalList<FunctionalList<String>> cses = new FunctionalList<>();
 
-		for (String string : cases) {
-			cses.add(
-					FunctionalList.fromString(
-							new FunctionalStringTokenizer(
-									new StringTokenizer(string, " ")),
-							s -> s));
+		for (String strang : cases) {
+			cses.add(FunctionalStringTokenizer.fromString(strang)
+					.toList(s -> s));
 		}
 
 		wg.makeRule(rule, cses);
diff --git a/RGens/src/main/java/bjc/RGens/text/GrammarReader.java b/RGens/src/main/java/bjc/RGens/text/GrammarReader.java
index bf03989..df633de 100644
--- a/RGens/src/main/java/bjc/RGens/text/GrammarReader.java
+++ b/RGens/src/main/java/bjc/RGens/text/GrammarReader.java
@@ -9,8 +9,7 @@ import java.util.Scanner;
 import java.util.StringTokenizer;
 import java.util.function.BiConsumer;
 
-import bjc.utils.FunctionalStringTokenizer;
-import bjc.utils.data.FunctionalList;
+import bjc.utils.funcdata.FunctionalStringTokenizer;
 import bjc.utils.gen.WeightedGrammar;
 
 public class GrammarReader {
@@ -37,8 +36,7 @@ public class GrammarReader {
 			prob = Integer.parseInt(stk.nextToken());
 		}
 
-		rs.getRules().addCase(rs.getRule(), prob, FunctionalList
-				.fromString(new FunctionalStringTokenizer(stk), s -> s));
+		rs.getRules().addCase(rs.getRule(), prob, new FunctionalStringTokenizer(stk).toList(s -> s));
 	}
 
 	private static void doPragmas(StringTokenizer stk, ReaderState rs) {
-- 
cgit v1.2.3