Skip to content

Commit 6e39fcb

Browse files
Rename evalOnce to letBind
1 parent c1b7e84 commit 6e39fcb

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/ast/tpd.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
11391139
}
11401140

11411141
/** Let bind `tree` unless `tree` is at least idempotent */
1142-
def evalOnce(tree: Tree)(within: Tree => Tree)(implicit ctx: Context): Tree =
1142+
def letBind(tree: Tree)(within: Tree => Tree)(implicit ctx: Context): Tree =
11431143
letBindUnless(TreeInfo.Idempotent, tree)(within)
11441144

11451145
def runtimeCall(name: TermName, args: List[Tree])(implicit ctx: Context): Tree = {

compiler/src/dotty/tools/dotc/transform/Erasure.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ object Erasure {
221221
val nullTree = Literal(Constant(null))
222222
val unboxedNull = adaptToType(nullTree, underlying)
223223

224-
evalOnce(tree) { t =>
224+
letBind(tree) { t =>
225225
If(t.select(defn.Object_eq).appliedTo(nullTree),
226226
unboxedNull,
227227
unboxedTree(t))

compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,20 +265,20 @@ object TypeTestsCasts {
265265
case _: SingletonType =>
266266
expr.isInstance(testType).withSpan(tree.span)
267267
case OrType(tp1, tp2) =>
268-
evalOnce(expr) { e =>
268+
letBind(expr) { e =>
269269
transformTypeTest(e, tp1, flagUnrelated = false)
270270
.or(transformTypeTest(e, tp2, flagUnrelated = false))
271271
}
272272
case AndType(tp1, tp2) =>
273-
evalOnce(expr) { e =>
273+
letBind(expr) { e =>
274274
transformTypeTest(e, tp1, flagUnrelated)
275275
.and(transformTypeTest(e, tp2, flagUnrelated))
276276
}
277277
case defn.MultiArrayOf(elem, ndims) if isUnboundedGeneric(elem) =>
278278
def isArrayTest(arg: Tree) =
279279
ref(defn.runtimeMethodRef(nme.isArray)).appliedTo(arg, Literal(Constant(ndims)))
280280
if (ndims == 1) isArrayTest(expr)
281-
else evalOnce(expr) { e =>
281+
else letBind(expr) { e =>
282282
derivedTree(e, defn.Any_isInstanceOf, e.tpe)
283283
.and(isArrayTest(e))
284284
}

compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class VCInlineMethods extends MiniPhase with IdentityDenotTransformer {
6868
val extensionMeth = extensionMethod(origMeth)
6969

7070
if (!ctParams.isEmpty) {
71-
evalOnce(qual) { ev =>
71+
letBind(qual) { ev =>
7272
val ctArgs = ctParams.map(tparam =>
7373
TypeTree(tparam.typeRef.asSeenFrom(ev.tpe, origCls)))
7474
ref(extensionMeth)

0 commit comments

Comments
 (0)