diff options
Diffstat (limited to 'clformat/src/main')
6 files changed, 45 insertions, 35 deletions
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java index 428e488..2f57b9f 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java @@ -3,6 +3,7 @@ package bjc.utils.ioutils.format.directives; import java.io.IOException; import bjc.utils.ioutils.format.CLFormatter; +import bjc.utils.ioutils.format.CLParameters; /** * Implementation of the A directive. @@ -14,22 +15,22 @@ public class AestheticDirective implements Directive { @Override public void format(FormatParameters dirParams) throws IOException { - // System.err.printf("Aesthetic directive with item \"%s\" and params: %s\n", item, tParams); CLFormatter.checkItem(dirParams.item, 'A'); int mincol = 0, colinc = 1, minpad = 0; char padchar = ' '; - if (dirParams.arrParams.length() == 0) { + CLParameters params = dirParams.arrParams; + if (params.length() == 0) { // Zero parameters, use all defaults - } else if (dirParams.arrParams.length() == 1) { - mincol = dirParams.arrParams.getIntDefault(0, "minimum column count", "A", 0); - } else if (dirParams.arrParams.length() < 4) { + } else if (params.length() == 1) { + mincol = params.getIntDefault(0, "minimum column count", "A", 0); + } else if (params.length() < 4) { throw new IllegalArgumentException("Must provide either zero, one or four arguments to A directive"); } else { - colinc = dirParams.arrParams.getIntDefault(1, "padding increment", "A", 1); - minpad = dirParams.arrParams.getIntDefault(2, "minimum amount of padding", "A", 0); - padchar = dirParams.arrParams.getCharDefault(3, "padding character", "A", ' '); + colinc = params.getIntDefault(1, "padding increment", "A", 1); + minpad = params.getIntDefault(2, "minimum amount of padding", "A", 0); + padchar = params.getCharDefault(3, "padding character", "A", ' '); } StringBuilder work = new StringBuilder(); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java index f983a5a..cb1fa29 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java @@ -1,5 +1,6 @@ package bjc.utils.ioutils.format.directives; +import bjc.utils.ioutils.format.CLParameters; import bjc.utils.ioutils.format.EscapeException; /** @@ -15,26 +16,27 @@ public class EscapeDirective implements Directive { if (dirParams.mods.dollarMod) dirParams.tParams.right(); - switch(dirParams.arrParams.length()) { + CLParameters params = dirParams.arrParams; + switch(params.length()) { case 0: shouldExit = dirParams.tParams.atEnd(); break; case 1: - int num = dirParams.arrParams.getInt(0, "condition count", "^"); + int num = params.getInt(0, "condition count", "^"); shouldExit = num == 0; break; case 2: - int left = dirParams.arrParams.getInt(0, "left-hand condition", "^"); - int right = dirParams.arrParams.getInt(1, "right-hand condition", "^"); + int left = params.getInt(0, "left-hand condition", "^"); + int right = params.getInt(1, "right-hand condition", "^"); shouldExit = left == right; break; case 3: default: - int low = dirParams.arrParams.getInt(0, "lower-bound condition", "^"); - int mid = dirParams.arrParams.getInt(1, "interval condition", "^"); - int high = dirParams.arrParams.getInt(2, "upper-bound condition", "^"); + int low = params.getInt(0, "lower-bound condition", "^"); + int mid = params.getInt(1, "interval condition", "^"); + int high = params.getInt(2, "upper-bound condition", "^"); shouldExit = (low <= mid) && (mid <= high); break; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java index 7fe4557..7f140b5 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java @@ -1,5 +1,7 @@ package bjc.utils.ioutils.format.directives; +import bjc.utils.ioutils.format.CLParameters; + /** * Implement the * directive. * @@ -10,25 +12,26 @@ public class GotoDirective implements Directive { @Override public void format(FormatParameters dirParams) { + CLParameters clParameters = dirParams.arrParams; if (dirParams.mods.colonMod) { int num = 1; - if (dirParams.arrParams.length() >= 1) { - num = dirParams.arrParams.getIntDefault(0, "number of arguments backward", "*", 1); + if (clParameters.length() >= 1) { + num = clParameters.getIntDefault(0, "number of arguments backward", "*", 1); } dirParams.tParams.left(num); } else if (dirParams.mods.atMod) { int num = 0; - if (dirParams.arrParams.length() >= 1) { - num = dirParams.arrParams.getIntDefault(0, "argument index", "*", 0); + if (clParameters.length() >= 1) { + num = clParameters.getIntDefault(0, "argument index", "*", 0); } dirParams.tParams.first(); dirParams.tParams.right(num); } else { int num = 1; - if (dirParams.arrParams.length() >= 1) { - num = dirParams.arrParams.getIntDefault(0, "number of arguments forward", "*", 1); + if (clParameters.length() >= 1) { + num = clParameters.getIntDefault(0, "number of arguments forward", "*", 1); } dirParams.tParams.right(num); 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 fb77a34..fcdb263 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 @@ -62,8 +62,9 @@ public class IterationDirective implements Directive { int maxItr = Integer.MAX_VALUE; - if (dirParams.arrParams.length() > 0) { - maxItr = dirParams.arrParams.getInt(0, "maximum iterations", "{"); + CLParameters clParameters = dirParams.arrParams; + if (clParameters.length() > 0) { + maxItr = clParameters.getInt(0, "maximum iterations", "{"); } int numItr = 0; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java index 7de8fb0..d6197da 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java @@ -1,6 +1,7 @@ package bjc.utils.ioutils.format.directives; import bjc.utils.ioutils.format.CLFormatter; +import bjc.utils.ioutils.format.CLParameters; import bjc.utils.math.NumberUtils; import java.io.IOException; @@ -27,7 +28,8 @@ public class RadixDirective extends GeneralNumberDirective { */ long val = ((Number) dirParams.item).longValue(); - if (dirParams.arrParams.length() == 0) { + CLParameters clParameters = dirParams.arrParams; + if (clParameters.length() == 0) { if (dirParams.mods.atMod) { dirParams.rw.write(NumberUtils.toRoman(val, dirParams.mods.colonMod)); } else if (dirParams.mods.colonMod) { @@ -36,12 +38,12 @@ public class RadixDirective extends GeneralNumberDirective { dirParams.rw.write(NumberUtils.toCardinal(val)); } } else { - if (dirParams.arrParams.length() < 1) + if (clParameters.length() < 1) throw new IllegalArgumentException("R directive requires at least one parameter, the radix"); - int radix = dirParams.arrParams.getInt(0, "radix", "R"); + int radix = clParameters.getInt(0, "radix", "R"); - handleNumberDirective(dirParams.rw, dirParams.mods, dirParams.arrParams, 0, val, radix); + handleNumberDirective(dirParams.rw, dirParams.mods, clParameters, 0, val, radix); } dirParams.tParams.right(); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java index 2a42158..332d7e2 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java @@ -15,15 +15,16 @@ public class TabulateDirective implements Directive { } + CLParameters params = dirParams.arrParams; if (dirParams.mods.atMod) { int colrel = 1, colinc = 1; - if (dirParams.arrParams.length() > 2) { - colinc = dirParams.arrParams.getIntDefault(1, "column increment", "T", 1); + if (params.length() > 2) { + colinc = params.getIntDefault(1, "column increment", "T", 1); } - if (dirParams.arrParams.length() > 1) { - colrel = dirParams.arrParams.getIntDefault(0, "relative column number", "T", 1); + if (params.length() > 1) { + colrel = params.getIntDefault(0, "relative column number", "T", 1); } for (int i = 0; i < colrel; i++) { @@ -40,12 +41,12 @@ public class TabulateDirective implements Directive { } else { int colnum = 1, colinc = 1; - if (dirParams.arrParams.length() > 2) { - colinc = dirParams.arrParams.getIntDefault(1, "column increment", "T", 1); + if (params.length() > 2) { + colinc = params.getIntDefault(1, "column increment", "T", 1); } - if (dirParams.arrParams.length() > 1) { - colnum = dirParams.arrParams.getIntDefault(0, "column number", "T", 1); + if (params.length() > 1) { + colnum = params.getIntDefault(0, "column number", "T", 1); } if (currCol < colnum) { |