Merge filter/map into mapMulti

Thihup · Oct 1, 2024 · 92c943c · 92c943c
1 parent f0b74e5
commit 92c943c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...up.jvisualg.frontend/src/main/java/dev/thihup/jvisualg/frontend/VisuAlgParserVisitor.java b/...up.jvisualg.frontend/src/main/java/dev/thihup/jvisualg/frontend/VisuAlgParserVisitor.java
@@ -259,8 +259,11 @@ public ExpressionNode visitIdOrArray(VisuAlgParser.IdOrArrayContext ctx) {
         return ctx.children
             .stream()
             .map(this::visit)
-            .filter(x -> x instanceof ExpressionNode)
-            .map(x -> (ExpressionNode) x)
+                .<ExpressionNode>mapMulti((node, consumer) -> {
+                    if (node instanceof ExpressionNode expressionNode) {
+                        consumer.accept(expressionNode);
+                    }
+                })
             .reduce((result, element) -> switch (element) {
                 case ArrayAccessNode(_, CompundNode<ExpressionNode> indexes, var location) ->
                         new ArrayAccessNode(result, indexes, location);