diff --git a/src/main/java/de/plugh/compositeparse/parsers/BoundedInteger.java b/src/main/java/de/plugh/compositeparse/parsers/BoundedInteger.java index 9362179..46be9fd 100644 --- a/src/main/java/de/plugh/compositeparse/parsers/BoundedInteger.java +++ b/src/main/java/de/plugh/compositeparse/parsers/BoundedInteger.java @@ -74,7 +74,6 @@ public class BoundedInteger implements Parser { * @param max maximum size of the integer * @return the {@link BoundedInteger} */ - public static BoundedInteger between(int min, int max) { return new BoundedInteger(min, max); } diff --git a/src/main/java/de/plugh/compositeparse/parsers/Constant.java b/src/main/java/de/plugh/compositeparse/parsers/Constant.java index 821a050..affc05a 100644 --- a/src/main/java/de/plugh/compositeparse/parsers/Constant.java +++ b/src/main/java/de/plugh/compositeparse/parsers/Constant.java @@ -1,7 +1,6 @@ package de.plugh.compositeparse.parsers; import de.plugh.compositeparse.Block; -import de.plugh.compositeparse.ParseException; import de.plugh.compositeparse.Parser; import java.util.List; @@ -31,7 +30,7 @@ public class Constant implements Parser { } @Override - public T read(Block block) throws ParseException { + public T read(Block block) { return value; } diff --git a/src/main/java/de/plugh/compositeparse/parsers/Decision.java b/src/main/java/de/plugh/compositeparse/parsers/Decision.java index 65973ad..d715e9a 100644 --- a/src/main/java/de/plugh/compositeparse/parsers/Decision.java +++ b/src/main/java/de/plugh/compositeparse/parsers/Decision.java @@ -6,6 +6,7 @@ import de.plugh.compositeparse.ParseException; import de.plugh.compositeparse.Parser; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -29,9 +30,7 @@ public class Decision implements Parser { @SafeVarargs public Decision(Pair, Parser>... pairs) { this.pairs = new ArrayList<>(); - for (Pair, Parser> pair : pairs) { - this.pairs.add(pair); - } + Collections.addAll(this.pairs, pairs); } /** diff --git a/src/main/java/de/plugh/compositeparse/parsers/Literal.java b/src/main/java/de/plugh/compositeparse/parsers/Literal.java index 25d06ee..df820c8 100644 --- a/src/main/java/de/plugh/compositeparse/parsers/Literal.java +++ b/src/main/java/de/plugh/compositeparse/parsers/Literal.java @@ -17,21 +17,6 @@ import java.util.function.Function; */ public class Literal implements Parser { - /** - * A single space {@code " "} - */ - public static final Literal SPACE = new Literal<>(" "); - - /** - * A single comma {@code ","} - */ - public static final Literal COMMA = new Literal<>(","); - - /** - * A single semicolon {@code ";"} - */ - public static final Literal SEMICOLON = new Literal<>(";"); - private final String literal; private final T value; diff --git a/src/main/java/de/plugh/compositeparse/parsers/Options.java b/src/main/java/de/plugh/compositeparse/parsers/Options.java index 306eb21..4b01064 100644 --- a/src/main/java/de/plugh/compositeparse/parsers/Options.java +++ b/src/main/java/de/plugh/compositeparse/parsers/Options.java @@ -5,6 +5,7 @@ import de.plugh.compositeparse.ParseException; import de.plugh.compositeparse.Parser; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -25,9 +26,7 @@ public class Options implements Parser { @SafeVarargs public Options(Parser... parsers) { this.parsers = new ArrayList<>(); - for (Parser parser : parsers) { - this.parsers.add(parser); - } + Collections.addAll(this.parsers, parsers); } /**