Rename BReference -> BParamRef

Author: mikosik

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

src/cli/src/test/java/org/smoothbuild/cli/accept/traces/call_and_order/logs

@@ -40,15 +40,15 @@
 :vm:schedule:call:execute
   @ {t-project}/module.smooth:1 myfunc
 :vm:schedule:call
-:vm:schedule:reference
+:vm:schedule:paramRef
 :vm:inline
   @ {t-project}/module.smooth:1 myfunc
 :vm:schedule:call:execute
   @ {t-project}/module.smooth:2 apply
   @ {t-project}/module.smooth:1 myfunc
 :vm:schedule:order
-:vm:schedule:reference
-:vm:schedule:reference
+:vm:schedule:paramRef
+:vm:schedule:paramRef
 :vm:schedule:order
 :vm:evaluate:order
   @ {t-project}/module.smooth:1 myfunc

src/cli/src/test/java/org/smoothbuild/cli/accept/traces/deep_lambda/logs

@@ -45,7 +45,7 @@
 :vm:schedule:call:execute
   @ <empty trace>
 :vm:schedule:order
-:vm:schedule:reference
+:vm:schedule:paramRef
 :vm:evaluate:order
   @ {t-project}/module.smooth:2 ???
 :scheduler:join

src/cli/src/test/java/org/smoothbuild/cli/accept/traces/default_value/logs

@@ -34,7 +34,7 @@
   @ <empty trace>
 :vm:schedule:call:execute
   @ <empty trace>
-:vm:schedule:reference
+:vm:schedule:paramRef
 :vm:schedule:call
 :vm:inline
   @ <empty trace>

src/cli/src/test/java/org/smoothbuild/cli/accept/traces/lambda_and_constructor/logs

@@ -35,7 +35,7 @@
 :vm:schedule:call:execute
   @ <empty trace>
 :vm:schedule:call
-:vm:schedule:reference
+:vm:schedule:paramRef
 :vm:inline
   @ <empty trace>
 :vm:schedule:call:execute
@@ -48,9 +48,9 @@
   @ {t-project}/module.smooth:5 result:lambda~1
   @ {t-project}/module.smooth:4 apply
 :vm:schedule:combine
-:vm:schedule:reference
-:vm:schedule:reference
-:vm:schedule:reference
+:vm:schedule:paramRef
+:vm:schedule:paramRef
+:vm:schedule:paramRef
 :vm:evaluate:combine
   @ {t-project}/module.smooth:4 MyStruct
   @ {t-project}/module.smooth:5 result:lambda~1

src/cli/src/test/java/org/smoothbuild/cli/accept/traces/select/logs

@@ -36,7 +36,7 @@
 :vm:schedule:call:execute
   @ <empty trace>
 :vm:schedule:combine
-:vm:schedule:reference
+:vm:schedule:paramRef
 :vm:evaluate:combine
   @ {t-project}/module.smooth:4 MyStruct
 :vm:evaluate:select

src/compiler-backend/src/main/java/org/smoothbuild/compilerbackend/ChainingBytecodeFactory.java

@@ -19,7 +19,7 @@
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BLambdaRef;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BMethod;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BOrder;
-import org.smoothbuild.virtualmachine.bytecode.expr.base.BReference;
+import org.smoothbuild.virtualmachine.bytecode.expr.base.BParamRef;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BSelect;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BString;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BTuple;
@@ -98,9 +98,9 @@ public BTuple tuple(List<BValue> items) throws SbTranslatorException {
     return invokeTranslatingIOException(() -> bytecodeFactory.tuple(items));
   }
 
-  public BReference reference(BType evaluationType, BigInteger index) throws SbTranslatorException {
+  public BParamRef paramRef(BType evaluationType, BigInteger index) throws SbTranslatorException {
     return invokeTranslatingIOException(
-        () -> bytecodeFactory.reference(evaluationType, bytecodeFactory.int_(index)));
+        () -> bytecodeFactory.paramRef(evaluationType, bytecodeFactory.int_(index)));
   }
 
   public BLambdaRef lambdaRef(BLambdaType evaluationType, BValue value)

src/compiler-backend/src/main/java/org/smoothbuild/compilerbackend/SbTranslator.java

@@ -203,8 +203,8 @@ private BExpr translateMonoReference(SMonoReference sMonoReference) throws SbTra
       if (itemS != null) {
         var evaluationType = typeTranslator.translate(itemS.type());
         var index = BigInteger.valueOf(lexicalEnvironment.indexOf(name));
-        var bReference = bytecodeF.reference(evaluationType, index);
-        return saveNalAndReturn(name.toString(), sMonoReference, bReference);
+        var bParamRef = bytecodeF.paramRef(evaluationType, index);
+        return saveNalAndReturn(name.toString(), sMonoReference, bParamRef);
       }
     }
     throw new SbTranslatorException(compileErrorMessage(
@@ -296,7 +296,7 @@ private BCombine referencesToAllArguments(BLambdaType lambdaType) throws SbTrans
         .params()
         .elements()
         .zipWithIndex()
-        .map(t -> bytecodeF.reference(t.element1(), BigInteger.valueOf(t.element2())));
+        .map(t -> bytecodeF.paramRef(t.element1(), BigInteger.valueOf(t.element2())));
     return bytecodeF.combine(argumentReferences);
   }
 
@@ -311,7 +311,7 @@ private List<BExpr> createReferenceB(BTupleType sParamTypes) throws SbTranslator
     return sParamTypes
         .elements()
         .zipWithIndex()
-        .map(tuple -> bytecodeF.reference(tuple.element1(), BigInteger.valueOf(tuple.element2())));
+        .map(tuple -> bytecodeF.paramRef(tuple.element1(), BigInteger.valueOf(tuple.element2())));
   }
 
   private BOrder translateOrder(SOrder sOrder) throws SbTranslatorException {

src/compiler-backend/src/test/java/org/smoothbuild/compilerbackend/SbTranslatorTest.java

@@ -141,7 +141,7 @@ void mono_expression_function() throws Exception {
         void poly_expression_function() throws Exception {
           var sFunc = idSFunc();
           var sInstantiate = sInstantiate(sFunc, list(sIntType()));
-          var bLambda = bLambda(bIntIntLambdaType(), bReference(bIntType(), 0));
+          var bLambda = bLambda(bIntIntLambdaType(), bParamRef(bIntType(), 0));
           assertTranslation(bindings(sFunc), sInstantiate, bLambda);
         }
 
@@ -157,9 +157,9 @@ void poly_expression_func_instantiated_with_type_param_of_enclosing_func_type_pa
           var sWrapFunc = sPoly(list(b), sFunc(b, "wrap", nlist(sItem(b, "p")), sBody));
           var sWrapMonoFunc = sInstantiate(sWrapFunc, list(sIntType()));
 
-          var bIdLambda = bLambda(bIntIntLambdaType(), bReference(bIntType(), 0));
+          var bIdLambda = bLambda(bIntIntLambdaType(), bParamRef(bIntType(), 0));
           var bWrapLambda =
-              bLambda(bIntIntLambdaType(), bCall(bIdLambda, bReference(bIntType(), 0)));
+              bLambda(bIntIntLambdaType(), bCall(bIdLambda, bParamRef(bIntType(), 0)));
           assertTranslation(bindings(sIdFunc, sWrapFunc), sWrapMonoFunc, bWrapLambda);
         }
 
@@ -176,7 +176,7 @@ void mono_native_function() throws Exception {
               bIntType(),
               bMethodTuple(jar, bString(classBinaryName)),
               bBool(true),
-              bCombine(bReference(bBlobType(), 0)));
+              bCombine(bParamRef(bBlobType(), 0)));
           var bLambda = bLambda(list(bBlobType()), bInvoke);
 
           var fileContentReader = fileContentReaderMock(path.withExtension("jar"), jar);
@@ -198,7 +198,7 @@ void poly_native_function() throws Exception {
               bIntType(),
               bMethodTuple(jar, bString(classBinaryName)),
               bBool(true),
-              bCombine(bReference(bIntType(), 0)));
+              bCombine(bParamRef(bIntType(), 0)));
           var bLambda = bLambda(list(bIntType()), bInvoke);
 
           var fileContentReader = fileContentReaderMock(path.withExtension("jar"), jar);
@@ -267,15 +267,15 @@ void string() throws Exception {
       @Test
       void lambda() throws Exception {
         var lambda = sLambda(nlist(sItem(sIntType(), "p")), sParamRef(sIntType(), "p"));
-        assertTranslation(lambda, bLambda(list(bIntType()), bReference(bIntType(), 0)));
+        assertTranslation(lambda, bLambda(list(bIntType()), bParamRef(bIntType(), 0)));
       }
 
       @Test
       void lambda_referencing_param_of_enclosing_function() throws Exception {
         var sLambda = sLambda(sParamRef(sIntType(), "p"));
         var sFunc = sPoly(sFunc("myFunc", nlist(sItem(sIntType(), "p")), sLambda));
 
-        var bBody = bLambda(bReference(bIntType(), 0));
+        var bBody = bLambda(bParamRef(bIntType(), 0));
         var bLambda = bLambda(bLambdaType(bIntType(), bIntLambdaType()), bBody);
 
         assertTranslation(sFunc, bLambda);
@@ -287,7 +287,7 @@ void lambda_with_param_and_referencing_param_of_enclosing_function() throws Exce
         var sLambda = sLambda(nlist(sItem(sBlobType(), "b")), sParamRef(sIntType(), "i"));
         var sFunc = sPoly(sFunc("myFunc", nlist(sItem(sIntType(), "i")), sLambda));
 
-        var bBody = bLambda(list(bBlobType()), bReference(bIntType(), 1));
+        var bBody = bLambda(list(bBlobType()), bParamRef(bIntType(), 1));
         var bLambda = bLambda(list(bIntType()), bBody);
 
         assertTranslation(sFunc, bLambda);
@@ -333,7 +333,7 @@ void select() throws Exception {
         var sCall = sCall(sInstantiate(sConstructor), sString("abc"));
         var sSelect = sStructSelect(sCall, "field");
 
-        var bConstructor = bLambda(list(bStringType()), bCombine(bReference(bStringType(), 0)));
+        var bConstructor = bLambda(list(bStringType()), bCombine(bParamRef(bStringType(), 0)));
         var bCall = bCall(bConstructor, bString("abc"));
         assertTranslation(bindings(sConstructor), sSelect, bSelect(bCall, bInt(0)));
       }
@@ -346,7 +346,7 @@ void instantiated_poly_expr_twice_with_outer_instantiation_actually_setting_its_
         var sFunc = sPoly(list(varA()), sFunc("myFunc", nlist(sItem(varA(), "a")), sLambda));
         var sInstantiate = sInstantiate(sFunc, list(sIntType()));
 
-        var bBody = bLambda(bReference(bIntType(), 0));
+        var bBody = bLambda(bParamRef(bIntType(), 0));
         var bLambda = bLambda(bLambdaType(bIntType(), bIntLambdaType()), bBody);
 
         assertTranslation(bindings(sFunc), sInstantiate, bLambda);

src/evaluator/src/test/java/org/smoothbuild/evaluator/EvaluatorTest.java

@@ -209,7 +209,7 @@ void constructor() throws BytecodeException {
           var constructorS =
               sPoly(sConstructor(sStructType("MyStruct", nlist(sSig(sIntType(), "myField")))));
           assertEvaluation(
-              constructorS, bLambda(list(bIntType()), bCombine(bReference(bIntType(), 0))));
+              constructorS, bLambda(list(bIntType()), bCombine(bParamRef(bIntType(), 0))));
         }
       }
 
@@ -238,7 +238,7 @@ void constructor() throws BytecodeException {
               sPoly(sConstructor(sStructType("MyStruct", nlist(sSig(sIntType(), "field"))))),
               bLambda(
                   bLambdaType(bIntType(), bTupleType(bIntType())),
-                  bCombine(bReference(bIntType(), 0))));
+                  bCombine(bParamRef(bIntType(), 0))));
         }
       }
     }