@@ -175,39 +175,39 @@ class ReifyQuotes extends MacroTransform {
175175 * `scala.quoted.Unpickler.unpickleExpr` that matches `tpe` with
176176 * core and splices as arguments.
177177 */
178- override protected def transformQuotation (body : Tree , qctx : Tree , quote : Tree )(implicit ctx : Context ): Tree = {
178+ override protected def transformQuotation (body : Tree , quote : Tree )(implicit ctx : Context ): Tree = {
179179 val isType = quote.symbol eq defn.InternalQuoted_typeQuote
180180 if (level > 0 ) {
181181 val body1 = nested(isQuote = true ).transform(body)(quoteContext)
182- super .transformQuotation(body1, qctx, quote)
182+ super .transformQuotation(body1, quote)
183183 }
184184 else body match {
185185 case body : RefTree if isCaptured(body.symbol, level + 1 ) =>
186186 // Optimization: avoid the full conversion when capturing `x`
187187 // in '{ x } to '{ ${x$1} } and go directly to `x$1`
188- capturers(body.symbol)(body).select(nme.apply).appliedTo(qctx)
188+ capturers(body.symbol)(body)
189189 case _=>
190190 val (body1, splices) = nested(isQuote = true ).splitQuote(body)(quoteContext)
191191 if (level == 0 ) {
192192 val body2 =
193193 if (body1.isType) body1
194194 else Inlined (Inliner .inlineCallTrace(ctx.owner, quote.sourcePos), Nil , body1)
195- pickledQuote(body2, splices, qctx, body.tpe, isType).withSpan(quote.span)
195+ pickledQuote(body2, splices, body.tpe, isType).withSpan(quote.span)
196196 }
197197 else {
198198 body
199199 }
200200 }
201201 }
202202
203- private def pickledQuote (body : Tree , splices : List [Tree ], qctx : Tree , originalTp : Type , isType : Boolean )(implicit ctx : Context ) = {
203+ private def pickledQuote (body : Tree , splices : List [Tree ], originalTp : Type , isType : Boolean )(implicit ctx : Context ) = {
204204 def liftedValue [T ](value : T , name : TermName ) =
205- ref(defn.LiftableModule ).select(name).select(" toExpr" .toTermName).appliedTo(Literal (Constant (value))).appliedTo(qctx)
205+ ref(defn.LiftableModule ).select(name).select(" toExpr" .toTermName).appliedTo(Literal (Constant (value)))
206206
207207 def pickleAsValue [T ](value : T ) = {
208208 value match {
209- case null => ref(defn.QuotedExprModule ).select(" nullExpr" .toTermName).appliedTo(qctx)
210- case _ : Unit => ref(defn.QuotedExprModule ).select(" unitExpr" .toTermName).appliedTo(qctx)
209+ case null => ref(defn.QuotedExprModule ).select(" nullExpr" .toTermName)
210+ case _ : Unit => ref(defn.QuotedExprModule ).select(" unitExpr" .toTermName)
211211 case _ : Boolean => liftedValue(value, " Liftable_Boolean_delegate" .toTermName)
212212 case _ : Byte => liftedValue(value, " Liftable_Byte_delegate" .toTermName)
213213 case _ : Short => liftedValue(value, " Liftable_Short_delegate" .toTermName)
@@ -229,9 +229,7 @@ class ReifyQuotes extends MacroTransform {
229229 else defn.FunctionType (1 , isContextual = true ).appliedTo(defn.QuoteContextClass .typeRef, defn.QuotedExprClass .typeRef.appliedTo(defn.AnyType )) | defn.QuotedTypeClass .typeRef.appliedTo(WildcardType )
230230 val pickledQuoteStrings = liftList(PickledQuotes .pickleQuote(body).map(x => Literal (Constant (x))), defn.StringType )
231231 val splicesList = liftList(splices, defn.FunctionType (1 ).appliedTo(defn.SeqType .appliedTo(defn.AnyType ), spliceResType))
232- val pickled = meth.appliedTo(pickledQuoteStrings, splicesList)
233- if (isType) pickled
234- else pickled.appliedTo(qctx)
232+ meth.appliedTo(pickledQuoteStrings, splicesList)
235233 }
236234
237235 if (splices.nonEmpty) pickleAsTasty()
0 commit comments