Johannes/java-commons
Johannes
/
java-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

style(muscript-optimizer): replace conditionals with guarded patterns
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2024-04-20 18:19:51 +02:00
parent 130e246ac2
commit 400a2cf654
Signed by: Johannes
GPG Key ID: E76429612C2929F4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
muscript-optimizer/src/main/java/io/gitlab/jfronny/muscript/optimizer/Optimizer.java
View File

@ -157,9 +157,7 @@ public class Optimizer {
case null -> throw new NullPointerException();
case DynamicConditional(var location, BoolLiteral(var location1, var value), var ifTrue, var ifFalse) -> value ? ifTrue : ifFalse;
case DynamicConditional(var location, Not(var location1, var inner), var ifTrue, var ifFalse) -> optimize(new DynamicConditional(location, inner, ifFalse, ifTrue));
case DynamicConditional(var location, var condition, var ifTrue, var ifFalse) -> ifTrue.equals(ifFalse)
? new ExprGroup(location, extractSideEffects(condition).map(Optimizer::optimize).toList(), ifTrue, null, false)
: new DynamicConditional(location, condition, ifTrue, ifFalse);
case DynamicConditional(var location, var condition, var ifTrue, var ifFalse) when ifTrue.equals(ifFalse) -> new ExprGroup(location, extractSideEffects(condition).map(Optimizer::optimize).toList(), ifTrue, null, false);
case GetOrAt(var location, ObjectLiteral l, var nameOrIndex) -> new Get(location, l, asString(nameOrIndex));
case GetOrAt(var location, ListLiteral l, var nameOrIndex) -> new At(location, l, asNumber(nameOrIndex));
case GetOrAt(var location, var left, StringExpr name) -> new Get(location, left, name);
@ -251,9 +249,8 @@ public class Optimizer {
case StringConditional(var location, var condition, var ifTrue, var ifFalse) -> extractConditionalSideEffects(location, condition, ifTrue, ifFalse);
case Bind(var location, var callable, var parameter) -> Stream.concat(extractSideEffects(callable), extractSideEffects(parameter));
case Call e -> Stream.of(e);
case ExprGroup(var location, var steps, var finish, var packedArgs, var fork) -> fork
? Stream.of(expr)
: Stream.of(ExprGroup.of(location, steps.stream().flatMap(Optimizer::extractSideEffects).toList()));
case ExprGroup(var location, var steps, var finish, var packedArgs, var fork) when fork -> Stream.of(expr);
case ExprGroup(var location, var steps, var finish, var packedArgs, var fork) -> Stream.of(ExprGroup.of(location, steps.stream().flatMap(Optimizer::extractSideEffects).toList()));
case Get(var location, var left, var name) -> Stream.concat(extractSideEffects(left), extractSideEffects(name));
case At(var location, var left, var index) -> Stream.concat(extractSideEffects(left), extractSideEffects(index));
case GetOrAt(var location, var left, var nameOrIndex) -> Stream.concat(extractSideEffects(left), extractSideEffects(nameOrIndex));