diff options
Diffstat (limited to 'clformat/src/main/java/bjc/utils/ioutils')
17 files changed, 145 insertions, 188 deletions
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java index 59133b6..94437ee 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java @@ -97,8 +97,7 @@ public class CLTokenizer implements Iterator<Decree> { } private Decree getNext() { - if (!hasNext()) - throw new NoSuchElementException("No possible decrees remaining"); + if (!hasNext()) throw new NoSuchElementException("No possible decrees remaining"); if (dir != null) { Decree tmp = dir; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java index 7e1ca87..2e45600 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java @@ -75,10 +75,11 @@ class CaseEdict implements Edict { while (mat.find()) { mat.appendReplacement(sb, ""); - String word = mat.group(1); - String ward = word.substring(0, 1).toUpperCase() + word.substring(1); + String word = mat.group(1); + String upperWord = word.substring(0, 1).toUpperCase() + + word.substring(1); - sb.append(ward); + sb.append(upperWord); sb.append(mat.group(2)); } @@ -100,7 +101,8 @@ class CaseEdict implements Edict { if (doCap) { doCap = false; - word = word.substring(0, 1).toUpperCase() + word.substring(1); + word = word.substring(0, 1).toUpperCase() + + word.substring(1); } sb.append(word); @@ -116,8 +118,10 @@ class CaseEdict implements Edict { strang = strang.toLowerCase(); break; default: - throw new IllegalArgumentException("INTERNAL ERROR: CaseEdict mode " - + caseMode + " is not supported. This is a bug."); + String msg = String.format( + "INTERNAL ERROR: CaseEdict mode %s is not supported. This is a bug.", + caseMode); + throw new IllegalArgumentException(msg); } formCTX.writer.write(strang); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java index ca0432c..6fd2309 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java @@ -30,24 +30,21 @@ class CharacterEdict implements Edict { @Override public void format(FormatContext formCTX) throws IOException { - Object o = formCTX.items.item(); + Object item = formCTX.items.item(); - CLFormatter.checkItem(o, 'C'); + CLFormatter.checkItem(item, 'C'); - if (!(o instanceof Character)) { - throw new IllegalFormatConversionException('C', o.getClass()); + if (!(item instanceof Character)) { + throw new IllegalFormatConversionException('C', item.getClass()); } - char ch = (Character) o; + char ch = (Character) item; int codepoint = ch; ReportWriter rw = formCTX.writer; - if (printCharName) { - rw.write(Character.getName(codepoint)); - } else { - rw.write(ch); - } + if (printCharName) rw.write(Character.getName(codepoint)); + else rw.write(ch); formCTX.items.right(); } 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 491d629..c7b2999 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 @@ -18,25 +18,24 @@ import bjc.utils.ioutils.format.*; public class ConditionalDirective implements Directive { @Override public Edict compile(CompileContext compCTX) { - CLModifiers mods = compCTX.decr.modifiers; + CLModifiers mods = compCTX.decr.modifiers; CLParameters params = compCTX.decr.parameters; + // :ConfigDirectives GroupDecree clauses = compCTX.directives.nextGroup(compCTX.decr, "]", ";"); ClauseDecree defClause = null; - boolean isDefault = false; + boolean isDefault = false; for (ClauseDecree clause : clauses) { - if (isDefault) - defClause = clause; + if (isDefault) defClause = clause; if (clause.terminator != null && clause.terminator.modifiers.colonMod) { isDefault = true; } } - if (mods.starMod && clauses.size() > 0) - defClause = clauses.clause(); + if (mods.starMod && clauses.size() > 0)defClause = clauses.clause(); CLValue index = null; @@ -56,8 +55,8 @@ public class ConditionalDirective implements Directive { mode = ConditionalEdict.Mode.INDEX_CLAUSE; } - return new ConditionalEdict(mode, mods.dollarMod, index, clauses, defClause, - compCTX.formatter); + return new ConditionalEdict(mode, mods.dollarMod, index, clauses, + defClause, compCTX.formatter); } } @@ -87,7 +86,9 @@ class ConditionalEdict implements Edict { this.clauses = new ArrayList<>(); for (ClauseDecree clause : clauses) { - this.clauses.add(new CLString(fmt.compile(clause))); + List<Edict> compiled = fmt.compile(clause); + + this.clauses.add(new CLString(compiled)); } this.defClause = new CLString(fmt.compile(defClause)); @@ -101,47 +102,47 @@ class ConditionalEdict implements Edict { try { switch (condMode) { case FIRST_SECOND: { - Object o = items.item(); + Object item = items.item(); items.right(); - boolean res = false; - if (o == null) { + boolean conditionResult = false; + if (item == null) { // throw new IllegalArgumentException("No parameter provided for [ // directive."); - } else if (!(o instanceof Boolean)) { - throw new IllegalFormatConversionException('[', o.getClass()); + } else if (!(item instanceof Boolean)) { + throw new IllegalFormatConversionException('[', item.getClass()); } else { - res = (Boolean) o; + conditionResult = (Boolean) item; } - CLString frmt; - if (res) { - frmt = clauses.get(1); + CLString pickedFormat; + if (conditionResult) { + pickedFormat = clauses.get(1); } else { - frmt = clauses.get(0); + pickedFormat = clauses.get(0); } - frmt.format(formCTX); + pickedFormat.format(formCTX); } break; case OUTPUT_TRUE: { - boolean res = false; - Object o = items.item(); + boolean conditionResult = false; + Object item = items.item(); - if (o == null) { + if (item == null) { // throw new IllegalArgumentException("No parameter provided for [ // directive."); - } else if (o instanceof Integer) { - if ((Integer) o != 0) { - res = true; + } else if (item instanceof Integer) { + if ((Integer) item != 0) { + conditionResult = true; } - } else if (o instanceof Boolean) { - res = (Boolean) o; + } else if (item instanceof Boolean) { + conditionResult = (Boolean) item; } else { - throw new IllegalFormatConversionException('[', o.getClass()); + throw new IllegalFormatConversionException('[', item.getClass()); } - if (res) { + if (conditionResult) { clauses.get(0).format(formCTX); } else { items.right(); @@ -149,34 +150,32 @@ class ConditionalEdict implements Edict { } break; case INDEX_CLAUSE: { - int res; + int clauseIndex; if (index != null) { - res = index.asInt(items, "conditional choice", "[", 0); + clauseIndex = index.asInt(items, "conditional choice", "[", 0); } else { - Object o = items.item(); + Object item = items.item(); - if (o == null) { + if (item == null) { throw new IllegalArgumentException( "No parameter provided for [ directive."); - } else if (!(o instanceof Number)) { - throw new IllegalFormatConversionException('[', o.getClass()); + } else if (!(item instanceof Number)) { + throw new IllegalFormatConversionException('[', item.getClass()); } - res = ((Number) o).intValue(); + clauseIndex = ((Number) item).intValue(); items.right(); } if (decrementIndex) - res -= 1; + clauseIndex -= 1; - if (clauses.size() == 0 || res < 0 || res >= clauses.size()) { - if (defClause != null) { - defClause.format(formCTX.writer, items); - } + if (clauses.size() == 0 || clauseIndex < 0 || clauseIndex >= clauses.size()) { + if (defClause != null) defClause.format(formCTX.writer, items); } else { - CLString frmt = clauses.get(res); + CLString frmt = clauses.get(clauseIndex); frmt.format(formCTX.writer, items); } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java index 1130a85..8c16917 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java @@ -18,7 +18,8 @@ public class DecimalDirective implements Directive { @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; - CLModifiers mods = compCTX.decr.modifiers; + @SuppressWarnings("unused") + CLModifiers mods = compCTX.decr.modifiers; CLValue decForm = CLValue.nil(); 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 343a54d..3610bda 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 @@ -14,7 +14,7 @@ public class EscapeDirective implements Directive { @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; - CLModifiers mods = compCTX.decr.modifiers; + CLModifiers mods = compCTX.decr.modifiers; CLValue param1 = CLValue.nil(); CLValue param2 = CLValue.nil(); @@ -27,28 +27,31 @@ public class EscapeDirective implements Directive { break; case 1: mode = EscapeEdict.Mode.COUNT; + params.mapIndices("count"); param1 = params.resolveKey("count"); break; case 2: + mode = EscapeEdict.Mode.EQUALITY; + params.mapIndices("lhand", "rhand"); param1 = params.resolveKey("lhand"); param2 = params.resolveKey("rhand"); - mode = EscapeEdict.Mode.EQUALITY; break; case 3: + mode = EscapeEdict.Mode.RANGE; + params.mapIndices("lower", "ival", "upper"); param1 = params.resolveKey("lower"); param2 = params.resolveKey("ival"); param3 = params.resolveKey("upper"); - mode = EscapeEdict.Mode.RANGE; break; default: throw new IllegalArgumentException("Too many parameters to ^ directive"); } - return new EscapeEdict(mods.atMod, mode, mods.colonMod, param1, param2, param3, - mods.dollarMod); + return new EscapeEdict(mods.atMod, mode, mods.colonMod, + param1, param2, param3, mods.dollarMod); } } @@ -88,8 +91,7 @@ class EscapeEdict implements Edict { Tape<Object> items = formCTX.items; - if (advance) - items.right(); + if (advance) items.right(); switch (mode) { case END: @@ -102,15 +104,15 @@ class EscapeEdict implements Edict { } break; case EQUALITY: { - int left = param1.asInt(items, "left-hand condition", "^", 0); + int left = param1.asInt(items, "left-hand condition", "^", 0); int right = param2.asInt(items, "right-hand condition", "^", 0); shouldExit = (left == right); } break; case RANGE: { - int low = param1.asInt(items, "lower-bound condition", "^", 0); - int mid = param2.asInt(items, "interval condition", "^", 0); + int low = param1.asInt(items, "lower-bound condition", "^", 0); + int mid = param2.asInt(items, "interval condition", "^", 0); int high = param3.asInt(items, "upper-bound condition", "^", 0); shouldExit = (low <= mid) && (mid <= high); @@ -121,15 +123,9 @@ class EscapeEdict implements Edict { "Escape condition mode " + mode + " isn't supported"); } - if (advance) - items.left(); - - if (isNegated) { - shouldExit = !shouldExit; - } + if (advance) items.left(); + if (isNegated) shouldExit = !shouldExit; - if (shouldExit) { - throw new DirectiveEscape(terminateIteration); - } + if (shouldExit) throw new DirectiveEscape(terminateIteration); } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java index 3ffa4ed..d206d17 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java @@ -18,7 +18,7 @@ public class FormatParameters { /** * The {@link ReportWriter} used for output. */ - public ReportWriter rw; + public ReportWriter writer; /** * The current format parameter. @@ -43,12 +43,12 @@ public class FormatParameters { /** * The formatter we are going from. */ - public CLFormatter fmt; + public CLFormatter formatter; /** * Create a new set of format parameters. * - * @param rw + * @param writer * The writer we are sending output to. * * @param item @@ -63,12 +63,12 @@ public class FormatParameters { * @param dirIter * The set of format decrees. * - * @param fmt + * @param formatter * The formatter we are using */ - public FormatParameters(ReportWriter rw, Object item, Decree decr, - Tape<Object> tParams, CLTokenizer dirIter, CLFormatter fmt) { - this.rw = rw; + public FormatParameters(ReportWriter writer, Object item, Decree decr, + Tape<Object> tParams, CLTokenizer dirIter, CLFormatter formatter) { + this.writer = writer; this.item = item; @@ -78,7 +78,7 @@ public class FormatParameters { this.dirIter = dirIter; - this.fmt = fmt; + this.formatter = formatter; } /** @@ -105,7 +105,7 @@ public class FormatParameters { * @return The compilation context from these parameters. */ public CompileContext toCompileCTX() { - return new CompileContext(dirIter, fmt, decr); + return new CompileContext(dirIter, formatter, decr); } /** @@ -114,6 +114,6 @@ public class FormatParameters { * @return The format context from these parameters. */ public FormatContext toFormatCTX() { - return new FormatContext(rw, tParams); + return new FormatContext(writer, tParams); } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java index 7402c98..dedbbac 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java @@ -38,11 +38,8 @@ class FreshlineEdict implements Edict { public void format(FormatContext formCTX) throws IOException { int nTimes = times.asInt(formCTX.items, "occurance count", "&", 1); - if (formCTX.writer.isLastCharNL()) - nTimes -= 1; + if (formCTX.writer.isLastCharNL()) nTimes -= 1; - for (int i = 0; i < nTimes; i++) { - formCTX.writer.write("\n"); - } + for (int i = 0; i < nTimes; i++) formCTX.writer.write("\n"); } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java index f12880e..f2fca71 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java @@ -57,7 +57,7 @@ public abstract class GeneralNumberDirective implements Directive { */ protected NumberParams getParams(CompileContext compCTX, int argidx) { CLParameters params = compCTX.decr.parameters; - CLModifiers mods = compCTX.decr.modifiers; + CLModifiers mods = compCTX.decr.modifiers; NumberParams np = new NumberParams(); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IndentDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IndentDirective.java index a19866f..4ccf627 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IndentDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IndentDirective.java @@ -14,9 +14,7 @@ public class IndentDirective implements Directive { CLParameters params = compCTX.decr.parameters; CLModifiers mods = compCTX.decr.modifiers; - if (mods.dollarMod) { - return new IndentConfigureEdict(); - } + if (mods.dollarMod) return new IndentConfigureEdict(); CLValue indentCount = CLValue.nil(); if (params.length() >= 1) { @@ -52,11 +50,8 @@ class IndentEdict implements Edict { } if (isRelative) { - if (dedent) { - formCTX.writer.dedent(numIndents); - } else { - formCTX.writer.indent(numIndents); - } + if (dedent) formCTX.writer.dedent(numIndents); + else formCTX.writer.indent(numIndents); } else { if (dedent) { throw new IllegalArgumentException("Cannot have negative indent level"); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java index 8ed39fb..c4b2edb 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java @@ -30,11 +30,11 @@ public class InflectDirective implements Directive { String dirName = decr.name; + // @FIXME Nov 13th 2020 Ben Culkin :GroupDecree + // Would it be appropriate to convert this to use GroupDecree? if (dirName != null) { if (dirName.equals("`[")) { - if (nestLevel > 0) { - body.add(decr); - } + if (nestLevel > 0) body.add(decr); nestLevel += 1; } else if (Directive.isOpening(dirName)) { @@ -44,9 +44,8 @@ public class InflectDirective implements Directive { } else if (dirName.equals("`]")) { nestLevel = Math.max(0, nestLevel - 1); - /* End the iteration. */ - if (nestLevel == 0) - break; + /* End the iteration if this was the final `]. */ + if (nestLevel == 0) break; } else if (Directive.isClosing(dirName)) { nestLevel = Math.max(0, nestLevel - 1); } else { @@ -69,11 +68,11 @@ class InflectEdict implements Edict { @Override public void format(FormatContext formCTX) throws IOException { - ReportWriter nrw = formCTX.writer.duplicate(new StringWriter()); + ReportWriter newWriter = formCTX.writer.duplicate(new StringWriter()); - body.format(nrw, formCTX.items); + body.format(newWriter, formCTX.items); - String strang = nrw.toString(); + String strang = newWriter.toString(); strang = InflectionML.inflect(strang); 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 b8cdf36..4b3b193 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 @@ -19,27 +19,23 @@ public class IterationDirective implements Directive { List<Decree> body = new ArrayList<>(); Iterator<Decree> dirIter = compCTX.directives; + // :GroupDecree while (dirIter.hasNext()) { Decree decr = dirIter.next(); if (decr.isLiteral) { body.add(decr); - continue; - } - - String dirName = decr.name; - - if (dirName != null) { - if (dirName.equals("}")) { - break; - } else { - /* Not a special directive. */ - body.add(decr); + } else { + String dirName = decr.name; + + if (dirName != null) { + if (dirName.equals("}")) break; + else body.add(decr); } } } CLParameters params = compCTX.decr.parameters; - CLModifiers mods = compCTX.decr.modifiers; + CLModifiers mods = compCTX.decr.modifiers; CLValue maxItr = CLValue.nil(); if (params.length() > 0) { @@ -96,7 +92,7 @@ class IterationEdict implements Edict { Object iter = formCTX.items.item(); boolean usingString = false; - String strang = null; + String currBody = null; if (body.isEmpty()) { /* Grab an argument. */ @@ -105,7 +101,7 @@ class IterationEdict implements Edict { } usingString = true; - strang = (String) iter; + currBody = (String) iter; if (!formCTX.items.right()) { throw new IllegalArgumentException( @@ -119,8 +115,7 @@ class IterationEdict implements Edict { case ALL_SUBLISTS: try { do { - if (numIterations > maxIterations) - break; + if (numIterations > maxIterations) break; numIterations += 1; if (!(iter instanceof Iterable<?>)) { @@ -129,8 +124,8 @@ class IterationEdict implements Edict { } @SuppressWarnings("unchecked") - Iterable<Object> nitr = (Iterable<Object>) iter; - Tape<Object> nParams = new SingleTape<>(nitr); + Iterable<Object> nitr = (Iterable<Object>) iter; + Tape<Object> nParams = new SingleTape<>(nitr); try { if (usingString) { @@ -140,15 +135,13 @@ class IterationEdict implements Edict { // CLString and then caching those compiled string. However, // we aren't // doing that now. -- ben, 12/17/19 - fmt.doFormatString(strang, formCTX.writer, nParams, false); + fmt.doFormatString(currBody, formCTX.writer, nParams, false); } else { body.format(formCTX.writer, nParams); } } catch (DirectiveEscape eex) { if (eex.endIteration) { - if (formCTX.items.atEnd()) { - throw eex; - } + if (formCTX.items.atEnd()) throw eex; } } @@ -162,14 +155,13 @@ class IterationEdict implements Edict { case ALL: try { while (!formCTX.items.atEnd()) { - if (numIterations > maxIterations) - break; + if (numIterations > maxIterations) break; numIterations += 1; if (usingString) { // :DynamicFormatString - fmt.doFormatString(strang, formCTX.writer, formCTX.items, false); + fmt.doFormatString(currBody, formCTX.writer, formCTX.items, false); } else { body.format(formCTX); } @@ -192,8 +184,7 @@ class IterationEdict implements Edict { while (itr.hasNext()) { Object obj = itr.next(); - if (numIterations > maxIterations) - break; + if (numIterations > maxIterations) break; numIterations += 1; if (!(obj instanceof Iterable<?>)) { @@ -208,13 +199,12 @@ class IterationEdict implements Edict { try { if (usingString) { // :DynamicString - fmt.doFormatString(strang, formCTX.writer, nParams, false); + fmt.doFormatString(currBody, formCTX.writer, nParams, false); } else { body.format(formCTX.writer, nParams); } } catch (DirectiveEscape eex) { - if (eex.endIteration && !itr.hasNext()) - throw eex; + if (eex.endIteration && !itr.hasNext()) throw eex; } } } catch (DirectiveEscape eex) { @@ -232,13 +222,12 @@ class IterationEdict implements Edict { Tape<Object> nParams = new SingleTape<>(itr); while (!nParams.atEnd()) { - if (numIterations > maxIterations) - break; + if (numIterations > maxIterations) break; numIterations += 1; if (usingString) { // :DynamicString - fmt.doFormatString(strang, formCTX.writer, nParams, false); + fmt.doFormatString(currBody, formCTX.writer, nParams, false); } else { body.format(formCTX.writer, nParams); } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java index c63bf4e..3e4a5ef 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java @@ -63,8 +63,6 @@ class LiteralEdict implements Edict { num = nTimes.asInt(formCTX.items, "occurance count", "literal", 1); } - for (int i = 0; i < num; i++) { - formCTX.writer.write(lit); - } + for (int i = 0; i < num; i++) formCTX.writer.write(lit); } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java index c7d4ab6..de1bb28 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java @@ -71,9 +71,8 @@ class NumberEdict implements Edict { long val = ((Number) item).longValue(); - int mincol = np.mincol.asInt(formCTX.items, "minimum column count", directive, 0); - char padchar - = np.padchar.asChar(formCTX.items, "padding character", directive, ' '); + int mincol = np.mincol.asInt(formCTX.items, "minimum column count", directive, 0); + char padchar = np.padchar.asChar(formCTX.items, "padding character", directive, ' '); boolean signed = np.signed; 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 e3ccfb4..24af908 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 @@ -27,13 +27,9 @@ public class RadixDirective extends GeneralNumberDirective { NumberParams np = null; if (params.length() == 0) { - if (mods.atMod) { - mode = RadixEdict.Mode.ROMAN; - } else if (mods.colonMod) { - mode = RadixEdict.Mode.ORDINAL; - } else { - mode = RadixEdict.Mode.CARDINAL; - } + if (mods.atMod) mode = RadixEdict.Mode.ROMAN; + else if (mods.colonMod) mode = RadixEdict.Mode.ORDINAL; + else mode = RadixEdict.Mode.CARDINAL; } else { mode = RadixEdict.Mode.NORMAL; @@ -96,11 +92,9 @@ class RadixEdict implements Edict { res = NumberUtils.toCardinal(val); break; case NORMAL: { - int radix = radixVal.asInt(formCTX.items, "radix", "R", 10); - - int mincol = np.mincol.asInt(formCTX.items, "minimum column count", "R", 0); - char padchar - = np.padchar.asChar(formCTX.items, "padding character", "R", ' '); + int radix = radixVal.asInt(formCTX.items, "radix", "R", 10); + int mincol = np.mincol.asInt(formCTX.items, "minimum column count", "R", 0); + char padchar = np.padchar.asChar(formCTX.items, "padding character", "R", ' '); boolean signed = np.signed; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java index 41c7adb..c60d0bb 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java @@ -48,9 +48,7 @@ class RecursiveEdict implements Edict { fmt.doFormatString(bod, formCTX.writer, formCTX.items, true); } catch (DirectiveEscape eex) { - if (eex.endIteration) { - throw new UnexpectedColonEscape(); - } + if (eex.endIteration) throw new UnexpectedColonEscape(); } } else { if (formCTX.items.atEnd()) { @@ -58,11 +56,11 @@ class RecursiveEdict implements Edict { "? directive requires two format parameters"); } - Object o = formCTX.items.item(); + Object item = formCTX.items.item(); formCTX.items.right(); - if (!(o instanceof Iterable<?>)) { - throw new MismatchedFormatArgType("?", Iterable.class, o.getClass()); + if (!(item instanceof Iterable<?>)) { + throw new MismatchedFormatArgType("?", Iterable.class, item.getClass()); } if (!(body instanceof String)) { @@ -70,7 +68,7 @@ class RecursiveEdict implements Edict { } @SuppressWarnings("unchecked") - Iterable<Object> itb = (Iterable<Object>) o; + Iterable<Object> itb = (Iterable<Object>) item; Tape<Object> newParams = new SingleTape<>(itb); try { 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 91b40c3..a9814ba 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 @@ -68,7 +68,7 @@ class TabulateEdict implements Edict { @Override public void format(FormatContext formCTX) throws IOException { - ReportWriter rw = formCTX.writer; + ReportWriter writer = formCTX.writer; Tape<Object> itms = formCTX.items; @@ -76,24 +76,19 @@ class TabulateEdict implements Edict { int currCol; - if (fromIndent) { - currCol = rw.getIndentPos(); - } else { - currCol = rw.getLinePos(); - } + if (fromIndent) currCol = writer.getIndentPos(); + else currCol = writer.getLinePos(); if (isRelative) { int colinc = colincVal.asInt(itms, "column increment", "T", 1); int colrel = colidVal.asInt(itms, "relative column number", "T", 1); - for (int i = 0; i < colrel; i++) { - rw.write(padchar); - } + for (int i = 0; i < colrel; i++) writer.write(padchar); int nSpaces = 0; while ((currCol + nSpaces) % colinc != 0) { - rw.write(padchar); + writer.write(padchar); nSpaces++; } @@ -102,17 +97,14 @@ class TabulateEdict implements Edict { int colnum = colidVal.asInt(itms, "column number", "T", 1); if (currCol < colnum) { - for (int i = currCol; i < colnum; i++) { - rw.write(padchar); - } + for (int i = currCol; i < colnum; i++) writer.write(padchar); } else { - if (colinc == 0) - return; + if (colinc == 0) return; int k = 0; while (colnum > (currCol + (k * colinc))) { - rw.write(padchar); + writer.write(padchar); k++; } |