From a2c7425458f645802a352abc4783e0afc73dba13 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 3 Dec 2020 19:22:35 -0500 Subject: Adapt to esodata changes --- base/src/examples/java/bjc/utils/examples/ShuntTest.java | 6 +++--- .../examples/java/bjc/utils/examples/rangen/DiabloItemGen.java | 6 +++--- .../java/bjc/utils/examples/rangen/RandomStringExamples.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'base/src/examples/java') diff --git a/base/src/examples/java/bjc/utils/examples/ShuntTest.java b/base/src/examples/java/bjc/utils/examples/ShuntTest.java index b62a5a6..c5defe4 100644 --- a/base/src/examples/java/bjc/utils/examples/ShuntTest.java +++ b/base/src/examples/java/bjc/utils/examples/ShuntTest.java @@ -3,7 +3,7 @@ package bjc.utils.examples; import java.util.Scanner; import bjc.funcdata.FunctionalStringTokenizer; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; import bjc.utils.parserutils.ShuntingYard; /** @@ -27,9 +27,9 @@ public class ShuntTest { final ShuntingYard yard = new ShuntingYard<>(true); - final IList preTokens + final ListEx preTokens = new FunctionalStringTokenizer(line).toList(strang -> strang); - final IList shuntedTokens = yard.postfix(preTokens, strang -> strang); + final ListEx shuntedTokens = yard.postfix(preTokens, strang -> strang); System.out.println(shuntedTokens.toString()); diff --git a/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java index 935a189..784ff03 100644 --- a/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java +++ b/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java @@ -1,7 +1,7 @@ package bjc.utils.examples.rangen; import bjc.funcdata.FunctionalStringTokenizer; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; import bjc.utils.gen.WeightedGrammar; /** @@ -15,7 +15,7 @@ public class DiabloItemGen { private static void addCase(final String ruleName, final int probability, final String ruleParts) { - final IList parts = FunctionalStringTokenizer.fromString(ruleParts) + final ListEx parts = FunctionalStringTokenizer.fromString(ruleParts) .toList(strang -> strang); rules.addCase(ruleName, probability, parts); @@ -85,7 +85,7 @@ public class DiabloItemGen { addInfixRules(); for (int i = 0; i < 100; i++) { - final IList ls = rules.generateListValues("", " "); + final ListEx ls = rules.generateListValues("", " "); final StringBuilder sb = new StringBuilder(); ls.forEach(sb::append); diff --git a/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java b/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java index bdc4f53..8458de7 100644 --- a/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java +++ b/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java @@ -2,7 +2,7 @@ package bjc.utils.examples.rangen; import bjc.funcdata.FunctionalList; import bjc.funcdata.FunctionalStringTokenizer; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; import bjc.utils.gen.RandomGrammar; /** @@ -15,10 +15,10 @@ public class RandomStringExamples { private static RandomGrammar rg; private static void addRule(final String rule, final String... cases) { - final IList> cses = new FunctionalList<>(); + final ListEx> cses = new FunctionalList<>(); for (final String strang : cases) { - final IList lst + final ListEx lst = FunctionalStringTokenizer.fromString(strang).toList(s -> s); cses.add(lst); @@ -56,7 +56,7 @@ public class RandomStringExamples { addRule("", "", " with ", ""); for (int i = 0; i < 10; i++) { - final IList ls = rg.generateListValues("", " "); + final ListEx ls = rg.generateListValues("", " "); final StringBuilder sb = new StringBuilder(); ls.forEach(sb::append); -- cgit v1.2.3