From 48cb3c7f49c7666be48de256b38cfae7f72f2a24 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 6 Dec 2018 20:40:09 -0500 Subject: Finish conversion to iterators Swapped to using an iterator that internally uses a matcher, instead of a direct iterator. This is so as to make it easier to convert to a non-matcher based iterator at some point. --- .../java/bjc/utils/ioutils/format/directives/ConditionalDirective.java | 1 + .../java/bjc/utils/ioutils/format/directives/IterationDirective.java | 1 + 2 files changed, 2 insertions(+) (limited to 'clformat/src/main/java/bjc/utils/ioutils/format') diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java index 2cbd513..55660ec 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java @@ -37,6 +37,7 @@ public class ConditionalDirective implements Directive { } Matcher dirMat = CLPattern.getDirectiveMatcher(direc); + dirMat.find(); /* Process a list of clauses. */ String dirName = dirMat.group("name"); String dirMods = dirMat.group("modifiers"); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java index 4184c76..b4d7c33 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java @@ -32,6 +32,7 @@ public class IterationDirective implements Directive { } Matcher dirMat = CLPattern.getDirectiveMatcher(direc); + dirMat.find(); /* Process a list of clauses. */ String dirName = dirMat.group("name"); -- cgit v1.2.3