Simplify thunks / laziness in ValScope.extend() and Evaluator.visitBindings()

Author: JoshRosen

sjsonnet/src/sjsonnet/Evaluator.scala

@@ -699,18 +699,16 @@ class Evaluator(
 
   def visitBindings(
       bindings: Array[Bind],
-      scope: (Val.Obj, Val.Obj) => ValScope): Array[(Val.Obj, Val.Obj) => Lazy] = {
-    val arrF = new Array[(Val.Obj, Val.Obj) => Lazy](bindings.length)
+      scope: => ValScope): Array[Lazy] = {
+    val arrF = new Array[Lazy](bindings.length)
     var i = 0
     while (i < bindings.length) {
       val b = bindings(i)
       arrF(i) = b.args match {
         case null =>
-          (self: Val.Obj, sup: Val.Obj) =>
-            new LazyWithComputeFunc(() => visitExpr(b.rhs)(scope(self, sup)))
+          new LazyWithComputeFunc(() => visitExpr(b.rhs)(scope))
         case argSpec =>
-          (self: Val.Obj, sup: Val.Obj) =>
-            new LazyWithComputeFunc(() => visitMethod(b.rhs, argSpec, b.pos)(scope(self, sup)))
+          new LazyWithComputeFunc(() => visitMethod(b.rhs, argSpec, b.pos)(scope))
       }
       i += 1
     }
@@ -851,7 +849,7 @@ class Evaluator(
             new Val.Obj.Member(e.plus, Visibility.Normal) {
               def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val = {
                 lazy val newScope: ValScope = s.extend(newBindings, self, sup)
-                lazy val newBindings = visitBindings(binds, (self, sup) => newScope)
+                lazy val newBindings = visitBindings(binds, newScope)
                 visitExpr(e.value)(newScope)
               }
             }

sjsonnet/src/sjsonnet/ValScope.scala

@@ -19,22 +19,14 @@ final class ValScope private (val bindings: Array[Lazy]) extends AnyVal {
   def length: Int = bindings.length
 
   def extend(
-      newBindingsF: Array[(Val.Obj, Val.Obj) => Lazy] = null,
+      newBindings: Array[Lazy],
       newSelf: Val.Obj,
       newSuper: Val.Obj): ValScope = {
-    val by = if (newBindingsF == null) 2 else newBindingsF.length + 2
+    val by = newBindings.length + 2
     val b = Arrays.copyOf(bindings, bindings.length + by)
     b(bindings.length) = newSelf
     b(bindings.length + 1) = newSuper
-    if (newBindingsF != null) {
-      var i = 0
-      var j = bindings.length + 2
-      while (i < newBindingsF.length) {
-        b(j) = newBindingsF(i).apply(newSelf, newSuper)
-        i += 1
-        j += 1
-      }
-    }
+    System.arraycopy(newBindings, 0, b, bindings.length + 2, newBindings.length)
     new ValScope(b)
   }