diff options
Diffstat (limited to 'clformat/src/main/java')
16 files changed, 5 insertions, 107 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 7a45442..9a81393 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 @@ -14,14 +14,6 @@ import bjc.utils.ioutils.format.*; * @author Ben Culkin */ public class AestheticDirective implements Directive { - - @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; 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 a586777..28ce2db 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 @@ -17,13 +17,6 @@ import bjc.utils.ioutils.format.*; public class CaseDirective implements Directive { private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)"); - @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - public Edict compile(CompileContext compCTX) { CLModifiers mods = compCTX.decr.modifiers; 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 b8c0737..bca488c 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 @@ -15,13 +15,6 @@ import bjc.utils.ioutils.format.*; */ public class CharacterDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { return new CharacterEdict(compCTX.decr.modifiers.colonMod); } 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 8047d6a..5a5422b 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 @@ -17,13 +17,6 @@ import bjc.utils.ioutils.format.*; */ public class ConditionalDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { CLModifiers mods = compCTX.decr.modifiers; CLParameters params = compCTX.decr.parameters; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java index 0813b23..b6e2df1 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java @@ -7,7 +7,6 @@ import java.io.IOException; * * @author Ben Culkin */ -@FunctionalInterface public interface Directive { /** * Execute this format directive. @@ -16,7 +15,11 @@ public interface Directive { * The parameters for the directive. * @throws IOException If something goes wrong. */ - public void format(FormatParameters dirParams) throws IOException; + public default void format(FormatParameters dirParams) throws IOException { + Edict edt = compile(dirParams.toCompileCTX()); + + edt.format(dirParams.toFormatCTX()); + }; /** * Compile this directive. 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 0b70d47..377102f 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,13 +14,6 @@ import bjc.utils.ioutils.format.*; */ public class EscapeDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; CLModifiers mods = compCTX.decr.modifiers; 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 444e6df..5609086 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 @@ -14,13 +14,6 @@ import bjc.utils.ioutils.format.*; */ public class FreshlineDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; 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 a52b577..9e5ef1f 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 @@ -13,13 +13,6 @@ import bjc.utils.ioutils.format.*; */ public class GotoDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; CLModifiers mods = compCTX.decr.modifiers; 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 c4c757a..6191832 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 @@ -12,13 +12,6 @@ import bjc.utils.ioutils.format.*; */ public class IndentDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; CLModifiers mods = compCTX.decr.modifiers; 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 652c652..b2e26d8 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 @@ -16,13 +16,6 @@ import bjc.utils.ioutils.format.*; */ public class InflectDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { List<Decree> body = new ArrayList<>(); 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 e22e41d..ac20baa 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 @@ -15,13 +15,6 @@ import bjc.utils.ioutils.format.*; */ public class IterationDirective implements Directive { @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { IterationEdict.Mode mode; 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 be7dbd7..98312d6 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 @@ -28,13 +28,6 @@ public class LiteralDirective implements Directive { } @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { CLValue nTimes = null; 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 83b294c..8591dc9 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 @@ -36,13 +36,6 @@ public class NumberDirective extends GeneralNumberDirective { private char directive; @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - - @Override public Edict compile(CompileContext compCTX) { NumberParams np = getParams(compCTX, argidx); 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 b6f8e1f..418519a 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 @@ -16,14 +16,6 @@ import static bjc.utils.ioutils.format.directives.GeneralNumberDirective.NumberP * */ public class RadixDirective extends GeneralNumberDirective { - - @Override - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - @Override public Edict compile(CompileContext compCTX) { CLParameters params = compCTX.decr.parameters; 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 71046c1..8040333 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 @@ -8,12 +8,6 @@ import bjc.utils.ioutils.format.*; import bjc.utils.ioutils.format.exceptions.*; public class RecursiveDirective implements Directive { - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - @Override public Edict compile(CompileContext compCTX) { return new RecursiveEdict(compCTX.decr.modifiers.atMod, compCTX.formatter); 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 1c1821c..04d0140 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 @@ -7,12 +7,6 @@ import bjc.utils.ioutils.*; import bjc.utils.ioutils.format.*; public class TabulateDirective implements Directive { - public void format(FormatParameters dirParams) throws IOException { - Edict edt = compile(dirParams.toCompileCTX()); - - edt.format(dirParams.toFormatCTX()); - } - @Override public Edict compile(CompileContext compCTX) { CLValue colinc = CLValue.nil(); |