summaryrefslogtreecommitdiff
path: root/clformat/src/main/java/bjc/utils
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2018-12-06 20:40:09 -0500
committerbculkin2442 <bjculkin@mix.wvu.edu>2018-12-06 20:40:09 -0500
commit48cb3c7f49c7666be48de256b38cfae7f72f2a24 (patch)
treeaa112b405ad6090fa0ffd91ecd7bd7356168bbf4 /clformat/src/main/java/bjc/utils
parent0aea3b65cc504643183569ad70e55f4f8769ea32 (diff)
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.
Diffstat (limited to 'clformat/src/main/java/bjc/utils')
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java1
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java1
2 files changed, 2 insertions, 0 deletions
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");