Merge branch 'master' of ssh://10.65.77.3/home/bjculkin/git/bjc-utils2

13 files changed, 58 insertions, 12 deletions

diff --git a/BJC-Utils2/data/formats.sprop b/BJC-Utils2/data/formats.sprop
index 7d8fc94..73ebc29 100644
--- a/BJC-Utils2/data/formats.sprop
+++ b/BJC-Utils2/data/formats.sprop
@@ -1,5 +1,29 @@
 # File storage for format strings
 
+#################################################
+# Generic format strings for regular expressions.
+#################################################
+
+## Format a regular expression for matching a delimiter separated list.
+## Takes two parameters
+## 1) The expression for each term
+## 2) The expression for the delimiter
+delimSeparatedList (?:%1$s(?:%2$s%1$s)*)
+
+######################################
+# CL format string regular expressions
+######################################
+
+## Format a regular expression for matching a potential CL format directive
+## Has two parts
+## 1) The optional set of prefix parameters
+## 2) The optional modifier
+## Captures three things
+## 1) The prefix parameters
+## 2) The modifiers
+## 3) The directive name
+clFormatDirective ~(?<params>%1$s)?(?<modifiers>%2$s?)(?<name>\S)
+
 ####################################################
 # Format strings for handling double-quoted strings.
 ####################################################
diff --git a/BJC-Utils2/data/regexes.sprop b/BJC-Utils2/data/regexes.sprop
index cdacea0..dadc09c 100644
--- a/BJC-Utils2/data/regexes.sprop
+++ b/BJC-Utils2/data/regexes.sprop
@@ -34,6 +34,22 @@ fpExponent [eE][+-]?
 ## NOTE: The incomplete parts are finished by where it is inserted.
 fpLeader [\x00-\x20]*[+-]?(?:NaN|Infinity|
 
+######################################
+# CL format string regular expressions
+######################################
+
+## Matches a format string prefix parameter
+## A prefix parameter is one of
+## * A signed decimal number
+## * A single character preceded by a single quote
+## * The letter V (or v)
+## * The character #
+clFormatPrefix (?:[-+]?\d+|'\S|[Vv]|#)
+
+## Match a format string modifier
+## A modifier is either : or @, or both in either order
+clFormatModifier (?:@|:|@:|:@)
+
 ##############################################
 # Miscellaneous validation regular expressions
 ##############################################
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java b/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java
index 014458b..1b87e52 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java
@@ -13,7 +13,6 @@ import java.util.function.Function;
 /*
  * FIXME something is broken in here. fix it.
  */
-@SuppressWarnings("javadoc")
 public class TopDownTransformIterator<ContainedType> implements Iterator<ITree<ContainedType>> {
 	private final Function<ContainedType, TopDownTransformResult>							picker;
 	private final BiFunction<ITree<ContainedType>, Consumer<Iterator<ITree<ContainedType>>>, ITree<ContainedType>>	transform;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazy.java
index e5f1b95..f71d32b 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazy.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazy.java
@@ -12,7 +12,6 @@ import bjc.utils.funcdata.IList;
 /*
  * Implements a lazy holder that has been bound
  */
-@SuppressWarnings("javadoc")
 public class BoundLazy<OldType, BoundContainedType> implements IHolder<BoundContainedType> {
 	/*
 	 * The old value
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
index 9333e15..df6e60b 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
@@ -12,7 +12,6 @@ import bjc.utils.data.LazyPair;
 /*
  * Implements a lazy pair that has been bound
  */
-@SuppressWarnings("javadoc")
 public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPair<NewLeft, NewRight> {
 	/*
 	 * The supplier of the left value
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundListHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundListHolder.java
index 65a6f3d..f3799fd 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundListHolder.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundListHolder.java
@@ -10,7 +10,6 @@ import bjc.utils.funcdata.IList;
 /*
  * Holds a list, converted into a holder
  */
-@SuppressWarnings("javadoc")
 public class BoundListHolder<ContainedType> implements IHolder<ContainedType> {
 	private final IList<IHolder<ContainedType>> heldHolders;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/HalfBoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/HalfBoundLazyPair.java
index a603a7f..8cac38b 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/HalfBoundLazyPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/HalfBoundLazyPair.java
@@ -12,7 +12,6 @@ import bjc.utils.data.LazyPair;
 /*
  * A lazy pair, with only one side bound
  */
-@SuppressWarnings("javadoc")
 public class HalfBoundLazyPair<OldType, NewLeft, NewRight> implements IPair<NewLeft, NewRight> {
 	private final Supplier<OldType> oldSupplier;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedLazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedLazy.java
index d2e2b98..4175724 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedLazy.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedLazy.java
@@ -6,7 +6,6 @@ import java.util.function.UnaryOperator;
 import bjc.utils.data.IHolder;
 import bjc.utils.data.Lazy;
 
-@SuppressWarnings("javadoc")
 public class WrappedLazy<ContainedType> implements IHolder<ContainedType> {
 	private final IHolder<IHolder<ContainedType>> held;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedOption.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedOption.java
index da53ab8..512c699 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedOption.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedOption.java
@@ -6,7 +6,6 @@ import java.util.function.UnaryOperator;
 import bjc.utils.data.IHolder;
 import bjc.utils.data.Option;
 
-@SuppressWarnings("javadoc")
 public class WrappedOption<ContainedType> implements IHolder<ContainedType> {
 	private final IHolder<IHolder<ContainedType>> held;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java
new file mode 100644
index 0000000..a119c9b
--- /dev/null
+++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java
@@ -0,0 +1,14 @@
+package bjc.utils.ioutils;

+

+import bjc.utils.PropertyDB;

+

+import static bjc.utils.PropertyDB.applyFormat;

+import static bjc.utils.PropertyDB.getCompiledRegex;

+import static bjc.utils.PropertyDB.getRegex;

+

+import java.util.regex.Pattern;

+

+public class CLFormatter {

+	private static final String  prefixParam  = getRegex("clFormatPrefix");

+	private static final Pattern pPrefixParam = Pattern.compile(prefixParam);

+}

diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java
index 0ea3415..0b43f7a 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/FilteredBlockReader.java
@@ -34,11 +34,11 @@ public class FilteredBlockReader implements BlockReader {
 	 */
 	private Consumer<Block> failAction;
 
-	public FilteredBlockReader(BlockReader src, Predicate predic) {
+	public FilteredBlockReader(BlockReader src, Predicate<Block> predic) {
 		this(src, predic, null);
 	}
 
-	public FilteredBlockReader(BlockReader src, Predicate predic, Consumer<Block> failAct) {
+	public FilteredBlockReader(BlockReader src, Predicate<Block> predic, Consumer<Block> failAct) {
 		source     = src;
 		pred       = predic;
 		failAction = failAct;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java
index 6bc27b8..552b471 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/defines/IteratedDefine.java
@@ -21,13 +21,13 @@ public class IteratedDefine implements UnaryOperator<String> {
 	 * @param circular
 	 * 	Whether or not to loop through the list of replacers, or just
 	 * 	repeat the last one.
-	 * @param repls
+	 * @param replacers
 	 * 	The set of replacers to use.
 	 */
 	public IteratedDefine(Pattern pattern, boolean circular, String... replacers) {
 		patt = pattern;
 
-		repls = new CircularIterator(Arrays.asList(replacers), circular);
+		repls = new CircularIterator<>(Arrays.asList(replacers), circular);
 	}
 
 	@Override
diff --git a/BJC-Utils2/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java b/BJC-Utils2/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java
index 99593ed..6fba1b2 100644
--- a/BJC-Utils2/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java
+++ b/BJC-Utils2/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java
@@ -16,7 +16,6 @@ import org.junit.rules.ExpectedException;
 /*
  * Tests for TokenUtils
  */
-@SuppressWarnings("javadoc")
 public class TokenUtilsTest {
 	@Rule
 	public ExpectedException exp = ExpectedException.none();