From 7a690a842855ce62377803e5aab7da23dfba753d Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 5 Apr 2024 17:43:37 +0200 Subject: [PATCH] style(muscript): carry over packedArgs on ExprGroup.optimize --- .../muscript/ast/dynamic/ExprGroup.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/muscript/src/main/java/io/gitlab/jfronny/muscript/ast/dynamic/ExprGroup.java b/muscript/src/main/java/io/gitlab/jfronny/muscript/ast/dynamic/ExprGroup.java index 891605e..ad4539e 100644 --- a/muscript/src/main/java/io/gitlab/jfronny/muscript/ast/dynamic/ExprGroup.java +++ b/muscript/src/main/java/io/gitlab/jfronny/muscript/ast/dynamic/ExprGroup.java @@ -83,17 +83,22 @@ public class ExprGroup extends DynamicExpr { @Override public DynamicExpr optimize() { - return of( - location, - Stream.concat( - steps.stream() - .map(Expr::optimize) - .flatMap(Expr::extractSideEffects) - .map(Expr::optimize), - Stream.of(fin.optimize()) - ).toList(), - fork - ).asDynamicExpr(); + List> exprs = Stream.concat( + steps.stream() + .map(Expr::optimize) + .flatMap(Expr::extractSideEffects) + .map(Expr::optimize), + Stream.of(fin.optimize()) + ).toList(); + if (packedArgs == null) { + return of( + location, + exprs, + fork + ).asDynamicExpr(); + } else { + return new ExprGroup(location, exprs, packedArgs, fork); + } } @Override