summaryrefslogtreecommitdiff
path: root/BJC-Utils2/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'BJC-Utils2/src/main/java')
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/data/Tree.java78
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java15
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/LeftCommands.java11
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/StringToken.java27
4 files changed, 77 insertions, 54 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
index cf4d1fb..cef9d51 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
@@ -74,7 +74,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
children = new FunctionalList<>();
- for(ITree<ContainedType> child : childrn) {
+ for (ITree<ContainedType> child : childrn) {
children.add(child);
childCount++;
@@ -83,7 +83,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public void addChild(ITree<ContainedType> child) {
- if(hasChildren == false) {
+ if (hasChildren == false) {
hasChildren = true;
children = new FunctionalList<>();
@@ -104,14 +104,14 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public void doForChildren(Consumer<ITree<ContainedType>> action) {
- if(childCount > 0) {
+ if (childCount > 0) {
children.forEach(action);
}
}
@Override
public ITree<ContainedType> flatMapTree(Function<ContainedType, ITree<ContainedType>> mapper) {
- if(hasChildren) {
+ if (hasChildren) {
ITree<ContainedType> flatMappedData = mapper.apply(data);
children.map((child) -> child.flatMapTree(mapper))
@@ -130,11 +130,14 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
protected <NewType> NewType internalCollapse(Function<ContainedType, NewType> leafTransform,
Function<ContainedType, Function<IList<NewType>, NewType>> nodeCollapser) {
- if(hasChildren) {
+ if (hasChildren) {
Function<IList<NewType>, NewType> nodeTransformer = nodeCollapser.apply(data);
IList<NewType> collapsedChildren = children.map((child) -> {
- return child.collapse(leafTransform, nodeCollapser, (subTreeVal) -> subTreeVal);
+ NewType collapsed = child.collapse(leafTransform, nodeCollapser,
+ (subTreeVal) -> subTreeVal);
+
+ return collapsed;
});
return nodeTransformer.apply(collapsedChildren);
@@ -144,7 +147,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
}
protected void internalToString(StringBuilder builder, int indentLevel, boolean initial) {
- for(int i = 0; i < indentLevel; i++) {
+ for (int i = 0; i < indentLevel; i++) {
builder.append(">\t");
}
@@ -154,7 +157,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
builder.append(data == null ? "(null)" : data.toString());
builder.append("\n");
- if(hasChildren) {
+ if (hasChildren) {
children.forEach((child) -> {
((Tree<ContainedType>) child).internalToString(builder, indentLevel + 1, false);
});
@@ -164,7 +167,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public <MappedType> ITree<MappedType> rebuildTree(Function<ContainedType, MappedType> leafTransformer,
Function<ContainedType, MappedType> operatorTransformer) {
- if(hasChildren) {
+ if (hasChildren) {
IList<ITree<MappedType>> mappedChildren = children.map((child) -> {
return child.rebuildTree(leafTransformer, operatorTransformer);
});
@@ -177,7 +180,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public void selectiveTransform(Predicate<ContainedType> nodePicker, UnaryOperator<ContainedType> transformer) {
- if(hasChildren) {
+ if (hasChildren) {
children.forEach((child) -> child.selectiveTransform(nodePicker, transformer));
} else {
data = transformer.apply(data);
@@ -189,11 +192,11 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
UnaryOperator<ITree<ContainedType>> transformer) {
TopDownTransformResult transformResult = transformPicker.apply(data);
- switch(transformResult) {
+ switch (transformResult) {
case PASSTHROUGH:
ITree<ContainedType> result = new Tree<>(data);
- if(hasChildren) {
+ if (hasChildren) {
children.forEach((child) -> {
result.addChild(child.topDownTransform(transformPicker, transformer));
});
@@ -209,7 +212,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
case PUSHDOWN:
result = new Tree<>(data);
- if(hasChildren) {
+ if (hasChildren) {
children.forEach((child) -> {
result.addChild(child.topDownTransform(transformPicker, transformer));
});
@@ -246,7 +249,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public <TransformedType> TransformedType transformChild(int childNo,
Function<ITree<ContainedType>, TransformedType> transformer) {
- if(childNo < 0 || childNo > childCount - 1)
+ if (childNo < 0 || childNo > childCount - 1)
throw new IllegalArgumentException("Child index #" + childNo + " is invalid");
return transformer.apply(children.getByIndex(childNo));
@@ -259,7 +262,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public <MappedType> ITree<MappedType> transformTree(Function<ContainedType, MappedType> transformer) {
- if(hasChildren) {
+ if (hasChildren) {
IList<ITree<MappedType>> transformedChildren = children
.map((child) -> child.transformTree(transformer));
@@ -271,11 +274,12 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public void traverse(TreeLinearizationMethod linearizationMethod, Consumer<ContainedType> action) {
- if(hasChildren) {
- switch(linearizationMethod) {
+ if (hasChildren) {
+ switch (linearizationMethod) {
case INORDER:
- if(childCount != 2) throw new IllegalArgumentException(
- "Can only do in-order traversal for binary trees.");
+ if (childCount != 2)
+ throw new IllegalArgumentException(
+ "Can only do in-order traversal for binary trees.");
children.getByIndex(0).traverse(linearizationMethod, action);
@@ -316,32 +320,40 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public boolean equals(Object obj) {
- if(this == obj) return true;
- if(obj == null) return false;
- if(getClass() != obj.getClass()) return false;
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
Tree<?> other = (Tree<?>) obj;
- if(data == null) {
- if(other.data != null) return false;
- } else if(!data.equals(other.data)) return false;
+ if (data == null) {
+ if (other.data != null)
+ return false;
+ } else if (!data.equals(other.data))
+ return false;
- if(childCount != other.childCount) return false;
+ if (childCount != other.childCount)
+ return false;
- if(children == null) {
- if(other.children != null) return false;
- } else if(!children.equals(other.children)) return false;
+ if (children == null) {
+ if (other.children != null)
+ return false;
+ } else if (!children.equals(other.children))
+ return false;
return true;
}
@Override
public int revFind(Predicate<ITree<ContainedType>> childPred) {
- if(childCount == 0) {
+ if (childCount == 0) {
return -1;
} else {
- for(int i = childCount - 1; i >= 0; i--) {
- if(childPred.test(getChild(i))) {
+ for (int i = childCount - 1; i >= 0; i--) {
+ if (childPred.test(getChild(i))) {
return i;
}
}
@@ -352,7 +364,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
@Override
public void prependChild(ITree<ContainedType> child) {
- if(hasChildren == false) {
+ if (hasChildren == false) {
hasChildren = true;
children = new FunctionalList<>();
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
index b142948..51be875 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java
@@ -22,9 +22,10 @@ public class StringUtils {
* of the provided regex
*/
public static boolean containsOnly(String input, String regex) {
- if(input == null)
+ if (input == null)
throw new NullPointerException("Input must not be null");
- else if(regex == null) throw new NullPointerException("Regex must not be null");
+ else if (regex == null)
+ throw new NullPointerException("Regex must not be null");
/*
* This regular expression is fairly simple.
@@ -46,7 +47,7 @@ public class StringUtils {
* The number of levels to indent
*/
public static void indentNLevels(StringBuilder builder, int levels) {
- for(int i = 0; i < levels; i++) {
+ for (int i = 0; i < levels; i++) {
builder.append("\t");
}
}
@@ -80,7 +81,7 @@ public class StringUtils {
* @return
*/
public static String toEnglishList(Object[] objects, String join, String comma) {
- if(objects == null) {
+ if (objects == null) {
throw new NullPointerException("Sequence must not be null");
}
@@ -89,7 +90,7 @@ public class StringUtils {
String joiner = join;
String coma = comma;
- switch(objects.length) {
+ switch (objects.length) {
case 0:
/*
* Empty list.
@@ -113,7 +114,7 @@ public class StringUtils {
/*
* Three or more items.
*/
- for(int i = 0; i < objects.length - 1; i++) {
+ for (int i = 0; i < objects.length - 1; i++) {
sb.append(objects[i].toString());
sb.append(coma + " ");
}
@@ -157,7 +158,7 @@ public class StringUtils {
* @return
*/
public static String toEnglishList(Object[] objects, boolean and) {
- if(and) {
+ if (and) {
return toEnglishList(objects, "and");
} else {
return toEnglishList(objects, "or");
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/LeftCommands.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/LeftCommands.java
index 30f3af8..5844c49 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/LeftCommands.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/LeftCommands.java
@@ -130,8 +130,11 @@ public class LeftCommands {
private boolean nonassoc;
- public TernaryCommand(int leftPower, K terminator, Token<K, V> mark, boolean isNonassoc) {
+ public TernaryCommand(int leftPower, K terminator, Token<K, V> marker, boolean isNonassoc) {
super(leftPower);
+
+ term = terminator;
+ mark = marker;
nonassoc = isNonassoc;
}
@@ -150,10 +153,10 @@ public class LeftCommands {
@Override
public int nextBinding() {
- if(nonassoc) {
+ if (nonassoc) {
return leftBinding() - 1;
} else {
- return super.nextBinding();
+ return leftBinding();
}
}
}
@@ -177,7 +180,7 @@ public class LeftCommands {
ITree<Token<K, V>> res = new Tree<>(operator, operand, tree);
- if(chainWith.contains(ctx.tokens.current().getKey())) {
+ if (chainWith.contains(ctx.tokens.current().getKey())) {
Token<K, V> tok = ctx.tokens.current();
ctx.tokens.next();
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/StringToken.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/StringToken.java
index 957e6fa..74f9c63 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/StringToken.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/StringToken.java
@@ -47,25 +47,32 @@ public class StringToken implements Token<String, String> {
@Override
public boolean equals(Object obj) {
- if(this == obj) return true;
- if(obj == null) return false;
- if(!(obj instanceof StringToken)) return false;
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof StringToken))
+ return false;
StringToken other = (StringToken) obj;
- if(key == null) {
- if(other.key != null) return false;
- } else if(!key.equals(other.key)) return false;
+ if (key == null) {
+ if (other.key != null)
+ return false;
+ } else if (!key.equals(other.key))
+ return false;
- if(val == null) {
- if(other.val != null) return false;
- } else if(!val.equals(other.val)) return false;
+ if (val == null) {
+ if (other.val != null)
+ return false;
+ } else if (!val.equals(other.val))
+ return false;
return true;
}
@Override
public String toString() {
- return String.format("StringToken [key=%s, val=%s]", key, val);
+ return String.format("StringToken [key='%s', val='%s']", key, val);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-10 12:15:30 +0000