chore: make use of sequenced collections
This commit is contained in:
parent
01f1fdf188
commit
003c317b11
|
@ -22,7 +22,7 @@ public class Closure extends DynamicExpr {
|
|||
public final boolean variadic;
|
||||
|
||||
public Closure(CodeLocation location, List<String> boundArgs, List<Expr<?>> expressions, boolean variadic) {
|
||||
this(location, boundArgs, expressions.subList(0, expressions.size() - 1), expressions.get(expressions.size() - 1).asDynamicExpr(), variadic);
|
||||
this(location, boundArgs, expressions.subList(0, expressions.size() - 1), expressions.getLast().asDynamicExpr(), variadic);
|
||||
}
|
||||
|
||||
private Closure(CodeLocation location, List<String> boundArgs, List<Expr<?>> steps, DynamicExpr fin, boolean variadic) {
|
||||
|
|
|
@ -35,7 +35,7 @@ public class ExprGroup extends DynamicExpr {
|
|||
public ExprGroup(CodeLocation location, List<Expr<?>> expressions, @Nullable PackedArgs packedArgs, boolean fork) {
|
||||
super(Order.Primary, location);
|
||||
this.steps = expressions.subList(0, expressions.size() - 1);
|
||||
this.fin = expressions.get(expressions.size() - 1).asDynamicExpr();
|
||||
this.fin = expressions.getLast().asDynamicExpr();
|
||||
this.packedArgs = packedArgs;
|
||||
this.fork = fork;
|
||||
if (!fork && packedArgs != null) throw new UnsupportedOperationException("packedArgs may only be used for forking ExprGroups");
|
||||
|
@ -47,7 +47,7 @@ public class ExprGroup extends DynamicExpr {
|
|||
|
||||
public static Expr<?> of(CodeLocation location, List<Expr<?>> expressions, boolean fork) {
|
||||
if (expressions.isEmpty()) return new NullLiteral(location);
|
||||
if (!fork && expressions.size() == 1) return expressions.get(0);
|
||||
if (!fork && expressions.size() == 1) return expressions.getFirst();
|
||||
return new ExprGroup(location, expressions, null, fork);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue