diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-04-08 13:28:09 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-04-08 13:28:09 -0400 |
| commit | 275a627719fc2231b16caea41130ff09f0f2b6a1 (patch) | |
| tree | 757e8ca2061ba6ed9b2063f7155edbe954b72bdb /BJC-Utils2/src/examples/java/bjc/utils | |
| parent | 79d3a4a47cbc1fcf17c77c6fc12ff826a3077bac (diff) | |
Switch functional data to use interfaces
Diffstat (limited to 'BJC-Utils2/src/examples/java/bjc/utils')
4 files changed, 9 insertions, 8 deletions
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java index 5016834..1af5e30 100644 --- a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java +++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java @@ -2,8 +2,8 @@ package bjc.utils.examples.parsing; import java.util.Scanner; -import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalStringTokenizer; +import bjc.utils.funcdata.IFunctionalList; import bjc.utils.parserutils.ShuntingYard; /** @@ -27,7 +27,7 @@ public class ShuntTester { ShuntingYard<String> yard = new ShuntingYard<>(); - FunctionalList<String> shuntedTokens = + IFunctionalList<String> shuntedTokens = yard.postfix(new FunctionalStringTokenizer(line) .toList((strang) -> strang), (strang) -> strang); diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java index 509c407..932e224 100644 --- a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java +++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java @@ -3,8 +3,8 @@ package bjc.utils.examples.parsing; import java.util.Scanner; import java.util.function.Predicate; -import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalStringTokenizer; +import bjc.utils.funcdata.IFunctionalList; import bjc.utils.parserutils.AST; import bjc.utils.parserutils.ShuntingYard; import bjc.utils.parserutils.TreeConstructor; @@ -30,7 +30,7 @@ public class TreeConstructTest { ShuntingYard<String> yard = new ShuntingYard<>(); - FunctionalList<String> shuntedTokens = + IFunctionalList<String> shuntedTokens = yard.postfix(new FunctionalStringTokenizer(line) .toList((strang) -> strang), (s) -> s); diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java index 10bf131..4a03a5b 100644 --- a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java +++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java @@ -1,7 +1,7 @@ package bjc.utils.examples.rangen; -import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalStringTokenizer; +import bjc.utils.funcdata.IFunctionalList; import bjc.utils.gen.WeightedGrammar; /** @@ -83,7 +83,7 @@ public class DiabloItemGen { addInfixRules(); for (int i = 0; i < 100; i++) { - FunctionalList<String> ls = + IFunctionalList<String> ls = rules.generateListValues("<item>", " "); StringBuilder sb = new StringBuilder(); diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java index bb1f8c6..116e276 100644 --- a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java +++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java @@ -2,6 +2,7 @@ package bjc.utils.examples.rangen; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalStringTokenizer; +import bjc.utils.funcdata.IFunctionalList; import bjc.utils.gen.RandomGrammar; /** @@ -44,7 +45,7 @@ public class RandomStringExamples { "<object>"); for (int i = 0; i < 10; i++) { - FunctionalList<String> ls = rg.generateListValues("<sentance>", " "); + IFunctionalList<String> ls = rg.generateListValues("<sentance>", " "); StringBuilder sb = new StringBuilder(); @@ -55,7 +56,7 @@ public class RandomStringExamples { } private static void addRule(String rule, String... cases) { - FunctionalList<FunctionalList<String>> cses = + IFunctionalList<IFunctionalList<String>> cses = new FunctionalList<>(); for (String strang : cases) { |