@@ -110,8 +110,6 @@ trait QuotesAndSplices {
110110 def typedSplicePattern (tree : untpd.SplicePattern , pt : Type )(using Context ): Tree = {
111111 record(" typedSplicePattern" )
112112 if isFullyDefined(pt, ForceDegree .flipBottom) then
113- def patternOuterContext (ctx : Context ): Context =
114- if (ctx.mode.is(Mode .QuotedPattern )) patternOuterContext(ctx.outer) else ctx
115113 val typedArgs = tree.args.map {
116114 case arg : untpd.Ident =>
117115 typedExpr(arg)
@@ -124,7 +122,7 @@ trait QuotesAndSplices {
124122 val argTypes = typedArgs.map(_.tpe.widenTermRefExpr)
125123 val patType = if tree.args.isEmpty then pt else defn.FunctionOf (argTypes, pt)
126124 val pat = typedPattern(tree.body, defn.QuotedExprClass .typeRef.appliedTo(patType))(
127- using spliceContext.retractMode( Mode . QuotedPattern ).addMode( Mode . Pattern ).withOwner(patternOuterContext(ctx).owner) )
125+ using quotePatternSpliceContext )
128126 val baseType = pat.tpe.baseType(defn.QuotedExprClass )
129127 val argType = if baseType.exists then baseType.argTypesHi.head else defn.NothingType
130128 untpd.cpy.SplicePattern (tree)(pat, typedArgs).withType(pt)
@@ -164,22 +162,40 @@ trait QuotesAndSplices {
164162 val typeSymInfo = pt match
165163 case pt : TypeBounds => pt
166164 case _ => TypeBounds .empty
165+
166+ def warnOnInferredBounds (typeSym : Symbol , ignoredBounds : Boolean ) =
167+ if ! (typeSymInfo =:= TypeBounds .empty) then
168+ val (openQuote, closeQuote) = if isInQuotedExprPattern then (" '{" , " }" ) else (" '[" , " ]" )
169+ if ! ignoredBounds then
170+ if ! isInQuotedTypePattern then // TODO remove this guard once SIP-53 is non-experimental
171+ report.warning(em " Type variable ` $tree` has partially inferred bounds $typeSymInfo. \n\n Consider defining bounds explicitly: \n $openQuote $typeSym$typeSymInfo; ... $closeQuote" , tree.srcPos)
172+ else if ! (typeSym.info <:< typeSymInfo) then
173+ if isInQuotedTypePattern then // TODO remove this branch once SIP-53 is non-experimental
174+ report.warning(
175+ s """ This bound pattern is not supported yet.
176+ |This kind of pattern will be supported with SIP-53.
177+ |SIP-53: https://docs.scala-lang.org/sips/quote-pattern-type-variable-syntax.html
178+ | """ .stripMargin, tree.srcPos)
179+ else
180+ report.warning(em " Ignored bound $typeSymInfo\n\n Consider defining bounds explicitly: \n $openQuote $typeSym${typeSym.info & typeSymInfo}; ... $closeQuote" , tree.srcPos)
181+
167182 getQuotedPatternTypeVariable(tree.name.asTypeName) match
168183 case Some (typeSym) =>
169184 checkExperimentalFeature(
170185 " support for multiple references to the same type (without backticks) in quoted type patterns (SIP-53)" ,
171186 tree.srcPos,
172187 " \n\n SIP-53: https://docs.scala-lang.org/sips/quote-pattern-type-variable-syntax.html" )
173- if ! (typeSymInfo =:= TypeBounds .empty) && ! (typeSym.info <:< typeSymInfo) then
174- report.warning(em " Ignored bound $typeSymInfo\n\n Consider defining bounds explicitly `'{ $typeSym${typeSym.info & typeSymInfo}; ... }` " , tree.srcPos)
188+ warnOnInferredBounds(typeSym, ignoredBounds = true )
175189 ref(typeSym)
176190 case None =>
191+
177192 def spliceOwner (ctx : Context ): Symbol =
178193 if (ctx.mode.is(Mode .QuotedPattern )) spliceOwner(ctx.outer) else ctx.owner
179194 val name = tree.name.toTypeName
180195 val nameOfSyntheticGiven = PatMatGivenVarName .fresh(tree.name.toTermName)
181196 val expr = untpd.cpy.Ident (tree)(nameOfSyntheticGiven)
182197 val typeSym = newSymbol(spliceOwner(ctx), name, EmptyFlags , typeSymInfo, NoSymbol , tree.span)
198+ warnOnInferredBounds(typeSym, ignoredBounds = false )
183199 typeSym.addAnnotation(Annotation (New (ref(defn.QuotedRuntimePatterns_patternTypeAnnot .typeRef)).withSpan(tree.span)))
184200 addQuotedPatternTypeVariable(typeSym)
185201 val pat = typedPattern(expr, defn.QuotedTypeClass .typeRef.appliedTo(typeSym.typeRef))(
@@ -452,7 +468,7 @@ trait QuotesAndSplices {
452468 " \n\n SIP-53: https://docs.scala-lang.org/sips/quote-pattern-type-variable-syntax.html" )
453469
454470 val (typeTypeVariables, patternCtx) =
455- val quoteCtx = quotePatternContext()
471+ val quoteCtx = quotePatternContext(quoted.isType )
456472 if untpdTypeVariables.isEmpty then (Nil , quoteCtx)
457473 else typedBlockStats(untpdTypeVariables)(using quoteCtx)
458474
@@ -534,20 +550,40 @@ trait QuotesAndSplices {
534550object QuotesAndSplices {
535551 import tpd ._
536552
553+ private enum QuotePattenKind :
554+ case Expr , Type
555+
537556 /** Key for mapping from quoted pattern type variable names into their symbol */
538557 private val TypeVariableKey = new Property .Key [collection.mutable.Map [TypeName , Symbol ]]
558+ private val QuotePattenKindKey = new Property .Key [QuotePattenKind ]
539559
540560 /** Get the symbol for the quoted pattern type variable if it exists */
541561 def getQuotedPatternTypeVariable (name : TypeName )(using Context ): Option [Symbol ] =
542562 ctx.property(TypeVariableKey ).get.get(name)
543563
544- /** Get the symbol for the quoted pattern type variable if it exists */
564+ def isInQuotedExprPattern (using Context ): Boolean =
565+ ctx.property(QuotePattenKindKey ).contains(QuotePattenKind .Expr )
566+
567+ def isInQuotedTypePattern (using Context ): Boolean =
568+ ctx.property(QuotePattenKindKey ).contains(QuotePattenKind .Type )
569+
570+ /** Get the symbol for the quoted pattern type variable if it exists */
545571 def addQuotedPatternTypeVariable (sym : Symbol )(using Context ): Unit =
546572 ctx.property(TypeVariableKey ).get.update(sym.name.asTypeName, sym)
547573
548- /** Context used to type the contents of a quoted */
549- def quotePatternContext ()(using Context ): Context =
574+ /** Context used to type the contents of a quote pattern */
575+ def quotePatternContext (isTypePattern : Boolean )(using Context ): Context =
550576 quoteContext.fresh.setNewScope
551- .addMode(Mode .QuotedPattern ).retractMode(Mode .Pattern )
577+ .addMode(Mode .QuotedPattern ).retractMode(Mode .Pattern ) // TODO do we need Mode.QuotedPattern?
552578 .setProperty(TypeVariableKey , collection.mutable.Map .empty)
579+ .setProperty(QuotePattenKindKey , if isTypePattern then QuotePattenKind .Type else QuotePattenKind .Expr )
580+
581+ /** Context used to type the contents of a quote pattern splice */
582+ def quotePatternSpliceContext (using Context ): Context =
583+ def patternOuterContext (ctx : Context ): Context =
584+ if ctx.mode.is(Mode .QuotedPattern ) then patternOuterContext(ctx.outer) else ctx
585+ spliceContext
586+ .retractMode(Mode .QuotedPattern ).addMode(Mode .Pattern )
587+ .dropProperty(QuotePattenKindKey )
588+ .withOwner(patternOuterContext(ctx).owner)
553589}
0 commit comments