Simplify toString() in BValue subclasses, Change BChoice to not depend on BExprs

Author: mikosik

src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/bytecode/expr/base/BArray.java

@@ -62,7 +62,7 @@ public String exprToString() throws BytecodeException {
     return new ToStringBuilder(getClass().getSimpleName())
         .addField("hash", hash())
         .addField("type", type())
-        .addListField("elements", elements(BValue.class).map(BExpr::exprToString))
+        .addListField("elements", elements(BValue.class).map(BExpr::toString))
         .toString();
   }
 }

src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/bytecode/expr/base/BChoice.java

@@ -34,7 +34,7 @@ public BChoiceType type() {
     return (BChoiceType) super.kind();
   }
 
-  public BSubExprs components() throws BytecodeException {
+  public Components components() throws BytecodeException {
     var members = members("index", "chosen");
     var index = members.get(INDEX_INDEX).asInstanceOf(BInt.class);
 
@@ -51,20 +51,20 @@ public BSubExprs components() throws BytecodeException {
     if (!itemType.equals(expectedExprType)) {
       throw new MemberHasWrongTypeException(hash(), kind(), "chosen", expectedExprType, itemType);
     }
-    return new BSubExprs(index, value);
+    return new Components(index, value);
   }
 
   @Override
   public String exprToString() throws BytecodeException {
     return new ToStringBuilder(getClass().getSimpleName())
         .addField("hash", hash())
         .addField("type", type())
-        .addListField("members", components().toList().map(BExpr::exprToString))
+        .addField("index", components().index())
+        .addField("chosen", components().chosen())
         .toString();
   }
 
-  public static record BSubExprs(BInt index, BValue chosen) implements BExprs {
-    @Override
+  public static record Components(BInt index, BValue chosen) {
     public List<BExpr> toList() {
       return list(index, chosen);
     }

src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/bytecode/expr/base/BTuple.java

@@ -69,7 +69,7 @@ public String exprToString() throws BytecodeException {
     return new ToStringBuilder(getClass().getSimpleName())
         .addField("hash", hash())
         .addField("type", type())
-        .addListField("elements", elements().map(BExpr::exprToString))
+        .addListField("elements", elements().map(BExpr::toString))
         .toString();
   }
 }

src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/base/BParamRefInliner.java

@@ -108,7 +108,7 @@ private BSwitch rewriteSwitch(BSwitch switch_, Resolver resolver)
 
   private BCombine rewriteCombine(BCombine combine, Resolver resolver)
       throws BytecodeException, ParamRefIndexOutOfBoundsException {
-    var items = combine.subExprs().items();
+    var items = combine.subExprs().toList();
     var rewrittenItems = rewriteExprs(items, resolver);
     if (items.equals(rewrittenItems)) {
       return combine;

src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/bytecode/expr/BExprCorruptedTest.java

@@ -33,6 +33,7 @@
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BBool;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BCall;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BChoice;
+import org.smoothbuild.virtualmachine.bytecode.expr.base.BChoice.Components;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BChoose;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BCombine;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BExpr;
@@ -429,8 +430,7 @@ void learning_test() throws Exception {
       var chosen = bString("abc");
       var dataHash = hash(hash(index), hash(chosen));
       var hash = hash(hash(choiceType), dataHash);
-      assertThat(((BChoice) dbGet(hash)).components())
-          .isEqualTo(new BChoice.BSubExprs(index, chosen));
+      assertThat(((BChoice) dbGet(hash)).components()).isEqualTo(new Components(index, chosen));
     }
 
     @Test

src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/bytecode/expr/base/BChoiceTest.java

@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.smoothbuild.common.collect.List;
 import org.smoothbuild.virtualmachine.bytecode.BytecodeException;
+import org.smoothbuild.virtualmachine.bytecode.expr.base.BChoice.Components;
 import org.smoothbuild.virtualmachine.dagger.VmTestContext;
 
 public class BChoiceTest extends VmTestContext {
@@ -43,7 +44,7 @@ void type() throws Exception {
   @Test
   void components_contains_object_passed_to_builder() throws Exception {
     var choice = bChoice();
-    assertThat(choice.components()).isEqualTo(new BChoice.BSubExprs(bInt(0), bString("7")));
+    assertThat(choice.components()).isEqualTo(new Components(bInt(0), bString("7")));
   }
 
   @Nested
@@ -89,21 +90,19 @@ void to_string() throws Exception {
     assertThat(bChoice().toString())
         .isEqualTo(
             """
-        BChoice(
-          hash = 656815d265879fc6dbd78bdc187affd260d2b6af8bcfad10dc9b32f5c5ae9d4b
-          type = {String|Int}
-          members = [
-            BInt(
-              hash = 7188b43d5debd8d65201a289a38515321a8419bc78b29e75675211deff8b08ba
-              type = Int
-              value = 0
-            )
-            BString(
-              hash = 1e1c0b706a66964d2af072b61122f728afb591ebfeacaec9ef1b846e00a16676
-              type = String
-              value = "7"
-            )
-          ]
-        )""");
+                BChoice(
+                  hash = 656815d265879fc6dbd78bdc187affd260d2b6af8bcfad10dc9b32f5c5ae9d4b
+                  type = {String|Int}
+                  index = BInt(
+                    hash = 7188b43d5debd8d65201a289a38515321a8419bc78b29e75675211deff8b08ba
+                    type = Int
+                    value = 0
+                  )
+                  chosen = BString(
+                    hash = 1e1c0b706a66964d2af072b61122f728afb591ebfeacaec9ef1b846e00a16676
+                    type = String
+                    value = "7"
+                  )
+                )""");
   }
 }

src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/bytecode/expr/base/BSwitchTest.java

@@ -120,18 +120,16 @@ void to_string() throws Exception {
           choice = BChoice(
             hash = 656815d265879fc6dbd78bdc187affd260d2b6af8bcfad10dc9b32f5c5ae9d4b
             type = {String|Int}
-            members = [
-              BInt(
-                hash = 7188b43d5debd8d65201a289a38515321a8419bc78b29e75675211deff8b08ba
-                type = Int
-                value = 0
-              )
-              BString(
-                hash = 1e1c0b706a66964d2af072b61122f728afb591ebfeacaec9ef1b846e00a16676
-                type = String
-                value = "7"
-              )
-            ]
+            index = BInt(
+              hash = 7188b43d5debd8d65201a289a38515321a8419bc78b29e75675211deff8b08ba
+              type = Int
+              value = 0
+            )
+            chosen = BString(
+              hash = 1e1c0b706a66964d2af072b61122f728afb591ebfeacaec9ef1b846e00a16676
+              type = String
+              value = "7"
+            )
           )
           handlers = BCombine(
             hash = 2a737302c93c91e983667dfe73b2f73f278d17ea8a8c954ff18b8001a68fc595