summaryrefslogtreecommitdiff
path: root/dice-lang/src/bjc/dicelang/Define.java
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2017-03-06 14:15:03 -0500
committerbculkin2442 <bjculkin@mix.wvu.edu>2017-03-06 14:15:03 -0500
commit9139064c95f6c9c4f7ba1d0aea21e2f5233ad188 (patch)
treedd93017bff73e61fec20c58b7baa43d1662c0c5b /dice-lang/src/bjc/dicelang/Define.java
parentb11f8d2c92aaaf1160e69190559ffadc4774f138 (diff)
Formatting/Documentation
Diffstat (limited to 'dice-lang/src/bjc/dicelang/Define.java')
-rw-r--r--dice-lang/src/bjc/dicelang/Define.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/dice-lang/src/bjc/dicelang/Define.java b/dice-lang/src/bjc/dicelang/Define.java
index 2967af6..a70ca61 100644
--- a/dice-lang/src/bjc/dicelang/Define.java
+++ b/dice-lang/src/bjc/dicelang/Define.java
@@ -34,6 +34,11 @@ public class Define implements UnaryOperator<String> {
doRecur = recur;
subType = isSub;
+ inError = false;
+
+ /*
+ * Only try to compile non-null predicates
+ */
if(predicte != null) {
try {
predicate = Pattern.compile(predicte);
@@ -44,6 +49,9 @@ public class Define implements UnaryOperator<String> {
}
}
+ /*
+ * Compile the search pattern
+ */
try {
searcher = Pattern.compile(searchr);
} catch (PatternSyntaxException psex) {
@@ -52,8 +60,9 @@ public class Define implements UnaryOperator<String> {
return;
}
- inError = false;
-
+ /*
+ * Check whether or not we do sub-replacements
+ */
if(subType) {
if(replacrs.iterator().hasNext()) {
replacers = new CircularIterator<>(replacrs, isCircular);